You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by ad...@apache.org on 2002/07/02 04:10:43 UTC
cvs commit: jakarta-ant-myrmidon/ant1compat/src/java/org/apache/tools/ant/taskdefs CallTarget.java
adammurdoch 2002/07/01 19:10:43
Modified: ant1compat/src/java/org/apache/tools/ant/taskdefs
CallTarget.java
Log:
Use project reference, instead of Project object, in ant1compat <antcall>.
Revision Changes Path
1.8 +6 -4 jakarta-ant-myrmidon/ant1compat/src/java/org/apache/tools/ant/taskdefs/CallTarget.java
Index: CallTarget.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/ant1compat/src/java/org/apache/tools/ant/taskdefs/CallTarget.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CallTarget.java 25 Jun 2002 14:45:55 -0000 1.7
+++ CallTarget.java 2 Jul 2002 02:10:43 -0000 1.8
@@ -9,7 +9,8 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.ExecuteTarget;
-import org.apache.myrmidon.interfaces.model.Project;
+import org.apache.myrmidon.interfaces.workspace.ProjectRef;
+import org.apache.myrmidon.interfaces.workspace.ProjectRefs;
/**
* The Ant1Compat version of the <antcall> task, which delegates to the
@@ -35,7 +36,8 @@
*/
protected void prepare( final ExecuteTarget exe ) throws TaskException
{
- final Project project = (Project)m_context.getProperty( Project.KEY );
- exe.setProject( project.getProjectDescriptor() );
+ final ProjectRefs refs = (ProjectRefs)m_context.getProperty( ProjectRefs.KEY );
+ final ProjectRef thisProject = refs.getProjectRef( null );
+ exe.setProject( thisProject.getProject() );
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>