svn commit: r1362690 - /maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/DefaultCheckstyleExecutor.java

[de...@apache.org]

Author: dennisl
Date: Tue Jul 17 22:33:11 2012
New Revision: 1362690

URL: http://svn.apache.org/viewvc?rev=1362690&view=rev
Log:
[MCHECKSTYLE-167] Unconfigured checkstyle plugin duplicates entries in aggregated report

Modified:
    maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/DefaultCheckstyleExecutor.java

Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/DefaultCheckstyleExecutor.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/DefaultCheckstyleExecutor.java?rev=1362690&r1=1362689&r2=1362690&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/DefaultCheckstyleExecutor.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/DefaultCheckstyleExecutor.java Tue Jul 17 22:33:11 2012
@@ -108,8 +108,6 @@ public class DefaultCheckstyleExecutor
         List<String> outputDirectories = new ArrayList<String>();
         File sourceDirectory = request.getSourceDirectory();
         File testSourceDirectory = request.getTestSourceDirectory();
-        prepareCheckstylePaths( request, project, classPathStrings, outputDirectories, sourceDirectory,
-                                testSourceDirectory );
         if ( request.isAggregate() )
         {
             for ( MavenProject childProject : request.getReactorProjects() )
@@ -119,6 +117,11 @@ public class DefaultCheckstyleExecutor
                                         new File( childProject.getBuild().getTestSourceDirectory() ) );
             }
         }
+        else
+        {
+            prepareCheckstylePaths( request, project, classPathStrings, outputDirectories, sourceDirectory,
+                                    testSourceDirectory );
+        }
 
         List<URL> urls = new ArrayList<URL>( classPathStrings.size() );
 
@@ -182,7 +185,6 @@ public class DefaultCheckstyleExecutor
         }
 
         CheckstyleReportListener sinkListener = new CheckstyleReportListener( configuration );
-        addSourceDirectory( sinkListener, sourceDirectory, testSourceDirectory, request );
         if ( request.isAggregate() )
         {
             for ( MavenProject childProject : request.getReactorProjects() )
@@ -191,6 +193,10 @@ public class DefaultCheckstyleExecutor
                                     new File( childProject.getBuild().getSourceDirectory() ), request );
             }
         }
+        else
+        {
+            addSourceDirectory( sinkListener, sourceDirectory, testSourceDirectory, request );
+        }
 
         checker.addListener( sinkListener );
 
@@ -475,7 +481,6 @@ public class DefaultCheckstyleExecutor
         File sourceDirectory = request.getSourceDirectory();
 
         List<File> files = new ArrayList<File>();
-        addFilesToProcess( request, excludesStr, sourceDirectory, files );
         if ( request.isAggregate() )
         {
             for ( MavenProject project : request.getReactorProjects() )
@@ -483,6 +488,10 @@ public class DefaultCheckstyleExecutor
                 addFilesToProcess( request, excludesStr, new File( project.getBuild().getSourceDirectory() ), files );
             }
         }
+        else
+        {
+            addFilesToProcess( request, excludesStr, sourceDirectory, files );
+        }
 
         return (File[]) files.toArray( EMPTY_FILE_ARRAY );
     }