You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by bo...@apache.org on 2002/05/10 12:16:41 UTC
cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs Ant.java Property.java
bodewig 02/05/10 03:16:39
Modified: src/main/org/apache/tools/ant/taskdefs Tag: ANT_15_BRANCH
Ant.java Property.java
Log:
If the same <ant> instance would be used twice, some attributes of the
nested <property> would get lost on the second call.
Revision Changes Path
No revision
No revision
1.56.2.1 +12 -0 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ant.java
Index: Ant.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ant.java,v
retrieving revision 1.56
retrieving revision 1.56.2.1
diff -u -r1.56 -r1.56.2.1
--- Ant.java 22 Apr 2002 13:43:52 -0000 1.56
+++ Ant.java 10 May 2002 10:16:38 -0000 1.56.2.1
@@ -184,6 +184,18 @@
if (p.getResource() != null) {
newP.setResource(p.getResource());
}
+ if (p.getPrefix() != null) {
+ newP.setPrefix(p.getPrefix());
+ }
+ if (p.getRefid() != null) {
+ newP.setRefid(p.getRefid());
+ }
+ if (p.getEnvironment() != null) {
+ newP.setEnvironment(p.getEnvironment());
+ }
+ if (p.getClasspath() != null) {
+ newP.setClasspath(p.getClasspath());
+ }
properties.setElementAt(newP, i);
}
}
1.48.2.1 +20 -0 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Property.java
Index: Property.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Property.java,v
retrieving revision 1.48
retrieving revision 1.48.2.1
diff -u -r1.48 -r1.48.2.1
--- Property.java 15 Apr 2002 13:36:17 -0000 1.48
+++ Property.java 10 May 2002 10:16:39 -0000 1.48.2.1
@@ -130,6 +130,9 @@
return file;
}
+ /**
+ * @since Ant 1.5
+ */
public void setPrefix(String prefix) {
this.prefix = prefix;
if (!prefix.endsWith(".")) {
@@ -137,6 +140,13 @@
}
}
+ /**
+ * @since Ant 1.5
+ */
+ public String getPrefix() {
+ return prefix;
+ }
+
public void setRefid(Reference ref) {
this.ref = ref;
}
@@ -157,6 +167,9 @@
this.env = env;
}
+ /**
+ * @since Ant 1.5
+ */
public String getEnvironment() {
return env;
}
@@ -178,6 +191,13 @@
public void setClasspathRef(Reference r) {
createClasspath().setRefid(r);
+ }
+
+ /**
+ * @since Ant 1.5
+ */
+ public Path getClasspath() {
+ return classpath;
}
/**
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>