ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/workspace DefaultWorkspace.java
Date Thu, 25 Apr 2002 03:33:34 GMT
donaldp     02/04/24 20:33:34

  Modified:    container/src/java/org/apache/myrmidon/components/workspace
                        DefaultWorkspace.java
  Log:
  Make sure each target has a new non-partitioning frame. Thus the path given in the TaskEvent
will accurately reflect location of task inside a target.
  
  Revision  Changes    Path
  1.46      +5 -3      jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java
  
  Index: DefaultWorkspace.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- DefaultWorkspace.java	25 Apr 2002 01:41:50 -0000	1.45
  +++ DefaultWorkspace.java	25 Apr 2002 03:33:34 -0000	1.46
  @@ -38,7 +38,7 @@
    * This is the default implementation of Workspace.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.45 $ $Date: 2002/04/25 01:41:50 $
  + * @version $Revision: 1.46 $ $Date: 2002/04/25 03:33:34 $
    */
   public class DefaultWorkspace
       extends AbstractLogEnabled
  @@ -332,7 +332,7 @@
               // Target has been executed
               return;
           }
  -        if( state == TargetState.TRAVERSING )
  +        else if( state == TargetState.TRAVERSING )
           {
               // Cycle in target dependencies
               final String message = REZ.getString( "target-dependency-cycle.error", name
);
  @@ -405,12 +405,14 @@
   
           //TODO - put this back in
           //frame.getContext().setProperty( Project.TARGET, target );
  +        final ExecutionFrame frame =
  +            entry.getFrame().createChildFrame( name, false );
   
           // Execute all tasks assciated with target
           final ModelElement[] tasks = target.getTasks();
           for( int i = 0; i < tasks.length; i++ )
           {
  -            executeTask( tasks[ i ], entry.getFrame() );
  +            executeTask( tasks[ i ], frame );
           }
   
           // Notify listeners
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message