--- jsr166/src/main/java/util/AbstractMap.java	2007/01/07 07:38:27	1.23
+++ jsr166/src/main/java/util/AbstractMap.java	2008/05/18 23:59:57	1.27
@@ -1,8 +1,26 @@
 /*
- * %W% %E%
+ * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
- * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
  */
 
 package java.util;
@@ -42,7 +60,6 @@ import java.util.Map.Entry;
  *
  * @author  Josh Bloch
  * @author  Neal Gafter
- * @version %I%, %G%
  * @see Map
  * @see Collection
  * @since 1.2
@@ -64,7 +81,7 @@ public abstract class AbstractMap<K,V> i
      * <p>This implementation returns <tt>entrySet().size()</tt>.
      */
     public int size() {
-	return entrySet().size();
+        return entrySet().size();
     }
 
     /**
@@ -73,7 +90,7 @@ public abstract class AbstractMap<K,V> i
      * <p>This implementation returns <tt>size() == 0</tt>.
      */
     public boolean isEmpty() {
-	return size() == 0;
+        return size() == 0;
     }
 
     /**
@@ -89,21 +106,21 @@ public abstract class AbstractMap<K,V> i
      * @throws NullPointerException {@inheritDoc}
      */
     public boolean containsValue(Object value) {
-	Iterator<Entry<K,V>> i = entrySet().iterator();
-	if (value==null) {
-	    while (i.hasNext()) {
-		Entry<K,V> e = i.next();
-		if (e.getValue()==null)
-		    return true;
-	    }
-	} else {
-	    while (i.hasNext()) {
-		Entry<K,V> e = i.next();
-		if (value.equals(e.getValue()))
-		    return true;
-	    }
-	}
-	return false;
+        Iterator<Entry<K,V>> i = entrySet().iterator();
+        if (value==null) {
+            while (i.hasNext()) {
+                Entry<K,V> e = i.next();
+                if (e.getValue()==null)
+                    return true;
+            }
+        } else {
+            while (i.hasNext()) {
+                Entry<K,V> e = i.next();
+                if (value.equals(e.getValue()))
+                    return true;
+            }
+        }
+        return false;
     }
 
     /**
@@ -120,21 +137,21 @@ public abstract class AbstractMap<K,V> i
      * @throws NullPointerException {@inheritDoc}
      */
     public boolean containsKey(Object key) {
-	Iterator<Map.Entry<K,V>> i = entrySet().iterator();
-	if (key==null) {
-	    while (i.hasNext()) {
-		Entry<K,V> e = i.next();
-		if (e.getKey()==null)
-		    return true;
-	    }
-	} else {
-	    while (i.hasNext()) {
-		Entry<K,V> e = i.next();
-		if (key.equals(e.getKey()))
-		    return true;
-	    }
-	}
-	return false;
+        Iterator<Map.Entry<K,V>> i = entrySet().iterator();
+        if (key==null) {
+            while (i.hasNext()) {
+                Entry<K,V> e = i.next();
+                if (e.getKey()==null)
+                    return true;
+            }
+        } else {
+            while (i.hasNext()) {
+                Entry<K,V> e = i.next();
+                if (key.equals(e.getKey()))
+                    return true;
+            }
+        }
+        return false;
     }
 
     /**
@@ -151,21 +168,21 @@ public abstract class AbstractMap<K,V> i
      * @throws NullPointerException          {@inheritDoc}
      */
     public V get(Object key) {
-	Iterator<Entry<K,V>> i = entrySet().iterator();
-	if (key==null) {
-	    while (i.hasNext()) {
-		Entry<K,V> e = i.next();
-		if (e.getKey()==null)
-		    return e.getValue();
-	    }
-	} else {
-	    while (i.hasNext()) {
-		Entry<K,V> e = i.next();
-		if (key.equals(e.getKey()))
-		    return e.getValue();
-	    }
-	}
-	return null;
+        Iterator<Entry<K,V>> i = entrySet().iterator();
+        if (key==null) {
+            while (i.hasNext()) {
+                Entry<K,V> e = i.next();
+                if (e.getKey()==null)
+                    return e.getValue();
+            }
+        } else {
+            while (i.hasNext()) {
+                Entry<K,V> e = i.next();
+                if (key.equals(e.getKey()))
+                    return e.getValue();
+            }
+        }
+        return null;
     }
 
 
@@ -183,7 +200,7 @@ public abstract class AbstractMap<K,V> i
      * @throws IllegalArgumentException      {@inheritDoc}
      */
     public V put(K key, V value) {
-	throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException();
     }
 
     /**
@@ -208,28 +225,28 @@ public abstract class AbstractMap<K,V> i
      * @throws NullPointerException          {@inheritDoc}
      */
     public V remove(Object key) {
-	Iterator<Entry<K,V>> i = entrySet().iterator();
-	Entry<K,V> correctEntry = null;
-	if (key==null) {
-	    while (correctEntry==null && i.hasNext()) {
-		Entry<K,V> e = i.next();
-		if (e.getKey()==null)
-		    correctEntry = e;
-	    }
-	} else {
-	    while (correctEntry==null && i.hasNext()) {
-		Entry<K,V> e = i.next();
-		if (key.equals(e.getKey()))
-		    correctEntry = e;
-	    }
-	}
-
-	V oldValue = null;
-	if (correctEntry !=null) {
-	    oldValue = correctEntry.getValue();
-	    i.remove();
-	}
-	return oldValue;
+        Iterator<Entry<K,V>> i = entrySet().iterator();
+        Entry<K,V> correctEntry = null;
+        if (key==null) {
+            while (correctEntry==null && i.hasNext()) {
+                Entry<K,V> e = i.next();
+                if (e.getKey()==null)
+                    correctEntry = e;
+            }
+        } else {
+            while (correctEntry==null && i.hasNext()) {
+                Entry<K,V> e = i.next();
+                if (key.equals(e.getKey()))
+                    correctEntry = e;
+            }
+        }
+
+        V oldValue = null;
+        if (correctEntry !=null) {
+            oldValue = correctEntry.getValue();
+            i.remove();
+        }
+        return oldValue;
     }
 
 
@@ -268,7 +285,7 @@ public abstract class AbstractMap<K,V> i
      * @throws UnsupportedOperationException {@inheritDoc}
      */
     public void clear() {
-	entrySet().clear();
+        entrySet().clear();
     }
 
 
@@ -298,36 +315,44 @@ public abstract class AbstractMap<K,V> i
      * method will not all return the same set.
      */
     public Set<K> keySet() {
-	if (keySet == null) {
-	    keySet = new AbstractSet<K>() {
-		public Iterator<K> iterator() {
-		    return new Iterator<K>() {
-			private Iterator<Entry<K,V>> i = entrySet().iterator();
-
-			public boolean hasNext() {
-			    return i.hasNext();
-			}
-
-			public K next() {
-			    return i.next().getKey();
-			}
-
-			public void remove() {
-			    i.remove();
-			}
+        if (keySet == null) {
+            keySet = new AbstractSet<K>() {
+                public Iterator<K> iterator() {
+                    return new Iterator<K>() {
+                        private Iterator<Entry<K,V>> i = entrySet().iterator();
+
+                        public boolean hasNext() {
+                            return i.hasNext();
+                        }
+
+                        public K next() {
+                            return i.next().getKey();
+                        }
+
+                        public void remove() {
+                            i.remove();
+                        }
                     };
-		}
+                }
 
-		public int size() {
-		    return AbstractMap.this.size();
-		}
-
-		public boolean contains(Object k) {
-		    return AbstractMap.this.containsKey(k);
-		}
-	    };
-	}
-	return keySet;
+                public int size() {
+                    return AbstractMap.this.size();
+                }
+
+                public boolean isEmpty() {
+                    return AbstractMap.this.isEmpty();
+                }
+
+                public void clear() {
+                    AbstractMap.this.clear();
+                }
+
+                public boolean contains(Object k) {
+                    return AbstractMap.this.containsKey(k);
+                }
+            };
+        }
+        return keySet;
     }
 
     /**
@@ -346,36 +371,44 @@ public abstract class AbstractMap<K,V> i
      * method will not all return the same collection.
      */
     public Collection<V> values() {
-	if (values == null) {
-	    values = new AbstractCollection<V>() {
-		public Iterator<V> iterator() {
-		    return new Iterator<V>() {
-			private Iterator<Entry<K,V>> i = entrySet().iterator();
-
-			public boolean hasNext() {
-			    return i.hasNext();
-			}
-
-			public V next() {
-			    return i.next().getValue();
-			}
-
-			public void remove() {
-			    i.remove();
-			}
+        if (values == null) {
+            values = new AbstractCollection<V>() {
+                public Iterator<V> iterator() {
+                    return new Iterator<V>() {
+                        private Iterator<Entry<K,V>> i = entrySet().iterator();
+
+                        public boolean hasNext() {
+                            return i.hasNext();
+                        }
+
+                        public V next() {
+                            return i.next().getValue();
+                        }
+
+                        public void remove() {
+                            i.remove();
+                        }
                     };
                 }
 
-		public int size() {
-		    return AbstractMap.this.size();
-		}
-
-		public boolean contains(Object v) {
-		    return AbstractMap.this.containsValue(v);
-		}
-	    };
-	}
-	return values;
+                public int size() {
+                    return AbstractMap.this.size();
+                }
+
+                public boolean isEmpty() {
+                    return AbstractMap.this.isEmpty();
+                }
+
+                public void clear() {
+                    AbstractMap.this.clear();
+                }
+
+                public boolean contains(Object v) {
+                    return AbstractMap.this.containsValue(v);
+                }
+            };
+        }
+        return values;
     }
 
     public abstract Set<Entry<K,V>> entrySet();
@@ -405,20 +438,20 @@ public abstract class AbstractMap<K,V> i
      * @return <tt>true</tt> if the specified object is equal to this map
      */
     public boolean equals(Object o) {
-	if (o == this)
-	    return true;
+        if (o == this)
+            return true;
 
-	if (!(o instanceof Map))
-	    return false;
-	Map<K,V> m = (Map<K,V>) o;
-	if (m.size() != size())
-	    return false;
+        if (!(o instanceof Map))
+            return false;
+        Map<K,V> m = (Map<K,V>) o;
+        if (m.size() != size())
+            return false;
 
         try {
             Iterator<Entry<K,V>> i = entrySet().iterator();
             while (i.hasNext()) {
                 Entry<K,V> e = i.next();
-		K key = e.getKey();
+                K key = e.getKey();
                 V value = e.getValue();
                 if (value == null) {
                     if (!(m.get(key)==null && m.containsKey(key)))
@@ -434,7 +467,7 @@ public abstract class AbstractMap<K,V> i
             return false;
         }
 
-	return true;
+        return true;
     }
 
     /**
@@ -455,11 +488,11 @@ public abstract class AbstractMap<K,V> i
      * @see Set#equals(Object)
      */
     public int hashCode() {
-	int h = 0;
-	Iterator<Entry<K,V>> i = entrySet().iterator();
-	while (i.hasNext())
-	    h += i.next().hashCode();
-	return h;
+        int h = 0;
+        Iterator<Entry<K,V>> i = entrySet().iterator();
+        while (i.hasNext())
+            h += i.next().hashCode();
+        return h;
     }
 
     /**
@@ -475,23 +508,23 @@ public abstract class AbstractMap<K,V> i
      * @return a string representation of this map
      */
     public String toString() {
-	Iterator<Entry<K,V>> i = entrySet().iterator();
-	if (! i.hasNext())
-	    return "{}";
-
-	StringBuilder sb = new StringBuilder();
-	sb.append('{');
-	for (;;) {
-	    Entry<K,V> e = i.next();
-	    K key = e.getKey();
-	    V value = e.getValue();
-	    sb.append(key   == this ? "(this Map)" : key);
-	    sb.append('=');
-	    sb.append(value == this ? "(this Map)" : value);
-	    if (! i.hasNext())
-		return sb.append('}').toString();
-	    sb.append(", ");
-	}
+        Iterator<Entry<K,V>> i = entrySet().iterator();
+        if (! i.hasNext())
+            return "{}";
+
+        StringBuilder sb = new StringBuilder();
+        sb.append('{');
+        for (;;) {
+            Entry<K,V> e = i.next();
+            K key = e.getKey();
+            V value = e.getValue();
+            sb.append(key   == this ? "(this Map)" : key);
+            sb.append('=');
+            sb.append(value == this ? "(this Map)" : value);
+            if (! i.hasNext())
+                return sb.append('}').toString();
+            sb.append(", ");
+        }
     }
 
     /**
@@ -534,12 +567,12 @@ public abstract class AbstractMap<K,V> i
      * @since 1.6
      */
     public static class SimpleEntry<K,V>
-	implements Entry<K,V>, java.io.Serializable
+        implements Entry<K,V>, java.io.Serializable
     {
-	private static final long serialVersionUID = -8499721149061103585L;
+        private static final long serialVersionUID = -8499721149061103585L;
 
-	private final K key;
-	private V value;
+        private final K key;
+        private V value;
 
         /**
          * Creates an entry representing a mapping from the specified
@@ -548,10 +581,10 @@ public abstract class AbstractMap<K,V> i
          * @param key the key represented by this entry
          * @param value the value represented by this entry
          */
-	public SimpleEntry(K key, V value) {
-	    this.key   = key;
+        public SimpleEntry(K key, V value) {
+            this.key   = key;
             this.value = value;
-	}
+        }
 
         /**
          * Creates an entry representing the same mapping as the
@@ -559,87 +592,87 @@ public abstract class AbstractMap<K,V> i
          *
          * @param entry the entry to copy
          */
-	public SimpleEntry(Entry<? extends K, ? extends V> entry) {
-	    this.key   = entry.getKey();
+        public SimpleEntry(Entry<? extends K, ? extends V> entry) {
+            this.key   = entry.getKey();
             this.value = entry.getValue();
-	}
+        }
+
+        /**
+         * Returns the key corresponding to this entry.
+         *
+         * @return the key corresponding to this entry
+         */
+        public K getKey() {
+            return key;
+        }
+
+        /**
+         * Returns the value corresponding to this entry.
+         *
+         * @return the value corresponding to this entry
+         */
+        public V getValue() {
+            return value;
+        }
+
+        /**
+         * Replaces the value corresponding to this entry with the specified
+         * value.
+         *
+         * @param value new value to be stored in this entry
+         * @return the old value corresponding to the entry
+         */
+        public V setValue(V value) {
+            V oldValue = this.value;
+            this.value = value;
+            return oldValue;
+        }
 
-    	/**
-	 * Returns the key corresponding to this entry.
-	 *
-	 * @return the key corresponding to this entry
-	 */
-	public K getKey() {
-	    return key;
-	}
-
-    	/**
-	 * Returns the value corresponding to this entry.
-	 *
-	 * @return the value corresponding to this entry
-	 */
-	public V getValue() {
-	    return value;
-	}
-
-    	/**
-	 * Replaces the value corresponding to this entry with the specified
-	 * value.
-	 *
-	 * @param value new value to be stored in this entry
-	 * @return the old value corresponding to the entry
-         */
-	public V setValue(V value) {
-	    V oldValue = this.value;
-	    this.value = value;
-	    return oldValue;
-	}
-
-	/**
-	 * Compares the specified object with this entry for equality.
-	 * Returns {@code true} if the given object is also a map entry and
-	 * the two entries represent the same mapping.	More formally, two
-	 * entries {@code e1} and {@code e2} represent the same mapping
-	 * if<pre>
-	 *   (e1.getKey()==null ?
-	 *    e2.getKey()==null :
-	 *    e1.getKey().equals(e2.getKey()))
-	 *   &amp;&amp;
-	 *   (e1.getValue()==null ?
-	 *    e2.getValue()==null :
-	 *    e1.getValue().equals(e2.getValue()))</pre>
-	 * 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;
-	    Map.Entry e = (Map.Entry)o;
-	    return eq(key, e.getKey()) && eq(value, e.getValue());
-	}
-
-	/**
-	 * Returns the hash code value for this map entry.  The hash code
-	 * of a map entry {@code e} is defined to be: <pre>
-	 *   (e.getKey()==null   ? 0 : e.getKey().hashCode()) ^
-	 *   (e.getValue()==null ? 0 : e.getValue().hashCode())</pre>
-	 * 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());
-	}
+        /**
+         * Compares the specified object with this entry for equality.
+         * Returns {@code true} if the given object is also a map entry and
+         * the two entries represent the same mapping.  More formally, two
+         * entries {@code e1} and {@code e2} represent the same mapping
+         * if<pre>
+         *   (e1.getKey()==null ?
+         *    e2.getKey()==null :
+         *    e1.getKey().equals(e2.getKey()))
+         *   &amp;&amp;
+         *   (e1.getValue()==null ?
+         *    e2.getValue()==null :
+         *    e1.getValue().equals(e2.getValue()))</pre>
+         * 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;
+            Map.Entry e = (Map.Entry)o;
+            return eq(key, e.getKey()) && eq(value, e.getValue());
+        }
+
+        /**
+         * Returns the hash code value for this map entry.  The hash code
+         * of a map entry {@code e} is defined to be: <pre>
+         *   (e.getKey()==null   ? 0 : e.getKey().hashCode()) ^
+         *   (e.getValue()==null ? 0 : e.getValue().hashCode())</pre>
+         * 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());
+        }
 
         /**
          * Returns a String representation of this map entry.  This
@@ -649,9 +682,9 @@ public abstract class AbstractMap<K,V> i
          *
          * @return a String representation of this map entry
          */
-	public String toString() {
-	    return key + "=" + value;
-	}
+        public String toString() {
+            return key + "=" + value;
+        }
 
     }
 
@@ -664,12 +697,12 @@ public abstract class AbstractMap<K,V> i
      * @since 1.6
      */
     public static class SimpleImmutableEntry<K,V>
-	implements Entry<K,V>, java.io.Serializable
+        implements Entry<K,V>, java.io.Serializable
     {
-	private static final long serialVersionUID = 7138329143949025153L;
+        private static final long serialVersionUID = 7138329143949025153L;
 
-	private final K key;
-	private final V value;
+        private final K key;
+        private final V value;
 
         /**
          * Creates an entry representing a mapping from the specified
@@ -678,10 +711,10 @@ public abstract class AbstractMap<K,V> i
          * @param key the key represented by this entry
          * @param value the value represented by this entry
          */
-	public SimpleImmutableEntry(K key, V value) {
-	    this.key   = key;
+        public SimpleImmutableEntry(K key, V value) {
+            this.key   = key;
             this.value = value;
-	}
+        }
 
         /**
          * Creates an entry representing the same mapping as the
@@ -689,88 +722,88 @@ public abstract class AbstractMap<K,V> i
          *
          * @param entry the entry to copy
          */
-	public SimpleImmutableEntry(Entry<? extends K, ? extends V> entry) {
-	    this.key   = entry.getKey();
+        public SimpleImmutableEntry(Entry<? extends K, ? extends V> entry) {
+            this.key   = entry.getKey();
             this.value = entry.getValue();
-	}
+        }
+
+        /**
+         * Returns the key corresponding to this entry.
+         *
+         * @return the key corresponding to this entry
+         */
+        public K getKey() {
+            return key;
+        }
+
+        /**
+         * Returns the value corresponding to this entry.
+         *
+         * @return the value corresponding to this entry
+         */
+        public V getValue() {
+            return value;
+        }
 
-    	/**
-	 * Returns the key corresponding to this entry.
-	 *
-	 * @return the key corresponding to this entry
-	 */
-	public K getKey() {
-	    return key;
-	}
-
-    	/**
-	 * Returns the value corresponding to this entry.
-	 *
-	 * @return the value corresponding to this entry
-	 */
-	public V getValue() {
-	    return value;
-	}
-
-    	/**
-	 * Replaces the value corresponding to this entry with the specified
-	 * value (optional operation).  This implementation simply throws
+        /**
+         * Replaces the value corresponding to this entry with the specified
+         * value (optional operation).  This implementation simply throws
          * <tt>UnsupportedOperationException</tt>, as this class implements
          * an <i>immutable</i> map entry.
-	 *
-	 * @param value new value to be stored in this entry
-	 * @return (Does not return)
-	 * @throws UnsupportedOperationException always
+         *
+         * @param value new value to be stored in this entry
+         * @return (Does not return)
+         * @throws UnsupportedOperationException always
          */
-	public V setValue(V value) {
+        public V setValue(V value) {
             throw new UnsupportedOperationException();
         }
 
-	/**
-	 * Compares the specified object with this entry for equality.
-	 * Returns {@code true} if the given object is also a map entry and
-	 * the two entries represent the same mapping.	More formally, two
-	 * entries {@code e1} and {@code e2} represent the same mapping
-	 * if<pre>
-	 *   (e1.getKey()==null ?
-	 *    e2.getKey()==null :
-	 *    e1.getKey().equals(e2.getKey()))
-	 *   &amp;&amp;
-	 *   (e1.getValue()==null ?
-	 *    e2.getValue()==null :
-	 *    e1.getValue().equals(e2.getValue()))</pre>
-	 * 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;
-	    Map.Entry e = (Map.Entry)o;
-	    return eq(key, e.getKey()) && eq(value, e.getValue());
-	}
-
-	/**
-	 * Returns the hash code value for this map entry.  The hash code
-	 * of a map entry {@code e} is defined to be: <pre>
-	 *   (e.getKey()==null   ? 0 : e.getKey().hashCode()) ^
-	 *   (e.getValue()==null ? 0 : e.getValue().hashCode())</pre>
-	 * 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());
-	}
+        /**
+         * Compares the specified object with this entry for equality.
+         * Returns {@code true} if the given object is also a map entry and
+         * the two entries represent the same mapping.  More formally, two
+         * entries {@code e1} and {@code e2} represent the same mapping
+         * if<pre>
+         *   (e1.getKey()==null ?
+         *    e2.getKey()==null :
+         *    e1.getKey().equals(e2.getKey()))
+         *   &amp;&amp;
+         *   (e1.getValue()==null ?
+         *    e2.getValue()==null :
+         *    e1.getValue().equals(e2.getValue()))</pre>
+         * 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;
+            Map.Entry e = (Map.Entry)o;
+            return eq(key, e.getKey()) && eq(value, e.getValue());
+        }
+
+        /**
+         * Returns the hash code value for this map entry.  The hash code
+         * of a map entry {@code e} is defined to be: <pre>
+         *   (e.getKey()==null   ? 0 : e.getKey().hashCode()) ^
+         *   (e.getValue()==null ? 0 : e.getValue().hashCode())</pre>
+         * 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());
+        }
 
         /**
          * Returns a String representation of this map entry.  This
@@ -780,9 +813,9 @@ public abstract class AbstractMap<K,V> i
          *
          * @return a String representation of this map entry
          */
-	public String toString() {
-	    return key + "=" + value;
-	}
+        public String toString() {
+            return key + "=" + value;
+        }
 
     }