o Fix errors reported by Checkstyle.
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1067324 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
index d2d0915..77cbea5 100644
--- a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
+++ b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
@@ -267,7 +267,7 @@
if ( propertiesFilePaths != null )
{
Properties workProperties = new Properties();
- workProperties.putAll(baseProps);
+ workProperties.putAll( baseProps );
for ( Iterator iterator = propertiesFilePaths.iterator(); iterator.hasNext(); )
{
@@ -282,7 +282,7 @@
// TODO new File should be new File(mavenProject.getBasedir(), filterfile ) ?
Properties properties = PropertyUtils.loadPropertyFile( new File( filterFile ), workProperties );
filterProperties.putAll( properties );
- workProperties.putAll(properties);
+ workProperties.putAll( properties );
}
catch ( IOException e )
{
diff --git a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
index 955d25e..99593d9 100644
--- a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
+++ b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
@@ -226,7 +226,7 @@
getLogger().debug( "ignoreDelta " + ignoreDelta );
Scanner scanner = buildContext.newScanner( resourceDirectory, ignoreDelta );
- setupScanner(resource, scanner);
+ setupScanner( resource, scanner );
scanner.scan();
@@ -259,7 +259,7 @@
//File destinationFile = new File( outputDirectory, destination );
- File destinationFile = getDestinationFile(outputDirectory, targetPath, name);
+ File destinationFile = getDestinationFile( outputDirectory, targetPath, name );
boolean filteredExt = filteredFileExtension( source.getName(), mavenResourcesExecution
.getNonFilteredFileExtensions() );
@@ -273,7 +273,7 @@
scanner = buildContext.newDeleteScanner( resourceDirectory );
- setupScanner(resource, scanner);
+ setupScanner( resource, scanner );
scanner.scan();
@@ -283,7 +283,7 @@
{
String name = (String) j.next();
- File destinationFile = getDestinationFile(outputDirectory, targetPath, name);
+ File destinationFile = getDestinationFile( outputDirectory, targetPath, name );
destinationFile.delete();
@@ -294,7 +294,8 @@
}
- private File getDestinationFile(File outputDirectory, String targetPath, String name) {
+ private File getDestinationFile( File outputDirectory, String targetPath, String name )
+ {
String destination = name;
if ( targetPath != null )
@@ -315,7 +316,8 @@
return destinationFile;
}
- private String[] setupScanner(Resource resource, Scanner scanner) {
+ private String[] setupScanner( Resource resource, Scanner scanner )
+ {
String[] includes = null;
if ( resource.getIncludes() != null && !resource.getIncludes().isEmpty() )
{
diff --git a/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java b/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
index 12ed37d..08f9f7c 100644
--- a/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
+++ b/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
@@ -221,7 +221,7 @@
}
return ch;
}
- if (preserveChar != null )
+ if ( preserveChar != null )
{
char copy = Character.valueOf( preserveChar.charValue() ).charValue();
preserveChar = null;
@@ -278,7 +278,7 @@
// so we preserve it
replaceData = key.toString();
replaceIndex = 1;
- preserveChar = Character.valueOf( (char)ch );
+ preserveChar = Character.valueOf( (char) ch );
return replaceData.charAt( 0 );
}
else
