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.31 by dl, Fri Apr 21 13:42:57 2006 UTC vs.
Revision 1.38 by jsr166, Wed May 10 02:31:44 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 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 226 | 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	<	}
233	<
234	<	private boolean valueSearchNull(Entry n) {
235	<	if (n.value == null)
236	<	return true;
237	<
238	<	// Check left and right subtrees for value
239	<	return (n.left  != null && valueSearchNull(n.left)) ||
240	<	(n.right != null && valueSearchNull(n.right));
241	<	}
242	<
243	<	private boolean valueSearchNonNull(Entry n, Object value) {
244	<	// Check this node for the value
245	<	if (value.equals(n.value))
246	<	return true;
247	<
248	<	// Check left and right subtrees for value
249	<	return (n.left  != null && valueSearchNonNull(n.left, value)) ||
250	<	(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 361 | Line 340 | public class TreeMap<K,V>
340		* Version of getEntry using comparator. Split off from getEntry
341		* for performance. (This is not worth doing for most methods,
342		* that are less dependent on comparator performance, but is
343	<	* worthwhile for get and put.)
343	>	* worthwhile here.)
344		*/
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 509 | Line 490 | public class TreeMap<K,V>
490		}
491
492		/**
512	–	* Returns the key corresponding to the specified Entry.
513	–	* @throws NoSuchElementException if the Entry is null
514	–	*/
515	–	static <K> K key(Entry<K,?> e) {
516	–	if (e==null)
517	–	throw new NoSuchElementException();
518	–	return e.key;
519	–	}
520	–
521	–	/**
493		* Associates the specified value with the specified key in this map.
494		* If the map previously contained a mapping for the key, the old
495		* value is replaced.
#	Line 537 | Line 508 | public class TreeMap<K,V>
508		*         does not permit null keys
509		*/
510		public V put(K key, V value) {
540	–	// Offload comparator-based version for sake of performance
541	–	if (comparator != null)
542	–	return putUsingComparator(key, value);
543	–	if (key == null)
544	–	throw new NullPointerException();
545	–	Comparable<? super K> k = (Comparable<? super K>) key;
546	–
511		Entry<K,V> t = root;
512	<	while (t != null) {
513	<	int cmp = k.compareTo(t.key);
514	<	if (cmp == 0) {
515	<	return t.setValue(value);
516	<	} else if (cmp < 0) {
517	<	if (t.left != null) {
512	>	if (t == null) {
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	>	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 {
556	<	incrementSize();
557	<	fixAfterInsertion(t.left = new Entry<K,V>(key, value, t));
558	<	return null;
559	<	}
560	<	} else { // cmp > 0
561	<	if (t.right != null) {
533	>	else if (cmp > 0)
534		t = t.right;
535	<	} else {
536	<	incrementSize();
537	<	fixAfterInsertion(t.right = new Entry<K,V>(key, value, t));
566	<	return null;
567	<	}
568	<	}
535	>	else
536	>	return t.setValue(value);
537	>	} while (t != null);
538		}
539	<	incrementSize();
540	<	root = new Entry<K,V>(key, value, null);
541	<	return null;
542	<	}
543	<
544	<	/**
545	<	* Version of put using comparator. Split off from put for
546	<	* performance.
578	<	*/
579	<	final V putUsingComparator(K key, V value) {
580	<	Comparator<? super K> cpr = comparator;
581	<	Entry<K,V> t = root;
582	<	while (t != null) {
583	<	int cmp = cpr.compare(key, t.key);
584	<	if (cmp == 0) {
585	<	return t.setValue(value);
586	<	} else if (cmp < 0) {
587	<	if (t.left != null) {
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 {
590	<	incrementSize();
591	<	fixAfterInsertion(t.left = new Entry<K,V>(key, value, t));
592	<	return null;
593	<	}
594	<	} else { // cmp > 0
595	<	if (t.right != null) {
548	>	else if (cmp > 0)
549		t = t.right;
550	<	} else {
551	<	incrementSize();
552	<	fixAfterInsertion(t.right = new Entry<K,V>(key, value, t));
600	<	return null;
601	<	}
602	<	}
550	>	else
551	>	return t.setValue(value);
552	>	} while (t != null);
553		}
554	<	cpr.compare(key, key); // type check
555	<	incrementSize();
556	<	root = new Entry<K,V>(key, value, null);
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
#	Line 679 | 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();
683	<	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();
691	<	return (e == null)? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
644	>	return exportEntry(getLastEntry());
645		}
646
647		/**
#	Line 696 | 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);
702	<	deleteEntry(p);
652	>	Map.Entry<K,V> result = exportEntry(p);
653	>	if (p != null)
654	>	deleteEntry(p);
655		return result;
656		}
657
#	Line 708 | 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);
714	<	deleteEntry(p);
663	>	Map.Entry<K,V> result = exportEntry(p);
664	>	if (p != null)
665	>	deleteEntry(p);
666		return result;
667		}
668
#	Line 723 | 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);
727	<	return (e == null)? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
677	>	return exportEntry(getLowerEntry(key));
678		}
679
680		/**
#	Line 735 | 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);
739	<	return (e == null)? null : e.key;
688	>	return keyOrNull(getLowerEntry(key));
689		}
690
691		/**
#	Line 747 | 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);
751	<	return (e == null)? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
699	>	return exportEntry(getFloorEntry(key));
700		}
701
702		/**
#	Line 759 | 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);
763	<	return (e == null)? null : e.key;
710	>	return keyOrNull(getFloorEntry(key));
711		}
712
713		/**
#	Line 771 | 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);
775	<	return (e == null)? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
721	>	return exportEntry(getCeilingEntry(key));
722		}
723
724		/**
#	Line 783 | 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);
787	<	return (e == null)? null : e.key;
732	>	return keyOrNull(getCeilingEntry(key));
733		}
734
735		/**
#	Line 795 | 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);
799	<	return (e == null)? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
743	>	return exportEntry(getHigherEntry(key));
744		}
745
746		/**
#	Line 807 | 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);
811	<	return (e == null)? null : e.key;
754	>	return keyOrNull(getHigherEntry(key));
755		}
756
757		// Views
#	Line 902 | Line 845 | public class TreeMap<K,V>
845		NavigableMap<K, V> km = descendingMap;
846		return (km != null) ? km :
847		(descendingMap = new DescendingSubMap(this,
848	<	true, null, 0,
849	<	true, null, 0));
848	>	true, null, true,
849	>	true, null, true));
850		}
851
852		/**
#	Line 917 | Line 860 | public class TreeMap<K,V>
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));
863	>	false, fromKey, fromInclusive,
864	>	false, toKey,   toInclusive);
865		}
866
867		/**
#	Line 931 | Line 874 | public class TreeMap<K,V>
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));
877	>	true,  null,  true,
878	>	false, toKey, inclusive);
879		}
880
881		/**
#	Line 945 | Line 888 | public class TreeMap<K,V>
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);
950	<	}
951	<
952	<	/**
953	<	* Translates a boolean "inclusive" value to the correct int value
954	<	* for the loExcluded or hiExcluded field.
955	<	*/
956	<	static int excluded(boolean inclusive) {
957	<	return inclusive ? 0 : 1;
891	>	false, fromKey, inclusive,
892	>	true,  null,    true);
893		}
894
895		/**
#	Line 1002 | 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))
1006	<	if (valEquals(e.getValue(), o))
1007	<	return true;
1008	<	return false;
940	>	return TreeMap.this.containsValue(o);
941		}
942
943		public boolean remove(Object o) {
#	Line 1118 | Line 1050 | public class TreeMap<K,V>
1050		return size() != oldSize;
1051		}
1052		public NavigableSet<E> subSet(E fromElement, boolean fromInclusive,
1053	<	E toElement, boolean toInclusive) {
1053	>	E toElement,   boolean toInclusive) {
1054		return new TreeSet<E>(m.subMap(fromElement, fromInclusive,
1055		toElement,   toInclusive));
1056		}
#	Line 1185 | Line 1117 | public class TreeMap<K,V>
1117		throw new IllegalStateException();
1118		if (modCount != expectedModCount)
1119		throw new ConcurrentModificationException();
1120	+	// deleted entries are replaced by their successors
1121		if (lastReturned.left != null && lastReturned.right != null)
1122		next = lastReturned;
1123		deleteEntry(lastReturned);
1124	<	expectedModCount++;
1124	>	expectedModCount = modCount;
1125		lastReturned = null;
1126		}
1127		}
#	Line 1229 | Line 1162 | public class TreeMap<K,V>
1162		}
1163		}
1164
1165	+	// Little utilities
1166	+
1167	+	/**
1168	+	* Compares two keys using the correct comparison method for this TreeMap.
1169	+	*/
1170	+	final int compare(Object k1, Object k2) {
1171	+	return comparator==null ? ((Comparable<? super K>)k1).compareTo((K)k2)
1172	+	: comparator.compare((K)k1, (K)k2);
1173	+	}
1174	+
1175	+	/**
1176	+	* Test two values for equality.  Differs from o1.equals(o2) only in
1177	+	* that it copes with <tt>null</tt> o1 properly.
1178	+	*/
1179	+	final static boolean valEquals(Object o1, Object o2) {
1180	+	return (o1==null ? o2==null : o1.equals(o2));
1181	+	}
1182	+
1183	+	/**
1184	+	* Return SimpleImmutableEntry for entry, or null if null
1185	+	*/
1186	+	static <K,V> Map.Entry<K,V> exportEntry(TreeMap.Entry<K,V> e) {
1187	+	return e == null? null :
1188	+	new AbstractMap.SimpleImmutableEntry<K,V>(e);
1189	+	}
1190	+
1191	+	/**
1192	+	* Return key for entry, or null if null
1193	+	*/
1194	+	static <K,V> K keyOrNull(TreeMap.Entry<K,V> e) {
1195	+	return e == null? null : e.key;
1196	+	}
1197	+
1198	+	/**
1199	+	* Returns the key corresponding to the specified Entry.
1200	+	* @throws NoSuchElementException if the Entry is null
1201	+	*/
1202	+	static <K> K key(Entry<K,?> e) {
1203	+	if (e==null)
1204	+	throw new NoSuchElementException();
1205	+	return e.key;
1206	+	}
1207	+
1208	+
1209		// SubMaps
1210
1211	+	/**
1212	+	* @serial include
1213	+	*/
1214		static abstract class NavigableSubMap<K,V> extends AbstractMap<K,V>
1215		implements NavigableMap<K,V>, java.io.Serializable {
1216	<
1237	<	/*
1216	>	/**
1217		* The backing map.
1218		*/
1219		final TreeMap<K,V> m;
1220
1221	<	/*
1222	<	* Endpoints are represented as triples (fromStart, lo, loExcluded)
1223	<	* and (toEnd, hi, hiExcluded). If fromStart is true, then
1224	<	* the low (absolute) bound is the start of the backing map, and the
1225	<	* other values are ignored. Otherwise, if loExcluded is
1226	<	* zero, lo is the inclusive bound, else loExcluded is one,
1227	<	* and lo is the exclusive bound. Similarly for the upper bound.
1221	>	/**
1222	>	* Endpoints are represented as triples (fromStart, lo,
1223	>	* loInclusive) and (toEnd, hi, hiInclusive). If fromStart is
1224	>	* true, then the low (absolute) bound is the start of the
1225	>	* backing map, and the other values are ignored. Otherwise,
1226	>	* if loInclusive is true, lo is the inclusive bound, else lo
1227	>	* is the exclusive bound. Similarly for the upper bound.
1228		*/
1250	–
1229		final K lo, hi;
1230		final boolean fromStart, toEnd;
1231	<	final int loExcluded, hiExcluded;
1231	>	final boolean loInclusive, hiInclusive;
1232
1233		NavigableSubMap(TreeMap<K,V> m,
1234	<	boolean fromStart, K lo, int loExcluded,
1235	<	boolean toEnd,     K hi, int hiExcluded) {
1234	>	boolean fromStart, K lo, boolean loInclusive,
1235	>	boolean toEnd,     K hi, boolean hiInclusive) {
1236		if (!fromStart && !toEnd) {
1237		if (m.compare(lo, hi) > 0)
1238		throw new IllegalArgumentException("fromKey > toKey");
1239	+	} else {
1240	+	if (!fromStart) // type check
1241	+	m.compare(lo, lo);
1242	+	if (!toEnd)
1243	+	m.compare(hi, hi);
1244		}
1262	–	else if (!fromStart) // type check
1263	–	m.compare(lo, lo);
1264	–	else if (!toEnd)
1265	–	m.compare(hi, hi);
1245
1246		this.m = m;
1247		this.fromStart = fromStart;
1248		this.lo = lo;
1249	<	this.loExcluded = loExcluded;
1249	>	this.loInclusive = loInclusive;
1250		this.toEnd = toEnd;
1251		this.hi = hi;
1252	<	this.hiExcluded = hiExcluded;
1252	>	this.hiInclusive = hiInclusive;
1253		}
1254
1255		// internal utilities
1256
1257	+	final boolean tooLow(Object key) {
1258	+	if (!fromStart) {
1259	+	int c = m.compare(key, lo);
1260	+	if (c < 0 || (c == 0 && !loInclusive))
1261	+	return true;
1262	+	}
1263	+	return false;
1264	+	}
1265	+
1266	+	final boolean tooHigh(Object key) {
1267	+	if (!toEnd) {
1268	+	int c = m.compare(key, hi);
1269	+	if (c > 0 || (c == 0 && !hiInclusive))
1270	+	return true;
1271	+	}
1272	+	return false;
1273	+	}
1274	+
1275		final boolean inRange(Object key) {
1276	<	return (fromStart || m.compare(key, lo) >= loExcluded)
1280	<	&& (toEnd || m.compare(hi, key) >= hiExcluded);
1276	>	return !tooLow(key) && !tooHigh(key);
1277		}
1278
1279		final boolean inClosedRange(Object key) {
#	Line 1289 | Line 1285 | public class TreeMap<K,V>
1285		return inclusive ? inRange(key) : inClosedRange(key);
1286		}
1287
1288	<	final boolean tooLow(K key) {
1289	<	return !fromStart && m.compare(key, lo) < loExcluded;
1290	<	}
1291	<
1292	<	final boolean tooHigh(K key) {
1297	<	return !toEnd && m.compare(hi, key) < hiExcluded;
1298	<	}
1288	>	/*
1289	>	* Absolute versions of relation operations.
1290	>	* Subclasses map to these using like-named "sub"
1291	>	* versions that invert senses for descending maps
1292	>	*/
1293
1294	<	/** Returns the lowest entry in this submap (absolute ordering) */
1295	<	final TreeMap.Entry<K,V> loEntry() {
1302	<	TreeMap.Entry<K,V> result =
1294	>	final TreeMap.Entry<K,V> absLowest() {
1295	>	TreeMap.Entry<K,V> e =
1296		(fromStart ?  m.getFirstEntry() :
1297	<	(loExcluded == 0 ? m.getCeilingEntry(lo) :
1298	<	m.getHigherEntry(lo)));
1299	<	return (result == null || tooHigh(result.key)) ? null : result;
1297	>	(loInclusive ? m.getCeilingEntry(lo) :
1298	>	m.getHigherEntry(lo)));
1299	>	return (e == null || tooHigh(e.key)) ? null : e;
1300		}
1301
1302	<	/** Returns the highest key in this submap (absolute ordering) */
1303	<	final TreeMap.Entry<K,V> hiEntry() {
1311	<	TreeMap.Entry<K,V> result =
1302	>	final TreeMap.Entry<K,V> absHighest() {
1303	>	TreeMap.Entry<K,V> e =
1304		(toEnd ?  m.getLastEntry() :
1305	<	(hiExcluded == 0 ?  m.getFloorEntry(hi) :
1306	<	m.getLowerEntry(hi)));
1307	<	return (result == null || tooLow(result.key)) ? null : result;
1305	>	(hiInclusive ?  m.getFloorEntry(hi) :
1306	>	m.getLowerEntry(hi)));
1307	>	return (e == null || tooLow(e.key)) ? null : e;
1308		}
1309
1310	<	/** Polls the lowest entry in this submap (absolute ordering) */
1311	<	final Map.Entry<K,V> pollLoEntry() {
1312	<	TreeMap.Entry<K,V> e = loEntry();
1313	<	if (e == null)
1314	<	return null;
1323	<	Map.Entry<K,V> result = new AbstractMap.SimpleImmutableEntry<K,V>(e);
1324	<	m.deleteEntry(e);
1325	<	return result;
1310	>	final TreeMap.Entry<K,V> absCeiling(K key) {
1311	>	if (tooLow(key))
1312	>	return absLowest();
1313	>	TreeMap.Entry<K,V> e = m.getCeilingEntry(key);
1314	>	return (e == null || tooHigh(e.key)) ? null : e;
1315		}
1316
1317	<	/** Polls the highest key in this submap (absolute ordering) */
1318	<	final Map.Entry<K,V> pollHiEntry() {
1319	<	TreeMap.Entry<K,V> e = hiEntry();
1320	<	if (e == null)
1321	<	return null;
1333	<	Map.Entry<K,V> result = new AbstractMap.SimpleImmutableEntry<K,V>(e);
1334	<	m.deleteEntry(e);
1335	<	return result;
1317	>	final TreeMap.Entry<K,V> absHigher(K key) {
1318	>	if (tooLow(key))
1319	>	return absLowest();
1320	>	TreeMap.Entry<K,V> e = m.getHigherEntry(key);
1321	>	return (e == null || tooHigh(e.key)) ? null : e;
1322		}
1323
1324	<	/**
1325	<	* Return the absolute high fence for ascending traversal
1326	<	*/
1327	<	final TreeMap.Entry<K,V> hiFence() {
1328	<	if (toEnd)
1343	<	return null;
1344	<	else if (hiExcluded == 0)
1345	<	return m.getHigherEntry(hi);
1346	<	else
1347	<	return m.getCeilingEntry(hi);
1324	>	final TreeMap.Entry<K,V> absFloor(K key) {
1325	>	if (tooHigh(key))
1326	>	return absHighest();
1327	>	TreeMap.Entry<K,V> e = m.getFloorEntry(key);
1328	>	return (e == null || tooLow(e.key)) ? null : e;
1329		}
1330
1331	<	/**
1332	<	* Return the absolute low fence for descending traversal
1333	<	*/
1334	<	final TreeMap.Entry<K,V> loFence() {
1335	<	if (fromStart)
1355	<	return null;
1356	<	else if (loExcluded == 0)
1357	<	return m.getLowerEntry(lo);
1358	<	else
1359	<	return m.getFloorEntry(lo);
1331	>	final TreeMap.Entry<K,V> absLower(K key) {
1332	>	if (tooHigh(key))
1333	>	return absHighest();
1334	>	TreeMap.Entry<K,V> e = m.getLowerEntry(key);
1335	>	return (e == null || tooLow(e.key)) ? null : e;
1336		}
1337
1338	+	/** Returns the absolute high fence for ascending traversal */
1339	+	final TreeMap.Entry<K,V> absHighFence() {
1340	+	return (toEnd ? null : (hiInclusive ?
1341	+	m.getHigherEntry(hi) :
1342	+	m.getCeilingEntry(hi)));
1343	+	}
1344	+
1345	+	/** Return the absolute low fence for descending traversal  */
1346	+	final TreeMap.Entry<K,V> absLowFence() {
1347	+	return (fromStart ? null : (loInclusive ?
1348	+	m.getLowerEntry(lo) :
1349	+	m.getFloorEntry(lo)));
1350	+	}
1351	+
1352	+	// Abstract methods defined in ascending vs descending classes
1353	+	// These relay to the appropriate absolute versions
1354	+
1355	+	abstract TreeMap.Entry<K,V> subLowest();
1356	+	abstract TreeMap.Entry<K,V> subHighest();
1357	+	abstract TreeMap.Entry<K,V> subCeiling(K key);
1358	+	abstract TreeMap.Entry<K,V> subHigher(K key);
1359	+	abstract TreeMap.Entry<K,V> subFloor(K key);
1360	+	abstract TreeMap.Entry<K,V> subLower(K key);
1361	+
1362	+	/** Returns ascending iterator from the perspective of this submap */
1363	+	abstract Iterator<K> keyIterator();
1364	+
1365	+	/** Returns descending iterator from the perspective of this submap */
1366	+	abstract Iterator<K> descendingKeyIterator();
1367	+
1368	+	// public methods
1369
1370		public boolean isEmpty() {
1371	<	return entrySet().isEmpty();
1371	>	return (fromStart && toEnd) ? m.isEmpty() : entrySet().isEmpty();
1372		}
1373
1374	<	public boolean containsKey(Object key) {
1375	<	return inRange(key) && m.containsKey(key);
1374	>	public int size() {
1375	>	return (fromStart && toEnd) ? m.size() : entrySet().size();
1376		}
1377
1378	<	public V get(Object key) {
1379	<	if (!inRange(key))
1373	<	return null;
1374	<	return m.get(key);
1378	>	public final boolean containsKey(Object key) {
1379	>	return inRange(key) && m.containsKey(key);
1380		}
1381
1382	<	public V put(K key, V value) {
1382	>	public final V put(K key, V value) {
1383		if (!inRange(key))
1384		throw new IllegalArgumentException("key out of range");
1385		return m.put(key, value);
1386		}
1387
1388	<	public V remove(Object key) {
1389	<	if (!inRange(key))
1385	<	return null;
1386	<	return m.remove(key);
1388	>	public final V get(Object key) {
1389	>	return !inRange(key)? null :  m.get(key);
1390		}
1391
1392	<	public Map.Entry<K,V> ceilingEntry(K key) {
1393	<	TreeMap.Entry<K,V> e = subCeiling(key);
1391	<	return e == null? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
1392	>	public final V remove(Object key) {
1393	>	return !inRange(key)? null  : m.remove(key);
1394		}
1395
1396	<	public K ceilingKey(K key) {
1397	<	TreeMap.Entry<K,V> e = subCeiling(key);
1396	<	return e == null? null : e.key;
1396	>	public final Map.Entry<K,V> ceilingEntry(K key) {
1397	>	return exportEntry(subCeiling(key));
1398		}
1399
1400	<	public Map.Entry<K,V> higherEntry(K key) {
1401	<	TreeMap.Entry<K,V> e = subHigher(key);
1401	<	return e == null? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
1400	>	public final K ceilingKey(K key) {
1401	>	return keyOrNull(subCeiling(key));
1402		}
1403
1404	<	public K higherKey(K key) {
1405	<	TreeMap.Entry<K,V> e = subHigher(key);
1406	<	return e == null? null : e.key;
1404	>	public final Map.Entry<K,V> higherEntry(K key) {
1405	>	return exportEntry(subHigher(key));
1406		}
1407
1408	<	public Map.Entry<K,V> floorEntry(K key) {
1409	<	TreeMap.Entry<K,V> e = subFloor(key);
1411	<	return e == null? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
1408	>	public final K higherKey(K key) {
1409	>	return keyOrNull(subHigher(key));
1410		}
1411
1412	<	public K floorKey(K key) {
1413	<	TreeMap.Entry<K,V> e = subFloor(key);
1416	<	return e == null? null : e.key;
1412	>	public final Map.Entry<K,V> floorEntry(K key) {
1413	>	return exportEntry(subFloor(key));
1414		}
1415
1416	<	public Map.Entry<K,V> lowerEntry(K key) {
1417	<	TreeMap.Entry<K,V> e = subLower(key);
1421	<	return e == null? null : new AbstractMap.SimpleImmutableEntry<K,V>(e);
1416	>	public final K floorKey(K key) {
1417	>	return keyOrNull(subFloor(key));
1418		}
1419
1420	<	public K lowerKey(K key) {
1421	<	TreeMap.Entry<K,V> e = subLower(key);
1426	<	return e == null? null : e.key;
1420	>	public final Map.Entry<K,V> lowerEntry(K key) {
1421	>	return exportEntry(subLower(key));
1422		}
1423
1424	<	abstract Iterator<K> keyIterator();
1425	<	abstract Iterator<K> descendingKeyIterator();
1424	>	public final K lowerKey(K key) {
1425	>	return keyOrNull(subLower(key));
1426	>	}
1427
1428	<	public NavigableSet<K> descendingKeySet() {
1429	<	return descendingMap().navigableKeySet();
1428	>	public final K firstKey() {
1429	>	return key(subLowest());
1430	>	}
1431	>
1432	>	public final K lastKey() {
1433	>	return key(subHighest());
1434	>	}
1435	>
1436	>	public final Map.Entry<K,V> firstEntry() {
1437	>	return exportEntry(subLowest());
1438	>	}
1439	>
1440	>	public final Map.Entry<K,V> lastEntry() {
1441	>	return exportEntry(subHighest());
1442	>	}
1443	>
1444	>	public final Map.Entry<K,V> pollFirstEntry() {
1445	>	TreeMap.Entry<K,V> e = subLowest();
1446	>	Map.Entry<K,V> result = exportEntry(e);
1447	>	if (e != null)
1448	>	m.deleteEntry(e);
1449	>	return result;
1450	>	}
1451	>
1452	>	public final Map.Entry<K,V> pollLastEntry() {
1453	>	TreeMap.Entry<K,V> e = subHighest();
1454	>	Map.Entry<K,V> result = exportEntry(e);
1455	>	if (e != null)
1456	>	m.deleteEntry(e);
1457	>	return result;
1458		}
1459
1460		// Views
#	Line 1438 | Line 1462 | public class TreeMap<K,V>
1462		transient EntrySetView entrySetView = null;
1463		transient KeySet<K> navigableKeySetView = null;
1464
1465	+	public final NavigableSet<K> navigableKeySet() {
1466	+	KeySet<K> nksv = navigableKeySetView;
1467	+	return (nksv != null) ? nksv :
1468	+	(navigableKeySetView = new TreeMap.KeySet(this));
1469	+	}
1470	+
1471	+	public final Set<K> keySet() {
1472	+	return navigableKeySet();
1473	+	}
1474	+
1475	+	public NavigableSet<K> descendingKeySet() {
1476	+	return descendingMap().navigableKeySet();
1477	+	}
1478	+
1479	+	public final SortedMap<K,V> subMap(K fromKey, K toKey) {
1480	+	return subMap(fromKey, true, toKey, false);
1481	+	}
1482	+
1483	+	public final SortedMap<K,V> headMap(K toKey) {
1484	+	return headMap(toKey, false);
1485	+	}
1486	+
1487	+	public final SortedMap<K,V> tailMap(K fromKey) {
1488	+	return tailMap(fromKey, true);
1489	+	}
1490	+
1491	+	// View classes
1492	+
1493		abstract class EntrySetView extends AbstractSet<Map.Entry<K,V>> {
1494		private transient int size = -1, sizeModCount;
1495
#	Line 1457 | Line 1509 | public class TreeMap<K,V>
1509		}
1510
1511		public boolean isEmpty() {
1512	<	TreeMap.Entry<K,V> n = loEntry();
1512	>	TreeMap.Entry<K,V> n = absLowest();
1513		return n == null || tooHigh(n.key);
1514		}
1515
#	Line 1489 | Line 1541 | public class TreeMap<K,V>
1541		}
1542		}
1543
1492	–	public NavigableSet<K> navigableKeySet() {
1493	–	KeySet<K> nksv = navigableKeySetView;
1494	–	return (nksv != null) ? nksv :
1495	–	(navigableKeySetView = new TreeMap.KeySet(this));
1496	–	}
1497	–
1498	–	public Set<K> keySet() {
1499	–	return navigableKeySet();
1500	–	}
1501	–
1502	–	public SortedMap<K,V> subMap(K fromKey, K toKey) {
1503	–	return subMap(fromKey, true, toKey, false);
1504	–	}
1505	–
1506	–	public SortedMap<K,V> headMap(K toKey) {
1507	–	return headMap(toKey, false);
1508	–	}
1509	–
1510	–	public SortedMap<K,V> tailMap(K fromKey) {
1511	–	return tailMap(fromKey, true);
1512	–	}
1513	–
1514	–	// The following four definitions are correct only for
1515	–	// ascending submaps. They are overridden in DescendingSubMap.
1516	–	// They are defined in the base class because the definitions
1517	–	// in DescendingSubMap rely on those for AscendingSubMap.
1518	–
1519	–	/**
1520	–	* Returns the entry corresponding to the ceiling of the specified
1521	–	* key from the perspective of this submap, or null if the submap
1522	–	* contains no such entry.
1523	–	*/
1524	–	TreeMap.Entry<K,V> subCeiling(K key) {
1525	–	if (tooLow(key))
1526	–	return loEntry();
1527	–	TreeMap.Entry<K,V> e = m.getCeilingEntry(key);
1528	–	return (e == null || tooHigh(e.key)) ? null : e;
1529	–	}
1530	–
1531	–	/**
1532	–	* Returns the entry corresponding to the higher of the specified
1533	–	* key from the perspective of this submap, or null if the submap
1534	–	* contains no such entry.
1535	–	*/
1536	–	TreeMap.Entry<K,V> subHigher(K key) {
1537	–	if (tooLow(key))
1538	–	return loEntry();
1539	–	TreeMap.Entry<K,V> e = m.getHigherEntry(key);
1540	–	return (e == null || tooHigh(e.key)) ? null : e;
1541	–	}
1542	–
1543	–	/**
1544	–	* Returns the entry corresponding to the floor of the specified
1545	–	* key from the perspective of this submap, or null if the submap
1546	–	* contains no such entry.
1547	–	*/
1548	–	TreeMap.Entry<K,V> subFloor(K key) {
1549	–	if (tooHigh(key))
1550	–	return hiEntry();
1551	–	TreeMap.Entry<K,V> e = m.getFloorEntry(key);
1552	–	return (e == null || tooLow(e.key)) ? null : e;
1553	–	}
1554	–
1555	–	/**
1556	–	* Returns the entry corresponding to the lower of the specified
1557	–	* key from the perspective of this submap, or null if the submap
1558	–	* contains no such entry.
1559	–	*/
1560	–	TreeMap.Entry<K,V> subLower(K key) {
1561	–	if (tooHigh(key))
1562	–	return hiEntry();
1563	–	TreeMap.Entry<K,V> e = m.getLowerEntry(key);
1564	–	return (e == null || tooLow(e.key)) ? null : e;
1565	–	}
1566	–
1544		/**
1545		* Iterators for SubMaps
1546		*/
#	Line 1605 | Line 1582 | public class TreeMap<K,V>
1582		return e;
1583		}
1584
1585	<	public void remove() {
1585	>	final void removeAscending() {
1586		if (lastReturned == null)
1587		throw new IllegalStateException();
1588		if (m.modCount != expectedModCount)
1589		throw new ConcurrentModificationException();
1590	+	// deleted entries are replaced by their successors
1591		if (lastReturned.left != null && lastReturned.right != null)
1592		next = lastReturned;
1593		m.deleteEntry(lastReturned);
1616	–	expectedModCount++;
1594		lastReturned = null;
1595	+	expectedModCount = m.modCount;
1596		}
1597	+
1598	+	final void removeDescending() {
1599	+	if (lastReturned == null)
1600	+	throw new IllegalStateException();
1601	+	if (m.modCount != expectedModCount)
1602	+	throw new ConcurrentModificationException();
1603	+	m.deleteEntry(lastReturned);
1604	+	lastReturned = null;
1605	+	expectedModCount = m.modCount;
1606	+	}
1607	+
1608		}
1609
1610		final class SubMapEntryIterator extends SubMapIterator<Map.Entry<K,V>> {
#	Line 1626 | Line 1615 | public class TreeMap<K,V>
1615		public Map.Entry<K,V> next() {
1616		return nextEntry();
1617		}
1618	+	public void remove() {
1619	+	removeAscending();
1620	+	}
1621		}
1622
1623		final class SubMapKeyIterator extends SubMapIterator<K> {
#	Line 1636 | Line 1628 | public class TreeMap<K,V>
1628		public K next() {
1629		return nextEntry().key;
1630		}
1631	+	public void remove() {
1632	+	removeAscending();
1633	+	}
1634		}
1635
1636		final class DescendingSubMapEntryIterator extends SubMapIterator<Map.Entry<K,V>> {
1637		DescendingSubMapEntryIterator(TreeMap.Entry<K,V> last,
1638	<	TreeMap.Entry<K,V> lastExcluded) {
1639	<	super(last, lastExcluded);
1638	>	TreeMap.Entry<K,V> fence) {
1639	>	super(last, fence);
1640		}
1641
1642		public Map.Entry<K,V> next() {
1643		return prevEntry();
1644		}
1645	+	public void remove() {
1646	+	removeDescending();
1647	+	}
1648		}
1649
1650		final class DescendingSubMapKeyIterator extends SubMapIterator<K> {
1651		DescendingSubMapKeyIterator(TreeMap.Entry<K,V> last,
1652	<	TreeMap.Entry<K,V> lastExcluded) {
1653	<	super(last, lastExcluded);
1652	>	TreeMap.Entry<K,V> fence) {
1653	>	super(last, fence);
1654		}
1655		public K next() {
1656		return prevEntry().key;
1657		}
1658	+	public void remove() {
1659	+	removeDescending();
1660	+	}
1661		}
1662		}
1663
1664	<	static class AscendingSubMap<K,V> extends NavigableSubMap<K,V> {
1664	>	/**
1665	>	* @serial include
1666	>	*/
1667	>	static final class AscendingSubMap<K,V> extends NavigableSubMap<K,V> {
1668		private static final long serialVersionUID = 912986545866124060L;
1669
1670		AscendingSubMap(TreeMap<K,V> m,
1671	<	boolean fromStart, K lo, int loExcluded,
1672	<	boolean toEnd, K hi, int hiExcluded) {
1673	<	super(m, fromStart, lo, loExcluded, toEnd, hi, hiExcluded);
1671	>	boolean fromStart, K lo, boolean loInclusive,
1672	>	boolean toEnd,     K hi, boolean hiInclusive) {
1673	>	super(m, fromStart, lo, loInclusive, toEnd, hi, hiInclusive);
1674		}
1675
1676		public Comparator<? super K> comparator() {
#	Line 1674 | Line 1678 | public class TreeMap<K,V>
1678		}
1679
1680		public NavigableMap<K,V> subMap(K fromKey, boolean fromInclusive,
1681	<	K toKey, boolean toInclusive) {
1681	>	K toKey,   boolean toInclusive) {
1682		if (!inRange(fromKey, fromInclusive))
1683		throw new IllegalArgumentException("fromKey out of range");
1684		if (!inRange(toKey, toInclusive))
1685		throw new IllegalArgumentException("toKey out of range");
1686		return new AscendingSubMap(m,
1687	<	false, fromKey, excluded(fromInclusive),
1688	<	false, toKey,   excluded(toInclusive));
1687	>	false, fromKey, fromInclusive,
1688	>	false, toKey,   toInclusive);
1689		}
1690
1691		public NavigableMap<K,V> headMap(K toKey, boolean inclusive) {
1692		if (!inClosedRange(toKey))
1693		throw new IllegalArgumentException("toKey out of range");
1694		return new AscendingSubMap(m,
1695	<	fromStart, lo,    loExcluded,
1696	<	false,     toKey, excluded(inclusive));
1695	>	fromStart, lo,    loInclusive,
1696	>	false,     toKey, inclusive);
1697		}
1698
1699		public NavigableMap<K,V> tailMap(K fromKey, boolean inclusive){
1700		if (!inRange(fromKey, inclusive))
1701		throw new IllegalArgumentException("fromKey out of range");
1702		return new AscendingSubMap(m,
1703	<	false, fromKey, excluded(inclusive),
1704	<	toEnd, hi,      hiExcluded);
1703	>	false, fromKey, inclusive,
1704	>	toEnd, hi,      hiInclusive);
1705	>	}
1706	>
1707	>	public NavigableMap<K,V> descendingMap() {
1708	>	NavigableMap<K,V> mv = descendingMapView;
1709	>	return (mv != null) ? mv :
1710	>	(descendingMapView =
1711	>	new DescendingSubMap(m,
1712	>	fromStart, lo, loInclusive,
1713	>	toEnd,     hi, hiInclusive));
1714		}
1715
1716		Iterator<K> keyIterator() {
1717	<	return new SubMapKeyIterator(loEntry(), hiFence());
1717	>	return new SubMapKeyIterator(absLowest(), absHighFence());
1718		}
1719
1720		Iterator<K> descendingKeyIterator() {
1721	<	return new DescendingSubMapKeyIterator(hiEntry(), loFence());
1721	>	return new DescendingSubMapKeyIterator(absHighest(), absLowFence());
1722		}
1723
1724	<	class AscendingEntrySetView extends NavigableSubMap.EntrySetView {
1724	>	final class AscendingEntrySetView extends EntrySetView {
1725		public Iterator<Map.Entry<K,V>> iterator() {
1726	<	return new SubMapEntryIterator(loEntry(), hiFence());
1726	>	return new SubMapEntryIterator(absLowest(), absHighFence());
1727		}
1728		}
1729
#	Line 1719 | Line 1732 | public class TreeMap<K,V>
1732		return (es != null) ? es : new AscendingEntrySetView();
1733		}
1734
1735	<	public K firstKey() {
1736	<	return key(loEntry());
1737	<	}
1738	<
1739	<	public K lastKey() {
1740	<	return key(hiEntry());
1728	<	}
1729	<
1730	<	public Map.Entry<K,V> firstEntry() {
1731	<	return loEntry();
1732	<	}
1733	<
1734	<	public Map.Entry<K,V> lastEntry() {
1735	<	return hiEntry();
1736	<	}
1737	<
1738	<	public Map.Entry<K,V> pollFirstEntry() {
1739	<	return pollLoEntry();
1740	<	}
1741	<
1742	<	public Map.Entry<K,V> pollLastEntry() {
1743	<	return pollHiEntry();
1744	<	}
1745	<
1746	<	public NavigableMap<K,V> descendingMap() {
1747	<	NavigableMap<K,V> mv = descendingMapView;
1748	<	return (mv != null) ? mv :
1749	<	(descendingMapView =
1750	<	new DescendingSubMap(m,
1751	<	fromStart, lo, loExcluded,
1752	<	toEnd,     hi, hiExcluded));
1753	<	}
1735	>	TreeMap.Entry<K,V> subLowest()       { return absLowest(); }
1736	>	TreeMap.Entry<K,V> subHighest()      { return absHighest(); }
1737	>	TreeMap.Entry<K,V> subCeiling(K key) { return absCeiling(key); }
1738	>	TreeMap.Entry<K,V> subHigher(K key)  { return absHigher(key); }
1739	>	TreeMap.Entry<K,V> subFloor(K key)   { return absFloor(key); }
1740	>	TreeMap.Entry<K,V> subLower(K key)   { return absLower(key); }
1741		}
1742
1743	<	static class DescendingSubMap<K,V> extends NavigableSubMap<K,V> {
1743	>	/**
1744	>	* @serial include
1745	>	*/
1746	>	static final class DescendingSubMap<K,V>  extends NavigableSubMap<K,V> {
1747		private static final long serialVersionUID = 912986545866120460L;
1748		DescendingSubMap(TreeMap<K,V> m,
1749	<	boolean fromStart, K lo, int loExcluded,
1750	<	boolean toEnd, K hi, int hiExcluded) {
1751	<	super(m, fromStart, lo, loExcluded, toEnd, hi, hiExcluded);
1749	>	boolean fromStart, K lo, boolean loInclusive,
1750	>	boolean toEnd,     K hi, boolean hiInclusive) {
1751	>	super(m, fromStart, lo, loInclusive, toEnd, hi, hiInclusive);
1752		}
1753
1754		private final Comparator<? super K> reverseComparator =
#	Line 1769 | Line 1759 | public class TreeMap<K,V>
1759		}
1760
1761		public NavigableMap<K,V> subMap(K fromKey, boolean fromInclusive,
1762	<	K toKey, boolean toInclusive) {
1762	>	K toKey,   boolean toInclusive) {
1763		if (!inRange(fromKey, fromInclusive))
1764		throw new IllegalArgumentException("fromKey out of range");
1765		if (!inRange(toKey, toInclusive))
1766		throw new IllegalArgumentException("toKey out of range");
1767		return new DescendingSubMap(m,
1768	<	false, toKey,   excluded(toInclusive),
1769	<	false, fromKey, excluded(fromInclusive));
1768	>	false, toKey,   toInclusive,
1769	>	false, fromKey, fromInclusive);
1770		}
1771
1772		public NavigableMap<K,V> headMap(K toKey, boolean inclusive) {
1773		if (!inRange(toKey, inclusive))
1774		throw new IllegalArgumentException("toKey out of range");
1775		return new DescendingSubMap(m,
1776	<	false, toKey, excluded(inclusive),
1777	<	toEnd, hi,    hiExcluded);
1776	>	false, toKey, inclusive,
1777	>	toEnd, hi,    hiInclusive);
1778		}
1779
1780		public NavigableMap<K,V> tailMap(K fromKey, boolean inclusive){
1781		if (!inRange(fromKey, inclusive))
1782		throw new IllegalArgumentException("fromKey out of range");
1783		return new DescendingSubMap(m,
1784	<	fromStart, lo, loExcluded,
1785	<	false, fromKey, excluded(inclusive));
1796	<	}
1797	<
1798	<	Iterator<K> keyIterator() {
1799	<	return new DescendingSubMapKeyIterator(hiEntry(), loFence());
1800	<	}
1801	<
1802	<	Iterator<K> descendingKeyIterator() {
1803	<	return new SubMapKeyIterator(loEntry(), hiFence());
1804	<	}
1805	<
1806	<	class DescendingEntrySetView extends NavigableSubMap.EntrySetView {
1807	<	public Iterator<Map.Entry<K,V>> iterator() {
1808	<	return new DescendingSubMapEntryIterator(hiEntry(), loFence());
1809	<	}
1810	<	}
1811	<
1812	<	public Set<Map.Entry<K,V>> entrySet() {
1813	<	EntrySetView es = entrySetView;
1814	<	return (es != null) ? es : new DescendingEntrySetView();
1815	<	}
1816	<
1817	<	public K firstKey() {
1818	<	return key(hiEntry());
1819	<	}
1820	<
1821	<	public K lastKey() {
1822	<	return key(loEntry());
1823	<	}
1824	<
1825	<	public Map.Entry<K,V> firstEntry() {
1826	<	return hiEntry();
1827	<	}
1828	<
1829	<	public Map.Entry<K,V> lastEntry() {
1830	<	return loEntry();
1831	<	}
1832	<
1833	<	public Map.Entry<K,V> pollFirstEntry() {
1834	<	return pollHiEntry();
1835	<	}
1836	<
1837	<	public Map.Entry<K,V> pollLastEntry() {
1838	<	return pollLoEntry();
1784	>	fromStart, lo, loInclusive,
1785	>	false, fromKey, inclusive);
1786		}
1787
1788		public NavigableMap<K,V> descendingMap() {
#	Line 1843 | Line 1790 | public class TreeMap<K,V>
1790		return (mv != null) ? mv :
1791		(descendingMapView =
1792		new AscendingSubMap(m,
1793	<	fromStart, lo, loExcluded,
1794	<	toEnd, hi, hiExcluded));
1793	>	fromStart, lo, loInclusive,
1794	>	toEnd,     hi, hiInclusive));
1795		}
1796
1797	<	@Override TreeMap.Entry<K,V> subCeiling(K key) {
1798	<	return super.subFloor(key);
1797	>	Iterator<K> keyIterator() {
1798	>	return new DescendingSubMapKeyIterator(absHighest(), absLowFence());
1799		}
1800
1801	<	@Override TreeMap.Entry<K,V> subHigher(K key) {
1802	<	return super.subLower(key);
1801	>	Iterator<K> descendingKeyIterator() {
1802	>	return new SubMapKeyIterator(absLowest(), absHighFence());
1803		}
1804
1805	<	@Override TreeMap.Entry<K,V> subFloor(K key) {
1806	<	return super.subCeiling(key);
1805	>	final class DescendingEntrySetView extends EntrySetView {
1806	>	public Iterator<Map.Entry<K,V>> iterator() {
1807	>	return new DescendingSubMapEntryIterator(absHighest(), absLowFence());
1808	>	}
1809		}
1810
1811	<	@Override TreeMap.Entry<K,V> subLower(K key) {
1812	<	return super.subHigher(key);
1811	>	public Set<Map.Entry<K,V>> entrySet() {
1812	>	EntrySetView es = entrySetView;
1813	>	return (es != null) ? es : new DescendingEntrySetView();
1814		}
1865	–	}
1815
1816	<	/**
1817	<	* Compares two keys using the correct comparison method for this TreeMap.
1818	<	*/
1819	<	final int compare(Object k1, Object k2) {
1820	<	return comparator==null ? ((Comparable<? super K>)k1).compareTo((K)k2)
1821	<	: comparator.compare((K)k1, (K)k2);
1873	<	}
1874	<
1875	<	/**
1876	<	* Test two values for equality.  Differs from o1.equals(o2) only in
1877	<	* that it copes with <tt>null</tt> o1 properly.
1878	<	*/
1879	<	final static boolean valEquals(Object o1, Object o2) {
1880	<	return (o1==null ? o2==null : o1.equals(o2));
1816	>	TreeMap.Entry<K,V> subLowest()       { return absHighest(); }
1817	>	TreeMap.Entry<K,V> subHighest()      { return absLowest(); }
1818	>	TreeMap.Entry<K,V> subCeiling(K key) { return absFloor(key); }
1819	>	TreeMap.Entry<K,V> subHigher(K key)  { return absLower(key); }
1820	>	TreeMap.Entry<K,V> subFloor(K key)   { return absCeiling(key); }
1821	>	TreeMap.Entry<K,V> subLower(K key)   { return absHigher(key); }
1822		}
1823
1824		/**
#	Line 1886 | Line 1827 | public class TreeMap<K,V>
1827		* support NavigableMap.  It translates an old-version SubMap into
1828		* a new-version AscendingSubMap. This class is never otherwise
1829		* used.
1830	+	*
1831	+	* @serial include
1832		*/
1833		private class SubMap extends AbstractMap<K,V>
1834		implements SortedMap<K,V>, java.io.Serializable {
#	Line 1894 | Line 1837 | public class TreeMap<K,V>
1837		private K fromKey, toKey;
1838		private Object readResolve() {
1839		return new AscendingSubMap(TreeMap.this,
1840	<	fromStart, fromKey, 0,
1841	<	toEnd, toKey, 1);
1840	>	fromStart, fromKey, true,
1841	>	toEnd, toKey, false);
1842		}
1843		public Set<Map.Entry<K,V>> entrySet() { throw new InternalError(); }
1844		public K lastKey() { throw new InternalError(); }
#	Line 1907 | Line 1850 | public class TreeMap<K,V>
1850		}
1851
1852
1853	+	// Red-black mechanics
1854	+
1855		private static final boolean RED   = false;
1856		private static final boolean BLACK = true;
1857
#	Line 1967 | Line 1912 | public class TreeMap<K,V>
1912		public boolean equals(Object o) {
1913		if (!(o instanceof Map.Entry))
1914		return false;
1915	<	Map.Entry e = (Map.Entry)o;
1915	>	Map.Entry<?,?> e = (Map.Entry<?,?>)o;
1916
1917		return valEquals(key,e.getKey()) && valEquals(value,e.getValue());
1918		}
#	Line 2082 | Line 2027 | public class TreeMap<K,V>
2027		return (p == null) ? null: p.right;
2028		}
2029
2030	<	/** From CLR **/
2030	>	/** From CLR */
2031		private void rotateLeft(Entry<K,V> p) {
2032	<	Entry<K,V> r = p.right;
2033	<	p.right = r.left;
2034	<	if (r.left != null)
2035	<	r.left.parent = p;
2036	<	r.parent = p.parent;
2037	<	if (p.parent == null)
2038	<	root = r;
2039	<	else if (p.parent.left == p)
2040	<	p.parent.left = r;
2041	<	else
2042	<	p.parent.right = r;
2043	<	r.left = p;
2044	<	p.parent = r;
2032	>	if (p != null) {
2033	>	Entry<K,V> r = p.right;
2034	>	p.right = r.left;
2035	>	if (r.left != null)
2036	>	r.left.parent = p;
2037	>	r.parent = p.parent;
2038	>	if (p.parent == null)
2039	>	root = r;
2040	>	else if (p.parent.left == p)
2041	>	p.parent.left = r;
2042	>	else
2043	>	p.parent.right = r;
2044	>	r.left = p;
2045	>	p.parent = r;
2046	>	}
2047		}
2048
2049	<	/** From CLR **/
2049	>	/** From CLR */
2050		private void rotateRight(Entry<K,V> p) {
2051	<	Entry<K,V> l = p.left;
2052	<	p.left = l.right;
2053	<	if (l.right != null) l.right.parent = p;
2054	<	l.parent = p.parent;
2055	<	if (p.parent == null)
2056	<	root = l;
2057	<	else if (p.parent.right == p)
2058	<	p.parent.right = l;
2059	<	else p.parent.left = l;
2060	<	l.right = p;
2061	<	p.parent = l;
2051	>	if (p != null) {
2052	>	Entry<K,V> l = p.left;
2053	>	p.left = l.right;
2054	>	if (l.right != null) l.right.parent = p;
2055	>	l.parent = p.parent;
2056	>	if (p.parent == null)
2057	>	root = l;
2058	>	else if (p.parent.right == p)
2059	>	p.parent.right = l;
2060	>	else p.parent.left = l;
2061	>	l.right = p;
2062	>	p.parent = l;
2063	>	}
2064		}
2065
2066	<
2118	<	/** From CLR **/
2066	>	/** From CLR */
2067		private void fixAfterInsertion(Entry<K,V> x) {
2068		x.color = RED;
2069
#	Line 2134 | Line 2082 | public class TreeMap<K,V>
2082		}
2083		setColor(parentOf(x), BLACK);
2084		setColor(parentOf(parentOf(x)), RED);
2085	<	if (parentOf(parentOf(x)) != null)
2138	<	rotateRight(parentOf(parentOf(x)));
2085	>	rotateRight(parentOf(parentOf(x)));
2086		}
2087		} else {
2088		Entry<K,V> y = leftOf(parentOf(parentOf(x)));
#	Line 2151 | Line 2098 | public class TreeMap<K,V>
2098		}
2099		setColor(parentOf(x), BLACK);
2100		setColor(parentOf(parentOf(x)), RED);
2101	<	if (parentOf(parentOf(x)) != null)
2155	<	rotateLeft(parentOf(parentOf(x)));
2101	>	rotateLeft(parentOf(parentOf(x)));
2102		}
2103		}
2104		}
#	Line 2162 | Line 2108 | public class TreeMap<K,V>
2108		/**
2109		* Delete node p, and then rebalance the tree.
2110		*/
2165	–
2111		private void deleteEntry(Entry<K,V> p) {
2112	<	decrementSize();
2112	>	modCount++;
2113	>	size--;
2114
2115		// If strictly internal, copy successor's element to p and then make p
2116		// point to successor.
#	Line 2210 | Line 2156 | public class TreeMap<K,V>
2156		}
2157		}
2158
2159	<	/** From CLR **/
2159	>	/** From CLR */
2160		private void fixAfterDeletion(Entry<K,V> x) {
2161		while (x != root && colorOf(x) == BLACK) {
2162		if (x == leftOf(parentOf(x))) {
#	Line 2318 | Line 2264 | public class TreeMap<K,V>
2264		buildFromSorted(size, null, s, null);
2265		}
2266
2267	<	/** Intended to be called only from TreeSet.readObject **/
2267	>	/** Intended to be called only from TreeSet.readObject */
2268		void readTreeSet(int size, java.io.ObjectInputStream s, V defaultVal)
2269		throws java.io.IOException, ClassNotFoundException {
2270		buildFromSorted(size, null, s, defaultVal);
2271		}
2272
2273	<	/** Intended to be called only from TreeSet.addAll **/
2273	>	/** Intended to be called only from TreeSet.addAll */
2274		void addAllForTreeSet(SortedSet<? extends K> set, V defaultVal) {
2275		try {
2276		buildFromSorted(set.size(), set.iterator(), null, defaultVal);

Diff Legend

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