diff options
author | Eric Blake <ebb9@byu.net> | 2001-10-25 07:34:18 +0000 |
---|---|---|
committer | Eric Blake <ebb9@byu.net> | 2001-10-25 07:34:18 +0000 |
commit | ef1db657a04a5bc9b5324ef59dce44a0b90dc6ca (patch) | |
tree | f4012f11ac34769ec8f7b2d613e987eff6d7df22 /java/util/LinkedHashMap.java | |
parent | 81f10bd9cab3969529746437db06b44b69772522 (diff) | |
download | classpath-ef1db657a04a5bc9b5324ef59dce44a0b90dc6ca.tar.gz |
2001-10-25 Eric Blake <ebb9@email.byu.edu>
* java/util/AbstractCollection.java (removeAllInternal),
(retainAllInternal): Add hooks for use by ArrayList.
* java/util/AbstractList.java: Minor code updates. Fix some
scoping.
* java/util/AbstractMap.java: ditto
* java/util/ArrayList.java (readObject, writeObject): ditto
(removeAllInternal, retainAllInternal): Optimize.
* java/util/Arrays.java: ditto
* java/util/Collections.java: ditto. Change order of parameters
to equals(Object, Object) to match specs.
* java/util/Dictionary.java: Improve javadoc.
(Dictionary): Add explicit constructor.
* java/util/HashMap.java: Improve javadoc. Rearrange methods to
follow order in JDK. Cleanups related to recent code migration to
AbstractMap. Fix some scoping.
(entrySet): Cache the result.
(modCount): Ensure that this is updated correctly.
* java/util/HashSet.java: Improve javadoc. Fix some scoping.
(init): Add hooks for LinkedHashSet.
(map): Use "" instead of Boolean.TRUE in backing map. Use
package-private API where possible for less overhead.
(readObject, writeObject): Fix serialization.
* java/util/Hashtable.java: Improve javadoc. Fix some scoping.
(entrySet, keySet, values): Cache the result.
(modCount): Ensure that this is updated correctly.
(contains, remove): Fix NullPointer checking to match specs.
(class Enumeration): Make more like HashIterator.
* java/util/IdentityHashMap.java: Minor code updates.
(modCount): Ensure that this is updated correctly.
(readObject, writeObject): Fix serialization.
* java/util/LinkedHashMap.java: Minor code updates. Cleanups
related to recent code migration to AbstractMap.
* java/util/LinkedHashSet.java: New file.
* java/util/LinkedList.java:
(readObject, writeObject): Fix serialization.
* java/util/Makefile.am: List recently added files.
* java/util/Stack.java: Minor code updates.
* java/util/TreeMap.java: Improve javadoc. Overhaul the class to
be more efficient. Fix some scoping. Rearrange the methods.
(nil): Ensure that this can be thread-safe, and make it a static
final. Initialize it to be more useful as a sentinal node.
(Node): Specify color in constructor.
(deleteFixup, insertFixup): Improve comments and algorithm.
(fabricateTree): Redesign with less overhead.
(lowestGreaterThan): Add parameter first to make SubMap easier.
(removeNode): Patch hole where nil was being modified. Choose
predecessor instead of successor so in-place swap works.
(class VerifyResult, verifyTree, verifySub, verifyError): Remove
this dead code after verifying the class works.
(class SubMap): Rewrite several algorithms to avoid problems with
comparing nil.
* java/util/TreeSet.java: Improve javadoc. Fix some scoping.
(clone): Fix ClassCastException when cloning subSet().
(readObject, writeObject): Fix serialization.
* java/util/WeakHashMap.java: Improve javadoc. Fix some scoping.
(NULL_KEY): Make it compare as null, for ease elsewhere.
(Class WeakEntry): Rename from Entry, to avoid shadowing
Map.Entry. Add missing toString.
(modCount): Ensure that this is updated correctly.
(clear, containsValue, keySet, putAll, values, WeakHashMap(Map)):
Add missing methods and constructor.
Diffstat (limited to 'java/util/LinkedHashMap.java')
-rw-r--r-- | java/util/LinkedHashMap.java | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/java/util/LinkedHashMap.java b/java/util/LinkedHashMap.java index 8950d5897..8503e375a 100644 --- a/java/util/LinkedHashMap.java +++ b/java/util/LinkedHashMap.java @@ -28,11 +28,6 @@ executable file might be covered by the GNU General Public License. */ package java.util; -import java.io.IOException; -import java.io.Serializable; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; - /** * This class provides a hashtable-backed implementation of the * Map interface, with predictable traversal order. @@ -89,6 +84,7 @@ import java.io.ObjectOutputStream; * @see TreeMap * @see Hashtable * @since 1.4 + * @status updated to 1.4 */ public class LinkedHashMap extends HashMap { @@ -218,8 +214,8 @@ public class LinkedHashMap extends HashMap * Construct a new insertion-ordered LinkedHashMap with a specific * inital capacity and default load factor of 0.75. * - * @param initialCapacity the initial capacity of this HashMap (>=0) - * @throws IllegalArgumentException if (initialCapacity < 0) + * @param initialCapacity the initial capacity of this HashMap (>= 0) + * @throws IllegalArgumentException if (initialCapacity < 0) */ public LinkedHashMap(int initialCapacity) { @@ -231,10 +227,10 @@ public class LinkedHashMap extends HashMap * Construct a new insertion-orderd LinkedHashMap with a specific * inital capacity and load factor. * - * @param initialCapacity the initial capacity (>=0) - * @param loadFactor the load factor (>0, not NaN) - * @throws IllegalArgumentException if (initialCapacity < 0) || - * ! (loadFactor > 0.0) + * @param initialCapacity the initial capacity (>= 0) + * @param loadFactor the load factor (> 0, not NaN) + * @throws IllegalArgumentException if (initialCapacity < 0) || + * ! (loadFactor > 0.0) */ public LinkedHashMap(int initialCapacity, float loadFactor) { @@ -281,7 +277,7 @@ public class LinkedHashMap extends HashMap LinkedHashEntry e = head; while (e != null) { - if (value == null ? e.value == null : value.equals(e.value)) + if (equals(value, e.value)) return true; e = e.succ; } @@ -307,7 +303,7 @@ public class LinkedHashMap extends HashMap HashEntry e = buckets[idx]; while (e != null) { - if (key == null ? e.key == null : key.equals(e.key)) + if (equals(key, e.key)) { if (accessOrder) { @@ -376,13 +372,14 @@ public class LinkedHashMap extends HashMap return false; } - /** Helper method called by <code>put</code>, which creates and adds a + /** + * Helper method called by <code>put</code>, which creates and adds a * new Entry, followed by performing bookkeeping (like removeEldestEntry). * * @param key the key of the new Entry * @param value the value * @param idx the index in buckets where the new Entry belongs - * @param callRemove Whether to call the removeEldestEntry method. + * @param callRemove whether to call the removeEldestEntry method * @see #put(Object, Object) * @see #removeEldestEntry(Map.Entry) */ @@ -397,6 +394,11 @@ public class LinkedHashMap extends HashMap remove(head); } + /** + * Helper method, called by clone() to reset the doubly-linked list. + * @param m the map to add entries from + * @see #clone() + */ void putAllInternal(Map m) { head = null; @@ -466,8 +468,8 @@ public class LinkedHashMap extends HashMap throw new IllegalStateException(); LinkedHashMap.this.remove(last.key); - knownMod++; last = null; + knownMod++; } }; } |