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.29 by dl, Thu Apr 20 20:34:37 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 109 | Line 109 | public class TreeMap<K,V>
109		*/
110		private transient int modCount = 0;
111
112	–	private void incrementSize()   { modCount++; size++; }
113	–	private void decrementSize()   { modCount++; size--; }
114	–
112		/**
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
#	Line 125 | Line 122 | public class TreeMap<K,V>
122		* <tt>ClassCastException</tt>.
123		*/
124		public TreeMap() {
125	+	comparator = null;
126		}
127
128		/**
#	Line 160 | 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 224 | 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	<	}
231	<
232	<	private boolean valueSearchNull(Entry n) {
233	<	if (n.value == null)
234	<	return true;
235	<
236	<	// Check left and right subtrees for value
237	<	return (n.left  != null && valueSearchNull(n.left)) ||
238	<	(n.right != null && valueSearchNull(n.right));
239	<	}
240	<
241	<	private boolean valueSearchNonNull(Entry n, Object value) {
242	<	// Check this node for the value
243	<	if (value.equals(n.value))
244	<	return true;
245	<
246	<	// Check left and right subtrees for value
247	<	return (n.left  != null && valueSearchNonNull(n.left, value)) ||
248	<	(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 364 | Line 345 | public class TreeMap<K,V>
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 385 | Line 368 | public class TreeMap<K,V>
368		*/
369		final Entry<K,V> getCeilingEntry(K key) {
370		Entry<K,V> p = root;
371	<	if (p==null)
389	<	return null;
390	<
391	<	while (true) {
371	>	while (p != null) {
372		int cmp = compare(key, p.key);
373		if (cmp < 0) {
374		if (p.left != null)
#	Line 410 | Line 390 | public class TreeMap<K,V>
390		} else
391		return p;
392		}
393	+	return null;
394		}
395
396		/**
#	Line 419 | Line 400 | public class TreeMap<K,V>
400		*/
401		final Entry<K,V> getFloorEntry(K key) {
402		Entry<K,V> p = root;
403	<	if (p==null)
423	<	return null;
424	<
425	<	while (true) {
403	>	while (p != null) {
404		int cmp = compare(key, p.key);
405		if (cmp > 0) {
406		if (p.right != null)
#	Line 445 | Line 423 | public class TreeMap<K,V>
423		return p;
424
425		}
426	+	return null;
427		}
428
429		/**
#	Line 455 | Line 434 | public class TreeMap<K,V>
434		*/
435		final Entry<K,V> getHigherEntry(K key) {
436		Entry<K,V> p = root;
437	<	if (p==null)
459	<	return null;
460	<
461	<	while (true) {
437	>	while (p != null) {
438		int cmp = compare(key, p.key);
439		if (cmp < 0) {
440		if (p.left != null)
#	Line 479 | Line 455 | public class TreeMap<K,V>
455		}
456		}
457		}
458	+	return null;
459		}
460
461		/**
#	Line 488 | Line 465 | public class TreeMap<K,V>
465		*/
466		final Entry<K,V> getLowerEntry(K key) {
467		Entry<K,V> p = root;
468	<	if (p==null)
492	<	return null;
493	<
494	<	while (true) {
468	>	while (p != null) {
469		int cmp = compare(key, p.key);
470		if (cmp > 0) {
471		if (p.right != null)
#	Line 512 | Line 486 | public class TreeMap<K,V>
486		}
487		}
488		}
489	<	}
516	<
517	<	/**
518	<	* Returns the key corresponding to the specified Entry.
519	<	* @throws NoSuchElementException if the Entry is null
520	<	*/
521	<	static <K> K key(Entry<K,?> e) {
522	<	if (e==null)
523	<	throw new NoSuchElementException();
524	<	return e.key;
489	>	return null;
490		}
491
492		/**
#	Line 544 | Line 509 | public class TreeMap<K,V>
509		*/
510		public V put(K key, V value) {
511		Entry<K,V> t = root;
547	–
512		if (t == null) {
513	<	// TBD
514	<	//             if (key == null) {
515	<	//                 if (comparator == null)
516	<	//                     throw new NullPointerException();
517	<	//                 comparator.compare(key, key);
554	<	//             }
555	<	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 {
568	<	incrementSize();
569	<	t.left = new Entry<K,V>(key, value, t);
570	<	fixAfterInsertion(t.left);
571	<	return null;
572	<	}
573	<	} else { // cmp > 0
574	<	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);
579	<	fixAfterInsertion(t.right);
580	<	return null;
581	<	}
582	<	}
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 655 | 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();
659	<	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();
667	<	return (e == null)? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
644	>	return exportEntry(getLastEntry());
645		}
646
647		/**
#	Line 672 | 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);
678	<	deleteEntry(p);
652	>	Map.Entry<K,V> result = exportEntry(p);
653	>	if (p != null)
654	>	deleteEntry(p);
655		return result;
656		}
657
#	Line 684 | 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);
690	<	deleteEntry(p);
663	>	Map.Entry<K,V> result = exportEntry(p);
664	>	if (p != null)
665	>	deleteEntry(p);
666		return result;
667		}
668
#	Line 699 | 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);
703	<	return (e == null)? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
677	>	return exportEntry(getLowerEntry(key));
678		}
679
680		/**
#	Line 711 | 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);
715	<	return (e == null)? null : e.key;
688	>	return keyOrNull(getLowerEntry(key));
689		}
690
691		/**
#	Line 723 | 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);
727	<	return (e == null)? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
699	>	return exportEntry(getFloorEntry(key));
700		}
701
702		/**
#	Line 735 | 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);
739	<	return (e == null)? null : e.key;
710	>	return keyOrNull(getFloorEntry(key));
711		}
712
713		/**
#	Line 747 | 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);
751	<	return (e == null)? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
721	>	return exportEntry(getCeilingEntry(key));
722		}
723
724		/**
#	Line 759 | 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);
763	<	return (e == null)? null : e.key;
732	>	return keyOrNull(getCeilingEntry(key));
733		}
734
735		/**
#	Line 771 | 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);
775	<	return (e == null)? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
743	>	return exportEntry(getHigherEntry(key));
744		}
745
746		/**
#	Line 783 | 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);
787	<	return (e == null)? null : e.key;
754	>	return keyOrNull(getHigherEntry(key));
755		}
756
757		// Views
#	Line 877 | 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(this,
848	<	true, null, 0,
849	<	true, null, 0));
847	>	(descendingMap = new DescendingSubMap(this,
848	>	true, null, true,
849	>	true, null, true));
850		}
851
852		/**
#	Line 892 | Line 859 | public class TreeMap<K,V>
859		*/
860		public NavigableMap<K,V> subMap(K fromKey, boolean fromInclusive,
861		K toKey,   boolean toInclusive) {
862	<	return new AscendingSubMap(this,
863	<	false, fromKey, excluded(fromInclusive),
864	<	false, toKey,   excluded(toInclusive));
862	>	return new AscendingSubMap(this,
863	>	false, fromKey, fromInclusive,
864	>	false, toKey,   toInclusive);
865		}
866
867		/**
#	Line 906 | Line 873 | public class TreeMap<K,V>
873		* @since 1.6
874		*/
875		public NavigableMap<K,V> headMap(K toKey, boolean inclusive) {
876	<	return new AscendingSubMap(this,
877	<	true, null, 0,
878	<	false, toKey, excluded(inclusive));
876	>	return new AscendingSubMap(this,
877	>	true,  null,  true,
878	>	false, toKey, inclusive);
879		}
880
881		/**
#	Line 920 | Line 887 | public class TreeMap<K,V>
887		* @since 1.6
888		*/
889		public NavigableMap<K,V> tailMap(K fromKey, boolean inclusive) {
890	<	return new AscendingSubMap(this,
891	<	false, fromKey, excluded(inclusive),
892	<	true, null, 0);
926	<	}
927	<
928	<	/**
929	<	* Translates a boolean "inclusive" value to the correct int value
930	<	* for the loExcluded or hiExcluded field.
931	<	*/
932	<	static int excluded(boolean inclusive) {
933	<	return inclusive ? 0 : 1;
890	>	return new AscendingSubMap(this,
891	>	false, fromKey, inclusive,
892	>	true,  null,    true);
893		}
894
895		/**
#	Line 978 | 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))
982	<	if (valEquals(e.getValue(), o))
983	<	return true;
984	<	return false;
940	>	return TreeMap.this.containsValue(o);
941		}
942
943		public boolean remove(Object o) {
#	Line 1093 | Line 1049 | public class TreeMap<K,V>
1049		m.remove(o);
1050		return size() != oldSize;
1051		}
1052	<	public NavigableSet<E> subSet(E fromElement,
1053	<	boolean fromInclusive,
1054	<	E toElement,
1055	<	boolean toInclusive) {
1100	<	return new TreeSet<E>
1101	<	(m.subMap(fromElement, fromInclusive,
1102	<	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> headSet(E toElement, boolean inclusive) {
1058		return new TreeSet<E>(m.headMap(toElement, inclusive));
#	Line 1125 | Line 1078 | public class TreeMap<K,V>
1078		* Base class for TreeMap Iterators
1079		*/
1080		abstract class PrivateEntryIterator<T> implements Iterator<T> {
1128	–	int expectedModCount = TreeMap.this.modCount;
1129	–	Entry<K,V> lastReturned = null;
1081		Entry<K,V> next;
1082	+	Entry<K,V> lastReturned;
1083	+	int expectedModCount;
1084
1085		PrivateEntryIterator(Entry<K,V> first) {
1086	+	expectedModCount = modCount;
1087	+	lastReturned = null;
1088		next = first;
1089		}
1090
#	Line 1138 | Line 1093 | public class TreeMap<K,V>
1093		}
1094
1095		final Entry<K,V> nextEntry() {
1096	<	if (next == null)
1096	>	Entry<K,V> e = lastReturned = next;
1097	>	if (e == null)
1098		throw new NoSuchElementException();
1099		if (modCount != expectedModCount)
1100		throw new ConcurrentModificationException();
1101	<	lastReturned = next;
1102	<	next = successor(next);
1147	<	return lastReturned;
1101	>	next = successor(e);
1102	>	return e;
1103		}
1104
1105		final Entry<K,V> prevEntry() {
1106	<	if (next == null)
1106	>	Entry<K,V> e = lastReturned= next;
1107	>	if (e == null)
1108		throw new NoSuchElementException();
1109		if (modCount != expectedModCount)
1110		throw new ConcurrentModificationException();
1111	<	lastReturned = next;
1112	<	next = predecessor(next);
1157	<	return lastReturned;
1111	>	next = predecessor(e);
1112	>	return e;
1113		}
1114
1115		public void remove() {
#	Line 1206 | Line 1161 | public class TreeMap<K,V>
1161		}
1162		}
1163
1164	<	// SubMaps
1164	>	// Little utilities
1165
1166	<	static abstract class NavigableSubMap<K,V> extends AbstractMap<K,V>
1167	<	implements NavigableMap<K,V>, java.io.Serializable {
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	<	/*
1175	<	* The backing map.
1176	<	*/
1177	<	final TreeMap<K,V> m;
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	<	/** True if low point is from start of backing map */
1183	<	boolean fromStart;
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	<	/**
1191	<	* The low endpoint of this submap in absolute terms, or null
1192	<	* if fromStart.
1193	<	*/
1194	<	K lo;
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	>	/**
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
1228	–	/**
1229	–	* Zero if the low endpoint is excluded from this submap, one if
1230	–	* it's included.  This field is unused if fromStart.
1231	–	*/
1232	–	int loExcluded;
1207
1208	<	/** True if high point is to End of backing map */
1235	<	boolean toEnd;
1208	>	// SubMaps
1209
1210	<	/**
1211	<	* The high endpoint of this submap in absolute terms, or null
1212	<	* if toEnd.
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	<	K hi;
1218	>	final TreeMap<K,V> m;
1219
1220		/**
1221	<	* Zero if the high endpoint is excluded from this submap, one if
1222	<	* it's included.  This field is unused if toEnd.
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	<	int hiExcluded;
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	>	}
1244
1249	–	NavigableSubMap(TreeMap<K,V> m,
1250	–	boolean fromStart, K lo, int loExcluded,
1251	–	boolean toEnd, K hi, int hiExcluded) {
1252	–	if (!fromStart && !toEnd && m.compare(lo, hi) > 0)
1253	–	throw new IllegalArgumentException("fromKey > toKey");
1245		this.m = m;
1246		this.fromStart = fromStart;
1247		this.lo = lo;
1248	<	this.loExcluded = loExcluded;
1248	>	this.loInclusive = loInclusive;
1249		this.toEnd = toEnd;
1250		this.hi = hi;
1251	<	this.hiExcluded = hiExcluded;
1251	>	this.hiInclusive = hiInclusive;
1252		}
1253
1254		// internal utilities
1255
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	+	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		final boolean inRange(Object key) {
1275	<	return (fromStart || m.compare(key, lo) >= loExcluded)
1267	<	&& (toEnd || m.compare(hi, key) >= hiExcluded);
1275	>	return !tooLow(key) && !tooHigh(key);
1276		}
1277
1278		final boolean inClosedRange(Object key) {
#	Line 1276 | Line 1284 | public class TreeMap<K,V>
1284		return inclusive ? inRange(key) : inClosedRange(key);
1285		}
1286
1287	<	final boolean tooLow(K key) {
1288	<	return !fromStart && m.compare(key, lo) < loExcluded;
1289	<	}
1290	<
1291	<	final boolean tooHigh(K key) {
1284	<	return !toEnd && m.compare(hi, key) < hiExcluded;
1285	<	}
1286	<
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	<	/** Returns the lowest entry in this submap (absolute ordering) */
1294	<	final TreeMap.Entry<K,V> loEntry() {
1290	<	TreeMap.Entry<K,V> result =
1293	>	final TreeMap.Entry<K,V> absLowest() {
1294	>	TreeMap.Entry<K,V> e =
1295		(fromStart ?  m.getFirstEntry() :
1296	<	(loExcluded == 0 ? m.getCeilingEntry(lo) :
1297	<	m.getHigherEntry(lo)));
1298	<	return (result == null || tooHigh(result.key)) ? null : result;
1296	>	(loInclusive ? m.getCeilingEntry(lo) :
1297	>	m.getHigherEntry(lo)));
1298	>	return (e == null || tooHigh(e.key)) ? null : e;
1299		}
1300
1301	<	/** Returns the highest key in this submap (absolute ordering) */
1302	<	final TreeMap.Entry<K,V> hiEntry() {
1299	<	TreeMap.Entry<K,V> result =
1301	>	final TreeMap.Entry<K,V> absHighest() {
1302	>	TreeMap.Entry<K,V> e =
1303		(toEnd ?  m.getLastEntry() :
1304	<	(hiExcluded == 0 ?  m.getFloorEntry(hi) :
1305	<	m.getLowerEntry(hi)));
1306	<	return (result == null || tooLow(result.key)) ? null : result;
1304	>	(hiInclusive ?  m.getFloorEntry(hi) :
1305	>	m.getLowerEntry(hi)));
1306	>	return (e == null || tooLow(e.key)) ? null : e;
1307		}
1308
1309	<	/** Polls the lowest entry in this submap (absolute ordering) */
1310	<	final Map.Entry<K,V> pollLoEntry() {
1311	<	TreeMap.Entry<K,V> e = loEntry();
1312	<	if (e == null)
1313	<	return null;
1311	<	Map.Entry<K,V> result = new AbstractMap.SimpleImmutableEntry<K,V>(e);
1312	<	m.deleteEntry(e);
1313	<	return result;
1309	>	final TreeMap.Entry<K,V> absCeiling(K key) {
1310	>	if (tooLow(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	<	/** Polls the highest key in this submap (absolute ordering) */
1317	<	final Map.Entry<K,V> pollHiEntry() {
1318	<	TreeMap.Entry<K,V> e = hiEntry();
1319	<	if (e == null)
1320	<	return null;
1321	<	Map.Entry<K,V> result = new AbstractMap.SimpleImmutableEntry<K,V>(e);
1322	<	m.deleteEntry(e);
1323	<	return result;
1316	>	final TreeMap.Entry<K,V> absHigher(K key) {
1317	>	if (tooLow(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	<	/**
1324	<	* Return the absolute high fence for ascending traversal
1325	<	*/
1326	<	final TreeMap.Entry<K,V> hiFence() {
1327	<	if (toEnd)
1331	<	return null;
1332	<	else if (hiExcluded == 0)
1333	<	return m.getHigherEntry(hi);
1334	<	else
1335	<	return m.getCeilingEntry(hi);
1323	>	final TreeMap.Entry<K,V> absFloor(K key) {
1324	>	if (tooHigh(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	<	/**
1331	<	* Return the absolute low fence for descending traversal
1332	<	*/
1333	<	final TreeMap.Entry<K,V> loFence() {
1334	<	if (fromStart)
1343	<	return null;
1344	<	else if (loExcluded == 0)
1345	<	return m.getLowerEntry(lo);
1346	<	else
1347	<	return m.getFloorEntry(lo);
1330	>	final TreeMap.Entry<K,V> absLower(K key) {
1331	>	if (tooHigh(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	+	/** 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	+	/** Returns ascending iterator from the perspective of this submap */
1362	+	abstract Iterator<K> keyIterator();
1363	+
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 entrySet().isEmpty();
1370	>	return (fromStart && toEnd) ? m.isEmpty() : entrySet().isEmpty();
1371		}
1372
1373	<	public boolean containsKey(Object key) {
1374	<	return inRange(key) && m.containsKey(key);
1373	>	public int size() {
1374	>	return (fromStart && toEnd) ? m.size() : entrySet().size();
1375		}
1376
1377	<	public V get(Object key) {
1378	<	if (!inRange(key))
1361	<	return null;
1362	<	return m.get(key);
1377	>	public final boolean containsKey(Object key) {
1378	>	return inRange(key) && m.containsKey(key);
1379		}
1380
1381	<	public V put(K key, V value) {
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	<	public V remove(Object key) {
1388	<	if (!inRange(key))
1373	<	return null;
1374	<	return m.remove(key);
1387	>	public final V get(Object key) {
1388	>	return !inRange(key)? null :  m.get(key);
1389		}
1390
1391	<	public Map.Entry<K,V> ceilingEntry(K key) {
1392	<	TreeMap.Entry<K,V> e = subCeiling(key);
1379	<	return e == null? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
1391	>	public final V remove(Object key) {
1392	>	return !inRange(key)? null  : m.remove(key);
1393		}
1394
1395	<	public K ceilingKey(K key) {
1396	<	TreeMap.Entry<K,V> e = subCeiling(key);
1384	<	return e == null? null : e.key;
1395	>	public final Map.Entry<K,V> ceilingEntry(K key) {
1396	>	return exportEntry(subCeiling(key));
1397		}
1398
1399	<	public Map.Entry<K,V> higherEntry(K key) {
1400	<	TreeMap.Entry<K,V> e = subHigher(key);
1389	<	return e == null? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
1399	>	public final K ceilingKey(K key) {
1400	>	return keyOrNull(subCeiling(key));
1401		}
1402
1403	<	public K higherKey(K key) {
1404	<	TreeMap.Entry<K,V> e = subHigher(key);
1394	<	return e == null? null : e.key;
1403	>	public final Map.Entry<K,V> higherEntry(K key) {
1404	>	return exportEntry(subHigher(key));
1405		}
1406
1407	<	public Map.Entry<K,V> floorEntry(K key) {
1408	<	TreeMap.Entry<K,V> e = subFloor(key);
1399	<	return e == null? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
1407	>	public final K higherKey(K key) {
1408	>	return keyOrNull(subHigher(key));
1409		}
1410
1411	<	public K floorKey(K key) {
1412	<	TreeMap.Entry<K,V> e = subFloor(key);
1404	<	return e == null? null : e.key;
1411	>	public final Map.Entry<K,V> floorEntry(K key) {
1412	>	return exportEntry(subFloor(key));
1413		}
1414
1415	<	public Map.Entry<K,V> lowerEntry(K key) {
1416	<	TreeMap.Entry<K,V> e = subLower(key);
1409	<	return e == null? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
1415	>	public final K floorKey(K key) {
1416	>	return keyOrNull(subFloor(key));
1417		}
1418
1419	<	public K lowerKey(K key) {
1420	<	TreeMap.Entry<K,V> e = subLower(key);
1414	<	return e == null? null : e.key;
1419	>	public final Map.Entry<K,V> lowerEntry(K key) {
1420	>	return exportEntry(subLower(key));
1421		}
1422
1423	<	abstract Iterator<K> keyIterator();
1424	<	abstract Iterator<K> descendingKeyIterator();
1423	>	public final K lowerKey(K key) {
1424	>	return keyOrNull(subLower(key));
1425	>	}
1426
1427	<	public NavigableSet<K> descendingKeySet() {
1428	<	return descendingMap().navigableKeySet();
1427	>	public final K firstKey() {
1428	>	return key(subLowest());
1429	>	}
1430	>
1431	>	public final K lastKey() {
1432	>	return key(subHighest());
1433	>	}
1434	>
1435	>	public final Map.Entry<K,V> firstEntry() {
1436	>	return exportEntry(subLowest());
1437	>	}
1438	>
1439	>	public final Map.Entry<K,V> lastEntry() {
1440	>	return exportEntry(subHighest());
1441	>	}
1442	>
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	>	}
1450	>
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		// Views
#	Line 1426 | Line 1461 | public class TreeMap<K,V>
1461		transient EntrySetView entrySetView = null;
1462		transient KeySet<K> navigableKeySetView = null;
1463
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 final Set<K> keySet() {
1471	+	return navigableKeySet();
1472	+	}
1473	+
1474	+	public NavigableSet<K> descendingKeySet() {
1475	+	return descendingMap().navigableKeySet();
1476	+	}
1477	+
1478	+	public final SortedMap<K,V> subMap(K fromKey, K toKey) {
1479	+	return subMap(fromKey, true, toKey, false);
1480	+	}
1481	+
1482	+	public final SortedMap<K,V> headMap(K toKey) {
1483	+	return headMap(toKey, false);
1484	+	}
1485	+
1486	+	public final SortedMap<K,V> tailMap(K fromKey) {
1487	+	return tailMap(fromKey, true);
1488	+	}
1489	+
1490	+	// View classes
1491	+
1492		abstract class EntrySetView extends AbstractSet<Map.Entry<K,V>> {
1493		private transient int size = -1, sizeModCount;
1494
#	Line 1434 | Line 1497 | public class TreeMap<K,V>
1497		return m.size();
1498		if (size == -1 || sizeModCount != m.modCount) {
1499		sizeModCount = m.modCount;
1500	<	size = 0;
1500	>	size = 0;
1501		Iterator i = iterator();
1502		while (i.hasNext()) {
1503		size++;
#	Line 1445 | Line 1508 | public class TreeMap<K,V>
1508		}
1509
1510		public boolean isEmpty() {
1511	<	TreeMap.Entry<K,V> n = loEntry();
1511	>	TreeMap.Entry<K,V> n = absLowest();
1512		return n == null || tooHigh(n.key);
1513		}
1514
#	Line 1477 | Line 1540 | public class TreeMap<K,V>
1540		}
1541		}
1542
1480	–	public NavigableSet<K> navigableKeySet() {
1481	–	KeySet<K> nksv = navigableKeySetView;
1482	–	return (nksv != null) ? nksv :
1483	–	(navigableKeySetView = new TreeMap.KeySet(this));
1484	–	}
1485	–
1486	–	public Set<K> keySet() {
1487	–	return navigableKeySet();
1488	–	}
1489	–
1490	–	public SortedMap<K,V> subMap(K fromKey, K toKey) {
1491	–	return subMap(fromKey, true, toKey, false);
1492	–	}
1493	–
1494	–	public SortedMap<K,V> headMap(K toKey) {
1495	–	return headMap(toKey, false);
1496	–	}
1497	–
1498	–	public SortedMap<K,V> tailMap(K fromKey) {
1499	–	return tailMap(fromKey, true);
1500	–	}
1501	–
1502	–
1503	–	// The following four definitions are correct only for
1504	–	// ascending submaps. They are overridden in DescendingSubMap.
1505	–	// They are defined in the base class because the definitions
1506	–	// in DescendingSubMap rely on those for AscendingSubMap.
1507	–
1508	–	/**
1509	–	* Returns the entry corresponding to the ceiling of the specified
1510	–	* key from the perspective of this submap, or null if the submap
1511	–	* contains no such entry.
1512	–	*/
1513	–	TreeMap.Entry<K,V> subCeiling(K key) {
1514	–	if (tooLow(key))
1515	–	return loEntry();
1516	–	TreeMap.Entry<K,V> e = m.getCeilingEntry(key);
1517	–	return (e == null || tooHigh(e.key)) ? null : e;
1518	–	}
1519	–
1520	–	/**
1521	–	* Returns the entry corresponding to the higher of the specified
1522	–	* key from the perspective of this submap, or null if the submap
1523	–	* contains no such entry.
1524	–	*/
1525	–	TreeMap.Entry<K,V> subHigher(K key) {
1526	–	if (tooLow(key))
1527	–	return loEntry();
1528	–	TreeMap.Entry<K,V> e = m.getHigherEntry(key);
1529	–	return (e == null || tooHigh(e.key)) ? null : e;
1530	–	}
1531	–
1532	–	/**
1533	–	* Returns the entry corresponding to the floor of the specified
1534	–	* key from the perspective of this submap, or null if the submap
1535	–	* contains no such entry.
1536	–	*/
1537	–	TreeMap.Entry<K,V> subFloor(K key) {
1538	–	if (tooHigh(key))
1539	–	return hiEntry();
1540	–	TreeMap.Entry<K,V> e = m.getFloorEntry(key);
1541	–	return (e == null || tooLow(e.key)) ? null : e;
1542	–	}
1543	–
1544	–	/**
1545	–	* Returns the entry corresponding to the lower of the specified
1546	–	* key from the perspective of this submap, or null if the submap
1547	–	* contains no such entry.
1548	–	*/
1549	–	TreeMap.Entry<K,V> subLower(K key) {
1550	–	if (tooHigh(key))
1551	–	return hiEntry();
1552	–	TreeMap.Entry<K,V> e = m.getLowerEntry(key);
1553	–	return (e == null || tooLow(e.key)) ? null : e;
1554	–	}
1555	–
1543		/**
1544		* Iterators for SubMaps
1545		*/
1546		abstract class SubMapIterator<T> implements Iterator<T> {
1547	<	int expectedModCount = m.modCount;
1561	<	TreeMap.Entry<K,V> lastReturned = null;
1547	>	TreeMap.Entry<K,V> lastReturned;
1548		TreeMap.Entry<K,V> next;
1549	<	final K firstExcludedKey;
1549	>	final K fenceKey;
1550	>	int expectedModCount;
1551
1552	<	SubMapIterator(TreeMap.Entry<K,V> first,
1553	<	TreeMap.Entry<K,V> firstExcluded) {
1552	>	SubMapIterator(TreeMap.Entry<K,V> first,
1553	>	TreeMap.Entry<K,V> fence) {
1554	>	expectedModCount = m.modCount;
1555	>	lastReturned = null;
1556		next = first;
1557	<	firstExcludedKey = (firstExcluded == null ? null
1569	<	: firstExcluded.key);
1557	>	fenceKey = fence == null ? null : fence.key;
1558		}
1559
1560		public final boolean hasNext() {
1561	<	return next != null && next.key != firstExcludedKey;
1561	>	return next != null && next.key != fenceKey;
1562		}
1563
1564		final TreeMap.Entry<K,V> nextEntry() {
1565	<	if (next == null || next.key == firstExcludedKey)
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	<	lastReturned = next;
1571	<	next = m.successor(next);
1583	<	return lastReturned;
1570	>	next = successor(e);
1571	>	return e;
1572		}
1573
1574		final TreeMap.Entry<K,V> prevEntry() {
1575	<	if (next == null || next.key == firstExcludedKey)
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	<	lastReturned = next;
1581	<	next = m.predecessor(next);
1593	<	return lastReturned;
1580	>	next = predecessor(e);
1581	>	return e;
1582		}
1583
1584		public void remove() {
#	Line 1607 | Line 1595 | public class TreeMap<K,V>
1595		}
1596
1597		final class SubMapEntryIterator extends SubMapIterator<Map.Entry<K,V>> {
1598	<	SubMapEntryIterator(TreeMap.Entry<K,V> first,
1599	<	TreeMap.Entry<K,V> firstExcluded) {
1600	<	super(first, firstExcluded);
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();
#	Line 1617 | Line 1605 | public class TreeMap<K,V>
1605		}
1606
1607		final class SubMapKeyIterator extends SubMapIterator<K> {
1608	<	SubMapKeyIterator(TreeMap.Entry<K,V> first,
1609	<	TreeMap.Entry<K,V> firstExcluded) {
1610	<	super(first, firstExcluded);
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;
#	Line 1627 | Line 1615 | public class TreeMap<K,V>
1615		}
1616
1617		final class DescendingSubMapEntryIterator extends SubMapIterator<Map.Entry<K,V>> {
1618	<	DescendingSubMapEntryIterator(TreeMap.Entry<K,V> last,
1619	<	TreeMap.Entry<K,V> lastExcluded) {
1620	<	super(last, lastExcluded);
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() {
#	Line 1638 | Line 1626 | public class TreeMap<K,V>
1626		}
1627
1628		final class DescendingSubMapKeyIterator extends SubMapIterator<K> {
1629	<	DescendingSubMapKeyIterator(TreeMap.Entry<K,V> last,
1630	<	TreeMap.Entry<K,V> lastExcluded) {
1631	<	super(last, lastExcluded);
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;
#	Line 1648 | Line 1636 | public class TreeMap<K,V>
1636		}
1637		}
1638
1639	<	static class AscendingSubMap<K,V> extends NavigableSubMap<K,V> {
1639	>	/**
1640	>	* @serial include
1641	>	*/
1642	>	static final class AscendingSubMap<K,V> extends NavigableSubMap<K,V> {
1643		private static final long serialVersionUID = 912986545866124060L;
1644
1645	<	AscendingSubMap(TreeMap<K,V> m,
1646	<	boolean fromStart, K lo, int loExcluded,
1647	<	boolean toEnd, K hi, int hiExcluded) {
1648	<	super(m, fromStart, lo, loExcluded, toEnd, hi, hiExcluded);
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 Comparator<? super K> comparator() {
1652		return m.comparator();
1653		}
1654
1655	<	public NavigableMap<K,V> subMap(K fromKey, boolean fromInclusive,
1656	<	K toKey, boolean toInclusive) {
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, excluded(fromInclusive),
1663	<	false, toKey,   excluded(toInclusive));
1661	>	return new AscendingSubMap(m,
1662	>	false, fromKey, fromInclusive,
1663	>	false, toKey,   toInclusive);
1664		}
1665
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,    loExcluded,
1671	<	false, toKey, excluded(inclusive));
1669	>	return new AscendingSubMap(m,
1670	>	fromStart, lo,    loInclusive,
1671	>	false,     toKey, inclusive);
1672		}
1673
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, excluded(inclusive),
1679	<	toEnd, hi,      hiExcluded);
1677	>	return new AscendingSubMap(m,
1678	>	false, fromKey, inclusive,
1679	>	toEnd, hi,      hiInclusive);
1680	>	}
1681	>
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		}
1690
1691		Iterator<K> keyIterator() {
1692	<	return new SubMapKeyIterator(loEntry(), hiFence());
1692	>	return new SubMapKeyIterator(absLowest(), absHighFence());
1693		}
1694
1695		Iterator<K> descendingKeyIterator() {
1696	<	return new DescendingSubMapKeyIterator(hiEntry(), loFence());
1696	>	return new DescendingSubMapKeyIterator(absHighest(), absLowFence());
1697		}
1698
1699	<	class AscendingEntrySetView extends NavigableSubMap.EntrySetView {
1699	>	final class AscendingEntrySetView extends EntrySetView {
1700		public Iterator<Map.Entry<K,V>> iterator() {
1701	<	return new SubMapEntryIterator(loEntry(), hiFence());
1701	>	return new SubMapEntryIterator(absLowest(), absHighFence());
1702		}
1703		}
1704
#	Line 1707 | Line 1707 | public class TreeMap<K,V>
1707		return (es != null) ? es : new AscendingEntrySetView();
1708		}
1709
1710	<	public K firstKey() {
1711	<	return key(loEntry());
1712	<	}
1713	<
1714	<	public K lastKey() {
1715	<	return key(hiEntry());
1716	<	}
1717	<
1718	<	public Map.Entry<K,V> firstEntry() {
1719	<	return loEntry();
1720	<	}
1721	<
1722	<	public Map.Entry<K,V> lastEntry() {
1723	<	return hiEntry();
1724	<	}
1725	<
1726	<	public Map.Entry<K,V> pollFirstEntry() {
1727	<	return pollLoEntry();
1728	<	}
1729	<
1730	<	public Map.Entry<K,V> pollLastEntry() {
1731	<	return pollHiEntry();
1732	<	}
1733	<
1734	<	public NavigableMap<K,V> descendingMap() {
1735	<	NavigableMap<K,V> mv = descendingMapView;
1736	<	return (mv != null) ? mv :
1737	<	(descendingMapView =
1738	<	new DescendingSubMap(m,
1739	<	fromStart, lo, loExcluded,
1740	<	toEnd, hi, hiExcluded));
1741	<	}
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	<	static class DescendingSubMap<K,V> extends NavigableSubMap<K,V> {
1718	>	/**
1719	>	* @serial include
1720	>	*/
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, int loExcluded,
1725	<	boolean toEnd, K hi, int hiExcluded) {
1726	<	super(m, fromStart, lo, loExcluded, toEnd, hi, hiExcluded);
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		private final Comparator<? super K> reverseComparator =
#	Line 1756 | Line 1733 | public class TreeMap<K,V>
1733		return reverseComparator;
1734		}
1735
1736	<	public NavigableMap<K,V> subMap(K fromKey, boolean fromInclusive,
1737	<	K toKey, boolean toInclusive) {
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,   excluded(toInclusive),
1744	<	false, fromKey, excluded(fromInclusive));
1742	>	return new DescendingSubMap(m,
1743	>	false, toKey,   toInclusive,
1744	>	false, fromKey, fromInclusive);
1745		}
1746
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, excluded(inclusive),
1752	<	toEnd, hi, hiExcluded);
1750	>	return new DescendingSubMap(m,
1751	>	false, toKey, inclusive,
1752	>	toEnd, hi,    hiInclusive);
1753		}
1754
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,      loExcluded,
1760	<	false, fromKey, excluded(inclusive));
1758	>	return new DescendingSubMap(m,
1759	>	fromStart, lo, loInclusive,
1760	>	false, fromKey, inclusive);
1761	>	}
1762	>
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		}
1771
1772		Iterator<K> keyIterator() {
1773	<	return new DescendingSubMapKeyIterator(hiEntry(), loFence());
1773	>	return new DescendingSubMapKeyIterator(absHighest(), absLowFence());
1774		}
1775
1776		Iterator<K> descendingKeyIterator() {
1777	<	return new SubMapKeyIterator(loEntry(), hiFence());
1777	>	return new SubMapKeyIterator(absLowest(), absHighFence());
1778		}
1779
1780	<	class DescendingEntrySetView extends NavigableSubMap.EntrySetView {
1780	>	final class DescendingEntrySetView extends EntrySetView {
1781		public Iterator<Map.Entry<K,V>> iterator() {
1782	<	return new DescendingSubMapEntryIterator(hiEntry(), loFence());
1782	>	return new DescendingSubMapEntryIterator(absHighest(), absLowFence());
1783		}
1784		}
1785
#	Line 1802 | Line 1788 | public class TreeMap<K,V>
1788		return (es != null) ? es : new DescendingEntrySetView();
1789		}
1790
1791	<	public K firstKey() {
1792	<	return key(hiEntry());
1793	<	}
1794	<
1795	<	public K lastKey() {
1796	<	return key(loEntry());
1811	<	}
1812	<
1813	<	public Map.Entry<K,V> firstEntry() {
1814	<	return hiEntry();
1815	<	}
1816	<
1817	<	public Map.Entry<K,V> lastEntry() {
1818	<	return loEntry();
1819	<	}
1820	<
1821	<	public Map.Entry<K,V> pollFirstEntry() {
1822	<	return pollHiEntry();
1823	<	}
1824	<
1825	<	public Map.Entry<K,V> pollLastEntry() {
1826	<	return pollLoEntry();
1827	<	}
1828	<
1829	<	public NavigableMap<K,V> descendingMap() {
1830	<	NavigableMap<K,V> mv = descendingMapView;
1831	<	return (mv != null) ? mv :
1832	<	(descendingMapView =
1833	<	new AscendingSubMap(m,
1834	<	fromStart, lo, loExcluded,
1835	<	toEnd, hi, hiExcluded));
1836	<	}
1837	<
1838	<	@Override TreeMap.Entry<K,V> subCeiling(K key) {
1839	<	return super.subFloor(key);
1840	<	}
1841	<
1842	<	@Override TreeMap.Entry<K,V> subHigher(K key) {
1843	<	return super.subLower(key);
1844	<	}
1845	<
1846	<	@Override TreeMap.Entry<K,V> subFloor(K key) {
1847	<	return super.subCeiling(key);
1848	<	}
1849	<
1850	<	@Override TreeMap.Entry<K,V> subLower(K key) {
1851	<	return super.subHigher(key);
1852	<	}
1853	<	}
1854	<
1855	<	/**
1856	<	* Compares two keys using the correct comparison method for this TreeMap.
1857	<	*/
1858	<	final int compare(Object k1, Object k2) {
1859	<	return comparator==null ? ((Comparable<? super K>)k1).compareTo((K)k2)
1860	<	: comparator.compare((K)k1, (K)k2);
1861	<	}
1862	<
1863	<	/**
1864	<	* Test two values for equality.  Differs from o1.equals(o2) only in
1865	<	* that it copes with <tt>null</tt> o1 properly.
1866	<	*/
1867	<	final static boolean valEquals(Object o1, Object o2) {
1868	<	return (o1==null ? o2==null : o1.equals(o2));
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		/**
#	Line 1874 | Line 1802 | public class TreeMap<K,V>
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 class SubMap extends AbstractMap<K,V>
1809		implements SortedMap<K,V>, java.io.Serializable {
#	Line 1881 | Line 1811 | public class TreeMap<K,V>
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, 0,
1816	<	toEnd, toKey, 1);
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(); }
#	Line 1895 | Line 1825 | public class TreeMap<K,V>
1825		}
1826
1827
1828	+	// Red-black mechanics
1829	+
1830		private static final boolean RED   = false;
1831		private static final boolean BLACK = true;
1832
#	Line 1955 | 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 1998 | Line 1930 | public class TreeMap<K,V>
1930		/**
1931		* Returns the successor of the specified Entry, or null if no such.
1932		*/
1933	<	final 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 2020 | Line 1952 | public class TreeMap<K,V>
1952		/**
1953		* Returns the predecessor of the specified Entry, or null if no such.
1954		*/
1955	<	final 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 2070 | 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	<
2106	<	/** From CLR **/
2041	>	/** From CLR */
2042		private void fixAfterInsertion(Entry<K,V> x) {
2043		x.color = RED;
2044
#	Line 2122 | 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)
2126	<	rotateRight(parentOf(parentOf(x)));
2060	>	rotateRight(parentOf(parentOf(x)));
2061		}
2062		} else {
2063		Entry<K,V> y = leftOf(parentOf(parentOf(x)));
#	Line 2137 | 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)
2143	<	rotateLeft(parentOf(parentOf(x)));
2076	>	rotateLeft(parentOf(parentOf(x)));
2077		}
2078		}
2079		}
#	Line 2150 | Line 2083 | public class TreeMap<K,V>
2083		/**
2084		* Delete node p, and then rebalance the tree.
2085		*/
2153	–
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 2198 | 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 2213 | 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 2240 | 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 2306 | 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