svn commit: r794114 - /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java

[vsiveton]

Author: vsiveton
Date: Tue Jul 14 23:23:00 2009
New Revision: 794114

URL: http://svn.apache.org/viewvc?rev=794114&view=rev
Log:
MJAVADOC-230: aggregate report requires to have aggregate=true configuration 
parameter
Submitted by: Jeff Maxwell

o patch applied

Modified:
    
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java

Modified: 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java?rev=794114&r1=794113&r2=794114&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
 (original)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
 Tue Jul 14 23:23:00 2009
@@ -137,16 +137,9 @@
     /** {...@inheritdoc} */
     public boolean canGenerateReport()
     {
-        boolean canGenerate;
-        if ( aggregate != isAggregator() )
-        {
-            canGenerate = false;
-        }
-        else if ( isAggregator() && !project.isExecutionRoot() )
-        {
-            canGenerate = false;
-        }
-        else
+        boolean canGenerate = false;
+
+        if ( !this.isAggregator() || ( this.isAggregator() && 
this.project.isExecutionRoot() ) )
         {
             List sourcePaths = getSourcePaths();