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.32 by dl, Sat Apr 22 16:38:01 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 994 | 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))
998	<	if (valEquals(e.getValue(), o))
999	<	return true;
1000	<	return false;
940	>	return TreeMap.this.containsValue(o);
941		}
942
943		public boolean remove(Object o) {
#	Line 1110 | 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 1177 | 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 1221 | 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	<	/*
1216	>	/**
1217		* The backing map.
1218		*/
1219		final TreeMap<K,V> m;
1220
1221	<	/*
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
#	Line 1238 | Line 1226 | public class TreeMap<K,V>
1226		* if loInclusive is true, lo is the inclusive bound, else lo
1227		* is the exclusive bound. Similarly for the upper bound.
1228		*/
1241	–
1229		final K lo, hi;
1230		final boolean fromStart, toEnd;
1231		final boolean loInclusive, hiInclusive;
#	Line 1298 | Line 1285 | public class TreeMap<K,V>
1285		return inclusive ? inRange(key) : inClosedRange(key);
1286		}
1287
1301	–	/**
1302	–	* Return SimpleImmutableEntry for entry, or null if null
1303	–	*/
1304	–	static <K,V> Map.Entry<K,V> exportEntry(TreeMap.Entry<K,V> e) {
1305	–	return e == null? null :
1306	–	new AbstractMap.SimpleImmutableEntry<K,V>(e);
1307	–	}
1308	–
1309	–	/**
1310	–	* Return key for entry, or null if null
1311	–	*/
1312	–	static <K,V> K exportKey(TreeMap.Entry<K,V> e) {
1313	–	return e == null? null : e.key;
1314	–	}
1315	–
1288		/*
1289		* Absolute versions of relation operations.
1290		* Subclasses map to these using like-named "sub"
#	Line 1334 | Line 1306 | public class TreeMap<K,V>
1306		m.getLowerEntry(hi)));
1307		return (e == null || tooLow(e.key)) ? null : e;
1308		}
1309	<
1309	>
1310		final TreeMap.Entry<K,V> absCeiling(K key) {
1311		if (tooLow(key))
1312		return absLowest();
#	Line 1365 | Line 1337 | public class TreeMap<K,V>
1337
1338		/** Returns the absolute high fence for ascending traversal */
1339		final TreeMap.Entry<K,V> absHighFence() {
1340	<	return (toEnd ? null : (hiInclusive ?
1340	>	return (toEnd ? null : (hiInclusive ?
1341		m.getHigherEntry(hi) :
1342		m.getCeilingEntry(hi)));
1343		}
#	Line 1378 | Line 1350 | public class TreeMap<K,V>
1350		}
1351
1352		// Abstract methods defined in ascending vs descending classes
1353	<	// These relay to the appropriate  absolute versions
1353	>	// These relay to the appropriate absolute versions
1354
1355		abstract TreeMap.Entry<K,V> subLowest();
1356		abstract TreeMap.Entry<K,V> subHighest();
#	Line 1426 | Line 1398 | public class TreeMap<K,V>
1398		}
1399
1400		public final K ceilingKey(K key) {
1401	<	return exportKey(subCeiling(key));
1401	>	return keyOrNull(subCeiling(key));
1402		}
1403
1404		public final Map.Entry<K,V> higherEntry(K key) {
#	Line 1434 | Line 1406 | public class TreeMap<K,V>
1406		}
1407
1408		public final K higherKey(K key) {
1409	<	return exportKey(subHigher(key));
1409	>	return keyOrNull(subHigher(key));
1410		}
1411
1412		public final Map.Entry<K,V> floorEntry(K key) {
#	Line 1442 | Line 1414 | public class TreeMap<K,V>
1414		}
1415
1416		public final K floorKey(K key) {
1417	<	return exportKey(subFloor(key));
1417	>	return keyOrNull(subFloor(key));
1418		}
1419
1420		public final Map.Entry<K,V> lowerEntry(K key) {
#	Line 1450 | Line 1422 | public class TreeMap<K,V>
1422		}
1423
1424		public final K lowerKey(K key) {
1425	<	return exportKey(subLower(key));
1425	>	return keyOrNull(subLower(key));
1426		}
1427
1428		public final K firstKey() {
#	Line 1610 | 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);
1621	–	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 1631 | 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 1641 | 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>> {
#	Line 1652 | Line 1642 | public class TreeMap<K,V>
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> {
#	Line 1662 | Line 1655 | public class TreeMap<K,V>
1655		public K next() {
1656		return prevEntry().key;
1657		}
1658	+	public void remove() {
1659	+	removeDescending();
1660	+	}
1661		}
1662		}
1663
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, boolean loInclusive,
1672	<	boolean toEnd, K hi, boolean hiInclusive) {
1672	>	boolean toEnd,     K hi, boolean hiInclusive) {
1673		super(m, fromStart, lo, loInclusive, toEnd, hi, hiInclusive);
1674		}
1675
#	Line 1679 | 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))
#	Line 1741 | Line 1740 | public class TreeMap<K,V>
1740		TreeMap.Entry<K,V> subLower(K key)   { return absLower(key); }
1741		}
1742
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, boolean loInclusive,
1750	<	boolean toEnd, K hi, boolean hiInclusive) {
1750	>	boolean toEnd,     K hi, boolean hiInclusive) {
1751		super(m, fromStart, lo, loInclusive, toEnd, hi, hiInclusive);
1752		}
1753
#	Line 1757 | 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))
#	Line 1820 | Line 1822 | public class TreeMap<K,V>
1822		}
1823
1824		/**
1823	–	* Compares two keys using the correct comparison method for this TreeMap.
1824	–	*/
1825	–	final int compare(Object k1, Object k2) {
1826	–	return comparator==null ? ((Comparable<? super K>)k1).compareTo((K)k2)
1827	–	: comparator.compare((K)k1, (K)k2);
1828	–	}
1829	–
1830	–	/**
1831	–	* Test two values for equality.  Differs from o1.equals(o2) only in
1832	–	* that it copes with <tt>null</tt> o1 properly.
1833	–	*/
1834	–	final static boolean valEquals(Object o1, Object o2) {
1835	–	return (o1==null ? o2==null : o1.equals(o2));
1836	–	}
1837	–
1838	–	/**
1825		* This class exists solely for the sake of serialization
1826		* compatibility with previous releases of TreeMap that did not
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 1862 | 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 1922 | 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 2037 | 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	<
2073	<	/** From CLR **/
2066	>	/** From CLR */
2067		private void fixAfterInsertion(Entry<K,V> x) {
2068		x.color = RED;
2069
#	Line 2089 | 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)
2093	<	rotateRight(parentOf(parentOf(x)));
2085	>	rotateRight(parentOf(parentOf(x)));
2086		}
2087		} else {
2088		Entry<K,V> y = leftOf(parentOf(parentOf(x)));
#	Line 2106 | 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)
2110	<	rotateLeft(parentOf(parentOf(x)));
2101	>	rotateLeft(parentOf(parentOf(x)));
2102		}
2103		}
2104		}
#	Line 2117 | Line 2108 | public class TreeMap<K,V>
2108		/**
2109		* Delete node p, and then rebalance the tree.
2110		*/
2120	–
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 2165 | 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 2273 | 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