conor 01/08/02 07:48:24
Modified: src/main/org/apache/tools/ant/taskdefs Tstamp.java
src/main/org/apache/tools/ant/types PatternSet.java
Log:
Two steps forward, one step back - make it build under JDK 1.1
Revision Changes Path
1.12 +3 -3
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
Index: Tstamp.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tstamp.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Tstamp.java 2001/07/30 13:08:05 1.11
+++ Tstamp.java 2001/08/02 14:48:24 1.12
@@ -136,7 +136,7 @@
if (st.hasMoreElements()) {
country = st.nextToken();
if (st.hasMoreElements()) {
- throw new BuildException( "bad locale format",
location);
+ throw new BuildException( "bad locale format",
getLocation());
}
}
}
@@ -145,7 +145,7 @@
}
}
catch (NoSuchElementException e) {
- throw new BuildException( "bad locale format", e, location);
+ throw new BuildException( "bad locale format", e,
getLocation());
}
}
@@ -179,7 +179,7 @@
field = Calendar.YEAR;
}
else {
- throw new BuildException(unit + " is not a unit supported by
the tstamp task");
+ throw new BuildException(unit + " is not a unit supported by
the tstamp task", getLocation());
}
}
1.10 +2 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PatternSet.java 2001/08/01 09:29:50 1.9
+++ PatternSet.java 2001/08/02 14:48:24 1.10
@@ -413,7 +413,7 @@
readPatterns(inclFile, includeList, p);
}
}
- includesFileList.clear();
+ includesFileList.removeAllElements();
}
if (excludesFileList.size() > 0) {
@@ -430,7 +430,7 @@
readPatterns(exclFile, excludeList, p);
}
}
- excludesFileList.clear();
+ excludesFileList.removeAllElements();
}
}
