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.34 by dl, Sun Apr 23 20:59:49 2006 UTC

#	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
550	<	//             if (key == null) {
551	<	//                 if (comparator == null)
552	<	//                     throw new NullPointerException();
553	<	//                 comparator.compare(key, key);
554	<	//             }
555	<	incrementSize();
513	>	compare(key, key); // type check
514		root = new Entry<K,V>(key, value, null);
515	+	size = 1;
516	+	modCount++;
517		return null;
518		}
519	<
520	<	while (true) {
521	<	int cmp = compare(key, t.key);
522	<	if (cmp == 0) {
523	<	return t.setValue(value);
524	<	} else if (cmp < 0) {
525	<	if (t.left != null) {
519	>	int cmp;
520	>	Entry<K,V> parent;
521	>	// split comparator and comparable paths
522	>	Comparator<? super K> cpr = comparator;
523	>	if (cpr != null) {
524	>	do {
525	>	parent = t;
526	>	cmp = cpr.compare(key, t.key);
527	>	if (cmp < 0)
528		t = t.left;
529	<	} 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) {
529	>	else if (cmp > 0)
530		t = t.right;
531	<	} else {
532	<	incrementSize();
533	<	t.right = new Entry<K,V>(key, value, t);
579	<	fixAfterInsertion(t.right);
580	<	return null;
581	<	}
582	<	}
531	>	else
532	>	return t.setValue(value);
533	>	} while (t != null);
534		}
535	+	else {
536	+	if (key == null)
537	+	throw new NullPointerException();
538	+	Comparable<? super K> k = (Comparable<? super K>) key;
539	+	do {
540	+	parent = t;
541	+	cmp = k.compareTo(t.key);
542	+	if (cmp < 0)
543	+	t = t.left;
544	+	else if (cmp > 0)
545	+	t = t.right;
546	+	else
547	+	return t.setValue(value);
548	+	} while (t != null);
549	+	}
550	+	Entry<K,V> e = new Entry<K,V>(key, value, parent);
551	+	if (cmp < 0)
552	+	parent.left = e;
553	+	else
554	+	parent.right = e;
555	+	fixAfterInsertion(e);
556	+	size++;
557	+	modCount++;
558	+	return null;
559		}
560
561		/**
#	Line 655 | Line 630 | public class TreeMap<K,V>
630		* @since 1.6
631		*/
632		public Map.Entry<K,V> firstEntry() {
633	<	Entry<K,V> e = getFirstEntry();
659	<	return (e == null)? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
633	>	return exportEntry(getFirstEntry());
634		}
635
636		/**
637		* @since 1.6
638		*/
639		public Map.Entry<K,V> lastEntry() {
640	<	Entry<K,V> e = getLastEntry();
667	<	return (e == null)? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
640	>	return exportEntry(getLastEntry());
641		}
642
643		/**
#	Line 672 | Line 645 | public class TreeMap<K,V>
645		*/
646		public Map.Entry<K,V> pollFirstEntry() {
647		Entry<K,V> p = getFirstEntry();
648	<	if (p == null)
649	<	return null;
650	<	Map.Entry<K,V> result = new AbstractMap.SimpleImmutableEntry<K,V>(p);
678	<	deleteEntry(p);
648	>	Map.Entry<K,V> result = exportEntry(p);
649	>	if (p != null)
650	>	deleteEntry(p);
651		return result;
652		}
653
#	Line 684 | Line 656 | public class TreeMap<K,V>
656		*/
657		public Map.Entry<K,V> pollLastEntry() {
658		Entry<K,V> p = getLastEntry();
659	<	if (p == null)
660	<	return null;
661	<	Map.Entry<K,V> result = new AbstractMap.SimpleImmutableEntry<K,V>(p);
690	<	deleteEntry(p);
659	>	Map.Entry<K,V> result = exportEntry(p);
660	>	if (p != null)
661	>	deleteEntry(p);
662		return result;
663		}
664
#	Line 699 | Line 670 | public class TreeMap<K,V>
670		* @since 1.6
671		*/
672		public Map.Entry<K,V> lowerEntry(K key) {
673	<	Entry<K,V> e =  getLowerEntry(key);
703	<	return (e == null)? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
673	>	return exportEntry(getLowerEntry(key));
674		}
675
676		/**
#	Line 711 | Line 681 | public class TreeMap<K,V>
681		* @since 1.6
682		*/
683		public K lowerKey(K key) {
684	<	Entry<K,V> e =  getLowerEntry(key);
715	<	return (e == null)? null : e.key;
684	>	return keyOrNull(getLowerEntry(key));
685		}
686
687		/**
#	Line 723 | Line 692 | public class TreeMap<K,V>
692		* @since 1.6
693		*/
694		public Map.Entry<K,V> floorEntry(K key) {
695	<	Entry<K,V> e = getFloorEntry(key);
727	<	return (e == null)? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
695	>	return exportEntry(getFloorEntry(key));
696		}
697
698		/**
#	Line 735 | Line 703 | public class TreeMap<K,V>
703		* @since 1.6
704		*/
705		public K floorKey(K key) {
706	<	Entry<K,V> e = getFloorEntry(key);
739	<	return (e == null)? null : e.key;
706	>	return keyOrNull(getFloorEntry(key));
707		}
708
709		/**
#	Line 747 | Line 714 | public class TreeMap<K,V>
714		* @since 1.6
715		*/
716		public Map.Entry<K,V> ceilingEntry(K key) {
717	<	Entry<K,V> e = getCeilingEntry(key);
751	<	return (e == null)? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
717	>	return exportEntry(getCeilingEntry(key));
718		}
719
720		/**
#	Line 759 | Line 725 | public class TreeMap<K,V>
725		* @since 1.6
726		*/
727		public K ceilingKey(K key) {
728	<	Entry<K,V> e = getCeilingEntry(key);
763	<	return (e == null)? null : e.key;
728	>	return keyOrNull(getCeilingEntry(key));
729		}
730
731		/**
#	Line 771 | Line 736 | public class TreeMap<K,V>
736		* @since 1.6
737		*/
738		public Map.Entry<K,V> higherEntry(K key) {
739	<	Entry<K,V> e = getHigherEntry(key);
775	<	return (e == null)? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
739	>	return exportEntry(getHigherEntry(key));
740		}
741
742		/**
#	Line 783 | Line 747 | public class TreeMap<K,V>
747		* @since 1.6
748		*/
749		public K higherKey(K key) {
750	<	Entry<K,V> e = getHigherEntry(key);
787	<	return (e == null)? null : e.key;
750	>	return keyOrNull(getHigherEntry(key));
751		}
752
753		// Views
#	Line 877 | Line 840 | public class TreeMap<K,V>
840		public NavigableMap<K, V> descendingMap() {
841		NavigableMap<K, V> km = descendingMap;
842		return (km != null) ? km :
843	<	(descendingMap = new DescendingSubMap(this,
844	<	true, null, 0,
845	<	true, null, 0));
843	>	(descendingMap = new DescendingSubMap(this,
844	>	true, null, true,
845	>	true, null, true));
846		}
847
848		/**
#	Line 892 | Line 855 | public class TreeMap<K,V>
855		*/
856		public NavigableMap<K,V> subMap(K fromKey, boolean fromInclusive,
857		K toKey,   boolean toInclusive) {
858	<	return new AscendingSubMap(this,
859	<	false, fromKey, excluded(fromInclusive),
860	<	false, toKey,   excluded(toInclusive));
858	>	return new AscendingSubMap(this,
859	>	false, fromKey, fromInclusive,
860	>	false, toKey,   toInclusive);
861		}
862
863		/**
#	Line 906 | Line 869 | public class TreeMap<K,V>
869		* @since 1.6
870		*/
871		public NavigableMap<K,V> headMap(K toKey, boolean inclusive) {
872	<	return new AscendingSubMap(this,
873	<	true, null, 0,
874	<	false, toKey, excluded(inclusive));
872	>	return new AscendingSubMap(this,
873	>	true,  null,  true,
874	>	false, toKey, inclusive);
875		}
876
877		/**
#	Line 920 | Line 883 | public class TreeMap<K,V>
883		* @since 1.6
884		*/
885		public NavigableMap<K,V> tailMap(K fromKey, boolean inclusive) {
886	<	return new AscendingSubMap(this,
887	<	false, fromKey, excluded(inclusive),
888	<	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;
886	>	return new AscendingSubMap(this,
887	>	false, fromKey, inclusive,
888	>	true,  null,    true);
889		}
890
891		/**
#	Line 978 | Line 933 | public class TreeMap<K,V>
933		}
934
935		public boolean contains(Object o) {
936	<	for (Entry<K,V> e = getFirstEntry(); e != null; e = successor(e))
982	<	if (valEquals(e.getValue(), o))
983	<	return true;
984	<	return false;
936	>	return TreeMap.this.containsValue(o);
937		}
938
939		public boolean remove(Object o) {
#	Line 1093 | Line 1045 | public class TreeMap<K,V>
1045		m.remove(o);
1046		return size() != oldSize;
1047		}
1048	<	public NavigableSet<E> subSet(E fromElement,
1049	<	boolean fromInclusive,
1050	<	E toElement,
1051	<	boolean toInclusive) {
1100	<	return new TreeSet<E>
1101	<	(m.subMap(fromElement, fromInclusive,
1102	<	toElement,   toInclusive));
1048	>	public NavigableSet<E> subSet(E fromElement, boolean fromInclusive,
1049	>	E toElement, boolean toInclusive) {
1050	>	return new TreeSet<E>(m.subMap(fromElement, fromInclusive,
1051	>	toElement,   toInclusive));
1052		}
1053		public NavigableSet<E> headSet(E toElement, boolean inclusive) {
1054		return new TreeSet<E>(m.headMap(toElement, inclusive));
#	Line 1125 | Line 1074 | public class TreeMap<K,V>
1074		* Base class for TreeMap Iterators
1075		*/
1076		abstract class PrivateEntryIterator<T> implements Iterator<T> {
1128	–	int expectedModCount = TreeMap.this.modCount;
1129	–	Entry<K,V> lastReturned = null;
1077		Entry<K,V> next;
1078	+	Entry<K,V> lastReturned;
1079	+	int expectedModCount;
1080
1081		PrivateEntryIterator(Entry<K,V> first) {
1082	+	expectedModCount = modCount;
1083	+	lastReturned = null;
1084		next = first;
1085		}
1086
#	Line 1138 | Line 1089 | public class TreeMap<K,V>
1089		}
1090
1091		final Entry<K,V> nextEntry() {
1092	<	if (next == null)
1092	>	Entry<K,V> e = lastReturned = next;
1093	>	if (e == null)
1094		throw new NoSuchElementException();
1095		if (modCount != expectedModCount)
1096		throw new ConcurrentModificationException();
1097	<	lastReturned = next;
1098	<	next = successor(next);
1147	<	return lastReturned;
1097	>	next = successor(e);
1098	>	return e;
1099		}
1100
1101		final Entry<K,V> prevEntry() {
1102	<	if (next == null)
1102	>	Entry<K,V> e = lastReturned= next;
1103	>	if (e == null)
1104		throw new NoSuchElementException();
1105		if (modCount != expectedModCount)
1106		throw new ConcurrentModificationException();
1107	<	lastReturned = next;
1108	<	next = predecessor(next);
1157	<	return lastReturned;
1107	>	next = predecessor(e);
1108	>	return e;
1109		}
1110
1111		public void remove() {
#	Line 1206 | Line 1157 | public class TreeMap<K,V>
1157		}
1158		}
1159
1160	<	// SubMaps
1160	>	// Little utilities
1161
1162	<	static abstract class NavigableSubMap<K,V> extends AbstractMap<K,V>
1163	<	implements NavigableMap<K,V>, java.io.Serializable {
1162	>	/**
1163	>	* Compares two keys using the correct comparison method for this TreeMap.
1164	>	*/
1165	>	final int compare(Object k1, Object k2) {
1166	>	return comparator==null ? ((Comparable<? super K>)k1).compareTo((K)k2)
1167	>	: comparator.compare((K)k1, (K)k2);
1168	>	}
1169
1170	<	/*
1171	<	* The backing map.
1172	<	*/
1173	<	final TreeMap<K,V> m;
1170	>	/**
1171	>	* Test two values for equality.  Differs from o1.equals(o2) only in
1172	>	* that it copes with <tt>null</tt> o1 properly.
1173	>	*/
1174	>	final static boolean valEquals(Object o1, Object o2) {
1175	>	return (o1==null ? o2==null : o1.equals(o2));
1176	>	}
1177
1178	<	/** True if low point is from start of backing map */
1179	<	boolean fromStart;
1178	>	/**
1179	>	* Return SimpleImmutableEntry for entry, or null if null
1180	>	*/
1181	>	static <K,V> Map.Entry<K,V> exportEntry(TreeMap.Entry<K,V> e) {
1182	>	return e == null? null :
1183	>	new AbstractMap.SimpleImmutableEntry<K,V>(e);
1184	>	}
1185
1186	<	/**
1187	<	* The low endpoint of this submap in absolute terms, or null
1188	<	* if fromStart.
1189	<	*/
1190	<	K lo;
1186	>	/**
1187	>	* Return key for entry, or null if null
1188	>	*/
1189	>	static <K,V> K keyOrNull(TreeMap.Entry<K,V> e) {
1190	>	return e == null? null : e.key;
1191	>	}
1192
1193	<	/**
1194	<	* Zero if the low endpoint is excluded from this submap, one if
1195	<	* it's included.  This field is unused if fromStart.
1196	<	*/
1197	<	int loExcluded;
1193	>	/**
1194	>	* Returns the key corresponding to the specified Entry.
1195	>	* @throws NoSuchElementException if the Entry is null
1196	>	*/
1197	>	static <K> K key(Entry<K,?> e) {
1198	>	if (e==null)
1199	>	throw new NoSuchElementException();
1200	>	return e.key;
1201	>	}
1202
1234	–	/** True if high point is to End of backing map */
1235	–	boolean toEnd;
1203
1204	<	/**
1205	<	* The high endpoint of this submap in absolute terms, or null
1206	<	* if toEnd.
1204	>	// SubMaps
1205	>
1206	>	static abstract class NavigableSubMap<K,V> extends AbstractMap<K,V>
1207	>	implements NavigableMap<K,V>, java.io.Serializable {
1208	>	/*
1209	>	* The backing map.
1210		*/
1211	<	K hi;
1211	>	final TreeMap<K,V> m;
1212
1213	<	/**
1214	<	* Zero if the high endpoint is excluded from this submap, one if
1215	<	* it's included.  This field is unused if toEnd.
1213	>	/*
1214	>	* Endpoints are represented as triples (fromStart, lo,
1215	>	* loInclusive) and (toEnd, hi, hiInclusive). If fromStart is
1216	>	* true, then the low (absolute) bound is the start of the
1217	>	* backing map, and the other values are ignored. Otherwise,
1218	>	* if loInclusive is true, lo is the inclusive bound, else lo
1219	>	* is the exclusive bound. Similarly for the upper bound.
1220		*/
1247	–	int hiExcluded;
1221
1222	<	NavigableSubMap(TreeMap<K,V> m,
1223	<	boolean fromStart, K lo, int loExcluded,
1224	<	boolean toEnd, K hi, int hiExcluded) {
1225	<	if (!fromStart && !toEnd && m.compare(lo, hi) > 0)
1226	<	throw new IllegalArgumentException("fromKey > toKey");
1222	>	final K lo, hi;
1223	>	final boolean fromStart, toEnd;
1224	>	final boolean loInclusive, hiInclusive;
1225	>
1226	>	NavigableSubMap(TreeMap<K,V> m,
1227	>	boolean fromStart, K lo, boolean loInclusive,
1228	>	boolean toEnd,     K hi, boolean hiInclusive) {
1229	>	if (!fromStart && !toEnd) {
1230	>	if (m.compare(lo, hi) > 0)
1231	>	throw new IllegalArgumentException("fromKey > toKey");
1232	>	} else {
1233	>	if (!fromStart) // type check
1234	>	m.compare(lo, lo);
1235	>	if (!toEnd)
1236	>	m.compare(hi, hi);
1237	>	}
1238	>
1239		this.m = m;
1240		this.fromStart = fromStart;
1241		this.lo = lo;
1242	<	this.loExcluded = loExcluded;
1242	>	this.loInclusive = loInclusive;
1243		this.toEnd = toEnd;
1244		this.hi = hi;
1245	<	this.hiExcluded = hiExcluded;
1245	>	this.hiInclusive = hiInclusive;
1246		}
1247
1248		// internal utilities
1249
1250	+	final boolean tooLow(Object key) {
1251	+	if (!fromStart) {
1252	+	int c = m.compare(key, lo);
1253	+	if (c < 0 || (c == 0 && !loInclusive))
1254	+	return true;
1255	+	}
1256	+	return false;
1257	+	}
1258	+
1259	+	final boolean tooHigh(Object key) {
1260	+	if (!toEnd) {
1261	+	int c = m.compare(key, hi);
1262	+	if (c > 0 || (c == 0 && !hiInclusive))
1263	+	return true;
1264	+	}
1265	+	return false;
1266	+	}
1267	+
1268		final boolean inRange(Object key) {
1269	<	return (fromStart || m.compare(key, lo) >= loExcluded)
1267	<	&& (toEnd || m.compare(hi, key) >= hiExcluded);
1269	>	return !tooLow(key) && !tooHigh(key);
1270		}
1271
1272		final boolean inClosedRange(Object key) {
#	Line 1276 | Line 1278 | public class TreeMap<K,V>
1278		return inclusive ? inRange(key) : inClosedRange(key);
1279		}
1280
1281	<	final boolean tooLow(K key) {
1282	<	return !fromStart && m.compare(key, lo) < loExcluded;
1283	<	}
1284	<
1285	<	final boolean tooHigh(K key) {
1284	<	return !toEnd && m.compare(hi, key) < hiExcluded;
1285	<	}
1286	<
1281	>	/*
1282	>	* Absolute versions of relation operations.
1283	>	* Subclasses map to these using like-named "sub"
1284	>	* versions that invert senses for descending maps
1285	>	*/
1286
1287	<	/** Returns the lowest entry in this submap (absolute ordering) */
1288	<	final TreeMap.Entry<K,V> loEntry() {
1290	<	TreeMap.Entry<K,V> result =
1287	>	final TreeMap.Entry<K,V> absLowest() {
1288	>	TreeMap.Entry<K,V> e =
1289		(fromStart ?  m.getFirstEntry() :
1290	<	(loExcluded == 0 ? m.getCeilingEntry(lo) :
1291	<	m.getHigherEntry(lo)));
1292	<	return (result == null || tooHigh(result.key)) ? null : result;
1290	>	(loInclusive ? m.getCeilingEntry(lo) :
1291	>	m.getHigherEntry(lo)));
1292	>	return (e == null || tooHigh(e.key)) ? null : e;
1293		}
1294
1295	<	/** Returns the highest key in this submap (absolute ordering) */
1296	<	final TreeMap.Entry<K,V> hiEntry() {
1299	<	TreeMap.Entry<K,V> result =
1295	>	final TreeMap.Entry<K,V> absHighest() {
1296	>	TreeMap.Entry<K,V> e =
1297		(toEnd ?  m.getLastEntry() :
1298	<	(hiExcluded == 0 ?  m.getFloorEntry(hi) :
1299	<	m.getLowerEntry(hi)));
1300	<	return (result == null || tooLow(result.key)) ? null : result;
1298	>	(hiInclusive ?  m.getFloorEntry(hi) :
1299	>	m.getLowerEntry(hi)));
1300	>	return (e == null || tooLow(e.key)) ? null : e;
1301		}
1302
1303	<	/** Polls the lowest entry in this submap (absolute ordering) */
1304	<	final Map.Entry<K,V> pollLoEntry() {
1305	<	TreeMap.Entry<K,V> e = loEntry();
1306	<	if (e == null)
1307	<	return null;
1311	<	Map.Entry<K,V> result = new AbstractMap.SimpleImmutableEntry<K,V>(e);
1312	<	m.deleteEntry(e);
1313	<	return result;
1303	>	final TreeMap.Entry<K,V> absCeiling(K key) {
1304	>	if (tooLow(key))
1305	>	return absLowest();
1306	>	TreeMap.Entry<K,V> e = m.getCeilingEntry(key);
1307	>	return (e == null || tooHigh(e.key)) ? null : e;
1308		}
1309
1310	<	/** Polls the highest key in this submap (absolute ordering) */
1311	<	final Map.Entry<K,V> pollHiEntry() {
1312	<	TreeMap.Entry<K,V> e = hiEntry();
1313	<	if (e == null)
1314	<	return null;
1321	<	Map.Entry<K,V> result = new AbstractMap.SimpleImmutableEntry<K,V>(e);
1322	<	m.deleteEntry(e);
1323	<	return result;
1310	>	final TreeMap.Entry<K,V> absHigher(K key) {
1311	>	if (tooLow(key))
1312	>	return absLowest();
1313	>	TreeMap.Entry<K,V> e = m.getHigherEntry(key);
1314	>	return (e == null || tooHigh(e.key)) ? null : e;
1315		}
1316
1317	<	/**
1318	<	* Return the absolute high fence for ascending traversal
1319	<	*/
1320	<	final TreeMap.Entry<K,V> hiFence() {
1321	<	if (toEnd)
1331	<	return null;
1332	<	else if (hiExcluded == 0)
1333	<	return m.getHigherEntry(hi);
1334	<	else
1335	<	return m.getCeilingEntry(hi);
1317	>	final TreeMap.Entry<K,V> absFloor(K key) {
1318	>	if (tooHigh(key))
1319	>	return absHighest();
1320	>	TreeMap.Entry<K,V> e = m.getFloorEntry(key);
1321	>	return (e == null || tooLow(e.key)) ? null : e;
1322		}
1323
1324	<	/**
1325	<	* Return the absolute low fence for descending traversal
1326	<	*/
1327	<	final TreeMap.Entry<K,V> loFence() {
1328	<	if (fromStart)
1343	<	return null;
1344	<	else if (loExcluded == 0)
1345	<	return m.getLowerEntry(lo);
1346	<	else
1347	<	return m.getFloorEntry(lo);
1324	>	final TreeMap.Entry<K,V> absLower(K key) {
1325	>	if (tooHigh(key))
1326	>	return absHighest();
1327	>	TreeMap.Entry<K,V> e = m.getLowerEntry(key);
1328	>	return (e == null || tooLow(e.key)) ? null : e;
1329		}
1330
1331	+	/** Returns the absolute high fence for ascending traversal */
1332	+	final TreeMap.Entry<K,V> absHighFence() {
1333	+	return (toEnd ? null : (hiInclusive ?
1334	+	m.getHigherEntry(hi) :
1335	+	m.getCeilingEntry(hi)));
1336	+	}
1337	+
1338	+	/** Return the absolute low fence for descending traversal  */
1339	+	final TreeMap.Entry<K,V> absLowFence() {
1340	+	return (fromStart ? null : (loInclusive ?
1341	+	m.getLowerEntry(lo) :
1342	+	m.getFloorEntry(lo)));
1343	+	}
1344	+
1345	+	// Abstract methods defined in ascending vs descending classes
1346	+	// These relay to the appropriate  absolute versions
1347	+
1348	+	abstract TreeMap.Entry<K,V> subLowest();
1349	+	abstract TreeMap.Entry<K,V> subHighest();
1350	+	abstract TreeMap.Entry<K,V> subCeiling(K key);
1351	+	abstract TreeMap.Entry<K,V> subHigher(K key);
1352	+	abstract TreeMap.Entry<K,V> subFloor(K key);
1353	+	abstract TreeMap.Entry<K,V> subLower(K key);
1354	+
1355	+	/** Returns ascending iterator from the perspective of this submap */
1356	+	abstract Iterator<K> keyIterator();
1357	+
1358	+	/** Returns descending iterator from the perspective of this submap */
1359	+	abstract Iterator<K> descendingKeyIterator();
1360	+
1361	+	// public methods
1362
1363		public boolean isEmpty() {
1364	<	return entrySet().isEmpty();
1364	>	return (fromStart && toEnd) ? m.isEmpty() : entrySet().isEmpty();
1365		}
1366
1367	<	public boolean containsKey(Object key) {
1368	<	return inRange(key) && m.containsKey(key);
1367	>	public int size() {
1368	>	return (fromStart && toEnd) ? m.size() : entrySet().size();
1369		}
1370
1371	<	public V get(Object key) {
1372	<	if (!inRange(key))
1361	<	return null;
1362	<	return m.get(key);
1371	>	public final boolean containsKey(Object key) {
1372	>	return inRange(key) && m.containsKey(key);
1373		}
1374
1375	<	public V put(K key, V value) {
1375	>	public final V put(K key, V value) {
1376		if (!inRange(key))
1377		throw new IllegalArgumentException("key out of range");
1378		return m.put(key, value);
1379		}
1380
1381	<	public V remove(Object key) {
1382	<	if (!inRange(key))
1373	<	return null;
1374	<	return m.remove(key);
1381	>	public final V get(Object key) {
1382	>	return !inRange(key)? null :  m.get(key);
1383		}
1384
1385	<	public Map.Entry<K,V> ceilingEntry(K key) {
1386	<	TreeMap.Entry<K,V> e = subCeiling(key);
1379	<	return e == null? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
1385	>	public final V remove(Object key) {
1386	>	return !inRange(key)? null  : m.remove(key);
1387		}
1388
1389	<	public K ceilingKey(K key) {
1390	<	TreeMap.Entry<K,V> e = subCeiling(key);
1384	<	return e == null? null : e.key;
1389	>	public final Map.Entry<K,V> ceilingEntry(K key) {
1390	>	return exportEntry(subCeiling(key));
1391		}
1392
1393	<	public Map.Entry<K,V> higherEntry(K key) {
1394	<	TreeMap.Entry<K,V> e = subHigher(key);
1389	<	return e == null? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
1393	>	public final K ceilingKey(K key) {
1394	>	return keyOrNull(subCeiling(key));
1395		}
1396
1397	<	public K higherKey(K key) {
1398	<	TreeMap.Entry<K,V> e = subHigher(key);
1394	<	return e == null? null : e.key;
1397	>	public final Map.Entry<K,V> higherEntry(K key) {
1398	>	return exportEntry(subHigher(key));
1399		}
1400
1401	<	public Map.Entry<K,V> floorEntry(K key) {
1402	<	TreeMap.Entry<K,V> e = subFloor(key);
1399	<	return e == null? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
1401	>	public final K higherKey(K key) {
1402	>	return keyOrNull(subHigher(key));
1403		}
1404
1405	<	public K floorKey(K key) {
1406	<	TreeMap.Entry<K,V> e = subFloor(key);
1404	<	return e == null? null : e.key;
1405	>	public final Map.Entry<K,V> floorEntry(K key) {
1406	>	return exportEntry(subFloor(key));
1407		}
1408
1409	<	public Map.Entry<K,V> lowerEntry(K key) {
1410	<	TreeMap.Entry<K,V> e = subLower(key);
1409	<	return e == null? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
1409	>	public final K floorKey(K key) {
1410	>	return keyOrNull(subFloor(key));
1411		}
1412
1413	<	public K lowerKey(K key) {
1414	<	TreeMap.Entry<K,V> e = subLower(key);
1414	<	return e == null? null : e.key;
1413	>	public final Map.Entry<K,V> lowerEntry(K key) {
1414	>	return exportEntry(subLower(key));
1415		}
1416
1417	<	abstract Iterator<K> keyIterator();
1418	<	abstract Iterator<K> descendingKeyIterator();
1417	>	public final K lowerKey(K key) {
1418	>	return keyOrNull(subLower(key));
1419	>	}
1420
1421	<	public NavigableSet<K> descendingKeySet() {
1422	<	return descendingMap().navigableKeySet();
1421	>	public final K firstKey() {
1422	>	return key(subLowest());
1423	>	}
1424	>
1425	>	public final K lastKey() {
1426	>	return key(subHighest());
1427	>	}
1428	>
1429	>	public final Map.Entry<K,V> firstEntry() {
1430	>	return exportEntry(subLowest());
1431	>	}
1432	>
1433	>	public final Map.Entry<K,V> lastEntry() {
1434	>	return exportEntry(subHighest());
1435	>	}
1436	>
1437	>	public final Map.Entry<K,V> pollFirstEntry() {
1438	>	TreeMap.Entry<K,V> e = subLowest();
1439	>	Map.Entry<K,V> result = exportEntry(e);
1440	>	if (e != null)
1441	>	m.deleteEntry(e);
1442	>	return result;
1443	>	}
1444	>
1445	>	public final Map.Entry<K,V> pollLastEntry() {
1446	>	TreeMap.Entry<K,V> e = subHighest();
1447	>	Map.Entry<K,V> result = exportEntry(e);
1448	>	if (e != null)
1449	>	m.deleteEntry(e);
1450	>	return result;
1451		}
1452
1453		// Views
#	Line 1426 | Line 1455 | public class TreeMap<K,V>
1455		transient EntrySetView entrySetView = null;
1456		transient KeySet<K> navigableKeySetView = null;
1457
1458	+	public final NavigableSet<K> navigableKeySet() {
1459	+	KeySet<K> nksv = navigableKeySetView;
1460	+	return (nksv != null) ? nksv :
1461	+	(navigableKeySetView = new TreeMap.KeySet(this));
1462	+	}
1463	+
1464	+	public final Set<K> keySet() {
1465	+	return navigableKeySet();
1466	+	}
1467	+
1468	+	public NavigableSet<K> descendingKeySet() {
1469	+	return descendingMap().navigableKeySet();
1470	+	}
1471	+
1472	+	public final SortedMap<K,V> subMap(K fromKey, K toKey) {
1473	+	return subMap(fromKey, true, toKey, false);
1474	+	}
1475	+
1476	+	public final SortedMap<K,V> headMap(K toKey) {
1477	+	return headMap(toKey, false);
1478	+	}
1479	+
1480	+	public final SortedMap<K,V> tailMap(K fromKey) {
1481	+	return tailMap(fromKey, true);
1482	+	}
1483	+
1484	+	// View classes
1485	+
1486		abstract class EntrySetView extends AbstractSet<Map.Entry<K,V>> {
1487		private transient int size = -1, sizeModCount;
1488
#	Line 1434 | Line 1491 | public class TreeMap<K,V>
1491		return m.size();
1492		if (size == -1 || sizeModCount != m.modCount) {
1493		sizeModCount = m.modCount;
1494	<	size = 0;
1494	>	size = 0;
1495		Iterator i = iterator();
1496		while (i.hasNext()) {
1497		size++;
#	Line 1445 | Line 1502 | public class TreeMap<K,V>
1502		}
1503
1504		public boolean isEmpty() {
1505	<	TreeMap.Entry<K,V> n = loEntry();
1505	>	TreeMap.Entry<K,V> n = absLowest();
1506		return n == null || tooHigh(n.key);
1507		}
1508
#	Line 1477 | Line 1534 | public class TreeMap<K,V>
1534		}
1535		}
1536
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	–
1537		/**
1538		* Iterators for SubMaps
1539		*/
1540		abstract class SubMapIterator<T> implements Iterator<T> {
1541	<	int expectedModCount = m.modCount;
1561	<	TreeMap.Entry<K,V> lastReturned = null;
1541	>	TreeMap.Entry<K,V> lastReturned;
1542		TreeMap.Entry<K,V> next;
1543	<	final K firstExcludedKey;
1543	>	final K fenceKey;
1544	>	int expectedModCount;
1545
1546	<	SubMapIterator(TreeMap.Entry<K,V> first,
1547	<	TreeMap.Entry<K,V> firstExcluded) {
1546	>	SubMapIterator(TreeMap.Entry<K,V> first,
1547	>	TreeMap.Entry<K,V> fence) {
1548	>	expectedModCount = m.modCount;
1549	>	lastReturned = null;
1550		next = first;
1551	<	firstExcludedKey = (firstExcluded == null ? null
1569	<	: firstExcluded.key);
1551	>	fenceKey = fence == null ? null : fence.key;
1552		}
1553
1554		public final boolean hasNext() {
1555	<	return next != null && next.key != firstExcludedKey;
1555	>	return next != null && next.key != fenceKey;
1556		}
1557
1558		final TreeMap.Entry<K,V> nextEntry() {
1559	<	if (next == null || next.key == firstExcludedKey)
1559	>	TreeMap.Entry<K,V> e = lastReturned = next;
1560	>	if (e == null || e.key == fenceKey)
1561		throw new NoSuchElementException();
1562		if (m.modCount != expectedModCount)
1563		throw new ConcurrentModificationException();
1564	<	lastReturned = next;
1565	<	next = m.successor(next);
1583	<	return lastReturned;
1564	>	next = successor(e);
1565	>	return e;
1566		}
1567
1568		final TreeMap.Entry<K,V> prevEntry() {
1569	<	if (next == null || next.key == firstExcludedKey)
1569	>	TreeMap.Entry<K,V> e = lastReturned = next;
1570	>	if (e == null || e.key == fenceKey)
1571		throw new NoSuchElementException();
1572		if (m.modCount != expectedModCount)
1573		throw new ConcurrentModificationException();
1574	<	lastReturned = next;
1575	<	next = m.predecessor(next);
1593	<	return lastReturned;
1574	>	next = predecessor(e);
1575	>	return e;
1576		}
1577
1578		public void remove() {
#	Line 1607 | Line 1589 | public class TreeMap<K,V>
1589		}
1590
1591		final class SubMapEntryIterator extends SubMapIterator<Map.Entry<K,V>> {
1592	<	SubMapEntryIterator(TreeMap.Entry<K,V> first,
1593	<	TreeMap.Entry<K,V> firstExcluded) {
1594	<	super(first, firstExcluded);
1592	>	SubMapEntryIterator(TreeMap.Entry<K,V> first,
1593	>	TreeMap.Entry<K,V> fence) {
1594	>	super(first, fence);
1595		}
1596		public Map.Entry<K,V> next() {
1597		return nextEntry();
#	Line 1617 | Line 1599 | public class TreeMap<K,V>
1599		}
1600
1601		final class SubMapKeyIterator extends SubMapIterator<K> {
1602	<	SubMapKeyIterator(TreeMap.Entry<K,V> first,
1603	<	TreeMap.Entry<K,V> firstExcluded) {
1604	<	super(first, firstExcluded);
1602	>	SubMapKeyIterator(TreeMap.Entry<K,V> first,
1603	>	TreeMap.Entry<K,V> fence) {
1604	>	super(first, fence);
1605		}
1606		public K next() {
1607		return nextEntry().key;
#	Line 1627 | Line 1609 | public class TreeMap<K,V>
1609		}
1610
1611		final class DescendingSubMapEntryIterator extends SubMapIterator<Map.Entry<K,V>> {
1612	<	DescendingSubMapEntryIterator(TreeMap.Entry<K,V> last,
1613	<	TreeMap.Entry<K,V> lastExcluded) {
1614	<	super(last, lastExcluded);
1612	>	DescendingSubMapEntryIterator(TreeMap.Entry<K,V> last,
1613	>	TreeMap.Entry<K,V> fence) {
1614	>	super(last, fence);
1615		}
1616
1617		public Map.Entry<K,V> next() {
#	Line 1638 | Line 1620 | public class TreeMap<K,V>
1620		}
1621
1622		final class DescendingSubMapKeyIterator extends SubMapIterator<K> {
1623	<	DescendingSubMapKeyIterator(TreeMap.Entry<K,V> last,
1624	<	TreeMap.Entry<K,V> lastExcluded) {
1625	<	super(last, lastExcluded);
1623	>	DescendingSubMapKeyIterator(TreeMap.Entry<K,V> last,
1624	>	TreeMap.Entry<K,V> fence) {
1625	>	super(last, fence);
1626		}
1627		public K next() {
1628		return prevEntry().key;
#	Line 1648 | Line 1630 | public class TreeMap<K,V>
1630		}
1631		}
1632
1633	<	static class AscendingSubMap<K,V> extends NavigableSubMap<K,V> {
1633	>	static final class AscendingSubMap<K,V> extends NavigableSubMap<K,V> {
1634		private static final long serialVersionUID = 912986545866124060L;
1635
1636	<	AscendingSubMap(TreeMap<K,V> m,
1637	<	boolean fromStart, K lo, int loExcluded,
1638	<	boolean toEnd, K hi, int hiExcluded) {
1639	<	super(m, fromStart, lo, loExcluded, toEnd, hi, hiExcluded);
1636	>	AscendingSubMap(TreeMap<K,V> m,
1637	>	boolean fromStart, K lo, boolean loInclusive,
1638	>	boolean toEnd, K hi, boolean hiInclusive) {
1639	>	super(m, fromStart, lo, loInclusive, toEnd, hi, hiInclusive);
1640		}
1641
1642		public Comparator<? super K> comparator() {
1643		return m.comparator();
1644		}
1645
1646	<	public NavigableMap<K,V> subMap(K fromKey, boolean fromInclusive,
1646	>	public NavigableMap<K,V> subMap(K fromKey, boolean fromInclusive,
1647		K toKey, boolean toInclusive) {
1648		if (!inRange(fromKey, fromInclusive))
1649		throw new IllegalArgumentException("fromKey out of range");
1650		if (!inRange(toKey, toInclusive))
1651		throw new IllegalArgumentException("toKey out of range");
1652	<	return new AscendingSubMap(m,
1653	<	false, fromKey, excluded(fromInclusive),
1654	<	false, toKey,   excluded(toInclusive));
1652	>	return new AscendingSubMap(m,
1653	>	false, fromKey, fromInclusive,
1654	>	false, toKey,   toInclusive);
1655		}
1656
1657		public NavigableMap<K,V> headMap(K toKey, boolean inclusive) {
1658		if (!inClosedRange(toKey))
1659		throw new IllegalArgumentException("toKey out of range");
1660	<	return new AscendingSubMap(m,
1661	<	fromStart, lo,    loExcluded,
1662	<	false, toKey, excluded(inclusive));
1660	>	return new AscendingSubMap(m,
1661	>	fromStart, lo,    loInclusive,
1662	>	false,     toKey, inclusive);
1663		}
1664
1665		public NavigableMap<K,V> tailMap(K fromKey, boolean inclusive){
1666		if (!inRange(fromKey, inclusive))
1667		throw new IllegalArgumentException("fromKey out of range");
1668	<	return new AscendingSubMap(m,
1669	<	false, fromKey, excluded(inclusive),
1670	<	toEnd, hi,      hiExcluded);
1668	>	return new AscendingSubMap(m,
1669	>	false, fromKey, inclusive,
1670	>	toEnd, hi,      hiInclusive);
1671	>	}
1672	>
1673	>	public NavigableMap<K,V> descendingMap() {
1674	>	NavigableMap<K,V> mv = descendingMapView;
1675	>	return (mv != null) ? mv :
1676	>	(descendingMapView =
1677	>	new DescendingSubMap(m,
1678	>	fromStart, lo, loInclusive,
1679	>	toEnd,     hi, hiInclusive));
1680		}
1681
1682		Iterator<K> keyIterator() {
1683	<	return new SubMapKeyIterator(loEntry(), hiFence());
1683	>	return new SubMapKeyIterator(absLowest(), absHighFence());
1684		}
1685
1686		Iterator<K> descendingKeyIterator() {
1687	<	return new DescendingSubMapKeyIterator(hiEntry(), loFence());
1687	>	return new DescendingSubMapKeyIterator(absHighest(), absLowFence());
1688		}
1689
1690	<	class AscendingEntrySetView extends NavigableSubMap.EntrySetView {
1690	>	final class AscendingEntrySetView extends EntrySetView {
1691		public Iterator<Map.Entry<K,V>> iterator() {
1692	<	return new SubMapEntryIterator(loEntry(), hiFence());
1692	>	return new SubMapEntryIterator(absLowest(), absHighFence());
1693		}
1694		}
1695
#	Line 1707 | Line 1698 | public class TreeMap<K,V>
1698		return (es != null) ? es : new AscendingEntrySetView();
1699		}
1700
1701	<	public K firstKey() {
1702	<	return key(loEntry());
1703	<	}
1704	<
1705	<	public K lastKey() {
1706	<	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	<	}
1701	>	TreeMap.Entry<K,V> subLowest()       { return absLowest(); }
1702	>	TreeMap.Entry<K,V> subHighest()      { return absHighest(); }
1703	>	TreeMap.Entry<K,V> subCeiling(K key) { return absCeiling(key); }
1704	>	TreeMap.Entry<K,V> subHigher(K key)  { return absHigher(key); }
1705	>	TreeMap.Entry<K,V> subFloor(K key)   { return absFloor(key); }
1706	>	TreeMap.Entry<K,V> subLower(K key)   { return absLower(key); }
1707		}
1708
1709	<	static class DescendingSubMap<K,V> extends NavigableSubMap<K,V> {
1709	>	static final class DescendingSubMap<K,V>  extends NavigableSubMap<K,V> {
1710		private static final long serialVersionUID = 912986545866120460L;
1711	<	DescendingSubMap(TreeMap<K,V> m,
1712	<	boolean fromStart, K lo, int loExcluded,
1713	<	boolean toEnd, K hi, int hiExcluded) {
1714	<	super(m, fromStart, lo, loExcluded, toEnd, hi, hiExcluded);
1711	>	DescendingSubMap(TreeMap<K,V> m,
1712	>	boolean fromStart, K lo, boolean loInclusive,
1713	>	boolean toEnd, K hi, boolean hiInclusive) {
1714	>	super(m, fromStart, lo, loInclusive, toEnd, hi, hiInclusive);
1715		}
1716
1717		private final Comparator<? super K> reverseComparator =
#	Line 1756 | Line 1721 | public class TreeMap<K,V>
1721		return reverseComparator;
1722		}
1723
1724	<	public NavigableMap<K,V> subMap(K fromKey, boolean fromInclusive,
1724	>	public NavigableMap<K,V> subMap(K fromKey, boolean fromInclusive,
1725		K toKey, boolean toInclusive) {
1726		if (!inRange(fromKey, fromInclusive))
1727		throw new IllegalArgumentException("fromKey out of range");
1728		if (!inRange(toKey, toInclusive))
1729		throw new IllegalArgumentException("toKey out of range");
1730	<	return new DescendingSubMap(m,
1731	<	false, toKey,   excluded(toInclusive),
1732	<	false, fromKey, excluded(fromInclusive));
1730	>	return new DescendingSubMap(m,
1731	>	false, toKey,   toInclusive,
1732	>	false, fromKey, fromInclusive);
1733		}
1734
1735		public NavigableMap<K,V> headMap(K toKey, boolean inclusive) {
1736		if (!inRange(toKey, inclusive))
1737		throw new IllegalArgumentException("toKey out of range");
1738	<	return new DescendingSubMap(m,
1739	<	false, toKey, excluded(inclusive),
1740	<	toEnd, hi, hiExcluded);
1738	>	return new DescendingSubMap(m,
1739	>	false, toKey, inclusive,
1740	>	toEnd, hi,    hiInclusive);
1741		}
1742
1743		public NavigableMap<K,V> tailMap(K fromKey, boolean inclusive){
1744		if (!inRange(fromKey, inclusive))
1745		throw new IllegalArgumentException("fromKey out of range");
1746	<	return new DescendingSubMap(m,
1747	<	fromStart, lo,      loExcluded,
1748	<	false, fromKey, excluded(inclusive));
1746	>	return new DescendingSubMap(m,
1747	>	fromStart, lo, loInclusive,
1748	>	false, fromKey, inclusive);
1749	>	}
1750	>
1751	>	public NavigableMap<K,V> descendingMap() {
1752	>	NavigableMap<K,V> mv = descendingMapView;
1753	>	return (mv != null) ? mv :
1754	>	(descendingMapView =
1755	>	new AscendingSubMap(m,
1756	>	fromStart, lo, loInclusive,
1757	>	toEnd,     hi, hiInclusive));
1758		}
1759
1760		Iterator<K> keyIterator() {
1761	<	return new DescendingSubMapKeyIterator(hiEntry(), loFence());
1761	>	return new DescendingSubMapKeyIterator(absHighest(), absLowFence());
1762		}
1763
1764		Iterator<K> descendingKeyIterator() {
1765	<	return new SubMapKeyIterator(loEntry(), hiFence());
1765	>	return new SubMapKeyIterator(absLowest(), absHighFence());
1766		}
1767
1768	<	class DescendingEntrySetView extends NavigableSubMap.EntrySetView {
1768	>	final class DescendingEntrySetView extends EntrySetView {
1769		public Iterator<Map.Entry<K,V>> iterator() {
1770	<	return new DescendingSubMapEntryIterator(hiEntry(), loFence());
1770	>	return new DescendingSubMapEntryIterator(absHighest(), absLowFence());
1771		}
1772		}
1773
#	Line 1802 | Line 1776 | public class TreeMap<K,V>
1776		return (es != null) ? es : new DescendingEntrySetView();
1777		}
1778
1779	<	public K firstKey() {
1780	<	return key(hiEntry());
1781	<	}
1782	<
1783	<	public K lastKey() {
1784	<	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));
1779	>	TreeMap.Entry<K,V> subLowest()       { return absHighest(); }
1780	>	TreeMap.Entry<K,V> subHighest()      { return absLowest(); }
1781	>	TreeMap.Entry<K,V> subCeiling(K key) { return absFloor(key); }
1782	>	TreeMap.Entry<K,V> subHigher(K key)  { return absLower(key); }
1783	>	TreeMap.Entry<K,V> subFloor(K key)   { return absCeiling(key); }
1784	>	TreeMap.Entry<K,V> subLower(K key)   { return absHigher(key); }
1785		}
1786
1787		/**
#	Line 1881 | Line 1797 | public class TreeMap<K,V>
1797		private boolean fromStart = false, toEnd = false;
1798		private K fromKey, toKey;
1799		private Object readResolve() {
1800	<	return new AscendingSubMap(TreeMap.this,
1801	<	fromStart, fromKey, 0,
1802	<	toEnd, toKey, 1);
1800	>	return new AscendingSubMap(TreeMap.this,
1801	>	fromStart, fromKey, true,
1802	>	toEnd, toKey, false);
1803		}
1804		public Set<Map.Entry<K,V>> entrySet() { throw new InternalError(); }
1805		public K lastKey() { throw new InternalError(); }
#	Line 1895 | Line 1811 | public class TreeMap<K,V>
1811		}
1812
1813
1814	+	// Red-black mechanics
1815	+
1816		private static final boolean RED   = false;
1817		private static final boolean BLACK = true;
1818
#	Line 1998 | Line 1916 | public class TreeMap<K,V>
1916		/**
1917		* Returns the successor of the specified Entry, or null if no such.
1918		*/
1919	<	final Entry<K,V> successor(Entry<K,V> t) {
1919	>	static <K,V> TreeMap.Entry<K,V> successor(Entry<K,V> t) {
1920		if (t == null)
1921		return null;
1922		else if (t.right != null) {
#	Line 2020 | Line 1938 | public class TreeMap<K,V>
1938		/**
1939		* Returns the predecessor of the specified Entry, or null if no such.
1940		*/
1941	<	final Entry<K,V> predecessor(Entry<K,V> t) {
1941	>	static <K,V> Entry<K,V> predecessor(Entry<K,V> t) {
1942		if (t == null)
1943		return null;
1944		else if (t.left != null) {
#	Line 2070 | Line 1988 | public class TreeMap<K,V>
1988		return (p == null) ? null: p.right;
1989		}
1990
1991	<	/** From CLR **/
1991	>	/** From CLR */
1992		private void rotateLeft(Entry<K,V> p) {
1993	<	Entry<K,V> r = p.right;
1994	<	p.right = r.left;
1995	<	if (r.left != null)
1996	<	r.left.parent = p;
1997	<	r.parent = p.parent;
1998	<	if (p.parent == null)
1999	<	root = r;
2000	<	else if (p.parent.left == p)
2001	<	p.parent.left = r;
2002	<	else
2003	<	p.parent.right = r;
2004	<	r.left = p;
2005	<	p.parent = r;
1993	>	if (p != null) {
1994	>	Entry<K,V> r = p.right;
1995	>	p.right = r.left;
1996	>	if (r.left != null)
1997	>	r.left.parent = p;
1998	>	r.parent = p.parent;
1999	>	if (p.parent == null)
2000	>	root = r;
2001	>	else if (p.parent.left == p)
2002	>	p.parent.left = r;
2003	>	else
2004	>	p.parent.right = r;
2005	>	r.left = p;
2006	>	p.parent = r;
2007	>	}
2008		}
2009
2010	<	/** From CLR **/
2010	>	/** From CLR */
2011		private void rotateRight(Entry<K,V> p) {
2012	<	Entry<K,V> l = p.left;
2013	<	p.left = l.right;
2014	<	if (l.right != null) l.right.parent = p;
2015	<	l.parent = p.parent;
2016	<	if (p.parent == null)
2017	<	root = l;
2018	<	else if (p.parent.right == p)
2019	<	p.parent.right = l;
2020	<	else p.parent.left = l;
2021	<	l.right = p;
2022	<	p.parent = l;
2012	>	if (p != null) {
2013	>	Entry<K,V> l = p.left;
2014	>	p.left = l.right;
2015	>	if (l.right != null) l.right.parent = p;
2016	>	l.parent = p.parent;
2017	>	if (p.parent == null)
2018	>	root = l;
2019	>	else if (p.parent.right == p)
2020	>	p.parent.right = l;
2021	>	else p.parent.left = l;
2022	>	l.right = p;
2023	>	p.parent = l;
2024	>	}
2025		}
2026
2027	<
2106	<	/** From CLR **/
2027	>	/** From CLR */
2028		private void fixAfterInsertion(Entry<K,V> x) {
2029		x.color = RED;
2030
#	Line 2122 | Line 2043 | public class TreeMap<K,V>
2043		}
2044		setColor(parentOf(x), BLACK);
2045		setColor(parentOf(parentOf(x)), RED);
2046	<	if (parentOf(parentOf(x)) != null)
2126	<	rotateRight(parentOf(parentOf(x)));
2046	>	rotateRight(parentOf(parentOf(x)));
2047		}
2048		} else {
2049		Entry<K,V> y = leftOf(parentOf(parentOf(x)));
#	Line 2137 | Line 2057 | public class TreeMap<K,V>
2057		x = parentOf(x);
2058		rotateRight(x);
2059		}
2060	<	setColor(parentOf(x),  BLACK);
2060	>	setColor(parentOf(x), BLACK);
2061		setColor(parentOf(parentOf(x)), RED);
2062	<	if (parentOf(parentOf(x)) != null)
2143	<	rotateLeft(parentOf(parentOf(x)));
2062	>	rotateLeft(parentOf(parentOf(x)));
2063		}
2064		}
2065		}
#	Line 2150 | Line 2069 | public class TreeMap<K,V>
2069		/**
2070		* Delete node p, and then rebalance the tree.
2071		*/
2153	–
2072		private void deleteEntry(Entry<K,V> p) {
2073	<	decrementSize();
2073	>	modCount++;
2074	>	size--;
2075
2076		// If strictly internal, copy successor's element to p and then make p
2077		// point to successor.
#	Line 2198 | Line 2117 | public class TreeMap<K,V>
2117		}
2118		}
2119
2120	<	/** From CLR **/
2120	>	/** From CLR */
2121		private void fixAfterDeletion(Entry<K,V> x) {
2122		while (x != root && colorOf(x) == BLACK) {
2123		if (x == leftOf(parentOf(x))) {
#	Line 2213 | Line 2132 | public class TreeMap<K,V>
2132
2133		if (colorOf(leftOf(sib))  == BLACK &&
2134		colorOf(rightOf(sib)) == BLACK) {
2135	<	setColor(sib,  RED);
2135	>	setColor(sib, RED);
2136		x = parentOf(x);
2137		} else {
2138		if (colorOf(rightOf(sib)) == BLACK) {
#	Line 2240 | Line 2159 | public class TreeMap<K,V>
2159
2160		if (colorOf(rightOf(sib)) == BLACK &&
2161		colorOf(leftOf(sib)) == BLACK) {
2162	<	setColor(sib,  RED);
2162	>	setColor(sib, RED);
2163		x = parentOf(x);
2164		} else {
2165		if (colorOf(leftOf(sib)) == BLACK) {
#	Line 2306 | Line 2225 | public class TreeMap<K,V>
2225		buildFromSorted(size, null, s, null);
2226		}
2227
2228	<	/** Intended to be called only from TreeSet.readObject **/
2228	>	/** Intended to be called only from TreeSet.readObject */
2229		void readTreeSet(int size, java.io.ObjectInputStream s, V defaultVal)
2230		throws java.io.IOException, ClassNotFoundException {
2231		buildFromSorted(size, null, s, defaultVal);
2232		}
2233
2234	<	/** Intended to be called only from TreeSet.addAll **/
2234	>	/** Intended to be called only from TreeSet.addAll */
2235		void addAllForTreeSet(SortedSet<? extends K> set, V defaultVal) {
2236		try {
2237		buildFromSorted(set.size(), set.iterator(), null, defaultVal);

Diff Legend

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