svn commit: r1744916 - in /maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering: BaseFilter.java DefaultMavenResourcesFiltering.java InterpolatorFilterReaderLineEnding.java

[khmarbaise]

Author: khmarbaise
Date: Sat May 21 11:53:12 2016
New Revision: 1744916

URL: http://svn.apache.org/viewvc?rev=1744916&view=rev
Log:
Fixed checkstyle reported errors/warnings.

Modified:
    
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/BaseFilter.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/InterpolatorFilterReaderLineEnding.java

Modified: 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java?rev=1744916&r1=1744915&r2=1744916&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
 (original)
+++ 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
 Sat May 21 11:53:12 2016
@@ -104,12 +104,13 @@ class BaseFilter
         //
         // khmarbaise: 2016-05-21:
         // If we throw an MavenFilteringException tests will fail which is
-        // caused by for example:     
-        // void copyFile( File from, final File to, boolean filtering, 
List<FileUtils.FilterWrapper> filterWrappers, String encoding )
+        // caused by for example:
+        // void copyFile( File from, final File to, boolean filtering, 
List<FileUtils.FilterWrapper> filterWrappers,
+        // String encoding )
         // in MavenFileFilter interface where no MavenSession is given.
         // So changing here to throw a MavenFilteringException would make
         // it necessary to change the interface or we need to find a better 
solution.
-        // 
+        //
         if ( request.getMavenSession() != null )
         {
             // User properties have precedence over system properties

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=1744916&r1=1744915&r2=1744916&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
 Sat May 21 11:53:12 2016
@@ -129,13 +129,7 @@ public class DefaultMavenResourcesFilter
 
         if ( mavenResourcesExecution.isUseDefaultFilterWrappers() )
         {
-            List<FileUtils.FilterWrapper> filterWrappers = new 
ArrayList<FileUtils.FilterWrapper>();
-            if ( mavenResourcesExecution.getFilterWrappers() != null )
-            {
-                filterWrappers.addAll( 
mavenResourcesExecution.getFilterWrappers() );
-            }
-            filterWrappers.addAll( mavenFileFilter.getDefaultFilterWrappers( 
mavenResourcesExecution ) );
-            mavenResourcesExecution.setFilterWrappers( filterWrappers );
+            handleDefaultFilterWrappers( mavenResourcesExecution );
         }
 
         if ( mavenResourcesExecution.getEncoding() == null || 
mavenResourcesExecution.getEncoding().length() < 1 )
@@ -264,6 +258,18 @@ public class DefaultMavenResourcesFilter
 
     }
 
+    private void handleDefaultFilterWrappers( MavenResourcesExecution 
mavenResourcesExecution )
+        throws MavenFilteringException
+    {
+        List<FileUtils.FilterWrapper> filterWrappers = new 
ArrayList<FileUtils.FilterWrapper>();
+        if ( mavenResourcesExecution.getFilterWrappers() != null )
+        {
+            filterWrappers.addAll( mavenResourcesExecution.getFilterWrappers() 
);
+        }
+        filterWrappers.addAll( mavenFileFilter.getDefaultFilterWrappers( 
mavenResourcesExecution ) );
+        mavenResourcesExecution.setFilterWrappers( filterWrappers );
+    }
+
     private File getDestinationFile( File outputDirectory, String targetPath, 
String name,
                                      MavenResourcesExecution 
mavenResourcesExecution )
                                          throws MavenFilteringException

Modified: 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEnding.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEnding.java?rev=1744916&r1=1744915&r2=1744916&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEnding.java
 (original)
+++ 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEnding.java
 Sat May 21 11:53:12 2016
@@ -227,7 +227,6 @@ public class InterpolatorFilterReaderLin
                 }
 
                 ch = in.read();
-
             }
 
         }