bodewig 02/03/11 02:17:23
Modified: . build.xml
src/main/org/apache/tools/ant/types XMLCatalog.java
Log:
JDK 1.1 fixes, second half.
Thanks Conor 8-)
Revision Changes Path
1.265 +0 -6 jakarta-ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/build.xml,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- build.xml 11 Mar 2002 07:23:33 -0000 1.264
+++ build.xml 11 Mar 2002 10:17:23 -0000 1.265
@@ -134,12 +134,6 @@
<!-- uses the context classloader -->
<exclude name="${optional.package}/junit/JUnitClassLoaderTest.java"
unless="jdk1.2+" />
-
- <!-- I hope these are just temporary -->
- <exclude name="${ant.package}/types/XCatalog.java"
- unless="jdk1.2+" />
- <exclude name="${ant.package}/taskdefs/XSLTProcess.java"
- unless="jdk1.2+" />
</patternset>
<patternset id="needs.jdk1.3+">
<exclude name="${ant.package}/taskdefs/TestProcess.java"
1.2 +7 -7
jakarta-ant/src/main/org/apache/tools/ant/types/XMLCatalog.java
Index: XMLCatalog.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/XMLCatalog.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLCatalog.java 11 Mar 2002 09:40:21 -0000 1.1
+++ XMLCatalog.java 11 Mar 2002 10:17:23 -0000 1.2
@@ -59,7 +59,7 @@
import java.io.InputStream;
import java.io.IOException;
import java.net.URL;
-import java.util.Iterator;
+import java.util.Enumeration;
import java.util.Vector;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
@@ -90,7 +90,7 @@
* elements, or use Norman Walsh's entity resolver from xml-commons</p>
*
* @author dIon Gillard
- * @version $Id: XMLCatalog.java,v 1.1 2002/03/11 09:40:21 conor Exp $
+ * @version $Id: XMLCatalog.java,v 1.2 2002/03/11 10:17:23 bodewig Exp $
*/
public class XMLCatalog extends DataType implements Cloneable,
EntityResolver {
@@ -125,7 +125,7 @@
* @param aDTD the DTDLocation instance to be aded to the catalog
*/
private void addElement(DTDLocation aDTD) {
- getElements().add(aDTD);
+ getElements().addElement(aDTD);
}
/**
@@ -139,7 +139,7 @@
if (isReference()) {
throw noChildrenAllowed();
}
- getElements().add(dtd);
+ getElements().addElement(dtd);
}
/**
@@ -250,10 +250,10 @@
* of the DTD or null if no such information is available
*/
private DTDLocation findMatchingDTD(String publicId) {
- Iterator elements = getElements().iterator();
+ Enumeration elements = getElements().elements();
DTDLocation element = null;
- while (elements.hasNext()) {
- element = (DTDLocation)elements.next();
+ while (elements.hasMoreElements()) {
+ element = (DTDLocation)elements.nextElement();
if (element.getPublicId().equals(publicId)) {
return element;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
