--- jsr166/src/main/java/util/TreeMap.java	2005/03/22 01:30:10	1.4
+++ jsr166/src/main/java/util/TreeMap.java	2005/03/31 15:23:10	1.7
@@ -11,7 +11,7 @@ package java.util;
 /**
  * Red-Black tree based implementation of the <tt>NavigableMap</tt> interface.
  * This class guarantees that the map will be in ascending key order, sorted
- * according to the <i>natural order</i> for the key's class (see
+ * according to the <i>natural order</i> for the keys' class (see
  * <tt>Comparable</tt>), or by the comparator provided at creation time,
  * depending on which constructor is used.<p>
  *
@@ -61,7 +61,7 @@ package java.util;
  * throw <tt>ConcurrentModificationException</tt> on a best-effort basis.
  * Therefore, it would be wrong to write a program that depended on this
  * exception for its correctness:   <i>the fail-fast behavior of iterators
- * should be used only to detect bugs.</i><p>
+ * should be used only to detect bugs.</i>
  *
  * <p>All <tt>Map.Entry</tt> pairs returned by methods in this class
  * and its views represent snapshots of mappings at the time they were
@@ -542,7 +542,7 @@ public class TreeMap<K,V>
      * @param key key with which the specified value is to be associated.
      * @param value value to be associated with the specified key.
      *
-     * @return previous value associated with specified key, or <tt>null</tt>
+     * @return the previous value associated with specified key, or <tt>null</tt>
      *         if there was no mapping for key.  A <tt>null</tt> return can
      *         also indicate that the map previously associated <tt>null</tt>
      *         with the specified key.
@@ -591,7 +591,7 @@ public class TreeMap<K,V>
      * Removes the mapping for this key from this TreeMap if present.
      *
      * @param  key key for which mapping should be removed
-     * @return previous value associated with specified key, or <tt>null</tt>
+     * @return the previous value associated with specified key, or <tt>null</tt>
      *         if there was no mapping for key.  A <tt>null</tt> return can
      *         also indicate that the map previously associated
      *         <tt>null</tt> with the specified key.
@@ -670,8 +670,6 @@ public class TreeMap<K,V>
     /**
      * Returns a key-value mapping associated with the greatest
      * key in this map, or <tt>null</tt> if the map is empty.
-     * The returned entry does <em>not</em> support
-     * the <tt>Entry.setValue</tt> method.
      * 
      * @return an Entry with greatest key, or <tt>null</tt>
      * if the map is empty.
@@ -1145,7 +1143,7 @@ public class TreeMap<K,V>
      * the key-value mappings in <tt>m</tt> whose keys are less than or equal
      * to <tt>high</tt>:
      * <pre>
-     *     NavigableMap head = m.headMap(high+"\0");
+     *     NavigableMap head = m.navigableHeadMap(high+"\0");
      * </pre>
      *
      * @param toKey high endpoint (exclusive) of the headMap.
@@ -1185,7 +1183,7 @@ public class TreeMap<K,V>
      * are strings.  The following idiom obtains a view containing
      * all of the key-value mappings in <tt>m</tt> whose keys are strictly
      * greater than <tt>low</tt>: <pre>
-     *     NavigableMap tail = m.tailMap(low+"\0");
+     *     NavigableMap tail = m.navigableTailMap(low+"\0");
      * </pre>
      *
      * @param fromKey low endpoint (inclusive) of the tailMap.
@@ -1310,7 +1308,7 @@ public class TreeMap<K,V>
         }
 
         public boolean isEmpty() {
-            return entrySet.isEmpty();
+            return entrySet().isEmpty();
         }
 
         public boolean containsKey(Object key) {
@@ -1374,7 +1372,7 @@ public class TreeMap<K,V>
         public Map.Entry<K,V> pollFirstEntry() {
 	    TreeMap.Entry<K,V> e = fromStart ? 
                 getFirstEntry() : getCeilingEntry(fromKey);
-            if (e == null || (!fromStart && compare(e.key, fromKey) < 0))
+            if (e == null || (!toEnd && compare(e.key, toKey) >= 0))
                 return null;
             Map.Entry result = new AbstractMap.SimpleImmutableEntry(e);
             deleteEntry(e);
@@ -1384,7 +1382,7 @@ public class TreeMap<K,V>
         public Map.Entry<K,V> pollLastEntry() {
 	    TreeMap.Entry<K,V> e = toEnd ? 
                 getLastEntry() : getLowerEntry(toKey);
-            if (e == null || (!toEnd && compare(e.key, toKey) >= 0))
+            if (e == null || (!fromStart && compare(e.key, fromKey) < 0))
                 return null;
             Map.Entry result = new AbstractMap.SimpleImmutableEntry(e);
             deleteEntry(e);
@@ -1464,10 +1462,11 @@ public class TreeMap<K,V>
             return e == null? null : e.key;
         }
 
-        private transient Set<Map.Entry<K,V>> entrySet = new EntrySetView();
+        private transient Set<Map.Entry<K,V>> entrySet = null;
 
         public Set<Map.Entry<K,V>> entrySet() {
-            return entrySet;
+            Set<Map.Entry<K,V>> es = entrySet;
+            return (es != null)? es : (entrySet = new EntrySetView());
         }
 
         private class EntrySetView extends AbstractSet<Map.Entry<K,V>> {
@@ -2164,8 +2163,9 @@ public class TreeMap<K,V>
         // Write out size (number of Mappings)
         s.writeInt(size);
 
+        Set<Map.Entry<K,V>> es = entrySet();
         // Write out keys and values (alternating)
-        for (Iterator<Map.Entry<K,V>> i = entrySet().iterator(); i.hasNext(); ) {
+        for (Iterator<Map.Entry<K,V>> i = es.iterator(); i.hasNext(); ) {
             Map.Entry<K,V> e = i.next();
             s.writeObject(e.getKey());
             s.writeObject(e.getValue());