From ae097cfbc9e5fb2026e983c3553521dba21c603a Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Mon, 11 Mar 2002 10:17:23 +0000
Subject: [PATCH] JDK 1.1 fixes, second half.

Thanks Conor 8-)


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271814 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                                           |  6 ------
 src/main/org/apache/tools/ant/types/XMLCatalog.java | 12 ++++++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/build.xml b/build.xml
index 755237e6d..1ff0bb100 100644
--- a/build.xml
+++ b/build.xml
@@ -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"
diff --git a/src/main/org/apache/tools/ant/types/XMLCatalog.java b/src/main/org/apache/tools/ant/types/XMLCatalog.java
index f95a5160a..bffa4610f 100644
--- a/src/main/org/apache/tools/ant/types/XMLCatalog.java
+++ b/src/main/org/apache/tools/ant/types/XMLCatalog.java
@@ -59,7 +59,7 @@ import java.io.FileInputStream;
 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;
@@ -125,7 +125,7 @@ public class XMLCatalog extends DataType implements Cloneable, EntityResolver {
      * @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 @@ public class XMLCatalog extends DataType implements Cloneable, EntityResolver {
         if (isReference()) {
             throw noChildrenAllowed();
         }
-        getElements().add(dtd);
+        getElements().addElement(dtd);
     }
     
     /**
@@ -250,10 +250,10 @@ public class XMLCatalog extends DataType implements Cloneable, EntityResolver {
      *         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;
             }