peterreilly 2003/10/20 07:18:35
Modified: src/main/org/apache/tools/ant/helper Tag: ANT_16_BRANCH
AntXMLContext.java ProjectHelper2.java
Log:
Merge with head
Revision Changes Path
No revision
No revision
1.4.2.1 +1 -0 ant/src/main/org/apache/tools/ant/helper/AntXMLContext.java
Index: AntXMLContext.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/helper/AntXMLContext.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- AntXMLContext.java 13 Aug 2003 13:18:54 -0000 1.4
+++ AntXMLContext.java 20 Oct 2003 14:18:35 -0000 1.4.2.1
@@ -135,6 +135,7 @@
*/
public AntXMLContext(Project project) {
this.project = project;
+ implicitTarget.setProject(project);
implicitTarget.setName("");
targetVector.addElement(implicitTarget);
}
1.33.2.1 +2 -0 ant/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
Index: ProjectHelper2.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/helper/ProjectHelper2.java,v
retrieving revision 1.33
retrieving revision 1.33.2.1
diff -u -r1.33 -r1.33.2.1
--- ProjectHelper2.java 17 Sep 2003 14:13:53 -0000 1.33
+++ ProjectHelper2.java 20 Oct 2003 14:18:35 -0000 1.33.2.1
@@ -157,6 +157,7 @@
Target currentTarget = context.getCurrentTarget();
try {
Target newCurrent = new Target();
+ newCurrent.setProject(project);
newCurrent.setName("");
context.setCurrentTarget(newCurrent);
parse(project, source, new RootHandler(context, mainHandler));
@@ -790,6 +791,7 @@
Project project = context.getProject();
Target target = new Target();
+ target.setProject(project);
context.addTarget(target);
for (int i = 0; i < attrs.getLength(); i++) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org
|