From a36442f0d08bb1a5b964b4c77d4c64eaf251c3e9 Mon Sep 17 00:00:00 2001 From: "Craig R. McClanahan" Date: Sun, 20 May 2001 21:03:30 +0000 Subject: [PATCH] Work around a problem reported by the VAJ Java compiler, caused by the fact that the superclass already has a private class named Iterator. Submitted by: Costin Cozianu git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130485 13f79535-47bb-0310-9956-ffa450edef68 --- .../commons/collections/FastArrayList.java | 12 ++++++------ .../apache/commons/collections/FastHashMap.java | 16 ++++++++-------- .../apache/commons/collections/FastTreeMap.java | 16 ++++++++-------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/java/org/apache/commons/collections/FastArrayList.java b/src/java/org/apache/commons/collections/FastArrayList.java index bb6a62a1f..ad5405eef 100644 --- a/src/java/org/apache/commons/collections/FastArrayList.java +++ b/src/java/org/apache/commons/collections/FastArrayList.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/FastArrayList.java,v 1.2 2001/04/21 12:19:57 craigmcc Exp $ - * $Revision: 1.2 $ - * $Date: 2001/04/21 12:19:57 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/FastArrayList.java,v 1.3 2001/05/20 21:03:30 craigmcc Exp $ + * $Revision: 1.3 $ + * $Date: 2001/05/20 21:03:30 $ * * ==================================================================== * @@ -94,7 +94,7 @@ import java.util.ListIterator; * maximum performance.

* * @author Craig R. McClanahan - * @version $Revision: 1.2 $ $Date: 2001/04/21 12:19:57 $ + * @version $Revision: 1.3 $ $Date: 2001/05/20 21:03:30 $ */ public class FastArrayList extends ArrayList { @@ -452,7 +452,7 @@ public class FastArrayList extends ArrayList { if (fast) { int hashCode = 1; - Iterator i = list.iterator(); + java.util.Iterator i = list.iterator(); while (i.hasNext()) { Object o = i.next(); hashCode = 31 * hashCode + (o == null ? 0 : o.hashCode()); @@ -461,7 +461,7 @@ public class FastArrayList extends ArrayList { } else { synchronized (list) { int hashCode = 1; - Iterator i = list.iterator(); + java.util.Iterator i = list.iterator(); while (i.hasNext()) { Object o = i.next(); hashCode = 31 * hashCode + (o == null ? 0 : o.hashCode()); diff --git a/src/java/org/apache/commons/collections/FastHashMap.java b/src/java/org/apache/commons/collections/FastHashMap.java index 547c7e5c4..0946e399b 100644 --- a/src/java/org/apache/commons/collections/FastHashMap.java +++ b/src/java/org/apache/commons/collections/FastHashMap.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/FastHashMap.java,v 1.3 2001/05/18 00:12:45 rwaldhoff Exp $ - * $Revision: 1.3 $ - * $Date: 2001/05/18 00:12:45 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/FastHashMap.java,v 1.4 2001/05/20 21:03:30 craigmcc Exp $ + * $Revision: 1.4 $ + * $Date: 2001/05/20 21:03:30 $ * * ==================================================================== * @@ -95,7 +95,7 @@ import java.util.Set; * maximum performance.

* * @author Craig R. McClanahan - * @version $Revision: 1.3 $ $Date: 2001/05/18 00:12:45 $ + * @version $Revision: 1.4 $ $Date: 2001/05/20 21:03:30 $ */ public class FastHashMap extends HashMap { @@ -300,7 +300,7 @@ public class FastHashMap extends HashMap { if (fast) { if (mo.size() != map.size()) return (false); - Iterator i = map.entrySet().iterator(); + java.util.Iterator i = map.entrySet().iterator(); while (i.hasNext()) { Map.Entry e = (Map.Entry) i.next(); Object key = e.getKey(); @@ -318,7 +318,7 @@ public class FastHashMap extends HashMap { synchronized (map) { if (mo.size() != map.size()) return (false); - Iterator i = map.entrySet().iterator(); + java.util.Iterator i = map.entrySet().iterator(); while (i.hasNext()) { Map.Entry e = (Map.Entry) i.next(); Object key = e.getKey(); @@ -368,14 +368,14 @@ public class FastHashMap extends HashMap { if (fast) { int h = 0; - Iterator i = map.entrySet().iterator(); + java.util.Iterator i = map.entrySet().iterator(); while (i.hasNext()) h += i.next().hashCode(); return (h); } else { synchronized (map) { int h = 0; - Iterator i = map.entrySet().iterator(); + java.util.Iterator i = map.entrySet().iterator(); while (i.hasNext()) h += i.next().hashCode(); return (h); diff --git a/src/java/org/apache/commons/collections/FastTreeMap.java b/src/java/org/apache/commons/collections/FastTreeMap.java index 1cd05f0bb..ea1fb609b 100644 --- a/src/java/org/apache/commons/collections/FastTreeMap.java +++ b/src/java/org/apache/commons/collections/FastTreeMap.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/FastTreeMap.java,v 1.3 2001/05/18 00:12:45 rwaldhoff Exp $ - * $Revision: 1.3 $ - * $Date: 2001/05/18 00:12:45 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/FastTreeMap.java,v 1.4 2001/05/20 21:03:30 craigmcc Exp $ + * $Revision: 1.4 $ + * $Date: 2001/05/20 21:03:30 $ * * ==================================================================== * @@ -97,7 +97,7 @@ import java.util.TreeMap; * maximum performance.

* * @author Craig R. McClanahan - * @version $Revision: 1.3 $ $Date: 2001/05/18 00:12:45 $ + * @version $Revision: 1.4 $ $Date: 2001/05/20 21:03:30 $ */ public class FastTreeMap extends TreeMap { @@ -320,7 +320,7 @@ public class FastTreeMap extends TreeMap { if (fast) { if (mo.size() != map.size()) return (false); - Iterator i = map.entrySet().iterator(); + java.util.Iterator i = map.entrySet().iterator(); while (i.hasNext()) { Map.Entry e = (Map.Entry) i.next(); Object key = e.getKey(); @@ -338,7 +338,7 @@ public class FastTreeMap extends TreeMap { synchronized (map) { if (mo.size() != map.size()) return (false); - Iterator i = map.entrySet().iterator(); + java.util.Iterator i = map.entrySet().iterator(); while (i.hasNext()) { Map.Entry e = (Map.Entry) i.next(); Object key = e.getKey(); @@ -404,14 +404,14 @@ public class FastTreeMap extends TreeMap { if (fast) { int h = 0; - Iterator i = map.entrySet().iterator(); + java.util.Iterator i = map.entrySet().iterator(); while (i.hasNext()) h += i.next().hashCode(); return (h); } else { synchronized (map) { int h = 0; - Iterator i = map.entrySet().iterator(); + java.util.Iterator i = map.entrySet().iterator(); while (i.hasNext()) h += i.next().hashCode(); return (h);