Author: dennisl Date: Mon Mar 9 19:44:08 2009 New Revision: 751806 URL: http://svn.apache.org/viewvc?rev=751806&view=rev Log: o Fix errors reported by Checkstyle.
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java?rev=751806&r1=751805&r2=751806&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java Mon Mar 9 19:44:08 2009 @@ -440,8 +440,8 @@ mavenResourcesExecution.setEscapeString( escapeString ); defaultFilterWrappers = mavenFileFilter.getDefaultFilterWrappers( project, filters, - escapedBackslashesInFilePath, - this.session, mavenResourcesExecution ); + escapedBackslashesInFilePath, + this.session, mavenResourcesExecution ); } catch ( MavenFilteringException e ) @@ -454,7 +454,7 @@ defaultFilterWrappers, getNonFilteredFileExtensions(), filteringDeploymentDescriptors, - this.artifactFactory); + this.artifactFactory ); final Iterator it = packagingTasks.iterator(); while ( it.hasNext() ) { @@ -671,7 +671,8 @@ return filteringDeploymentDescriptors; } - public ArtifactFactory getArtifactFactory() { + public ArtifactFactory getArtifactFactory() + { return this.artifactFactory; } @@ -868,11 +869,13 @@ this.nonFilteredFileExtensions = nonFilteredFileExtensions; } - public ArtifactFactory getArtifactFactory() { + public ArtifactFactory getArtifactFactory() + { return this.artifactFactory; } - public void setArtifactFactory(ArtifactFactory artifactFactory) { + public void setArtifactFactory( ArtifactFactory artifactFactory ) + { this.artifactFactory = artifactFactory; } } Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java?rev=751806&r1=751805&r2=751806&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java Mon Mar 9 19:44:08 2009 @@ -93,8 +93,8 @@ catch ( InterpolationException e ) { throw new MojoExecutionException( - "Could not get the final name of the artifact[" + artifact.getGroupId() + ":" + - artifact.getArtifactId() + ":" + artifact.getVersion() + "]", e ); + "Could not get the final name of the artifact[" + artifact.getGroupId() + ":" + artifact.getArtifactId() + + ":" + artifact.getVersion() + "]", e ); } final String targetFilename = LIB_PATH + archiveName;