* java/util/Hashtable.java (Hashtable(Map)): Use putAll, not

	putAllInternal.
	(putAllInternal): Correct comment.
	* java/util/HashMap.java (HashMap(Map)): As above.
	(putAllInternal): As above.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@74400 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9821039..fb76298 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,12 @@
 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.
        (containsValue): Don't delegate to internalContainsValue.
 

diff --git a/libjava/java/util/HashMap.java b/libjava/java/util/HashMap.java
index 6317ba7..fd6b658 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 9cfa925..698871b 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
    */