--- jsr166/src/main/java/util/NavigableMap.java	2006/04/19 15:07:14	1.14
+++ jsr166/src/main/java/util/NavigableMap.java	2006/04/21 03:53:57	1.17
@@ -23,8 +23,8 @@ package java.util;
  * method returns a view of the map with the senses of all relational
  * and directional methods inverted. The performance of ascending
  * operations and views is likely to be faster than that of descending
- * ones.  Methods {@code navigableSubMap}, {@code navigableHeadMap},
- * and {@code navigableTailMap} differ from the similarly named {@code
+ * ones.  Methods {@code subMap}, {@code headMap},
+ * and {@code tailMap} differ from the like-named {@code
  * SortedMap} methods in accepting additional arguments describing
  * whether lower and upper bounds are inclusive versus exclusive.
  * Submaps of any {@code NavigableMap} must implement the {@code
@@ -208,7 +208,7 @@ public interface NavigableMap<K,V> exten
     /**
      * Returns a {@link NavigableMap} view of the mappings contained in this
      * map in descending order.  The descending map is backed by this map, so
-     * changes to the map are reflected in the descending set, and vice-versa.
+     * changes to the map are reflected in the descending map, and vice-versa.
      * If either map is modified while an iteration over a collection view of
      * the other map is in progress (except through the iterator's own
      * {@code remove} operation), the results of the iteration are undefined.
@@ -268,10 +268,10 @@ public interface NavigableMap<K,V> exten
      *
      * @param fromKey low endpoint of the keys in the returned map
      * @param fromInclusive true if the low endpoint ({@code fromKey}) is
-     *        to be included in the the returned view
+     *        to be included in the returned view
      * @param toKey high endpoint of the keys in the returned map
      * @param toInclusive true if the high endpoint ({@code toKey}) is
-     *        to be included in the the returned view
+     *        to be included in the returned view
      * @return a view of the portion of this map whose keys range from
      *         {@code fromKey} to {@code toKey}
      * @throws ClassCastException if {@code fromKey} and {@code toKey}
@@ -287,8 +287,8 @@ public interface NavigableMap<K,V> exten
      *         range, and {@code fromKey} or {@code toKey} lies
      *         outside the bounds of the range
      */
-    NavigableMap<K,V> navigableSubMap(K fromKey, boolean fromInclusive,
-                                      K toKey,   boolean toInclusive);
+    NavigableMap<K,V> subMap(K fromKey, boolean fromInclusive,
+                             K toKey,   boolean toInclusive);
 
     /**
      * Returns a view of the portion of this map whose keys are less than (or
@@ -302,7 +302,7 @@ public interface NavigableMap<K,V> exten
      *
      * @param toKey high endpoint of the keys in the returned map
      * @param inclusive true if the high endpoint ({@code toKey}) is
-     *        to be included in the the returned view
+     *        to be included in the returned view
      * @return a view of the portion of this map whose keys are less than
      *         (or equal to, if {@code inclusive} is true) {@code toKey}
      * @throws ClassCastException if {@code toKey} is not compatible
@@ -317,7 +317,7 @@ public interface NavigableMap<K,V> exten
      *         restricted range, and {@code toKey} lies outside the
      *         bounds of the range
      */
-    NavigableMap<K,V> navigableHeadMap(K toKey, boolean inclusive);
+    NavigableMap<K,V> headMap(K toKey, boolean inclusive);
 
     /**
      * Returns a view of the portion of this map whose keys are greater than (or
@@ -331,7 +331,7 @@ public interface NavigableMap<K,V> exten
      *
      * @param fromKey low endpoint of the keys in the returned map
      * @param inclusive true if the low endpoint ({@code fromKey}) is
-     *        to be included in the the returned view
+     *        to be included in the returned view
      * @return a view of the portion of this map whose keys are greater than
      *         (or equal to, if {@code inclusive} is true) {@code fromKey}
      * @throws ClassCastException if {@code fromKey} is not compatible
@@ -346,5 +346,5 @@ public interface NavigableMap<K,V> exten
      *         restricted range, and {@code fromKey} lies outside the
      *         bounds of the range
      */
-    NavigableMap<K,V> navigableTailMap(K fromKey, boolean inclusive);
+    NavigableMap<K,V> tailMap(K fromKey, boolean inclusive);
 }