SLFO-pool/xml-commons-apis-bootstrap
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
904b7c80a6
xml-commons-apis-bootstrap/xml-commons-enum.patch

599 lines
23 KiB
Diff
Raw Blame History

Index: xml-commons-1_0_b2/java/src/org/apache/env/Which.java
===================================================================
--- xml-commons-1_0_b2/java/src/org/apache/env/Which.java.orig 2001-12-21 23:59:05.000000000 +0100
+++ xml-commons-1_0_b2/java/src/org/apache/env/Which.java 2011-02-21 14:32:51.244975486 +0100
@@ -289,12 +289,12 @@
if (null == hash)
return;
- Enumeration enum = hash.keys();
+ Enumeration myEnum = hash.keys();
Vector v = new Vector();
- while (enum.hasMoreElements())
+ while (myEnum.hasMoreElements())
{
- Object key = enum.nextElement();
+ Object key = myEnum.nextElement();
String keyStr = key.toString();
Object item = hash.get(key);
@@ -311,12 +311,12 @@
}
}
- enum = v.elements();
+ myEnum = v.elements();
- while (enum.hasMoreElements())
+ while (myEnum.hasMoreElements())
{
- String n = (String) enum.nextElement();
- Hashtable h = (Hashtable) enum.nextElement();
+ String n = (String) myEnum.nextElement();
+ Hashtable h = (Hashtable) myEnum.nextElement();
reportHashtable(h, n, out);
}
Index: xml-commons-1_0_b2/java/src/org/apache/xml/resolver/Catalog.java
===================================================================
--- xml-commons-1_0_b2/java/src/org/apache/xml/resolver/Catalog.java.orig 2002-01-30 13:25:00.000000000 +0100
+++ xml-commons-1_0_b2/java/src/org/apache/xml/resolver/Catalog.java 2011-02-21 14:32:51.246975564 +0100
@@ -451,9 +451,9 @@
mapArr.add(null);
}
- Enumeration enum = readerMap.keys();
- while (enum.hasMoreElements()) {
- String mimeType = (String) enum.nextElement();
+ Enumeration myEnum = readerMap.keys();
+ while (myEnum.hasMoreElements()) {
+ String mimeType = (String) myEnum.nextElement();
Integer pos = (Integer) readerMap.get(mimeType);
mapArr.set(pos.intValue(), mimeType);
}
@@ -1064,9 +1064,9 @@
}
// Parse all the DELEGATE catalogs
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == DELEGATE_PUBLIC
|| e.getEntryType() == DELEGATE_SYSTEM
|| e.getEntryType() == DELEGATE_URI) {
@@ -1140,9 +1140,9 @@
// If there's a DOCTYPE entry in this catalog, use it
boolean over = default_override;
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == OVERRIDE) {
over = e.getEntryArg(0).equalsIgnoreCase("YES");
continue;
@@ -1178,9 +1178,9 @@
Debug.message(3, "resolveDocument");
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == DOCUMENT) {
return e.getEntryArg(1); //FIXME check this
}
@@ -1253,9 +1253,9 @@
// If there's a ENTITY entry in this catalog, use it
boolean over = default_override;
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == OVERRIDE) {
over = e.getEntryArg(0).equalsIgnoreCase("YES");
continue;
@@ -1339,9 +1339,9 @@
// If there's a NOTATION entry in this catalog, use it
boolean over = default_override;
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == OVERRIDE) {
over = e.getEntryArg(0).equalsIgnoreCase("YES");
continue;
@@ -1498,9 +1498,9 @@
// If there's a PUBLIC entry in this catalog, use it
boolean over = default_override;
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == OVERRIDE) {
over = e.getEntryArg(0).equalsIgnoreCase("YES");
continue;
@@ -1516,10 +1516,10 @@
// If there's a DELEGATE_PUBLIC entry in this catalog, use it
over = default_override;
- enum = catalogEntries.elements();
+ myEnum = catalogEntries.elements();
Vector delCats = new Vector();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == OVERRIDE) {
over = e.getEntryArg(0).equalsIgnoreCase("YES");
continue;
@@ -1624,9 +1624,9 @@
String osname = System.getProperty("os.name");
boolean windows = (osname.indexOf("Windows") >= 0);
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == SYSTEM
&& (e.getEntryArg(0).equals(systemId)
|| (windows
@@ -1636,11 +1636,11 @@
}
// If there's a REWRITE_SYSTEM entry in this catalog, use it
- enum = catalogEntries.elements();
+ myEnum = catalogEntries.elements();
String startString = null;
String prefix = null;
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == REWRITE_SYSTEM) {
String p = (String) e.getEntryArg(0);
@@ -1662,10 +1662,10 @@
}
// If there's a DELEGATE_SYSTEM entry in this catalog, use it
- enum = catalogEntries.elements();
+ myEnum = catalogEntries.elements();
Vector delCats = new Vector();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == DELEGATE_SYSTEM) {
String p = (String) e.getEntryArg(0);
@@ -1759,9 +1759,9 @@
*/
protected String resolveLocalURI(String uri)
throws MalformedURLException, IOException {
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == URI
&& (e.getEntryArg(0).equals(uri))) {
return e.getEntryArg(1);
@@ -1769,11 +1769,11 @@
}
// If there's a REWRITE_URI entry in this catalog, use it
- enum = catalogEntries.elements();
+ myEnum = catalogEntries.elements();
String startString = null;
String prefix = null;
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == REWRITE_URI) {
String p = (String) e.getEntryArg(0);
@@ -1795,10 +1795,10 @@
}
// If there's a DELEGATE_URI entry in this catalog, use it
- enum = catalogEntries.elements();
+ myEnum = catalogEntries.elements();
Vector delCats = new Vector();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == DELEGATE_URI) {
String p = (String) e.getEntryArg(0);
Index: xml-commons-1_0_b2/java/src/org/apache/xml/resolver/Resolver.java
===================================================================
--- xml-commons-1_0_b2/java/src/org/apache/xml/resolver/Resolver.java.orig 2002-01-30 13:25:00.000000000 +0100
+++ xml-commons-1_0_b2/java/src/org/apache/xml/resolver/Resolver.java 2011-02-21 14:32:51.269976454 +0100
@@ -215,9 +215,9 @@
return resolved;
}
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == RESOLVER) {
resolved = resolveExternalSystem(uri, e.getEntryArg(0));
if (resolved != null) {
@@ -272,9 +272,9 @@
return resolved;
}
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == RESOLVER) {
resolved = resolveExternalSystem(systemId, e.getEntryArg(0));
if (resolved != null) {
@@ -334,9 +334,9 @@
return resolved;
}
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == RESOLVER) {
if (systemId != null) {
resolved = resolveExternalSystem(systemId,
@@ -575,9 +575,9 @@
Vector map = new Vector();
String osname = System.getProperty("os.name");
boolean windows = (osname.indexOf("Windows") >= 0);
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == SYSTEM
&& (e.getEntryArg(0).equals(systemId)
|| (windows
@@ -603,9 +603,9 @@
Vector map = new Vector();
String osname = System.getProperty("os.name");
boolean windows = (osname.indexOf("Windows") >= 0);
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == SYSTEM
&& (e.getEntryArg(1).equals(systemId)
|| (windows
Index: xml-commons-resolver-1_1_b1/java/src/org/apache/xml/resolver/Catalog.java
===================================================================
--- xml-commons-resolver-1_1_b1/java/src/org/apache/xml/resolver/Catalog.java.orig 2003-09-02 09:05:08.000000000 +0200
+++ xml-commons-resolver-1_1_b1/java/src/org/apache/xml/resolver/Catalog.java 2011-02-21 14:32:51.412981992 +0100
@@ -486,9 +486,9 @@
mapArr.add(null);
}
- Enumeration enum = readerMap.keys();
- while (enum.hasMoreElements()) {
- String mimeType = (String) enum.nextElement();
+ Enumeration myEnum = readerMap.keys();
+ while (myEnum.hasMoreElements()) {
+ String mimeType = (String) myEnum.nextElement();
Integer pos = (Integer) readerMap.get(mimeType);
mapArr.set(pos.intValue(), mimeType);
}
@@ -1152,9 +1152,9 @@
}
// Parse all the DELEGATE catalogs
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == DELEGATE_PUBLIC
|| e.getEntryType() == DELEGATE_SYSTEM
|| e.getEntryType() == DELEGATE_URI) {
@@ -1228,9 +1228,9 @@
// If there's a DOCTYPE entry in this catalog, use it
boolean over = default_override;
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == OVERRIDE) {
over = e.getEntryArg(0).equalsIgnoreCase("YES");
continue;
@@ -1266,9 +1266,9 @@
catalogManager.debug.message(3, "resolveDocument");
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == DOCUMENT) {
return e.getEntryArg(1); //FIXME check this
}
@@ -1341,9 +1341,9 @@
// If there's a ENTITY entry in this catalog, use it
boolean over = default_override;
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == OVERRIDE) {
over = e.getEntryArg(0).equalsIgnoreCase("YES");
continue;
@@ -1427,9 +1427,9 @@
// If there's a NOTATION entry in this catalog, use it
boolean over = default_override;
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == OVERRIDE) {
over = e.getEntryArg(0).equalsIgnoreCase("YES");
continue;
@@ -1586,9 +1586,9 @@
// If there's a PUBLIC entry in this catalog, use it
boolean over = default_override;
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == OVERRIDE) {
over = e.getEntryArg(0).equalsIgnoreCase("YES");
continue;
@@ -1604,10 +1604,10 @@
// If there's a DELEGATE_PUBLIC entry in this catalog, use it
over = default_override;
- enum = catalogEntries.elements();
+ myEnum = catalogEntries.elements();
Vector delCats = new Vector();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == OVERRIDE) {
over = e.getEntryArg(0).equalsIgnoreCase("YES");
continue;
@@ -1712,9 +1712,9 @@
String osname = System.getProperty("os.name");
boolean windows = (osname.indexOf("Windows") >= 0);
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == SYSTEM
&& (e.getEntryArg(0).equals(systemId)
|| (windows
@@ -1724,11 +1724,11 @@
}
// If there's a REWRITE_SYSTEM entry in this catalog, use it
- enum = catalogEntries.elements();
+ myEnum = catalogEntries.elements();
String startString = null;
String prefix = null;
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == REWRITE_SYSTEM) {
String p = (String) e.getEntryArg(0);
@@ -1750,10 +1750,10 @@
}
// If there's a DELEGATE_SYSTEM entry in this catalog, use it
- enum = catalogEntries.elements();
+ myEnum = catalogEntries.elements();
Vector delCats = new Vector();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == DELEGATE_SYSTEM) {
String p = (String) e.getEntryArg(0);
@@ -1846,9 +1846,9 @@
*/
protected String resolveLocalURI(String uri)
throws MalformedURLException, IOException {
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == URI
&& (e.getEntryArg(0).equals(uri))) {
return e.getEntryArg(1);
@@ -1856,11 +1856,11 @@
}
// If there's a REWRITE_URI entry in this catalog, use it
- enum = catalogEntries.elements();
+ myEnum = catalogEntries.elements();
String startString = null;
String prefix = null;
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == REWRITE_URI) {
String p = (String) e.getEntryArg(0);
@@ -1882,10 +1882,10 @@
}
// If there's a DELEGATE_URI entry in this catalog, use it
- enum = catalogEntries.elements();
+ myEnum = catalogEntries.elements();
Vector delCats = new Vector();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == DELEGATE_URI) {
String p = (String) e.getEntryArg(0);
Index: xml-commons-resolver-1_1_b1/java/src/org/apache/xml/resolver/Resolver.java
===================================================================
--- xml-commons-resolver-1_1_b1/java/src/org/apache/xml/resolver/Resolver.java.orig 2003-09-02 09:05:08.000000000 +0200
+++ xml-commons-resolver-1_1_b1/java/src/org/apache/xml/resolver/Resolver.java 2011-02-21 14:32:51.413982030 +0100
@@ -197,9 +197,9 @@
return resolved;
}
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == RESOLVER) {
resolved = resolveExternalSystem(uri, e.getEntryArg(0));
if (resolved != null) {
@@ -254,9 +254,9 @@
return resolved;
}
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == RESOLVER) {
resolved = resolveExternalSystem(systemId, e.getEntryArg(0));
if (resolved != null) {
@@ -316,9 +316,9 @@
return resolved;
}
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == RESOLVER) {
if (systemId != null) {
resolved = resolveExternalSystem(systemId,
@@ -557,9 +557,9 @@
Vector map = new Vector();
String osname = System.getProperty("os.name");
boolean windows = (osname.indexOf("Windows") >= 0);
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == SYSTEM
&& (e.getEntryArg(0).equals(systemId)
|| (windows
@@ -585,9 +585,9 @@
Vector map = new Vector();
String osname = System.getProperty("os.name");
boolean windows = (osname.indexOf("Windows") >= 0);
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == SYSTEM
&& (e.getEntryArg(1).equals(systemId)
|| (windows
Index: xml-commons-resolver-1_1_b1/java/src/org/apache/env/Which.java
===================================================================
--- xml-commons-resolver-1_1_b1/java/src/org/apache/env/Which.java.orig 2002-08-07 21:24:05.000000000 +0200
+++ xml-commons-resolver-1_1_b1/java/src/org/apache/env/Which.java 2011-02-21 16:42:54.303931676 +0100
@@ -316,12 +316,12 @@
if (null == hash)
return;
- Enumeration enum = hash.keys();
+ Enumeration enum2 = hash.keys();
Vector v = new Vector();
- while (enum.hasMoreElements())
+ while (enum2.hasMoreElements())
{
- Object key = enum.nextElement();
+ Object key = enum2.nextElement();
String keyStr = key.toString();
Object item = hash.get(key);
@@ -338,12 +338,12 @@
}
}
- enum = v.elements();
+ enum2 = v.elements();
- while (enum.hasMoreElements())
+ while (enum2.hasMoreElements())
{
- String n = (String) enum.nextElement();
- Hashtable h = (Hashtable) enum.nextElement();
+ String n = (String) enum2.nextElement();
+ Hashtable h = (Hashtable) enum2.nextElement();
reportHashtable(h, n, out);
}
Reference in New Issue View Git Blame Copy Permalink