svn commit: r808344 - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java

[bentmann]

Author: bentmann
Date: Thu Aug 27 09:55:02 2009
New Revision: 808344

URL: http://svn.apache.org/viewvc?rev=808344&view=rev
Log:
o Refactored code

Modified:
    
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
    
maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java

Modified: 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=808344&r1=808343&r2=808344&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
 (original)
+++ 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
 Thu Aug 27 09:55:02 2009
@@ -211,7 +211,7 @@
         logger.debug( 
"-----------------------------------------------------------------------" );
         logger.debug( "Goal:          " + mojoExecId );
         logger.debug( "Style:         "
-            + ( isAggregatorMojo( mojoExecution.getMojoDescriptor() ) ? 
"Aggregating" : "Regular" ) );
+            + ( mojoExecution.getMojoDescriptor().isAggregating() ? 
"Aggregating" : "Regular" ) );
         logger.debug( "Configuration: " + mojoExecution.getConfiguration() );
     }
 
@@ -643,7 +643,7 @@
 
                 MojoDescriptor mojoDescriptor = getMojoDescriptor( task, 
session, session.getTopLevelProject() );
 
-                boolean aggregating = isAggregatorMojo( mojoDescriptor );
+                boolean aggregating = mojoDescriptor.isAggregating();
 
                 if ( currentSegment == null || currentSegment.aggregating != 
aggregating )
                 {
@@ -675,17 +675,6 @@
         return task.indexOf( ':' ) >= 0;
     }
 
-    private boolean isAggregatorMojo( MojoDescriptor mojoDescriptor )
-    {
-        return mojoDescriptor.isAggregator() || 
!mojoDescriptor.isProjectRequired();
-    }
-
-    private boolean isForkingMojo( MojoDescriptor mojoDescriptor )
-    {
-        return StringUtils.isNotEmpty( mojoDescriptor.getExecuteGoal() )
-            || StringUtils.isNotEmpty( mojoDescriptor.getExecutePhase() );
-    }
-
     private static final class ProjectBuild
     {
 
@@ -906,7 +895,7 @@
     {
         MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
 
-        if ( !isForkingMojo( mojoDescriptor ) )
+        if ( !mojoDescriptor.isForking() )
         {
             return;
         }
@@ -918,7 +907,7 @@
 
         List<MavenProject> forkedProjects;
 
-        if ( isAggregatorMojo( mojoDescriptor ) )
+        if ( mojoDescriptor.isAggregating() )
         {
             forkedProjects = session.getProjects();
         }

Modified: 
maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java?rev=808344&r1=808343&r2=808344&view=diff
==============================================================================
--- 
maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
 (original)
+++ 
maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
 Thu Aug 27 09:55:02 2009
@@ -617,6 +617,23 @@
     }
 
     /**
+     * @return {...@code true} if this mojo is aggregating projects, {...@code 
false} otherwise.
+     */
+    public boolean isAggregating()
+    {
+        return isAggregator() || !isProjectRequired();
+    }
+
+    /**
+     * @return {...@code true} if this mojo forks either a goal or the 
lifecycle, {...@code false} otherwise.
+     */
+    public boolean isForking()
+    {
+        return ( getExecuteGoal() != null && getExecuteGoal().length() > 0 )
+            || ( getExecutePhase() != null && getExecutePhase().length() > 0 );
+    }
+
+    /**
      * Creates a shallow copy of this mojo descriptor.
      */
     @Override