Author: dennisl
Date: Fri Feb 4 22:56:23 2011
New Revision: 1067324
URL: http://svn.apache.org/viewvc?rev=1067324&view=rev
Log:
o Fix errors reported by Checkstyle.
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java?rev=1067324&r1=1067323&r2=1067324&view=diff
==============================================================================
---
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
(original)
+++
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
Fri Feb 4 22:56:23 2011
@@ -267,7 +267,7 @@ public class DefaultMavenFileFilter
if ( propertiesFilePaths != null )
{
Properties workProperties = new Properties();
- workProperties.putAll(baseProps);
+ workProperties.putAll( baseProps );
for ( Iterator iterator = propertiesFilePaths.iterator();
iterator.hasNext(); )
{
@@ -282,7 +282,7 @@ public class DefaultMavenFileFilter
// 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 )
{
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java?rev=1067324&r1=1067323&r2=1067324&view=diff
==============================================================================
---
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
(original)
+++
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
Fri Feb 4 22:56:23 2011
@@ -226,7 +226,7 @@ public class DefaultMavenResourcesFilter
getLogger().debug( "ignoreDelta " + ignoreDelta );
Scanner scanner = buildContext.newScanner( resourceDirectory,
ignoreDelta );
- setupScanner(resource, scanner);
+ setupScanner( resource, scanner );
scanner.scan();
@@ -259,7 +259,7 @@ public class DefaultMavenResourcesFilter
//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 @@ public class DefaultMavenResourcesFilter
scanner = buildContext.newDeleteScanner( resourceDirectory );
- setupScanner(resource, scanner);
+ setupScanner( resource, scanner );
scanner.scan();
@@ -283,7 +283,7 @@ public class DefaultMavenResourcesFilter
{
String name = (String) j.next();
- File destinationFile = getDestinationFile(outputDirectory,
targetPath, name);
+ File destinationFile = getDestinationFile( outputDirectory,
targetPath, name );
destinationFile.delete();
@@ -294,7 +294,8 @@ public class DefaultMavenResourcesFilter
}
- 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 @@ public class DefaultMavenResourcesFilter
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()
)
{
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java?rev=1067324&r1=1067323&r2=1067324&view=diff
==============================================================================
---
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
(original)
+++
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
Fri Feb 4 22:56:23 2011
@@ -221,7 +221,7 @@ public class MultiDelimiterInterpolatorF
}
return ch;
}
- if (preserveChar != null )
+ if ( preserveChar != null )
{
char copy = Character.valueOf( preserveChar.charValue()
).charValue();
preserveChar = null;
@@ -278,7 +278,7 @@ public class MultiDelimiterInterpolatorF
// so we preserve it
replaceData = key.toString();
replaceIndex = 1;
- preserveChar = Character.valueOf( (char)ch );
+ preserveChar = Character.valueOf( (char) ch );
return replaceData.charAt( 0 );
}
else
