Commit 0f46e428 by Bryce McKinlay Committed by Bryce McKinlay

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
parent eb1e64ef
2002-12-08 Bryce McKinlay <bryce@mckinlay.net.nz> 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. * java/util/Hashtable.java (internalContainsValue): Removed.
(containsValue): Don't delegate to internalContainsValue. (containsValue): Don't delegate to internalContainsValue.
......
...@@ -223,7 +223,7 @@ public class HashMap extends AbstractMap ...@@ -223,7 +223,7 @@ public class HashMap extends AbstractMap
public HashMap(Map m) public HashMap(Map m)
{ {
this(Math.max(m.size() * 2, DEFAULT_CAPACITY), DEFAULT_LOAD_FACTOR); this(Math.max(m.size() * 2, DEFAULT_CAPACITY), DEFAULT_LOAD_FACTOR);
putAllInternal(m); putAll(m);
} }
/** /**
...@@ -699,9 +699,9 @@ public class HashMap extends AbstractMap ...@@ -699,9 +699,9 @@ public class HashMap extends AbstractMap
} }
/** /**
* A simplified, more efficient internal implementation of putAll(). The * A simplified, more efficient internal implementation of putAll(). clone()
* Map constructor and clone() should not call putAll or put, in order to * should not call putAll or put, in order to be compatible with the JDK
* be compatible with the JDK implementation with respect to subclasses. * implementation with respect to subclasses.
* *
* @param m the map to initialize this from * @param m the map to initialize this from
*/ */
......
...@@ -234,7 +234,7 @@ public class Hashtable extends Dictionary ...@@ -234,7 +234,7 @@ public class Hashtable extends Dictionary
public Hashtable(Map m) public Hashtable(Map m)
{ {
this(Math.max(m.size() * 2, DEFAULT_CAPACITY), DEFAULT_LOAD_FACTOR); this(Math.max(m.size() * 2, DEFAULT_CAPACITY), DEFAULT_LOAD_FACTOR);
putAllInternal(m); putAll(m);
} }
/** /**
...@@ -852,9 +852,9 @@ public class Hashtable extends Dictionary ...@@ -852,9 +852,9 @@ public class Hashtable extends Dictionary
} }
/** /**
* A simplified, more efficient internal implementation of putAll(). The * A simplified, more efficient internal implementation of putAll(). clone()
* Map constructor and clone() should not call putAll or put, in order to * should not call putAll or put, in order to be compatible with the JDK
* be compatible with the JDK implementation with respect to subclasses. * implementation with respect to subclasses.
* *
* @param m the map to initialize this from * @param m the map to initialize this from
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment