You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by do...@apache.org on 2001/12/01 04:34:35 UTC
cvs commit: jakarta-ant/src/main/org/apache/tools/ant/types PatternSet.java
donaldp 01/11/30 19:34:35
Modified: src/main/org/apache/tools/ant Target.java
src/main/org/apache/tools/ant/taskdefs Echo.java Exit.java
Input.java Javadoc.java Property.java SQLExec.java
src/main/org/apache/tools/ant/types PatternSet.java
Log:
Make changes so that tasks use the two arg replaceProperties() rather than 3 arg as it is lower coupling.
Revision Changes Path
1.27 +2 -2 jakarta-ant/src/main/org/apache/tools/ant/Target.java
Index: Target.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Target.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Target.java 2001/11/09 15:48:11 1.26
+++ Target.java 2001/12/01 03:34:35 1.27
@@ -222,7 +222,7 @@
return true;
}
- String test = ProjectHelper.replaceProperties(getProject(), ifCondition, getProject().getProperties());
+ String test = ProjectHelper.replaceProperties(getProject(), ifCondition);
return project.getProperty(test) != null;
}
@@ -230,7 +230,7 @@
if ("".equals(unlessCondition)) {
return true;
}
- String test = ProjectHelper.replaceProperties(getProject(), unlessCondition, getProject().getProperties());
+ String test = ProjectHelper.replaceProperties(getProject(), unlessCondition);
return project.getProperty(test) == null;
}
}
1.9 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Echo.java
Index: Echo.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Echo.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Echo.java 2001/10/28 21:26:29 1.8
+++ Echo.java 2001/12/01 03:34:35 1.9
@@ -128,7 +128,7 @@
*/
public void addText(String msg) {
message +=
- ProjectHelper.replaceProperties(project, msg, project.getProperties());
+ ProjectHelper.replaceProperties(project, msg);
}
/**
1.6 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Exit.java
Index: Exit.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Exit.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Exit.java 2001/11/22 08:41:49 1.5
+++ Exit.java 2001/12/01 03:34:35 1.6
@@ -84,7 +84,7 @@
*/
public void addText(String msg) {
message +=
- ProjectHelper.replaceProperties(project, msg, project.getProperties());
+ ProjectHelper.replaceProperties(project, msg);
}
}
1.2 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Input.java
Index: Input.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Input.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Input.java 2001/11/30 12:24:17 1.1
+++ Input.java 2001/12/01 03:34:35 1.2
@@ -204,7 +204,7 @@
*/
public void addText(String msg) {
message +=
- ProjectHelper.replaceProperties(project, msg, project.getProperties());
+ ProjectHelper.replaceProperties(project, msg);
}
}
1.67 +1 -2 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
Index: Javadoc.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- Javadoc.java 2001/11/27 18:04:52 1.66
+++ Javadoc.java 2001/12/01 03:34:35 1.67
@@ -1146,8 +1146,7 @@
* Convenience method to expand properties.
*/
protected String expand(String content) {
- return ProjectHelper.replaceProperties(project, content,
- project.getProperties());
+ return ProjectHelper.replaceProperties(project, content);
}
private String getJavadocExecutableName()
1.36 +1 -1 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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Property.java 2001/11/30 17:35:06 1.35
+++ Property.java 2001/12/01 03:34:35 1.36
@@ -280,7 +280,7 @@
String name = (String) e.nextElement();
String value = (String) props.getProperty(name);
- String v = ProjectHelper.replaceProperties(project, value, project.getProperties());
+ String v = ProjectHelper.replaceProperties(project, value);
addProperty(name, v);
}
}
1.26 +1 -2 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
Index: SQLExec.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/SQLExec.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- SQLExec.java 2001/10/28 21:26:29 1.25
+++ SQLExec.java 2001/12/01 03:34:35 1.26
@@ -533,8 +533,7 @@
try{
while ((line=in.readLine()) != null){
line = line.trim();
- line = ProjectHelper.replaceProperties(project, line,
- project.getProperties());
+ line = ProjectHelper.replaceProperties(project, line);
if (line.startsWith("//")) continue;
if (line.startsWith("--")) continue;
StringTokenizer st = new StringTokenizer(line);
1.14 +1 -2 jakarta-ant/src/main/org/apache/tools/ant/types/PatternSet.java
Index: PatternSet.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/PatternSet.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- PatternSet.java 2001/10/28 21:27:19 1.13
+++ PatternSet.java 2001/12/01 03:34:35 1.14
@@ -291,8 +291,7 @@
String line = patternReader.readLine();
while (line != null) {
if (line.length() > 0) {
- line = ProjectHelper.replaceProperties(p, line,
- p.getProperties());
+ line = ProjectHelper.replaceProperties(p, line);
addPatternToList(patternlist).setName(line);
}
line = patternReader.readLine();
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>