From 0f46e42809b564fe41b28868e4531a72e72096e5 Mon Sep 17 00:00:00 2001 From: Bryce McKinlay Date: Sun, 7 Dec 2003 23:00:49 +0000 Subject: [PATCH] Hashtable.java (Hashtable(Map)): Use putAll, not putAllInternal. * java/util/Hashtable.java (Hashtable(Map)): Use putAll, not putAllInternal. (putAllInternal): Correct comment. * java/util/HashMap.java (HashMap(Map)): As above. (putAllInternal): As above. From-SVN: r74400 --- libjava/ChangeLog | 7 +++++++ libjava/java/util/HashMap.java | 8 ++++---- libjava/java/util/Hashtable.java | 8 ++++---- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 98210397a62..fb762981c21 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2002-12-08 Bryce McKinlay + + * java/util/Hashtable.java (Hashtable(Map)): Use putAll, not putAllInternal. + (putAllInternal): Correct comment. + * java/util/HashMap.java (HashMap(Map)): As above. + (putAllInternal): As above. + 2002-12-08 Bryce McKinlay * java/util/Hashtable.java (internalContainsValue): Removed. diff --git a/libjava/java/util/HashMap.java b/libjava/java/util/HashMap.java index 6317ba7cec1..fd6b658bcb7 100644 --- a/libjava/java/util/HashMap.java +++ b/libjava/java/util/HashMap.java @@ -223,7 +223,7 @@ public class HashMap extends AbstractMap public HashMap(Map m) { this(Math.max(m.size() * 2, DEFAULT_CAPACITY), DEFAULT_LOAD_FACTOR); - putAllInternal(m); + putAll(m); } /** @@ -699,9 +699,9 @@ public class HashMap extends AbstractMap } /** - * A simplified, more efficient internal implementation of putAll(). The - * Map constructor and clone() should not call putAll or put, in order to - * be compatible with the JDK implementation with respect to subclasses. + * A simplified, more efficient internal implementation of putAll(). clone() + * should not call putAll or put, in order to be compatible with the JDK + * implementation with respect to subclasses. * * @param m the map to initialize this from */ diff --git a/libjava/java/util/Hashtable.java b/libjava/java/util/Hashtable.java index 9cfa925762a..698871b5124 100644 --- a/libjava/java/util/Hashtable.java +++ b/libjava/java/util/Hashtable.java @@ -234,7 +234,7 @@ public class Hashtable extends Dictionary public Hashtable(Map m) { this(Math.max(m.size() * 2, DEFAULT_CAPACITY), DEFAULT_LOAD_FACTOR); - putAllInternal(m); + putAll(m); } /** @@ -852,9 +852,9 @@ public class Hashtable extends Dictionary } /** - * A simplified, more efficient internal implementation of putAll(). The - * Map constructor and clone() should not call putAll or put, in order to - * be compatible with the JDK implementation with respect to subclasses. + * A simplified, more efficient internal implementation of putAll(). clone() + * should not call putAll or put, in order to be compatible with the JDK + * implementation with respect to subclasses. * * @param m the map to initialize this from */ -- 2.30.2