diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/java/util/HashMap.java | 9 | ||||
| -rw-r--r-- | libjava/java/util/Hashtable.java | 8 |
3 files changed, 15 insertions, 9 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 23d9adc..260c7ce 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2003-11-26 Stuart Ballard <stuart.ballard@corp.fast.net> + + * java/util/HashMap.java (putAll): Use Iterator hasNext() method. + (putAllInternal): Likewise. + * java/util/Hashtable.java (putAll): Use Iterator hasNext() method. + (putAllInternal): Likewise. + 2003-11-26 Michael Koch <konqueror@gmx.de> * java/net/URLStreamHandler.java diff --git a/libjava/java/util/HashMap.java b/libjava/java/util/HashMap.java index 6b3466c..6317ba7 100644 --- a/libjava/java/util/HashMap.java +++ b/libjava/java/util/HashMap.java @@ -381,8 +381,7 @@ public class HashMap extends AbstractMap public void putAll(Map m) { Iterator itr = m.entrySet().iterator(); - int msize = m.size(); - while (msize-- > 0) + while (itr.hasNext()) { Map.Entry e = (Map.Entry) itr.next(); // Optimize in case the Entry is one of our own. @@ -709,10 +708,10 @@ public class HashMap extends AbstractMap void putAllInternal(Map m) { Iterator itr = m.entrySet().iterator(); - int msize = m.size(); - size = msize; - while (msize-- > 0) + size = 0; + while (itr.hasNext()) { + size++; Map.Entry e = (Map.Entry) itr.next(); Object key = e.getKey(); int idx = hash(key); diff --git a/libjava/java/util/Hashtable.java b/libjava/java/util/Hashtable.java index a94143b..b0de0a2 100644 --- a/libjava/java/util/Hashtable.java +++ b/libjava/java/util/Hashtable.java @@ -510,7 +510,7 @@ public class Hashtable extends Dictionary { Iterator itr = m.entrySet().iterator(); - for (int msize = m.size(); msize > 0; msize--) + while (itr.hasNext()) { Map.Entry e = (Map.Entry) itr.next(); // Optimize in case the Entry is one of our own. @@ -859,11 +859,11 @@ public class Hashtable extends Dictionary void putAllInternal(Map m) { Iterator itr = m.entrySet().iterator(); - int msize = m.size(); - this.size = msize; + size = 0; - for (; msize > 0; msize--) + while (itr.hasNext()) { + size++; Map.Entry e = (Map.Entry) itr.next(); Object key = e.getKey(); int idx = hash(key); |