craigmcc 01/05/20 14:03:30
Modified: collections/src/java/org/apache/commons/collections
FastArrayList.java FastHashMap.java
FastTreeMap.java
Log:
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 <[EMAIL PROTECTED]>
Revision Changes Path
1.3 +6 -6
jakarta-commons/collections/src/java/org/apache/commons/collections/FastArrayList.java
Index: FastArrayList.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/FastArrayList.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FastArrayList.java 2001/04/21 12:19:57 1.2
+++ FastArrayList.java 2001/05/20 21:03:30 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/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/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 @@
* maximum performance.</p>
*
* @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 @@
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 @@
} 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());
1.4 +8 -8
jakarta-commons/collections/src/java/org/apache/commons/collections/FastHashMap.java
Index: FastHashMap.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/FastHashMap.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FastHashMap.java 2001/05/18 00:12:45 1.3
+++ FastHashMap.java 2001/05/20 21:03:30 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/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/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 @@
* maximum performance.</p>
*
* @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 @@
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 @@
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 @@
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);
1.4 +8 -8
jakarta-commons/collections/src/java/org/apache/commons/collections/FastTreeMap.java
Index: FastTreeMap.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/FastTreeMap.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FastTreeMap.java 2001/05/18 00:12:45 1.3
+++ FastTreeMap.java 2001/05/20 21:03:30 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/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/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 @@
* maximum performance.</p>
*
* @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 @@
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 @@
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 @@
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);
