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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 98210397a62582eee0735533fa81ec80cdf2f896..fb762981c213e5bede9921a2688362bacf3a09f4 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2002-12-08  Bryce McKinlay  <bryce@mckinlay.net.nz>
+
+       * 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  <bryce@mckinlay.net.nz>
 
        * java/util/Hashtable.java (internalContainsValue): Removed.

diff --git a/libjava/java/util/HashMap.java b/libjava/java/util/HashMap.java
index 6317ba7cec1339db3a74c5f12d34416963867e37..fd6b658bcb77c243b5411866ddcc2e2ae6c9143f 100644 (file)
--- 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 9cfa925762aa3c57d8f91bdbadfddeb7df10b791..698871b512490e0cc2746268351660cfa8eaf38d 100644 (file)
--- 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
    */