ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/main/java/util/TreeMap.java

Comparing jsr166/src/main/java/util/TreeMap.java (file contents):
Revision 1.28 by dl, Wed Apr 19 15:07:14 2006 UTC vs.
Revision 1.36 by jsr166, Tue May 9 16:35:40 2006 UTC

#	Line 68 | Line 68 | package java.util;
68		* associated map using <tt>put</tt>.)
69		*
70		* <p>This class is a member of the
71	<	* <a href="{@docRoot}/../guide/collections/index.html">
71	>	* <a href="{@docRoot}/../technotes/guides/collections/index.html">
72		* Java Collections Framework</a>.
73		*
74		* @param <K> the type of keys maintained by this map
#	Line 95 | Line 95 | public class TreeMap<K,V>
95		*
96		* @serial
97		*/
98	<	private Comparator<? super K> comparator = null;
98	>	private final Comparator<? super K> comparator;
99
100		private transient Entry<K,V> root = null;
101
#	Line 110 | Line 110 | public class TreeMap<K,V>
110		private transient int modCount = 0;
111
112		/**
113	–	* A sentinel to indicate that an endpoint of a submap is not bounded.
114	–	* It is used to generate head maps, tail maps, and descending views
115	–	* of the entire backing map. The sentinel must be serializable,
116	–	* requiring a little class to express.
117	–	*/
118	–	private static class Unbounded implements java.io.Serializable {}
119	–	private static final Unbounded UNBOUNDED = new Unbounded();
120	–
121	–	private void incrementSize()   { modCount++; size++; }
122	–	private void decrementSize()   { modCount++; size--; }
123	–
124	–	/**
113		* Constructs a new, empty tree map, using the natural ordering of its
114		* keys.  All keys inserted into the map must implement the {@link
115		* Comparable} interface.  Furthermore, all such keys must be
#	Line 134 | Line 122 | public class TreeMap<K,V>
122		* <tt>ClassCastException</tt>.
123		*/
124		public TreeMap() {
125	+	comparator = null;
126		}
127
128		/**
#	Line 169 | Line 158 | public class TreeMap<K,V>
158		* @throws NullPointerException if the specified map is null
159		*/
160		public TreeMap(Map<? extends K, ? extends V> m) {
161	+	comparator = null;
162		putAll(m);
163		}
164
#	Line 233 | Line 223 | public class TreeMap<K,V>
223		* @since 1.2
224		*/
225		public boolean containsValue(Object value) {
226	<	return (root==null ? false :
227	<	(value==null ? valueSearchNull(root)
228	<	: valueSearchNonNull(root, value)));
229	<	}
240	<
241	<	private boolean valueSearchNull(Entry n) {
242	<	if (n.value == null)
243	<	return true;
244	<
245	<	// Check left and right subtrees for value
246	<	return (n.left  != null && valueSearchNull(n.left)) ||
247	<	(n.right != null && valueSearchNull(n.right));
248	<	}
249	<
250	<	private boolean valueSearchNonNull(Entry n, Object value) {
251	<	// Check this node for the value
252	<	if (value.equals(n.value))
253	<	return true;
254	<
255	<	// Check left and right subtrees for value
256	<	return (n.left  != null && valueSearchNonNull(n.left, value)) ||
257	<	(n.right != null && valueSearchNonNull(n.right, value));
226	>	for (Entry<K,V> e = getFirstEntry(); e != null; e = successor(e))
227	>	if (valEquals(value, e.value))
228	>	return true;
229	>	return false;
230		}
231
232		/**
#	Line 344 | Line 316 | public class TreeMap<K,V>
316		*         and this map uses natural ordering, or its comparator
317		*         does not permit null keys
318		*/
319	<	private Entry<K,V> getEntry(Object key) {
319	>	final Entry<K,V> getEntry(Object key) {
320		// Offload comparator-based version for sake of performance
321		if (comparator != null)
322		return getEntryUsingComparator(key);
#	Line 370 | Line 342 | public class TreeMap<K,V>
342		* that are less dependent on comparator performance, but is
343		* worthwhile here.)
344		*/
345	<	private Entry<K,V> getEntryUsingComparator(Object key) {
345	>	final Entry<K,V> getEntryUsingComparator(Object key) {
346		K k = (K) key;
347		Comparator<? super K> cpr = comparator;
348	<	Entry<K,V> p = root;
349	<	while (p != null) {
350	<	int cmp = cpr.compare(k, p.key);
351	<	if (cmp < 0)
352	<	p = p.left;
353	<	else if (cmp > 0)
354	<	p = p.right;
355	<	else
356	<	return p;
348	>	if (cpr != null) {
349	>	Entry<K,V> p = root;
350	>	while (p != null) {
351	>	int cmp = cpr.compare(k, p.key);
352	>	if (cmp < 0)
353	>	p = p.left;
354	>	else if (cmp > 0)
355	>	p = p.right;
356	>	else
357	>	return p;
358	>	}
359		}
360		return null;
361		}
#	Line 392 | Line 366 | public class TreeMap<K,V>
366		* key; if no such entry exists (i.e., the greatest key in the Tree is less
367		* than the specified key), returns <tt>null</tt>.
368		*/
369	<	private Entry<K,V> getCeilingEntry(K key) {
369	>	final Entry<K,V> getCeilingEntry(K key) {
370		Entry<K,V> p = root;
371	<	if (p==null)
398	<	return null;
399	<
400	<	while (true) {
371	>	while (p != null) {
372		int cmp = compare(key, p.key);
373		if (cmp < 0) {
374		if (p.left != null)
#	Line 419 | Line 390 | public class TreeMap<K,V>
390		} else
391		return p;
392		}
393	+	return null;
394		}
395
396		/**
#	Line 426 | Line 398 | public class TreeMap<K,V>
398		* exists, returns the entry for the greatest key less than the specified
399		* key; if no such entry exists, returns <tt>null</tt>.
400		*/
401	<	private Entry<K,V> getFloorEntry(K key) {
401	>	final Entry<K,V> getFloorEntry(K key) {
402		Entry<K,V> p = root;
403	<	if (p==null)
432	<	return null;
433	<
434	<	while (true) {
403	>	while (p != null) {
404		int cmp = compare(key, p.key);
405		if (cmp > 0) {
406		if (p.right != null)
#	Line 454 | Line 423 | public class TreeMap<K,V>
423		return p;
424
425		}
426	+	return null;
427		}
428
429		/**
#	Line 462 | Line 432 | public class TreeMap<K,V>
432		* key greater than the specified key; if no such entry exists
433		* returns <tt>null</tt>.
434		*/
435	<	private Entry<K,V> getHigherEntry(K key) {
435	>	final Entry<K,V> getHigherEntry(K key) {
436		Entry<K,V> p = root;
437	<	if (p==null)
468	<	return null;
469	<
470	<	while (true) {
437	>	while (p != null) {
438		int cmp = compare(key, p.key);
439		if (cmp < 0) {
440		if (p.left != null)
#	Line 488 | Line 455 | public class TreeMap<K,V>
455		}
456		}
457		}
458	+	return null;
459		}
460
461		/**
#	Line 495 | Line 463 | public class TreeMap<K,V>
463		* no such entry exists (i.e., the least key in the Tree is greater than
464		* the specified key), returns <tt>null</tt>.
465		*/
466	<	private Entry<K,V> getLowerEntry(K key) {
466	>	final Entry<K,V> getLowerEntry(K key) {
467		Entry<K,V> p = root;
468	<	if (p==null)
501	<	return null;
502	<
503	<	while (true) {
468	>	while (p != null) {
469		int cmp = compare(key, p.key);
470		if (cmp > 0) {
471		if (p.right != null)
#	Line 521 | Line 486 | public class TreeMap<K,V>
486		}
487		}
488		}
489	<	}
525	<
526	<	/**
527	<	* Returns the key corresponding to the specified Entry.
528	<	* @throws NoSuchElementException if the Entry is null
529	<	*/
530	<	private static <K> K key(Entry<K,?> e) {
531	<	if (e==null)
532	<	throw new NoSuchElementException();
533	<	return e.key;
489	>	return null;
490		}
491
492		/**
#	Line 553 | Line 509 | public class TreeMap<K,V>
509		*/
510		public V put(K key, V value) {
511		Entry<K,V> t = root;
556	–
512		if (t == null) {
513	<	// TBD
514	<	//             if (key == null) {
515	<	//                 if (comparator == null)
516	<	//                     throw new NullPointerException();
517	<	//                 comparator.compare(key, key);
563	<	//             }
564	<	incrementSize();
513	>	// TBD:
514	>	// 5045147: (coll) Adding null to an empty TreeSet should
515	>	// throw NullPointerException
516	>	//
517	>	// compare(key, key); // type check
518		root = new Entry<K,V>(key, value, null);
519	+	size = 1;
520	+	modCount++;
521		return null;
522		}
523	<
524	<	while (true) {
525	<	int cmp = compare(key, t.key);
526	<	if (cmp == 0) {
527	<	return t.setValue(value);
528	<	} else if (cmp < 0) {
529	<	if (t.left != null) {
523	>	int cmp;
524	>	Entry<K,V> parent;
525	>	// split comparator and comparable paths
526	>	Comparator<? super K> cpr = comparator;
527	>	if (cpr != null) {
528	>	do {
529	>	parent = t;
530	>	cmp = cpr.compare(key, t.key);
531	>	if (cmp < 0)
532		t = t.left;
533	<	} else {
577	<	incrementSize();
578	<	t.left = new Entry<K,V>(key, value, t);
579	<	fixAfterInsertion(t.left);
580	<	return null;
581	<	}
582	<	} else { // cmp > 0
583	<	if (t.right != null) {
533	>	else if (cmp > 0)
534		t = t.right;
535	<	} else {
536	<	incrementSize();
537	<	t.right = new Entry<K,V>(key, value, t);
588	<	fixAfterInsertion(t.right);
589	<	return null;
590	<	}
591	<	}
535	>	else
536	>	return t.setValue(value);
537	>	} while (t != null);
538		}
539	+	else {
540	+	if (key == null)
541	+	throw new NullPointerException();
542	+	Comparable<? super K> k = (Comparable<? super K>) key;
543	+	do {
544	+	parent = t;
545	+	cmp = k.compareTo(t.key);
546	+	if (cmp < 0)
547	+	t = t.left;
548	+	else if (cmp > 0)
549	+	t = t.right;
550	+	else
551	+	return t.setValue(value);
552	+	} while (t != null);
553	+	}
554	+	Entry<K,V> e = new Entry<K,V>(key, value, parent);
555	+	if (cmp < 0)
556	+	parent.left = e;
557	+	else
558	+	parent.right = e;
559	+	fixAfterInsertion(e);
560	+	size++;
561	+	modCount++;
562	+	return null;
563		}
564
565		/**
#	Line 664 | Line 634 | public class TreeMap<K,V>
634		* @since 1.6
635		*/
636		public Map.Entry<K,V> firstEntry() {
637	<	Entry<K,V> e = getFirstEntry();
668	<	return (e == null)? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
637	>	return exportEntry(getFirstEntry());
638		}
639
640		/**
641		* @since 1.6
642		*/
643		public Map.Entry<K,V> lastEntry() {
644	<	Entry<K,V> e = getLastEntry();
676	<	return (e == null)? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
644	>	return exportEntry(getLastEntry());
645		}
646
647		/**
#	Line 681 | Line 649 | public class TreeMap<K,V>
649		*/
650		public Map.Entry<K,V> pollFirstEntry() {
651		Entry<K,V> p = getFirstEntry();
652	<	if (p == null)
653	<	return null;
654	<	Map.Entry<K,V> result = new AbstractMap.SimpleImmutableEntry<K,V>(p);
687	<	deleteEntry(p);
652	>	Map.Entry<K,V> result = exportEntry(p);
653	>	if (p != null)
654	>	deleteEntry(p);
655		return result;
656		}
657
#	Line 693 | Line 660 | public class TreeMap<K,V>
660		*/
661		public Map.Entry<K,V> pollLastEntry() {
662		Entry<K,V> p = getLastEntry();
663	<	if (p == null)
664	<	return null;
665	<	Map.Entry<K,V> result = new AbstractMap.SimpleImmutableEntry<K,V>(p);
699	<	deleteEntry(p);
663	>	Map.Entry<K,V> result = exportEntry(p);
664	>	if (p != null)
665	>	deleteEntry(p);
666		return result;
667		}
668
#	Line 708 | Line 674 | public class TreeMap<K,V>
674		* @since 1.6
675		*/
676		public Map.Entry<K,V> lowerEntry(K key) {
677	<	Entry<K,V> e =  getLowerEntry(key);
712	<	return (e == null)? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
677	>	return exportEntry(getLowerEntry(key));
678		}
679
680		/**
#	Line 720 | Line 685 | public class TreeMap<K,V>
685		* @since 1.6
686		*/
687		public K lowerKey(K key) {
688	<	Entry<K,V> e =  getLowerEntry(key);
724	<	return (e == null)? null : e.key;
688	>	return keyOrNull(getLowerEntry(key));
689		}
690
691		/**
#	Line 732 | Line 696 | public class TreeMap<K,V>
696		* @since 1.6
697		*/
698		public Map.Entry<K,V> floorEntry(K key) {
699	<	Entry<K,V> e = getFloorEntry(key);
736	<	return (e == null)? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
699	>	return exportEntry(getFloorEntry(key));
700		}
701
702		/**
#	Line 744 | Line 707 | public class TreeMap<K,V>
707		* @since 1.6
708		*/
709		public K floorKey(K key) {
710	<	Entry<K,V> e = getFloorEntry(key);
748	<	return (e == null)? null : e.key;
710	>	return keyOrNull(getFloorEntry(key));
711		}
712
713		/**
#	Line 756 | Line 718 | public class TreeMap<K,V>
718		* @since 1.6
719		*/
720		public Map.Entry<K,V> ceilingEntry(K key) {
721	<	Entry<K,V> e = getCeilingEntry(key);
760	<	return (e == null)? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
721	>	return exportEntry(getCeilingEntry(key));
722		}
723
724		/**
#	Line 768 | Line 729 | public class TreeMap<K,V>
729		* @since 1.6
730		*/
731		public K ceilingKey(K key) {
732	<	Entry<K,V> e = getCeilingEntry(key);
772	<	return (e == null)? null : e.key;
732	>	return keyOrNull(getCeilingEntry(key));
733		}
734
735		/**
#	Line 780 | Line 740 | public class TreeMap<K,V>
740		* @since 1.6
741		*/
742		public Map.Entry<K,V> higherEntry(K key) {
743	<	Entry<K,V> e = getHigherEntry(key);
784	<	return (e == null)? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
743	>	return exportEntry(getHigherEntry(key));
744		}
745
746		/**
#	Line 792 | Line 751 | public class TreeMap<K,V>
751		* @since 1.6
752		*/
753		public K higherKey(K key) {
754	<	Entry<K,V> e = getHigherEntry(key);
796	<	return (e == null)? null : e.key;
754	>	return keyOrNull(getHigherEntry(key));
755		}
756
757		// Views
#	Line 803 | Line 761 | public class TreeMap<K,V>
761		* the first time this view is requested.  Views are stateless, so
762		* there's no reason to create more than one.
763		*/
764	<	private transient Set<Map.Entry<K,V>> entrySet = null;
764	>	private transient EntrySet entrySet = null;
765		private transient KeySet<K> navigableKeySet = null;
766		private transient NavigableMap<K,V> descendingMap = null;
767
#	Line 829 | Line 787 | public class TreeMap<K,V>
787		* @since 1.6
788		*/
789		public NavigableSet<K> navigableKeySet() {
790	<	NavigableSet<K> nks = navigableKeySet;
790	>	KeySet<K> nks = navigableKeySet;
791		return (nks != null) ? nks : (navigableKeySet = new KeySet(this));
792		}
793
#	Line 876 | Line 834 | public class TreeMap<K,V>
834		* <tt>add</tt> or <tt>addAll</tt> operations.
835		*/
836		public Set<Map.Entry<K,V>> entrySet() {
837	<	Set<Map.Entry<K,V>> es = entrySet;
837	>	EntrySet es = entrySet;
838		return (es != null) ? es : (entrySet = new EntrySet());
839		}
840
#	Line 886 | Line 844 | public class TreeMap<K,V>
844		public NavigableMap<K, V> descendingMap() {
845		NavigableMap<K, V> km = descendingMap;
846		return (km != null) ? km :
847	<	(descendingMap = new DescendingSubMap((K)UNBOUNDED, 0,
848	<	(K)UNBOUNDED, 0));
847	>	(descendingMap = new DescendingSubMap(this,
848	>	true, null, true,
849	>	true, null, true));
850		}
851
852		/**
#	Line 898 | Line 857 | public class TreeMap<K,V>
857		* @throws IllegalArgumentException {@inheritDoc}
858		* @since 1.6
859		*/
860	<	public NavigableMap<K,V> navigableSubMap(K fromKey, boolean fromInclusive,
861	<	K toKey,   boolean toInclusive) {
862	<	return new AscendingSubMap(fromKey, excluded(fromInclusive),
863	<	toKey,   excluded(toInclusive));
860	>	public NavigableMap<K,V> subMap(K fromKey, boolean fromInclusive,
861	>	K toKey,   boolean toInclusive) {
862	>	return new AscendingSubMap(this,
863	>	false, fromKey, fromInclusive,
864	>	false, toKey,   toInclusive);
865		}
866
867		/**
#	Line 912 | Line 872 | public class TreeMap<K,V>
872		* @throws IllegalArgumentException {@inheritDoc}
873		* @since 1.6
874		*/
875	<	public NavigableMap<K,V> navigableHeadMap(K toKey, boolean inclusive) {
876	<	return new AscendingSubMap((K)UNBOUNDED, 0, toKey, excluded(inclusive));
875	>	public NavigableMap<K,V> headMap(K toKey, boolean inclusive) {
876	>	return new AscendingSubMap(this,
877	>	true,  null,  true,
878	>	false, toKey, inclusive);
879		}
880
881		/**
#	Line 924 | Line 886 | public class TreeMap<K,V>
886		* @throws IllegalArgumentException {@inheritDoc}
887		* @since 1.6
888		*/
889	<	public NavigableMap<K,V> navigableTailMap(K fromKey, boolean inclusive) {
890	<	return new AscendingSubMap(fromKey, excluded(inclusive), (K)UNBOUNDED, 0);
891	<	}
892	<
931	<	/**
932	<	* Translates a boolean "inclusive" value to the correct int value
933	<	* for the loExcluded or hiExcluded field.
934	<	*/
935	<	static int excluded(boolean inclusive) {
936	<	return inclusive ? 0 : 1;
889	>	public NavigableMap<K,V> tailMap(K fromKey, boolean inclusive) {
890	>	return new AscendingSubMap(this,
891	>	false, fromKey, inclusive,
892	>	true,  null,    true);
893		}
894
895		/**
#	Line 944 | Line 900 | public class TreeMap<K,V>
900		* @throws IllegalArgumentException {@inheritDoc}
901		*/
902		public SortedMap<K,V> subMap(K fromKey, K toKey) {
903	<	return navigableSubMap(fromKey, true, toKey, false);
903	>	return subMap(fromKey, true, toKey, false);
904		}
905
906		/**
#	Line 955 | Line 911 | public class TreeMap<K,V>
911		* @throws IllegalArgumentException {@inheritDoc}
912		*/
913		public SortedMap<K,V> headMap(K toKey) {
914	<	return navigableHeadMap(toKey, false);
914	>	return headMap(toKey, false);
915		}
916
917		/**
#	Line 966 | Line 922 | public class TreeMap<K,V>
922		* @throws IllegalArgumentException {@inheritDoc}
923		*/
924		public SortedMap<K,V> tailMap(K fromKey) {
925	<	return navigableTailMap(fromKey, true);
925	>	return tailMap(fromKey, true);
926		}
927
928		// View class support
#	Line 981 | Line 937 | public class TreeMap<K,V>
937		}
938
939		public boolean contains(Object o) {
940	<	for (Entry<K,V> e = getFirstEntry(); e != null; e = successor(e))
985	<	if (valEquals(e.getValue(), o))
986	<	return true;
987	<	return false;
940	>	return TreeMap.this.containsValue(o);
941		}
942
943		public boolean remove(Object o) {
#	Line 1096 | Line 1049 | public class TreeMap<K,V>
1049		m.remove(o);
1050		return size() != oldSize;
1051		}
1052	<	public NavigableSet<E> navigableSubSet(E fromElement,
1053	<	boolean fromInclusive,
1054	<	E toElement,
1055	<	boolean toInclusive) {
1103	<	return new TreeSet<E>
1104	<	(m.navigableSubMap(fromElement, fromInclusive,
1105	<	toElement,   toInclusive));
1052	>	public NavigableSet<E> subSet(E fromElement, boolean fromInclusive,
1053	>	E toElement,   boolean toInclusive) {
1054	>	return new TreeSet<E>(m.subMap(fromElement, fromInclusive,
1055	>	toElement,   toInclusive));
1056		}
1057	<	public NavigableSet<E> navigableHeadSet(E toElement, boolean inclusive) {
1058	<	return new TreeSet<E>(m.navigableHeadMap(toElement, inclusive));
1057	>	public NavigableSet<E> headSet(E toElement, boolean inclusive) {
1058	>	return new TreeSet<E>(m.headMap(toElement, inclusive));
1059		}
1060	<	public NavigableSet<E> navigableTailSet(E fromElement, boolean inclusive) {
1061	<	return new TreeSet<E>(m.navigableTailMap(fromElement, inclusive));
1060	>	public NavigableSet<E> tailSet(E fromElement, boolean inclusive) {
1061	>	return new TreeSet<E>(m.tailMap(fromElement, inclusive));
1062		}
1063		public SortedSet<E> subSet(E fromElement, E toElement) {
1064	<	return navigableSubSet(fromElement, true, toElement, false);
1064	>	return subSet(fromElement, true, toElement, false);
1065		}
1066		public SortedSet<E> headSet(E toElement) {
1067	<	return navigableHeadSet(toElement, false);
1067	>	return headSet(toElement, false);
1068		}
1069		public SortedSet<E> tailSet(E fromElement) {
1070	<	return navigableTailSet(fromElement, true);
1070	>	return tailSet(fromElement, true);
1071		}
1072		public NavigableSet<E> descendingSet() {
1073		return new TreeSet(m.descendingMap());
1074		}
1075		}
1076
1077	<	// SubMaps
1078	<
1079	<	abstract class NavigableSubMap extends AbstractMap<K,V>
1080	<	implements NavigableMap<K,V>, java.io.Serializable {
1081	<
1082	<	/**
1083	<	* The low endpoint of this submap in absolute terms.  For ascending
1134	<	* submaps this will be the "first" endpoint; for descending submaps,
1135	<	* the last.  If there is no bound, this field is set to UNBOUNDED.
1136	<	*/
1137	<	K lo;
1138	<
1139	<	/**
1140	<	* Zero if the low endpoint is excluded from this submap, one if
1141	<	* it's included.  This field is unused if lo is UNBOUNDED.
1142	<	*/
1143	<	int loExcluded;
1144	<
1145	<	/**
1146	<	* The high endpoint of this submap in absolute terms.  For ascending
1147	<	* submaps this will be the "last" endpoint; for descending submaps,
1148	<	* the first.  If there is no bound, this field is set to UNBOUNDED.
1149	<	*/
1150	<	K hi;
1151	<
1152	<	/**
1153	<	* Zero if the high endpoint is excluded from this submap, one if
1154	<	* it's included.  This field is unused if hi is UNBOUNDED.
1155	<	*/
1156	<	int hiExcluded;
1077	>	/**
1078	>	* Base class for TreeMap Iterators
1079	>	*/
1080	>	abstract class PrivateEntryIterator<T> implements Iterator<T> {
1081	>	Entry<K,V> next;
1082	>	Entry<K,V> lastReturned;
1083	>	int expectedModCount;
1084
1085	<	NavigableSubMap(K lo, int loExcluded, K hi, int hiExcluded) {
1086	<	if (lo != UNBOUNDED && hi != UNBOUNDED && compare(lo, hi) > 0)
1087	<	throw new IllegalArgumentException("fromKey > toKey");
1088	<	this.lo = lo;
1162	<	this.loExcluded = loExcluded;
1163	<	this.hi = hi;
1164	<	this.hiExcluded = hiExcluded;
1085	>	PrivateEntryIterator(Entry<K,V> first) {
1086	>	expectedModCount = modCount;
1087	>	lastReturned = null;
1088	>	next = first;
1089		}
1090
1091	<	public boolean isEmpty() {
1092	<	return entrySet().isEmpty();
1091	>	public final boolean hasNext() {
1092	>	return next != null;
1093		}
1094
1095	<	public boolean containsKey(Object key) {
1096	<	return inRange(key) && TreeMap.this.containsKey(key);
1095	>	final Entry<K,V> nextEntry() {
1096	>	Entry<K,V> e = lastReturned = next;
1097	>	if (e == null)
1098	>	throw new NoSuchElementException();
1099	>	if (modCount != expectedModCount)
1100	>	throw new ConcurrentModificationException();
1101	>	next = successor(e);
1102	>	return e;
1103		}
1104
1105	<	public V get(Object key) {
1106	<	if (!inRange(key))
1107	<	return null;
1108	<	return TreeMap.this.get(key);
1105	>	final Entry<K,V> prevEntry() {
1106	>	Entry<K,V> e = lastReturned= next;
1107	>	if (e == null)
1108	>	throw new NoSuchElementException();
1109	>	if (modCount != expectedModCount)
1110	>	throw new ConcurrentModificationException();
1111	>	next = predecessor(e);
1112	>	return e;
1113		}
1114
1115	<	public V put(K key, V value) {
1116	<	if (!inRange(key))
1117	<	throw new IllegalArgumentException("key out of range");
1118	<	return TreeMap.this.put(key, value);
1115	>	public void remove() {
1116	>	if (lastReturned == null)
1117	>	throw new IllegalStateException();
1118	>	if (modCount != expectedModCount)
1119	>	throw new ConcurrentModificationException();
1120	>	if (lastReturned.left != null && lastReturned.right != null)
1121	>	next = lastReturned;
1122	>	deleteEntry(lastReturned);
1123	>	expectedModCount++;
1124	>	lastReturned = null;
1125		}
1126	+	}
1127
1128	<	public V remove(Object key) {
1129	<	if (!inRange(key))
1130	<	return null;
1190	<	return TreeMap.this.remove(key);
1128	>	final class EntryIterator extends PrivateEntryIterator<Map.Entry<K,V>> {
1129	>	EntryIterator(Entry<K,V> first) {
1130	>	super(first);
1131		}
1132	<
1133	<	public Map.Entry<K,V> ceilingEntry(K key) {
1194	<	TreeMap.Entry<K,V> e = subCeiling(key);
1195	<	return e == null? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
1132	>	public Map.Entry<K,V> next() {
1133	>	return nextEntry();
1134		}
1135	+	}
1136
1137	<	public K ceilingKey(K key) {
1138	<	TreeMap.Entry<K,V> e = subCeiling(key);
1139	<	return e == null? null : e.key;
1137	>	final class ValueIterator extends PrivateEntryIterator<V> {
1138	>	ValueIterator(Entry<K,V> first) {
1139	>	super(first);
1140		}
1141	<
1142	<	public Map.Entry<K,V> higherEntry(K key) {
1204	<	TreeMap.Entry<K,V> e = subHigher(key);
1205	<	return e == null? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
1141	>	public V next() {
1142	>	return nextEntry().value;
1143		}
1144	+	}
1145
1146	<	public K higherKey(K key) {
1147	<	TreeMap.Entry<K,V> e = subHigher(key);
1148	<	return e == null? null : e.key;
1146	>	final class KeyIterator extends PrivateEntryIterator<K> {
1147	>	KeyIterator(Entry<K,V> first) {
1148	>	super(first);
1149		}
1150	<
1151	<	public Map.Entry<K,V> floorEntry(K key) {
1214	<	TreeMap.Entry<K,V> e = subFloor(key);
1215	<	return e == null? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
1150	>	public K next() {
1151	>	return nextEntry().key;
1152		}
1153	+	}
1154
1155	<	public K floorKey(K key) {
1156	<	TreeMap.Entry<K,V> e = subFloor(key);
1157	<	return e == null? null : e.key;
1155	>	final class DescendingKeyIterator extends PrivateEntryIterator<K> {
1156	>	DescendingKeyIterator(Entry<K,V> first) {
1157	>	super(first);
1158		}
1159	<
1160	<	public Map.Entry<K,V> lowerEntry(K key) {
1224	<	TreeMap.Entry<K,V> e = subLower(key);
1225	<	return e == null? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
1159	>	public K next() {
1160	>	return prevEntry().key;
1161		}
1162	+	}
1163
1164	<	public K lowerKey(K key) {
1229	<	TreeMap.Entry<K,V> e = subLower(key);
1230	<	return e == null? null : e.key;
1231	<	}
1164	>	// Little utilities
1165
1166	<	abstract Iterator<K> keyIterator();
1167	<	abstract Iterator<K> descendingKeyIterator();
1166	>	/**
1167	>	* Compares two keys using the correct comparison method for this TreeMap.
1168	>	*/
1169	>	final int compare(Object k1, Object k2) {
1170	>	return comparator==null ? ((Comparable<? super K>)k1).compareTo((K)k2)
1171	>	: comparator.compare((K)k1, (K)k2);
1172	>	}
1173
1174	<	public NavigableSet<K> descendingKeySet() {
1175	<	return descendingMap().navigableKeySet();
1176	<	}
1174	>	/**
1175	>	* Test two values for equality.  Differs from o1.equals(o2) only in
1176	>	* that it copes with <tt>null</tt> o1 properly.
1177	>	*/
1178	>	final static boolean valEquals(Object o1, Object o2) {
1179	>	return (o1==null ? o2==null : o1.equals(o2));
1180	>	}
1181
1182	<	// Views
1183	<	transient NavigableMap<K,V> descendingMapView = null;
1184	<	transient Set<Map.Entry<K,V>> entrySetView = null;
1185	<	private transient NavigableSet<K> navigableKeySetView = null;
1182	>	/**
1183	>	* Return SimpleImmutableEntry for entry, or null if null
1184	>	*/
1185	>	static <K,V> Map.Entry<K,V> exportEntry(TreeMap.Entry<K,V> e) {
1186	>	return e == null? null :
1187	>	new AbstractMap.SimpleImmutableEntry<K,V>(e);
1188	>	}
1189
1190	<	abstract class EntrySetView extends AbstractSet<Map.Entry<K,V>> {
1191	<	private transient int size = -1, sizeModCount;
1190	>	/**
1191	>	* Return key for entry, or null if null
1192	>	*/
1193	>	static <K,V> K keyOrNull(TreeMap.Entry<K,V> e) {
1194	>	return e == null? null : e.key;
1195	>	}
1196
1197	<	public int size() {
1198	<	if (size == -1 || sizeModCount != TreeMap.this.modCount) {
1199	<	size = 0;  sizeModCount = TreeMap.this.modCount;
1200	<	Iterator i = iterator();
1201	<	while (i.hasNext()) {
1202	<	size++;
1203	<	i.next();
1204	<	}
1205	<	}
1257	<	return size;
1258	<	}
1197	>	/**
1198	>	* Returns the key corresponding to the specified Entry.
1199	>	* @throws NoSuchElementException if the Entry is null
1200	>	*/
1201	>	static <K> K key(Entry<K,?> e) {
1202	>	if (e==null)
1203	>	throw new NoSuchElementException();
1204	>	return e.key;
1205	>	}
1206
1260	–	public boolean isEmpty() {
1261	–	return !iterator().hasNext();
1262	–	}
1207
1208	<	public boolean contains(Object o) {
1265	<	if (!(o instanceof Map.Entry))
1266	<	return false;
1267	<	Map.Entry<K,V> entry = (Map.Entry<K,V>) o;
1268	<	K key = entry.getKey();
1269	<	if (!inRange(key))
1270	<	return false;
1271	<	TreeMap.Entry node = getEntry(key);
1272	<	return node != null &&
1273	<	valEquals(node.getValue(), entry.getValue());
1274	<	}
1208	>	// SubMaps
1209
1210	<	public boolean remove(Object o) {
1211	<	if (!(o instanceof Map.Entry))
1212	<	return false;
1213	<	Map.Entry<K,V> entry = (Map.Entry<K,V>) o;
1214	<	K key = entry.getKey();
1215	<	if (!inRange(key))
1216	<	return false;
1217	<	TreeMap.Entry<K,V> node = getEntry(key);
1218	<	if (node!=null && valEquals(node.getValue(),entry.getValue())){
1219	<	deleteEntry(node);
1220	<	return true;
1221	<	}
1222	<	return false;
1210	>	/**
1211	>	* @serial include
1212	>	*/
1213	>	static abstract class NavigableSubMap<K,V> extends AbstractMap<K,V>
1214	>	implements NavigableMap<K,V>, java.io.Serializable {
1215	>	/**
1216	>	* The backing map.
1217	>	*/
1218	>	final TreeMap<K,V> m;
1219	>
1220	>	/**
1221	>	* Endpoints are represented as triples (fromStart, lo,
1222	>	* loInclusive) and (toEnd, hi, hiInclusive). If fromStart is
1223	>	* true, then the low (absolute) bound is the start of the
1224	>	* backing map, and the other values are ignored. Otherwise,
1225	>	* if loInclusive is true, lo is the inclusive bound, else lo
1226	>	* is the exclusive bound. Similarly for the upper bound.
1227	>	*/
1228	>	final K lo, hi;
1229	>	final boolean fromStart, toEnd;
1230	>	final boolean loInclusive, hiInclusive;
1231	>
1232	>	NavigableSubMap(TreeMap<K,V> m,
1233	>	boolean fromStart, K lo, boolean loInclusive,
1234	>	boolean toEnd,     K hi, boolean hiInclusive) {
1235	>	if (!fromStart && !toEnd) {
1236	>	if (m.compare(lo, hi) > 0)
1237	>	throw new IllegalArgumentException("fromKey > toKey");
1238	>	} else {
1239	>	if (!fromStart) // type check
1240	>	m.compare(lo, lo);
1241	>	if (!toEnd)
1242	>	m.compare(hi, hi);
1243		}
1290	–	}
1244
1245	<	public NavigableSet<K> navigableKeySet() {
1246	<	NavigableSet<K> nksv = navigableKeySetView;
1247	<	return (nksv != null) ? nksv :
1248	<	(navigableKeySetView = new TreeMap.KeySet(this));
1245	>	this.m = m;
1246	>	this.fromStart = fromStart;
1247	>	this.lo = lo;
1248	>	this.loInclusive = loInclusive;
1249	>	this.toEnd = toEnd;
1250	>	this.hi = hi;
1251	>	this.hiInclusive = hiInclusive;
1252		}
1253
1254	<	public Set<K> keySet() {
1299	<	return navigableKeySet();
1300	<	}
1254	>	// internal utilities
1255
1256	<	public SortedMap<K,V> subMap(K fromKey, K toKey) {
1257	<	return navigableSubMap(fromKey, true, toKey, false);
1256	>	final boolean tooLow(Object key) {
1257	>	if (!fromStart) {
1258	>	int c = m.compare(key, lo);
1259	>	if (c < 0 || (c == 0 && !loInclusive))
1260	>	return true;
1261	>	}
1262	>	return false;
1263		}
1264
1265	<	public SortedMap<K,V> headMap(K toKey) {
1266	<	return navigableHeadMap(toKey, false);
1265	>	final boolean tooHigh(Object key) {
1266	>	if (!toEnd) {
1267	>	int c = m.compare(key, hi);
1268	>	if (c > 0 || (c == 0 && !hiInclusive))
1269	>	return true;
1270	>	}
1271	>	return false;
1272		}
1273
1274	<	public SortedMap<K,V> tailMap(K fromKey) {
1275	<	return navigableTailMap(fromKey, true);
1274	>	final boolean inRange(Object key) {
1275	>	return !tooLow(key) && !tooHigh(key);
1276		}
1277
1278	<	/** Returns the lowest entry in this submap (absolute ordering) */
1279	<	TreeMap.Entry<K,V> loEntry() {
1280	<	TreeMap.Entry<K,V> result =
1317	<	((lo == UNBOUNDED) ? getFirstEntry() :
1318	<	(loExcluded == 0) ? getCeilingEntry(lo) : getHigherEntry(lo));
1319	<	return (result == null || tooHigh(result.key)) ? null : result;
1278	>	final boolean inClosedRange(Object key) {
1279	>	return (fromStart || m.compare(key, lo) >= 0)
1280	>	&& (toEnd || m.compare(hi, key) >= 0);
1281		}
1282
1283	<	/** Returns the highest key in this submap (absolute ordering) */
1284	<	TreeMap.Entry<K,V> hiEntry() {
1324	<	TreeMap.Entry<K,V> result =
1325	<	((hi == UNBOUNDED) ? getLastEntry() :
1326	<	(hiExcluded == 0) ? getFloorEntry(hi) : getLowerEntry(hi));
1327	<	return (result == null || tooLow(result.key)) ? null : result;
1283	>	final boolean inRange(Object key, boolean inclusive) {
1284	>	return inclusive ? inRange(key) : inClosedRange(key);
1285		}
1286
1287	<	/** Polls the lowest entry in this submap (absolute ordering) */
1288	<	Map.Entry<K,V> pollLoEntry() {
1287	>	/*
1288	>	* Absolute versions of relation operations.
1289	>	* Subclasses map to these using like-named "sub"
1290	>	* versions that invert senses for descending maps
1291	>	*/
1292	>
1293	>	final TreeMap.Entry<K,V> absLowest() {
1294		TreeMap.Entry<K,V> e =
1295	<	((lo == UNBOUNDED) ? getFirstEntry() :
1296	<	(loExcluded == 0) ? getCeilingEntry(lo) : getHigherEntry(lo));
1297	<	if (e == null || tooHigh(e.key))
1298	<	return null;
1337	<	Map.Entry<K,V> result = new AbstractMap.SimpleImmutableEntry<K,V>(e);
1338	<	deleteEntry(e);
1339	<	return result;
1295	>	(fromStart ?  m.getFirstEntry() :
1296	>	(loInclusive ? m.getCeilingEntry(lo) :
1297	>	m.getHigherEntry(lo)));
1298	>	return (e == null || tooHigh(e.key)) ? null : e;
1299		}
1300
1301	<	/** Polls the highest key in this submap (absolute ordering) */
1343	<	Map.Entry<K,V> pollHiEntry() {
1301	>	final TreeMap.Entry<K,V> absHighest() {
1302		TreeMap.Entry<K,V> e =
1303	<	((hi == UNBOUNDED) ? getLastEntry() :
1304	<	(hiExcluded == 0) ? getFloorEntry(hi) : getLowerEntry(hi));
1305	<	if (e == null || tooLow(e.key))
1306	<	return null;
1349	<	Map.Entry<K,V> result = new AbstractMap.SimpleImmutableEntry<K,V>(e);
1350	<	deleteEntry(e);
1351	<	return result;
1303	>	(toEnd ?  m.getLastEntry() :
1304	>	(hiInclusive ?  m.getFloorEntry(hi) :
1305	>	m.getLowerEntry(hi)));
1306	>	return (e == null || tooLow(e.key)) ? null : e;
1307		}
1308
1309	<	// The following four definitions are correct only for
1355	<	// ascending submaps. They are overridden in DescendingSubMap.
1356	<	// They are defined in the base class because the definitions
1357	<	// in DescendingSubMap rely on those for AscendingSubMap.
1358	<
1359	<	/**
1360	<	* Returns the entry corresponding to the ceiling of the specified
1361	<	* key from the perspective of this submap, or null if the submap
1362	<	* contains no such entry.
1363	<	*/
1364	<	TreeMap.Entry<K,V> subCeiling(K key) {
1309	>	final TreeMap.Entry<K,V> absCeiling(K key) {
1310		if (tooLow(key))
1311	<	return loEntry();
1312	<	TreeMap.Entry<K,V> e = getCeilingEntry(key);
1311	>	return absLowest();
1312	>	TreeMap.Entry<K,V> e = m.getCeilingEntry(key);
1313		return (e == null || tooHigh(e.key)) ? null : e;
1314		}
1315
1316	<	/**
1372	<	* Returns the entry corresponding to the higher of the specified
1373	<	* key from the perspective of this submap, or null if the submap
1374	<	* contains no such entry.
1375	<	*/
1376	<	TreeMap.Entry<K,V> subHigher(K key) {
1316	>	final TreeMap.Entry<K,V> absHigher(K key) {
1317		if (tooLow(key))
1318	<	return loEntry();
1319	<	TreeMap.Entry<K,V> e = getHigherEntry(key);
1318	>	return absLowest();
1319	>	TreeMap.Entry<K,V> e = m.getHigherEntry(key);
1320		return (e == null || tooHigh(e.key)) ? null : e;
1321		}
1322
1323	<	/**
1384	<	* Returns the entry corresponding to the floor of the specified
1385	<	* key from the perspective of this submap, or null if the submap
1386	<	* contains no such entry.
1387	<	*/
1388	<	TreeMap.Entry<K,V> subFloor(K key) {
1323	>	final TreeMap.Entry<K,V> absFloor(K key) {
1324		if (tooHigh(key))
1325	<	return hiEntry();
1326	<	TreeMap.Entry<K,V> e = getFloorEntry(key);
1325	>	return absHighest();
1326	>	TreeMap.Entry<K,V> e = m.getFloorEntry(key);
1327		return (e == null || tooLow(e.key)) ? null : e;
1328		}
1329
1330	<	/**
1396	<	* Returns the entry corresponding to the lower of the specified
1397	<	* key from the perspective of this submap, or null if the submap
1398	<	* contains no such entry.
1399	<	*/
1400	<	TreeMap.Entry<K,V> subLower(K key) {
1330	>	final TreeMap.Entry<K,V> absLower(K key) {
1331		if (tooHigh(key))
1332	<	return hiEntry();
1333	<	TreeMap.Entry<K,V> e = getLowerEntry(key);
1332	>	return absHighest();
1333	>	TreeMap.Entry<K,V> e = m.getLowerEntry(key);
1334		return (e == null || tooLow(e.key)) ? null : e;
1335		}
1336
1337	<	boolean inRange(Object key) {
1338	<	return (lo == UNBOUNDED || compare(key, lo) >= loExcluded)
1339	<	&& (hi == UNBOUNDED || compare(hi, key) >= hiExcluded);
1340	<	}
1337	>	/** Returns the absolute high fence for ascending traversal */
1338	>	final TreeMap.Entry<K,V> absHighFence() {
1339	>	return (toEnd ? null : (hiInclusive ?
1340	>	m.getHigherEntry(hi) :
1341	>	m.getCeilingEntry(hi)));
1342	>	}
1343	>
1344	>	/** Return the absolute low fence for descending traversal  */
1345	>	final TreeMap.Entry<K,V> absLowFence() {
1346	>	return (fromStart ? null : (loInclusive ?
1347	>	m.getLowerEntry(lo) :
1348	>	m.getFloorEntry(lo)));
1349	>	}
1350	>
1351	>	// Abstract methods defined in ascending vs descending classes
1352	>	// These relay to the appropriate absolute versions
1353	>
1354	>	abstract TreeMap.Entry<K,V> subLowest();
1355	>	abstract TreeMap.Entry<K,V> subHighest();
1356	>	abstract TreeMap.Entry<K,V> subCeiling(K key);
1357	>	abstract TreeMap.Entry<K,V> subHigher(K key);
1358	>	abstract TreeMap.Entry<K,V> subFloor(K key);
1359	>	abstract TreeMap.Entry<K,V> subLower(K key);
1360
1361	<	boolean inClosedRange(Object key) {
1362	<	return (lo == UNBOUNDED || compare(key, lo) >= 0)
1414	<	&& (hi == UNBOUNDED || compare(hi, key) >= 0);
1415	<	}
1361	>	/** Returns ascending iterator from the perspective of this submap */
1362	>	abstract Iterator<K> keyIterator();
1363
1364	<	boolean inRange(Object key, boolean inclusive) {
1365	<	return inclusive ? inRange(key) : inClosedRange(key);
1364	>	/** Returns descending iterator from the perspective of this submap */
1365	>	abstract Iterator<K> descendingKeyIterator();
1366	>
1367	>	// public methods
1368	>
1369	>	public boolean isEmpty() {
1370	>	return (fromStart && toEnd) ? m.isEmpty() : entrySet().isEmpty();
1371		}
1372
1373	<	boolean tooLow(K key) {
1374	<	return lo != UNBOUNDED && compare(key, lo) < loExcluded;
1373	>	public int size() {
1374	>	return (fromStart && toEnd) ? m.size() : entrySet().size();
1375		}
1376
1377	<	boolean tooHigh(K key) {
1378	<	return hi != UNBOUNDED && compare(hi, key) < hiExcluded;
1377	>	public final boolean containsKey(Object key) {
1378	>	return inRange(key) && m.containsKey(key);
1379		}
1428	–	}
1380
1381	<	class AscendingSubMap extends NavigableSubMap {
1382	<	private static final long serialVersionUID = 912986545866124060L;
1381	>	public final V put(K key, V value) {
1382	>	if (!inRange(key))
1383	>	throw new IllegalArgumentException("key out of range");
1384	>	return m.put(key, value);
1385	>	}
1386
1387	<	AscendingSubMap(K lo, int loExcluded, K hi, int hiExcluded) {
1388	<	super(lo, loExcluded, hi, hiExcluded);
1387	>	public final V get(Object key) {
1388	>	return !inRange(key)? null :  m.get(key);
1389		}
1390
1391	<	public Comparator<? super K> comparator() {
1392	<	return comparator;
1391	>	public final V remove(Object key) {
1392	>	return !inRange(key)? null  : m.remove(key);
1393		}
1394
1395	<	public NavigableMap<K,V> navigableSubMap(
1396	<	K fromKey, boolean fromInclusive, K toKey, boolean toInclusive) {
1443	<	if (!inRange(fromKey, fromInclusive))
1444	<	throw new IllegalArgumentException("fromKey out of range");
1445	<	if (!inRange(toKey, toInclusive))
1446	<	throw new IllegalArgumentException("toKey out of range");
1447	<	return new AscendingSubMap(fromKey, excluded(fromInclusive),
1448	<	toKey,   excluded(toInclusive));
1395	>	public final Map.Entry<K,V> ceilingEntry(K key) {
1396	>	return exportEntry(subCeiling(key));
1397		}
1398
1399	<	public NavigableMap<K,V> navigableHeadMap(K toKey, boolean inclusive) {
1400	<	if (!inClosedRange(toKey))
1453	<	throw new IllegalArgumentException("toKey out of range");
1454	<	return new AscendingSubMap(lo,    loExcluded,
1455	<	toKey, excluded(inclusive));
1399	>	public final K ceilingKey(K key) {
1400	>	return keyOrNull(subCeiling(key));
1401		}
1402
1403	<	public NavigableMap<K,V> navigableTailMap(K fromKey, boolean inclusive){
1404	<	if (!inRange(fromKey, inclusive))
1460	<	throw new IllegalArgumentException("fromKey out of range");
1461	<	return new AscendingSubMap(fromKey, excluded(inclusive),
1462	<	hi,      hiExcluded);
1403	>	public final Map.Entry<K,V> higherEntry(K key) {
1404	>	return exportEntry(subHigher(key));
1405		}
1406
1407	<	Iterator<K> keyIterator() {
1408	<	return new SubMapKeyIterator
1467	<	(loEntry(),
1468	<	hi == UNBOUNDED ? null :
1469	<	hiExcluded == 1 ? getCeilingEntry(hi) :
1470	<	getHigherEntry(hi));
1407	>	public final K higherKey(K key) {
1408	>	return keyOrNull(subHigher(key));
1409		}
1410
1411	<	Iterator<K> descendingKeyIterator() {
1412	<	return new DescendingSubMapKeyIterator
1475	<	(hiEntry(),
1476	<	lo == UNBOUNDED ? null :
1477	<	loExcluded == 1 ? getFloorEntry(lo) :
1478	<	getLowerEntry(lo));
1411	>	public final Map.Entry<K,V> floorEntry(K key) {
1412	>	return exportEntry(subFloor(key));
1413		}
1414
1415	<	public Set<Map.Entry<K,V>> entrySet() {
1416	<	Set<Map.Entry<K,V>> es = entrySetView;
1483	<	if  (es != null)
1484	<	return es;
1485	<	return entrySetView = new NavigableSubMap.EntrySetView() {
1486	<	public Iterator<Map.Entry<K,V>> iterator() {
1487	<	return new SubMapEntryIterator(loEntry(),
1488	<	hi == UNBOUNDED ? null :
1489	<	hiExcluded == 1 ? getCeilingEntry(hi) :
1490	<	getHigherEntry(hi));
1491	<	}
1492	<	};
1415	>	public final K floorKey(K key) {
1416	>	return keyOrNull(subFloor(key));
1417		}
1418
1419	<	public K firstKey() {
1420	<	return key(loEntry());
1419	>	public final Map.Entry<K,V> lowerEntry(K key) {
1420	>	return exportEntry(subLower(key));
1421		}
1422
1423	<	public K lastKey() {
1424	<	return key(hiEntry());
1423	>	public final K lowerKey(K key) {
1424	>	return keyOrNull(subLower(key));
1425		}
1426
1427	<	public Map.Entry<K,V> firstEntry() {
1428	<	return loEntry();
1427	>	public final K firstKey() {
1428	>	return key(subLowest());
1429		}
1430
1431	<	public Map.Entry<K,V> lastEntry() {
1432	<	return hiEntry();
1431	>	public final K lastKey() {
1432	>	return key(subHighest());
1433		}
1434
1435	<	public Map.Entry<K,V> pollFirstEntry() {
1436	<	return pollLoEntry();
1435	>	public final Map.Entry<K,V> firstEntry() {
1436	>	return exportEntry(subLowest());
1437		}
1438
1439	<	public Map.Entry<K,V> pollLastEntry() {
1440	<	return pollHiEntry();
1439	>	public final Map.Entry<K,V> lastEntry() {
1440	>	return exportEntry(subHighest());
1441		}
1442
1443	<	public NavigableMap<K,V> descendingMap() {
1444	<	NavigableMap<K,V> m = descendingMapView;
1445	<	return (m != null) ? m :
1446	<	(descendingMapView =
1447	<	new DescendingSubMap(lo, loExcluded, hi, hiExcluded));
1443	>	public final Map.Entry<K,V> pollFirstEntry() {
1444	>	TreeMap.Entry<K,V> e = subLowest();
1445	>	Map.Entry<K,V> result = exportEntry(e);
1446	>	if (e != null)
1447	>	m.deleteEntry(e);
1448	>	return result;
1449		}
1525	–	}
1450
1451	<	class DescendingSubMap extends NavigableSubMap {
1452	<	private static final long serialVersionUID = 912986545866120460L;
1453	<	DescendingSubMap(K lo, int loExcluded, K hi, int hiExcluded) {
1454	<	super(lo, loExcluded, hi, hiExcluded);
1451	>	public final Map.Entry<K,V> pollLastEntry() {
1452	>	TreeMap.Entry<K,V> e = subHighest();
1453	>	Map.Entry<K,V> result = exportEntry(e);
1454	>	if (e != null)
1455	>	m.deleteEntry(e);
1456	>	return result;
1457		}
1458
1459	<	private final Comparator<? super K> reverseComparator =
1460	<	Collections.reverseOrder(comparator);
1459	>	// Views
1460	>	transient NavigableMap<K,V> descendingMapView = null;
1461	>	transient EntrySetView entrySetView = null;
1462	>	transient KeySet<K> navigableKeySetView = null;
1463
1464	<	public Comparator<? super K> comparator() {
1465	<	return reverseComparator;
1464	>	public final NavigableSet<K> navigableKeySet() {
1465	>	KeySet<K> nksv = navigableKeySetView;
1466	>	return (nksv != null) ? nksv :
1467	>	(navigableKeySetView = new TreeMap.KeySet(this));
1468		}
1469
1470	<	public NavigableMap<K,V> navigableSubMap(
1471	<	K fromKey, boolean fromInclusive, K toKey, boolean toInclusive) {
1542	<	if (!inRange(fromKey, fromInclusive))
1543	<	throw new IllegalArgumentException("fromKey out of range");
1544	<	if (!inRange(toKey, toInclusive))
1545	<	throw new IllegalArgumentException("toKey out of range");
1546	<	return new DescendingSubMap(toKey,   excluded(toInclusive),
1547	<	fromKey, excluded(fromInclusive));
1470	>	public final Set<K> keySet() {
1471	>	return navigableKeySet();
1472		}
1473
1474	<	public NavigableMap<K,V> navigableHeadMap(K toKey, boolean inclusive) {
1475	<	if (!inRange(toKey, inclusive))
1552	<	throw new IllegalArgumentException("toKey out of range");
1553	<	return new DescendingSubMap(toKey, inclusive ? 0:1, hi, hiExcluded);
1474	>	public NavigableSet<K> descendingKeySet() {
1475	>	return descendingMap().navigableKeySet();
1476		}
1477
1478	<	public NavigableMap<K,V> navigableTailMap(K fromKey, boolean inclusive){
1479	<	if (!inRange(fromKey, inclusive))
1558	<	throw new IllegalArgumentException("fromKey out of range");
1559	<	return new DescendingSubMap(lo,      loExcluded,
1560	<	fromKey, excluded(inclusive));
1478	>	public final SortedMap<K,V> subMap(K fromKey, K toKey) {
1479	>	return subMap(fromKey, true, toKey, false);
1480		}
1481
1482	<	Iterator<K> keyIterator() {
1483	<	return new DescendingSubMapKeyIterator
1565	<	(hiEntry(),
1566	<	lo == UNBOUNDED ? null :
1567	<	loExcluded == 1 ? getFloorEntry(lo) :
1568	<	getLowerEntry(lo));
1482	>	public final SortedMap<K,V> headMap(K toKey) {
1483	>	return headMap(toKey, false);
1484		}
1485
1486	<	Iterator<K> descendingKeyIterator() {
1487	<	return new SubMapKeyIterator
1573	<	(loEntry(),
1574	<	hi == UNBOUNDED ? null :
1575	<	hiExcluded == 1 ? getCeilingEntry(hi) :
1576	<	getHigherEntry(hi));
1486	>	public final SortedMap<K,V> tailMap(K fromKey) {
1487	>	return tailMap(fromKey, true);
1488		}
1489
1490	<	public Set<Map.Entry<K,V>> entrySet() {
1491	<	Set<Map.Entry<K,V>> es = entrySetView;
1492	<	if  (es != null)
1493	<	return es;
1494	<	return entrySetView = new NavigableSubMap.EntrySetView() {
1495	<	public Iterator<Map.Entry<K,V>> iterator() {
1496	<	return new DescendingSubMapEntryIterator(hiEntry(),
1497	<	lo == UNBOUNDED ? null :
1498	<	loExcluded == 1 ? getFloorEntry(lo) :
1499	<	getLowerEntry(lo));
1490	>	// View classes
1491	>
1492	>	abstract class EntrySetView extends AbstractSet<Map.Entry<K,V>> {
1493	>	private transient int size = -1, sizeModCount;
1494	>
1495	>	public int size() {
1496	>	if (fromStart && toEnd)
1497	>	return m.size();
1498	>	if (size == -1 || sizeModCount != m.modCount) {
1499	>	sizeModCount = m.modCount;
1500	>	size = 0;
1501	>	Iterator i = iterator();
1502	>	while (i.hasNext()) {
1503	>	size++;
1504	>	i.next();
1505	>	}
1506		}
1507	<	};
1508	<	}
1507	>	return size;
1508	>	}
1509
1510	<	public K firstKey() {
1511	<	return key(hiEntry());
1512	<	}
1510	>	public boolean isEmpty() {
1511	>	TreeMap.Entry<K,V> n = absLowest();
1512	>	return n == null || tooHigh(n.key);
1513	>	}
1514
1515	<	public K lastKey() {
1516	<	return key(loEntry());
1517	<	}
1515	>	public boolean contains(Object o) {
1516	>	if (!(o instanceof Map.Entry))
1517	>	return false;
1518	>	Map.Entry<K,V> entry = (Map.Entry<K,V>) o;
1519	>	K key = entry.getKey();
1520	>	if (!inRange(key))
1521	>	return false;
1522	>	TreeMap.Entry node = m.getEntry(key);
1523	>	return node != null &&
1524	>	valEquals(node.getValue(), entry.getValue());
1525	>	}
1526
1527	<	public Map.Entry<K,V> firstEntry() {
1528	<	return hiEntry();
1527	>	public boolean remove(Object o) {
1528	>	if (!(o instanceof Map.Entry))
1529	>	return false;
1530	>	Map.Entry<K,V> entry = (Map.Entry<K,V>) o;
1531	>	K key = entry.getKey();
1532	>	if (!inRange(key))
1533	>	return false;
1534	>	TreeMap.Entry<K,V> node = m.getEntry(key);
1535	>	if (node!=null && valEquals(node.getValue(),entry.getValue())){
1536	>	m.deleteEntry(node);
1537	>	return true;
1538	>	}
1539	>	return false;
1540	>	}
1541		}
1542
1543	<	public Map.Entry<K,V> lastEntry() {
1544	<	return loEntry();
1545	<	}
1543	>	/**
1544	>	* Iterators for SubMaps
1545	>	*/
1546	>	abstract class SubMapIterator<T> implements Iterator<T> {
1547	>	TreeMap.Entry<K,V> lastReturned;
1548	>	TreeMap.Entry<K,V> next;
1549	>	final K fenceKey;
1550	>	int expectedModCount;
1551	>
1552	>	SubMapIterator(TreeMap.Entry<K,V> first,
1553	>	TreeMap.Entry<K,V> fence) {
1554	>	expectedModCount = m.modCount;
1555	>	lastReturned = null;
1556	>	next = first;
1557	>	fenceKey = fence == null ? null : fence.key;
1558	>	}
1559
1560	<	public Map.Entry<K,V> pollFirstEntry() {
1561	<	return pollHiEntry();
1562	<	}
1560	>	public final boolean hasNext() {
1561	>	return next != null && next.key != fenceKey;
1562	>	}
1563
1564	<	public Map.Entry<K,V> pollLastEntry() {
1565	<	return pollLoEntry();
1566	<	}
1564	>	final TreeMap.Entry<K,V> nextEntry() {
1565	>	TreeMap.Entry<K,V> e = lastReturned = next;
1566	>	if (e == null || e.key == fenceKey)
1567	>	throw new NoSuchElementException();
1568	>	if (m.modCount != expectedModCount)
1569	>	throw new ConcurrentModificationException();
1570	>	next = successor(e);
1571	>	return e;
1572	>	}
1573
1574	<	public NavigableMap<K,V> descendingMap() {
1575	<	NavigableMap<K,V> m = descendingMapView;
1576	<	return (m != null) ? m :
1577	<	(descendingMapView =
1578	<	new AscendingSubMap(lo, loExcluded, hi, hiExcluded));
1579	<	}
1574	>	final TreeMap.Entry<K,V> prevEntry() {
1575	>	TreeMap.Entry<K,V> e = lastReturned = next;
1576	>	if (e == null || e.key == fenceKey)
1577	>	throw new NoSuchElementException();
1578	>	if (m.modCount != expectedModCount)
1579	>	throw new ConcurrentModificationException();
1580	>	next = predecessor(e);
1581	>	return e;
1582	>	}
1583
1584	<	@Override TreeMap.Entry<K,V> subCeiling(K key) {
1585	<	return super.subFloor(key);
1584	>	public void remove() {
1585	>	if (lastReturned == null)
1586	>	throw new IllegalStateException();
1587	>	if (m.modCount != expectedModCount)
1588	>	throw new ConcurrentModificationException();
1589	>	if (lastReturned.left != null && lastReturned.right != null)
1590	>	next = lastReturned;
1591	>	m.deleteEntry(lastReturned);
1592	>	expectedModCount++;
1593	>	lastReturned = null;
1594	>	}
1595		}
1596
1597	<	@Override TreeMap.Entry<K,V> subHigher(K key) {
1598	<	return super.subLower(key);
1597	>	final class SubMapEntryIterator extends SubMapIterator<Map.Entry<K,V>> {
1598	>	SubMapEntryIterator(TreeMap.Entry<K,V> first,
1599	>	TreeMap.Entry<K,V> fence) {
1600	>	super(first, fence);
1601	>	}
1602	>	public Map.Entry<K,V> next() {
1603	>	return nextEntry();
1604	>	}
1605		}
1606
1607	<	@Override TreeMap.Entry<K,V> subFloor(K key) {
1608	<	return super.subCeiling(key);
1607	>	final class SubMapKeyIterator extends SubMapIterator<K> {
1608	>	SubMapKeyIterator(TreeMap.Entry<K,V> first,
1609	>	TreeMap.Entry<K,V> fence) {
1610	>	super(first, fence);
1611	>	}
1612	>	public K next() {
1613	>	return nextEntry().key;
1614	>	}
1615		}
1616
1617	<	@Override TreeMap.Entry<K,V> subLower(K key) {
1618	<	return super.subHigher(key);
1617	>	final class DescendingSubMapEntryIterator extends SubMapIterator<Map.Entry<K,V>> {
1618	>	DescendingSubMapEntryIterator(TreeMap.Entry<K,V> last,
1619	>	TreeMap.Entry<K,V> fence) {
1620	>	super(last, fence);
1621	>	}
1622	>
1623	>	public Map.Entry<K,V> next() {
1624	>	return prevEntry();
1625	>	}
1626		}
1639	–	}
1627
1628	<	/**
1629	<	* This class exists solely for the sake of serialization
1630	<	* compatibility with previous releases of TreeMap that did not
1631	<	* support NavigableMap.  It translates an old-version SubMap into
1632	<	* a new-version AscendingSubMap. This class is never otherwise
1633	<	* used.
1634	<	*/
1635	<	private class SubMap extends AbstractMap<K,V>
1649	<	implements SortedMap<K,V>, java.io.Serializable {
1650	<	private static final long serialVersionUID = -6520786458950516097L;
1651	<	private boolean fromStart = false, toEnd = false;
1652	<	private K fromKey, toKey;
1653	<	private Object readResolve() {
1654	<	return new AscendingSubMap
1655	<	(fromStart? ((K)UNBOUNDED) : fromKey, 0,
1656	<	toEnd? ((K)UNBOUNDED) : toKey, 1);
1628	>	final class DescendingSubMapKeyIterator extends SubMapIterator<K> {
1629	>	DescendingSubMapKeyIterator(TreeMap.Entry<K,V> last,
1630	>	TreeMap.Entry<K,V> fence) {
1631	>	super(last, fence);
1632	>	}
1633	>	public K next() {
1634	>	return prevEntry().key;
1635	>	}
1636		}
1658	–	public Set<Map.Entry<K,V>> entrySet() { throw new UnsupportedOperationException(); }
1659	–	public K lastKey() { throw new UnsupportedOperationException(); }
1660	–	public K firstKey() { throw new UnsupportedOperationException(); }
1661	–	public SortedMap<K,V> subMap(K fromKey, K toKey) { throw new UnsupportedOperationException(); }
1662	–	public SortedMap<K,V> headMap(K toKey) { throw new UnsupportedOperationException(); }
1663	–	public SortedMap<K,V> tailMap(K fromKey) { throw new UnsupportedOperationException(); }
1664	–	public Comparator<? super K> comparator() { throw new UnsupportedOperationException(); }
1637		}
1638
1639		/**
1640	<	* TreeMap Iterator.
1640	>	* @serial include
1641		*/
1642	<	abstract class PrivateEntryIterator<T> implements Iterator<T> {
1643	<	int expectedModCount = TreeMap.this.modCount;
1672	<	Entry<K,V> lastReturned = null;
1673	<	Entry<K,V> next;
1642	>	static final class AscendingSubMap<K,V> extends NavigableSubMap<K,V> {
1643	>	private static final long serialVersionUID = 912986545866124060L;
1644
1645	<	PrivateEntryIterator(Entry<K,V> first) {
1646	<	next = first;
1645	>	AscendingSubMap(TreeMap<K,V> m,
1646	>	boolean fromStart, K lo, boolean loInclusive,
1647	>	boolean toEnd,     K hi, boolean hiInclusive) {
1648	>	super(m, fromStart, lo, loInclusive, toEnd, hi, hiInclusive);
1649		}
1650
1651	<	public final boolean hasNext() {
1652	<	return next != null;
1651	>	public Comparator<? super K> comparator() {
1652	>	return m.comparator();
1653		}
1654
1655	<	final Entry<K,V> nextEntry() {
1656	<	if (next == null)
1657	<	throw new NoSuchElementException();
1658	<	if (modCount != expectedModCount)
1659	<	throw new ConcurrentModificationException();
1660	<	lastReturned = next;
1661	<	next = successor(next);
1662	<	return lastReturned;
1655	>	public NavigableMap<K,V> subMap(K fromKey, boolean fromInclusive,
1656	>	K toKey,   boolean toInclusive) {
1657	>	if (!inRange(fromKey, fromInclusive))
1658	>	throw new IllegalArgumentException("fromKey out of range");
1659	>	if (!inRange(toKey, toInclusive))
1660	>	throw new IllegalArgumentException("toKey out of range");
1661	>	return new AscendingSubMap(m,
1662	>	false, fromKey, fromInclusive,
1663	>	false, toKey,   toInclusive);
1664		}
1665
1666	<	final Entry<K,V> prevEntry() {
1667	<	if (next == null)
1668	<	throw new NoSuchElementException();
1669	<	if (modCount != expectedModCount)
1670	<	throw new ConcurrentModificationException();
1671	<	lastReturned = next;
1699	<	next = predecessor(next);
1700	<	return lastReturned;
1666	>	public NavigableMap<K,V> headMap(K toKey, boolean inclusive) {
1667	>	if (!inClosedRange(toKey))
1668	>	throw new IllegalArgumentException("toKey out of range");
1669	>	return new AscendingSubMap(m,
1670	>	fromStart, lo,    loInclusive,
1671	>	false,     toKey, inclusive);
1672		}
1673
1674	<	public void remove() {
1675	<	if (lastReturned == null)
1676	<	throw new IllegalStateException();
1677	<	if (modCount != expectedModCount)
1678	<	throw new ConcurrentModificationException();
1679	<	if (lastReturned.left != null && lastReturned.right != null)
1709	<	next = lastReturned;
1710	<	deleteEntry(lastReturned);
1711	<	expectedModCount++;
1712	<	lastReturned = null;
1674	>	public NavigableMap<K,V> tailMap(K fromKey, boolean inclusive){
1675	>	if (!inRange(fromKey, inclusive))
1676	>	throw new IllegalArgumentException("fromKey out of range");
1677	>	return new AscendingSubMap(m,
1678	>	false, fromKey, inclusive,
1679	>	toEnd, hi,      hiInclusive);
1680		}
1714	–	}
1681
1682	<	final class EntryIterator extends PrivateEntryIterator<Map.Entry<K,V>> {
1683	<	EntryIterator(Entry<K,V> first) {
1684	<	super(first);
1685	<	}
1686	<	public Map.Entry<K,V> next() {
1687	<	return nextEntry();
1682	>	public NavigableMap<K,V> descendingMap() {
1683	>	NavigableMap<K,V> mv = descendingMapView;
1684	>	return (mv != null) ? mv :
1685	>	(descendingMapView =
1686	>	new DescendingSubMap(m,
1687	>	fromStart, lo, loInclusive,
1688	>	toEnd,     hi, hiInclusive));
1689		}
1723	–	}
1690
1691	<	final class ValueIterator extends PrivateEntryIterator<V> {
1692	<	ValueIterator(Entry<K,V> first) {
1727	<	super(first);
1728	<	}
1729	<	public V next() {
1730	<	return nextEntry().value;
1691	>	Iterator<K> keyIterator() {
1692	>	return new SubMapKeyIterator(absLowest(), absHighFence());
1693		}
1732	–	}
1694
1695	<	final class KeyIterator extends PrivateEntryIterator<K> {
1696	<	KeyIterator(Entry<K,V> first) {
1736	<	super(first);
1737	<	}
1738	<	public K next() {
1739	<	return nextEntry().key;
1695	>	Iterator<K> descendingKeyIterator() {
1696	>	return new DescendingSubMapKeyIterator(absHighest(), absLowFence());
1697		}
1741	–	}
1698
1699	<	final class DescendingKeyIterator extends PrivateEntryIterator<K> {
1700	<	DescendingKeyIterator(Entry<K,V> first) {
1701	<	super(first);
1699	>	final class AscendingEntrySetView extends EntrySetView {
1700	>	public Iterator<Map.Entry<K,V>> iterator() {
1701	>	return new SubMapEntryIterator(absLowest(), absHighFence());
1702	>	}
1703		}
1704	<	public K next() {
1705	<	return prevEntry().key;
1704	>
1705	>	public Set<Map.Entry<K,V>> entrySet() {
1706	>	EntrySetView es = entrySetView;
1707	>	return (es != null) ? es : new AscendingEntrySetView();
1708		}
1709	+
1710	+	TreeMap.Entry<K,V> subLowest()       { return absLowest(); }
1711	+	TreeMap.Entry<K,V> subHighest()      { return absHighest(); }
1712	+	TreeMap.Entry<K,V> subCeiling(K key) { return absCeiling(key); }
1713	+	TreeMap.Entry<K,V> subHigher(K key)  { return absHigher(key); }
1714	+	TreeMap.Entry<K,V> subFloor(K key)   { return absFloor(key); }
1715	+	TreeMap.Entry<K,V> subLower(K key)   { return absLower(key); }
1716		}
1717
1718	<	/**
1719	<	* Iterators for SubMaps
1718	>	/**
1719	>	* @serial include
1720		*/
1721	<	abstract class SubMapIterator<T> implements Iterator<T> {
1722	<	int expectedModCount = TreeMap.this.modCount;
1723	<	Entry<K,V> lastReturned = null;
1724	<	Entry<K,V> next;
1725	<	final K firstExcludedKey;
1726	<
1761	<	SubMapIterator(Entry<K,V> first, Entry<K,V> firstExcluded) {
1762	<	next = first;
1763	<	firstExcludedKey = (firstExcluded == null ? null
1764	<	: firstExcluded.key);
1721	>	static final class DescendingSubMap<K,V>  extends NavigableSubMap<K,V> {
1722	>	private static final long serialVersionUID = 912986545866120460L;
1723	>	DescendingSubMap(TreeMap<K,V> m,
1724	>	boolean fromStart, K lo, boolean loInclusive,
1725	>	boolean toEnd,     K hi, boolean hiInclusive) {
1726	>	super(m, fromStart, lo, loInclusive, toEnd, hi, hiInclusive);
1727		}
1728
1729	<	public final boolean hasNext() {
1730	<	return next != null && next.key != firstExcludedKey;
1769	<	}
1729	>	private final Comparator<? super K> reverseComparator =
1730	>	Collections.reverseOrder(m.comparator);
1731
1732	<	final Entry<K,V> nextEntry() {
1733	<	if (next == null || next.key == firstExcludedKey)
1773	<	throw new NoSuchElementException();
1774	<	if (modCount != expectedModCount)
1775	<	throw new ConcurrentModificationException();
1776	<	lastReturned = next;
1777	<	next = successor(next);
1778	<	return lastReturned;
1732	>	public Comparator<? super K> comparator() {
1733	>	return reverseComparator;
1734		}
1735
1736	<	final Entry<K,V> prevEntry() {
1737	<	if (next == null || next.key == firstExcludedKey)
1738	<	throw new NoSuchElementException();
1739	<	if (modCount != expectedModCount)
1740	<	throw new ConcurrentModificationException();
1741	<	lastReturned = next;
1742	<	next = predecessor(next);
1743	<	return lastReturned;
1736	>	public NavigableMap<K,V> subMap(K fromKey, boolean fromInclusive,
1737	>	K toKey,   boolean toInclusive) {
1738	>	if (!inRange(fromKey, fromInclusive))
1739	>	throw new IllegalArgumentException("fromKey out of range");
1740	>	if (!inRange(toKey, toInclusive))
1741	>	throw new IllegalArgumentException("toKey out of range");
1742	>	return new DescendingSubMap(m,
1743	>	false, toKey,   toInclusive,
1744	>	false, fromKey, fromInclusive);
1745		}
1746
1747	<	public void remove() {
1748	<	if (lastReturned == null)
1749	<	throw new IllegalStateException();
1750	<	if (modCount != expectedModCount)
1751	<	throw new ConcurrentModificationException();
1752	<	if (lastReturned.left != null && lastReturned.right != null)
1797	<	next = lastReturned;
1798	<	deleteEntry(lastReturned);
1799	<	expectedModCount++;
1800	<	lastReturned = null;
1747	>	public NavigableMap<K,V> headMap(K toKey, boolean inclusive) {
1748	>	if (!inRange(toKey, inclusive))
1749	>	throw new IllegalArgumentException("toKey out of range");
1750	>	return new DescendingSubMap(m,
1751	>	false, toKey, inclusive,
1752	>	toEnd, hi,    hiInclusive);
1753		}
1802	–	}
1754
1755	<	final class SubMapEntryIterator extends SubMapIterator<Map.Entry<K,V>> {
1756	<	SubMapEntryIterator(Entry<K,V> first, Entry<K,V> firstExcluded) {
1757	<	super(first, firstExcluded);
1758	<	}
1759	<	public Map.Entry<K,V> next() {
1760	<	return nextEntry();
1755	>	public NavigableMap<K,V> tailMap(K fromKey, boolean inclusive){
1756	>	if (!inRange(fromKey, inclusive))
1757	>	throw new IllegalArgumentException("fromKey out of range");
1758	>	return new DescendingSubMap(m,
1759	>	fromStart, lo, loInclusive,
1760	>	false, fromKey, inclusive);
1761		}
1811	–	}
1762
1763	<	final class SubMapKeyIterator extends SubMapIterator<K> {
1764	<	SubMapKeyIterator(Entry<K,V> first, Entry<K,V> firstExcluded) {
1765	<	super(first, firstExcluded);
1766	<	}
1767	<	public K next() {
1768	<	return nextEntry().key;
1763	>	public NavigableMap<K,V> descendingMap() {
1764	>	NavigableMap<K,V> mv = descendingMapView;
1765	>	return (mv != null) ? mv :
1766	>	(descendingMapView =
1767	>	new AscendingSubMap(m,
1768	>	fromStart, lo, loInclusive,
1769	>	toEnd,     hi, hiInclusive));
1770		}
1820	–	}
1771
1772	<	final class DescendingSubMapEntryIterator extends SubMapIterator<Map.Entry<K,V>> {
1773	<	DescendingSubMapEntryIterator(Entry<K,V> last, Entry<K,V> lastExcluded) {
1824	<	super(last, lastExcluded);
1772	>	Iterator<K> keyIterator() {
1773	>	return new DescendingSubMapKeyIterator(absHighest(), absLowFence());
1774		}
1775
1776	<	public Map.Entry<K,V> next() {
1777	<	return prevEntry();
1776	>	Iterator<K> descendingKeyIterator() {
1777	>	return new SubMapKeyIterator(absLowest(), absHighFence());
1778		}
1830	–	}
1779
1780	<	final class DescendingSubMapKeyIterator extends SubMapIterator<K> {
1781	<	DescendingSubMapKeyIterator(Entry<K,V> last, Entry<K,V> lastExcluded) {
1782	<	super(last, lastExcluded);
1780	>	final class DescendingEntrySetView extends EntrySetView {
1781	>	public Iterator<Map.Entry<K,V>> iterator() {
1782	>	return new DescendingSubMapEntryIterator(absHighest(), absLowFence());
1783	>	}
1784		}
1785	<	public K next() {
1786	<	return prevEntry().key;
1785	>
1786	>	public Set<Map.Entry<K,V>> entrySet() {
1787	>	EntrySetView es = entrySetView;
1788	>	return (es != null) ? es : new DescendingEntrySetView();
1789		}
1839	–	}
1790
1791	<	/**
1792	<	* Compares two keys using the correct comparison method for this TreeMap.
1793	<	*/
1794	<	private int compare(Object k1, Object k2) {
1795	<	return comparator==null ? ((Comparable<? super K>)k1).compareTo((K)k2)
1796	<	: comparator.compare((K)k1, (K)k2);
1791	>	TreeMap.Entry<K,V> subLowest()       { return absHighest(); }
1792	>	TreeMap.Entry<K,V> subHighest()      { return absLowest(); }
1793	>	TreeMap.Entry<K,V> subCeiling(K key) { return absFloor(key); }
1794	>	TreeMap.Entry<K,V> subHigher(K key)  { return absLower(key); }
1795	>	TreeMap.Entry<K,V> subFloor(K key)   { return absCeiling(key); }
1796	>	TreeMap.Entry<K,V> subLower(K key)   { return absHigher(key); }
1797		}
1798
1799		/**
1800	<	* Test two values for equality.  Differs from o1.equals(o2) only in
1801	<	* that it copes with <tt>null</tt> o1 properly.
1800	>	* This class exists solely for the sake of serialization
1801	>	* compatibility with previous releases of TreeMap that did not
1802	>	* support NavigableMap.  It translates an old-version SubMap into
1803	>	* a new-version AscendingSubMap. This class is never otherwise
1804	>	* used.
1805	>	*
1806	>	* @serial include
1807		*/
1808	<	private static boolean valEquals(Object o1, Object o2) {
1809	<	return (o1==null ? o2==null : o1.equals(o2));
1808	>	private class SubMap extends AbstractMap<K,V>
1809	>	implements SortedMap<K,V>, java.io.Serializable {
1810	>	private static final long serialVersionUID = -6520786458950516097L;
1811	>	private boolean fromStart = false, toEnd = false;
1812	>	private K fromKey, toKey;
1813	>	private Object readResolve() {
1814	>	return new AscendingSubMap(TreeMap.this,
1815	>	fromStart, fromKey, true,
1816	>	toEnd, toKey, false);
1817	>	}
1818	>	public Set<Map.Entry<K,V>> entrySet() { throw new InternalError(); }
1819	>	public K lastKey() { throw new InternalError(); }
1820	>	public K firstKey() { throw new InternalError(); }
1821	>	public SortedMap<K,V> subMap(K fromKey, K toKey) { throw new InternalError(); }
1822	>	public SortedMap<K,V> headMap(K toKey) { throw new InternalError(); }
1823	>	public SortedMap<K,V> tailMap(K fromKey) { throw new InternalError(); }
1824	>	public Comparator<? super K> comparator() { throw new InternalError(); }
1825		}
1826
1827	+
1828	+	// Red-black mechanics
1829	+
1830		private static final boolean RED   = false;
1831		private static final boolean BLACK = true;
1832
#	Line 1862 | Line 1835 | public class TreeMap<K,V>
1835		* user (see Map.Entry).
1836		*/
1837
1838	<	static class Entry<K,V> implements Map.Entry<K,V> {
1838	>	static final class Entry<K,V> implements Map.Entry<K,V> {
1839		K key;
1840		V value;
1841		Entry<K,V> left = null;
#	Line 1914 | Line 1887 | public class TreeMap<K,V>
1887		public boolean equals(Object o) {
1888		if (!(o instanceof Map.Entry))
1889		return false;
1890	<	Map.Entry e = (Map.Entry)o;
1890	>	Map.Entry<?,?> e = (Map.Entry<?,?>)o;
1891
1892		return valEquals(key,e.getKey()) && valEquals(value,e.getValue());
1893		}
#	Line 1934 | Line 1907 | public class TreeMap<K,V>
1907		* Returns the first Entry in the TreeMap (according to the TreeMap's
1908		* key-sort function).  Returns null if the TreeMap is empty.
1909		*/
1910	<	private Entry<K,V> getFirstEntry() {
1910	>	final Entry<K,V> getFirstEntry() {
1911		Entry<K,V> p = root;
1912		if (p != null)
1913		while (p.left != null)
#	Line 1946 | Line 1919 | public class TreeMap<K,V>
1919		* Returns the last Entry in the TreeMap (according to the TreeMap's
1920		* key-sort function).  Returns null if the TreeMap is empty.
1921		*/
1922	<	private Entry<K,V> getLastEntry() {
1922	>	final Entry<K,V> getLastEntry() {
1923		Entry<K,V> p = root;
1924		if (p != null)
1925		while (p.right != null)
#	Line 1957 | Line 1930 | public class TreeMap<K,V>
1930		/**
1931		* Returns the successor of the specified Entry, or null if no such.
1932		*/
1933	<	private Entry<K,V> successor(Entry<K,V> t) {
1933	>	static <K,V> TreeMap.Entry<K,V> successor(Entry<K,V> t) {
1934		if (t == null)
1935		return null;
1936		else if (t.right != null) {
#	Line 1979 | Line 1952 | public class TreeMap<K,V>
1952		/**
1953		* Returns the predecessor of the specified Entry, or null if no such.
1954		*/
1955	<	private Entry<K,V> predecessor(Entry<K,V> t) {
1955	>	static <K,V> Entry<K,V> predecessor(Entry<K,V> t) {
1956		if (t == null)
1957		return null;
1958		else if (t.left != null) {
#	Line 2029 | Line 2002 | public class TreeMap<K,V>
2002		return (p == null) ? null: p.right;
2003		}
2004
2005	<	/** From CLR **/
2005	>	/** From CLR */
2006		private void rotateLeft(Entry<K,V> p) {
2007	<	Entry<K,V> r = p.right;
2008	<	p.right = r.left;
2009	<	if (r.left != null)
2010	<	r.left.parent = p;
2011	<	r.parent = p.parent;
2012	<	if (p.parent == null)
2013	<	root = r;
2014	<	else if (p.parent.left == p)
2015	<	p.parent.left = r;
2016	<	else
2017	<	p.parent.right = r;
2018	<	r.left = p;
2019	<	p.parent = r;
2007	>	if (p != null) {
2008	>	Entry<K,V> r = p.right;
2009	>	p.right = r.left;
2010	>	if (r.left != null)
2011	>	r.left.parent = p;
2012	>	r.parent = p.parent;
2013	>	if (p.parent == null)
2014	>	root = r;
2015	>	else if (p.parent.left == p)
2016	>	p.parent.left = r;
2017	>	else
2018	>	p.parent.right = r;
2019	>	r.left = p;
2020	>	p.parent = r;
2021	>	}
2022		}
2023
2024	<	/** From CLR **/
2024	>	/** From CLR */
2025		private void rotateRight(Entry<K,V> p) {
2026	<	Entry<K,V> l = p.left;
2027	<	p.left = l.right;
2028	<	if (l.right != null) l.right.parent = p;
2029	<	l.parent = p.parent;
2030	<	if (p.parent == null)
2031	<	root = l;
2032	<	else if (p.parent.right == p)
2033	<	p.parent.right = l;
2034	<	else p.parent.left = l;
2035	<	l.right = p;
2036	<	p.parent = l;
2026	>	if (p != null) {
2027	>	Entry<K,V> l = p.left;
2028	>	p.left = l.right;
2029	>	if (l.right != null) l.right.parent = p;
2030	>	l.parent = p.parent;
2031	>	if (p.parent == null)
2032	>	root = l;
2033	>	else if (p.parent.right == p)
2034	>	p.parent.right = l;
2035	>	else p.parent.left = l;
2036	>	l.right = p;
2037	>	p.parent = l;
2038	>	}
2039		}
2040
2041	<
2065	<	/** From CLR **/
2041	>	/** From CLR */
2042		private void fixAfterInsertion(Entry<K,V> x) {
2043		x.color = RED;
2044
#	Line 2081 | Line 2057 | public class TreeMap<K,V>
2057		}
2058		setColor(parentOf(x), BLACK);
2059		setColor(parentOf(parentOf(x)), RED);
2060	<	if (parentOf(parentOf(x)) != null)
2085	<	rotateRight(parentOf(parentOf(x)));
2060	>	rotateRight(parentOf(parentOf(x)));
2061		}
2062		} else {
2063		Entry<K,V> y = leftOf(parentOf(parentOf(x)));
#	Line 2096 | Line 2071 | public class TreeMap<K,V>
2071		x = parentOf(x);
2072		rotateRight(x);
2073		}
2074	<	setColor(parentOf(x),  BLACK);
2074	>	setColor(parentOf(x), BLACK);
2075		setColor(parentOf(parentOf(x)), RED);
2076	<	if (parentOf(parentOf(x)) != null)
2102	<	rotateLeft(parentOf(parentOf(x)));
2076	>	rotateLeft(parentOf(parentOf(x)));
2077		}
2078		}
2079		}
#	Line 2109 | Line 2083 | public class TreeMap<K,V>
2083		/**
2084		* Delete node p, and then rebalance the tree.
2085		*/
2112	–
2086		private void deleteEntry(Entry<K,V> p) {
2087	<	decrementSize();
2087	>	modCount++;
2088	>	size--;
2089
2090		// If strictly internal, copy successor's element to p and then make p
2091		// point to successor.
#	Line 2157 | Line 2131 | public class TreeMap<K,V>
2131		}
2132		}
2133
2134	<	/** From CLR **/
2134	>	/** From CLR */
2135		private void fixAfterDeletion(Entry<K,V> x) {
2136		while (x != root && colorOf(x) == BLACK) {
2137		if (x == leftOf(parentOf(x))) {
#	Line 2172 | Line 2146 | public class TreeMap<K,V>
2146
2147		if (colorOf(leftOf(sib))  == BLACK &&
2148		colorOf(rightOf(sib)) == BLACK) {
2149	<	setColor(sib,  RED);
2149	>	setColor(sib, RED);
2150		x = parentOf(x);
2151		} else {
2152		if (colorOf(rightOf(sib)) == BLACK) {
#	Line 2199 | Line 2173 | public class TreeMap<K,V>
2173
2174		if (colorOf(rightOf(sib)) == BLACK &&
2175		colorOf(leftOf(sib)) == BLACK) {
2176	<	setColor(sib,  RED);
2176	>	setColor(sib, RED);
2177		x = parentOf(x);
2178		} else {
2179		if (colorOf(leftOf(sib)) == BLACK) {
#	Line 2265 | Line 2239 | public class TreeMap<K,V>
2239		buildFromSorted(size, null, s, null);
2240		}
2241
2242	<	/** Intended to be called only from TreeSet.readObject **/
2242	>	/** Intended to be called only from TreeSet.readObject */
2243		void readTreeSet(int size, java.io.ObjectInputStream s, V defaultVal)
2244		throws java.io.IOException, ClassNotFoundException {
2245		buildFromSorted(size, null, s, defaultVal);
2246		}
2247
2248	<	/** Intended to be called only from TreeSet.addAll **/
2248	>	/** Intended to be called only from TreeSet.addAll */
2249		void addAllForTreeSet(SortedSet<? extends K> set, V defaultVal) {
2250		try {
2251		buildFromSorted(set.size(), set.iterator(), null, defaultVal);

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines