craigmcc 01/05/20 14:08:59
Modified: src/share/org/apache/struts/util FastArrayList.java
FastHashMap.java FastTreeMap.java
Log:
Port fix for VAJ compile workaround to the HEAD branch as well.
Revision Changes Path
1.5 +6 -6
jakarta-struts/src/share/org/apache/struts/util/FastArrayList.java
Index: FastArrayList.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/FastArrayList.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FastArrayList.java 2001/05/20 01:15:17 1.4
+++ FastArrayList.java 2001/05/20 21:08:59 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/FastArrayList.java,v 1.4
2001/05/20 01:15:17 craigmcc Exp $
- * $Revision: 1.4 $
- * $Date: 2001/05/20 01:15:17 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/FastArrayList.java,v 1.5
2001/05/20 21:08:59 craigmcc Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/05/20 21:08:59 $
*
* ====================================================================
*
@@ -97,7 +97,7 @@
* an equivalent class in the Jakarta Commons Collections package.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 2001/05/20 01:15:17 $
+ * @version $Revision: 1.5 $ $Date: 2001/05/20 21:08:59 $
*/
public class FastArrayList extends ArrayList {
@@ -455,7 +455,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());
@@ -464,7 +464,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.5 +8 -8 jakarta-struts/src/share/org/apache/struts/util/FastHashMap.java
Index: FastHashMap.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/FastHashMap.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FastHashMap.java 2001/05/20 01:15:17 1.4
+++ FastHashMap.java 2001/05/20 21:08:59 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/FastHashMap.java,v 1.4
2001/05/20 01:15:17 craigmcc Exp $
- * $Revision: 1.4 $
- * $Date: 2001/05/20 01:15:17 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/FastHashMap.java,v 1.5
2001/05/20 21:08:59 craigmcc Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/05/20 21:08:59 $
*
* ====================================================================
*
@@ -98,7 +98,7 @@
* an equivalent class in the Jakarta Commons Collections package.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 2001/05/20 01:15:17 $
+ * @version $Revision: 1.5 $ $Date: 2001/05/20 21:08:59 $
*/
public class FastHashMap extends HashMap {
@@ -303,7 +303,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();
@@ -321,7 +321,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();
@@ -371,14 +371,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-struts/src/share/org/apache/struts/util/FastTreeMap.java
Index: FastTreeMap.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/FastTreeMap.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FastTreeMap.java 2001/05/20 01:15:18 1.3
+++ FastTreeMap.java 2001/05/20 21:08:59 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/FastTreeMap.java,v 1.3
2001/05/20 01:15:18 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2001/05/20 01:15:18 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/FastTreeMap.java,v 1.4
2001/05/20 21:08:59 craigmcc Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/05/20 21:08:59 $
*
* ====================================================================
*
@@ -100,7 +100,7 @@
* an equivalent class in the Jakarta Commons Collections package.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.3 $ $Date: 2001/05/20 01:15:18 $
+ * @version $Revision: 1.4 $ $Date: 2001/05/20 21:08:59 $
*/
public class FastTreeMap extends TreeMap {
@@ -323,7 +323,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();
@@ -341,7 +341,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();
@@ -407,14 +407,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);
