You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by vm...@apache.org on 2002/08/05 19:59:24 UTC
cvs commit: jakarta-cactus/anttasks/src/java/org/apache/cactus/ant ArgListTask.java CheckPropertiesTask.java
vmassol 2002/08/05 10:59:24
Modified: anttasks/src/java/org/apache/cactus/ant ArgListTask.java
CheckPropertiesTask.java
Log:
improvement suggested by Stefan Bodewig
Revision Changes Path
1.3 +2 -5 jakarta-cactus/anttasks/src/java/org/apache/cactus/ant/ArgListTask.java
Index: ArgListTask.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/anttasks/src/java/org/apache/cactus/ant/ArgListTask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ArgListTask.java 30 Jul 2002 20:14:49 -0000 1.2
+++ ArgListTask.java 5 Aug 2002 17:59:24 -0000 1.3
@@ -140,10 +140,7 @@
// Check if this property is defined
String value = getProject().getProperty(propertyName);
if (value == null) {
- value = getProject().getUserProperty(propertyName);
- if (value == null) {
- continue;
- }
+ continue;
}
// Yes, add the property the list of args
1.2 +4 -7 jakarta-cactus/anttasks/src/java/org/apache/cactus/ant/CheckPropertiesTask.java
Index: CheckPropertiesTask.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/anttasks/src/java/org/apache/cactus/ant/CheckPropertiesTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CheckPropertiesTask.java 30 Jul 2002 20:14:49 -0000 1.1
+++ CheckPropertiesTask.java 5 Aug 2002 17:59:24 -0000 1.2
@@ -114,12 +114,9 @@
String value = getProject().getProperty(property.getName());
if (value == null) {
- value = getProject().getUserProperty(property.getName());
- if (value == null) {
- // The property does not exist
- throw new BuildException("The property ["
- + property.getName() + "] is not defined");
- }
+ // The property does not exist
+ throw new BuildException("The property ["
+ + property.getName() + "] is not defined");
}
// Print the property name/value
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>