git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Bryce McKinlay 2003-12-07 23:00:49 +00:00 committed by Bryce McKinlay
parent eb1e64ef80
commit 0f46e42809
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/ChangeLog
View File

@ -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> 2002-12-08 Bryce McKinlay <bryce@mckinlay.net.nz>
* java/util/Hashtable.java (internalContainsValue): Removed. * java/util/Hashtable.java (internalContainsValue): Removed.

8
libjava/java/util/HashMap.java
View File

@ -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
} }
/** /**
* 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
*/ */

8
libjava/java/util/Hashtable.java
View File

@ -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
} }
/** /**
* 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
*/ */