--- jsr166/src/main/java/util/AbstractMap.java 2005/04/27 07:13:50 1.8 +++ jsr166/src/main/java/util/AbstractMap.java 2006/02/07 20:54:24 1.20 @@ -1,7 +1,7 @@ /* * %W% %E% * - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. */ @@ -10,30 +10,30 @@ import java.util.Map.Entry; /** * This class provides a skeletal implementation of the Map - * interface, to minimize the effort required to implement this interface.
+ * interface, to minimize the effort required to implement this interface. * - * To implement an unmodifiable map, the programmer needs only to extend this + *
To implement an unmodifiable map, the programmer needs only to extend this * class and provide an implementation for the entrySet method, which * returns a set-view of the map's mappings. Typically, the returned set * will, in turn, be implemented atop AbstractSet. This set should * not support the add or remove methods, and its iterator - * should not support the remove method.
+ * should not support the remove method. * - * To implement a modifiable map, the programmer must additionally override + *
To implement a modifiable map, the programmer must additionally override * this class's put method (which otherwise throws an * UnsupportedOperationException), and the iterator returned by * entrySet().iterator() must additionally implement its - * remove method.
+ * remove method. * - * The programmer should generally provide a void (no argument) and map + *
The programmer should generally provide a void (no argument) and map * constructor, as per the recommendation in the Map interface - * specification.
+ * specification. * - * The documentation for each non-abstract methods in this class describes its + *
The documentation for each non-abstract methods in this class describes its * implementation in detail. Each of these methods may be overridden if the - * map being implemented admits a more efficient implementation.
+ * map being implemented admits a more efficient implementation. * - * This class is a member of the + *
This class is a member of the
*
* Java Collections Framework.
*
@@ -59,45 +59,34 @@ public abstract class AbstractMap
+ * {@inheritDoc}
*
- * This implementation returns entrySet().size().
- *
- * @return the number of key-value mappings in this map.
+ * This implementation returns entrySet().size().
*/
public int size() {
return entrySet().size();
}
/**
- * Returns true if this map contains no key-value mappings.
- *
- * This implementation returns size() == 0.
+ * {@inheritDoc}
*
- * @return true if this map contains no key-value mappings.
+ * This implementation returns size() == 0.
*/
public boolean isEmpty() {
return size() == 0;
}
/**
- * Returns true if this map maps one or more keys to this value.
- * More formally, returns true if and only if this map contains
- * at least one mapping to a value v such that (value==null ?
- * v==null : value.equals(v)). This operation will probably require
- * time linear in the map size for most implementations of Map.
- *
- * This implementation iterates over entrySet() searching for an entry
- * with the specified value. If such an entry is found, true is
- * returned. If the iteration terminates without finding such an entry,
- * false is returned. Note that this implementation requires
- * linear time in the size of the map.
+ * {@inheritDoc}
*
- * @param value value whose presence in this map is to be tested.
+ * This implementation iterates over entrySet() searching
+ * for an entry with the specified value. If such an entry is found,
+ * true is returned. If the iteration terminates without
+ * finding such an entry, false is returned. Note that this
+ * implementation requires linear time in the size of the map.
*
- * @return true if this map maps one or more keys to this value.
+ * @throws ClassCastException {@inheritDoc}
+ * @throws NullPointerException {@inheritDoc}
*/
public boolean containsValue(Object value) {
Iterator
+ * {@inheritDoc}
*
- * This implementation iterates over entrySet() searching for an
- * entry with the specified key. If such an entry is found, true
- * is returned. If the iteration terminates without finding such an
- * entry, false is returned. Note that this implementation
- * requires linear time in the size of the map; many implementations will
- * override this method.
- *
- * @param key key whose presence in this map is to be tested.
- * @return true if this map contains a mapping for the specified
- * key.
- * @throws NullPointerException if key is null
- * and this map does not permit null keys.
+ * This implementation iterates over entrySet() searching
+ * for an entry with the specified key. If such an entry is found,
+ * true is returned. If the iteration terminates without
+ * finding such an entry, false is returned. Note that this
+ * implementation requires linear time in the size of the map; many
+ * implementations will override this method.
+ *
+ * @throws ClassCastException {@inheritDoc}
+ * @throws NullPointerException {@inheritDoc}
*/
public boolean containsKey(Object key) {
Iterator
- *
- * This implementation iterates over entrySet() searching for an
- * entry with the specified key. If such an entry is found, the entry's
- * value is returned. If the iteration terminates without finding such an
- * entry, null is returned. Note that this implementation
- * requires linear time in the size of the map; many implementations will
- * override this method.
- *
- * @param key key whose associated value is to be returned.
- * @return the value to which this map maps the specified key.
+ * {@inheritDoc}
*
- * @throws NullPointerException if key is null
- * and this map does not permit null keys.
+ * This implementation iterates over entrySet() searching
+ * for an entry with the specified key. If such an entry is found,
+ * the entry's value is returned. If the iteration terminates without
+ * finding such an entry, null is returned. Note that this
+ * implementation requires linear time in the size of the map; many
+ * implementations will override this method.
*
- * @see #containsKey(Object)
+ * @throws ClassCastException {@inheritDoc}
+ * @throws NullPointerException {@inheritDoc}
*/
public V get(Object key) {
Iterator
+ * {@inheritDoc}
*
- * This implementation always throws an
+ * This implementation always throws an
* UnsupportedOperationException.
*
- * @param key key with which the specified value is to be associated.
- * @param value value to be associated with the specified key.
- *
- * @return the previous value associated with specified key, or null
- * if there was no mapping for key. (A null return can
- * also indicate that the map previously associated null
- * with the specified key, if the implementation supports
- * null values.)
- *
- * @throws UnsupportedOperationException if the put operation
- * is not supported by this map.
- * @throws ClassCastException if the class of the specified key or value
- * prevents it from being stored in this map.
- * @throws IllegalArgumentException if some aspect of this key or value
- * prevents it from being stored in this map.
- * @throws NullPointerException if this map does not permit null
- * keys or values, and the specified key or value is null.
+ * @throws UnsupportedOperationException {@inheritDoc}
+ * @throws ClassCastException {@inheritDoc}
+ * @throws NullPointerException {@inheritDoc}
+ * @throws IllegalArgumentException {@inheritDoc}
*/
public V put(K key, V value) {
throw new UnsupportedOperationException();
}
/**
- * Removes the mapping for this key from this map if present (optional
- * operation).
+ * {@inheritDoc}
*
- * This implementation iterates over entrySet() searching for an
+ * This implementation iterates over entrySet() searching for an
* entry with the specified key. If such an entry is found, its value is
* obtained with its getValue operation, the entry is removed
* from the collection (and the backing map) with the iterator's
* remove operation, and the saved value is returned. If the
* iteration terminates without finding such an entry, null is
* returned. Note that this implementation requires linear time in the
- * size of the map; many implementations will override this method.
+ * size of the map; many implementations will override this method.
+ *
+ * Note that this implementation throws an
+ * UnsupportedOperationException if the entrySet
+ * iterator does not support the remove method and this map
+ * contains a mapping for the specified key.
*
- * Note that this implementation throws an
- * UnsupportedOperationException if the entrySet iterator
- * does not support the remove method and this map contains a
- * mapping for the specified key.
- *
- * @param key key whose mapping is to be removed from the map.
- * @return the previous value associated with specified key, or null
- * if there was no entry for key. (A null return can
- * also indicate that the map previously associated null
- * with the specified key, if the implementation supports
- * null values.)
- * @throws UnsupportedOperationException if the remove operation
- * is not supported by this map.
+ * @throws UnsupportedOperationException {@inheritDoc}
+ * @throws ClassCastException {@inheritDoc}
+ * @throws NullPointerException {@inheritDoc}
*/
public V remove(Object key) {
Iterator
+ * {@inheritDoc}
*
- * This implementation iterates over the specified map's
+ * This implementation iterates over the specified map's
* entrySet() collection, and calls this map's put
- * operation once for each entry returned by the iteration.
+ * operation once for each entry returned by the iteration.
*
- * Note that this implementation throws an
+ * Note that this implementation throws an
* UnsupportedOperationException if this map does not support
* the put operation and the specified map is nonempty.
*
- * @param t mappings to be stored in this map.
- *
- * @throws UnsupportedOperationException if the putAll operation
- * is not supported by this map.
- * @throws ClassCastException if the class of a key or value in the
- * specified map prevents it from being stored in this map.
- * @throws IllegalArgumentException if some aspect of a key or value in
- * the specified map prevents it from being stored in this map.
- * @throws NullPointerException if the specified map is null, or if
- * this map does not permit null keys or values, and the
- * specified map contains null keys or values.
+ * @throws UnsupportedOperationException {@inheritDoc}
+ * @throws ClassCastException {@inheritDoc}
+ * @throws NullPointerException {@inheritDoc}
+ * @throws IllegalArgumentException {@inheritDoc}
*/
- public void putAll(Map extends K, ? extends V> t) {
- Iterator extends Entry extends K, ? extends V>> i = t.entrySet().iterator();
- while (i.hasNext()) {
- Entry extends K, ? extends V> e = i.next();
- put(e.getKey(), e.getValue());
- }
+ public void putAll(Map extends K, ? extends V> m) {
+ for (Map.Entry extends K, ? extends V> e : m.entrySet())
+ put(e.getKey(), e.getValue());
}
/**
- * Removes all mappings from this map (optional operation).
+ * {@inheritDoc}
*
- * This implementation calls entrySet().clear().
+ * This implementation calls entrySet().clear().
*
- * Note that this implementation throws an
+ * Note that this implementation throws an
* UnsupportedOperationException if the entrySet
* does not support the clear operation.
*
- * @throws UnsupportedOperationException if the clear operation
- * is not supported by this map.
+ * @throws UnsupportedOperationException {@inheritDoc}
*/
public void clear() {
entrySet().clear();
@@ -342,17 +283,7 @@ public abstract class AbstractMap This implementation returns a set that subclasses {@link AbstractSet}.
* The subclass's iterator method returns a "wrapper object" over this
@@ -400,17 +331,7 @@ public abstract class AbstractMap This implementation returns a collection that subclasses {@link
* AbstractCollection}. The subclass's iterator method returns a
@@ -423,8 +344,6 @@ public abstract class AbstractMap
+ * of the Map interface.
*
- * This implementation first checks if the specified object is this map;
+ * This implementation first checks if the specified object is this map;
* if so it returns true. Then, it checks if the specified
* object is a map whose size is identical to the size of this map; if
* not, it returns false. If so, it iterates over this map's
@@ -484,8 +401,8 @@ public abstract class AbstractMap
- *
- * This implementation iterates over entrySet(), calling
- * hashCode on each element (entry) in the Collection, and adding
- * up the results.
+ * entrySet() view. This ensures that m1.equals(m2)
+ * implies that m1.hashCode()==m2.hashCode() for any two maps
+ * m1 and m2, as required by the general contract of
+ * {@link Object#hashCode}.
+ *
+ * This implementation iterates over entrySet(), calling
+ * {@link Map.Entry#hashCode hashCode()} on each element (entry) in the
+ * set, and adding up the results.
*
- * @return the hash code value for this map.
+ * @return the hash code value for this map
* @see Map.Entry#hashCode()
- * @see Object#hashCode()
* @see Object#equals(Object)
* @see Set#equals(Object)
*/
@@ -554,50 +470,35 @@ public abstract class AbstractMap
- *
- * This implementation creates an empty string buffer, appends a left
- * brace, and iterates over the map's entrySet view, appending
- * the string representation of each map.entry in turn. After
- * appending each entry except the last, the string ", " is
- * appended. Finally a right brace is appended. A string is obtained
- * from the stringbuffer, and returned.
+ * {@link String#valueOf(Object)}.
*
- * @return a String representation of this map.
+ * @return a string representation of this map
*/
public String toString() {
- StringBuffer buf = new StringBuffer();
- buf.append("{");
-
Iterator
+ * (e1.getKey()==null ?
+ * e2.getKey()==null :
+ * e1.getKey().equals(e2.getKey()))
+ * &&
+ * (e1.getValue()==null ?
+ * e2.getValue()==null :
+ * e1.getValue().equals(e2.getValue()))
+ * This ensures that the {@code equals} method works properly across
+ * different implementations of the {@code Map.Entry} interface.
+ *
+ * @param o object to be compared for equality with this map entry
+ * @return {@code true} if the specified object is equal to this map
+ * entry
+ * @see #hashCode
+ */
public boolean equals(Object o) {
if (!(o instanceof Map.Entry))
return false;
@@ -695,9 +623,22 @@ public abstract class AbstractMap
+ * (e.getKey()==null ? 0 : e.getKey().hashCode()) ^
+ * (e.getValue()==null ? 0 : e.getValue().hashCode())
+ * This ensures that {@code e1.equals(e2)} implies that
+ * {@code e1.hashCode()==e2.hashCode()} for any two Entries
+ * {@code e1} and {@code e2}, as required by the general
+ * contract of {@link Object#hashCode}.
+ *
+ * @return the hash code value for this map entry
+ * @see #equals
+ */
public int hashCode() {
- return ((key == null) ? 0 : key.hashCode()) ^
- ((value == null) ? 0 : value.hashCode());
+ return (key == null ? 0 : key.hashCode()) ^
+ (value == null ? 0 : value.hashCode());
}
/**
@@ -706,7 +647,7 @@ public abstract class AbstractMap
+ * (e1.getKey()==null ?
+ * e2.getKey()==null :
+ * e1.getKey().equals(e2.getKey()))
+ * &&
+ * (e1.getValue()==null ?
+ * e2.getValue()==null :
+ * e1.getValue().equals(e2.getValue()))
+ * This ensures that the {@code equals} method works properly across
+ * different implementations of the {@code Map.Entry} interface.
+ *
+ * @param o object to be compared for equality with this map entry
+ * @return {@code true} if the specified object is equal to this map
+ * entry
+ * @see #hashCode
+ */
public boolean equals(Object o) {
if (!(o instanceof Map.Entry))
return false;
@@ -786,9 +754,22 @@ public abstract class AbstractMap
+ * (e.getKey()==null ? 0 : e.getKey().hashCode()) ^
+ * (e.getValue()==null ? 0 : e.getValue().hashCode())
+ * This ensures that {@code e1.equals(e2)} implies that
+ * {@code e1.hashCode()==e2.hashCode()} for any two Entries
+ * {@code e1} and {@code e2}, as required by the general
+ * contract of {@link Object#hashCode}.
+ *
+ * @return the hash code value for this map entry
+ * @see #equals
+ */
public int hashCode() {
- return ((key == null) ? 0 : key.hashCode()) ^
- ((value == null) ? 0 : value.hashCode());
+ return (key == null ? 0 : key.hashCode()) ^
+ (value == null ? 0 : value.hashCode());
}
/**
@@ -797,7 +778,7 @@ public abstract class AbstractMap