jvanzyl     2004/05/08 10:18:39

  Modified:    maven-core/src/main/java/org/apache/maven/plugin/manager
                        DefaultPluginManagerManager.java
  Log:
  o we don't need to look for children and parents, i was getting problems because i 
was using the whole DAG and not a subset corresponding to the vertex in question.
  
  Revision  Changes    Path
  1.17      +10 -19    
maven-components/maven-core/src/main/java/org/apache/maven/plugin/manager/DefaultPluginManagerManager.java
  
  Index: DefaultPluginManagerManager.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/manager/DefaultPluginManagerManager.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- DefaultPluginManagerManager.java  8 May 2004 13:40:21 -0000       1.16
  +++ DefaultPluginManagerManager.java  8 May 2004 17:18:39 -0000       1.17
  @@ -92,30 +92,21 @@
   
           PluginExecutionResponse response = null;
   
  -        
  -        //@todo why need to check both parents and children?
  -        if ( dag.getChildLabels( goal ).size() == 0 && dag.getParentLabels( goal 
).size() == 0 )
  -        {
  -            response = attainGoal( pluginManager, context );
  -        }
  -        else
  -        {
  -            List goals = TopologicalSorter.sort( dag.getVertex( goal ) );
  +        List goals = TopologicalSorter.sort( dag.getVertex( goal ) );
   
  -            int goalIndex = goals.indexOf( goal );
  +        int goalIndex = goals.indexOf( goal );
   
  -            for ( int j = 0; j <= goalIndex; j++ )
  -            {
  -                String goalName = (String) goals.get( j );
  +        for ( int j = 0; j <= goalIndex; j++ )
  +        {
  +            String goalName = (String) goals.get( j );
   
  -                context.setGoal( goalName );
  +            context.setGoal( goalName );
   
  -                response = attainGoal( pluginManager, context );
  +            response = attainGoal( pluginManager, context );
   
  -                if ( response.exceptionOccurred() )
  -                {
  -                    return response;
  -                }
  +            if ( response.exceptionOccurred() )
  +            {
  +                return response;
               }
           }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to