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.52 by jsr166, Sat Oct 16 16:44:39 2010 UTC vs.
Revision 1.53 by jsr166, Fri Oct 22 05:18:30 2010 UTC

#	Line 1055 | Line 1055 | public class TreeMap<K,V>
1055		public Comparator<? super E> comparator() { return m.comparator(); }
1056		public E pollFirst() {
1057		Map.Entry<E,Object> e = m.pollFirstEntry();
1058	<	return e == null? null : e.getKey();
1058	>	return (e == null) ? null : e.getKey();
1059		}
1060		public E pollLast() {
1061		Map.Entry<E,Object> e = m.pollLastEntry();
1062	<	return e == null? null : e.getKey();
1062	>	return (e == null) ? null : e.getKey();
1063		}
1064		public boolean remove(Object o) {
1065		int oldSize = size();
#	Line 1203 | Line 1203 | public class TreeMap<K,V>
1203		* Return SimpleImmutableEntry for entry, or null if null
1204		*/
1205		static <K,V> Map.Entry<K,V> exportEntry(TreeMap.Entry<K,V> e) {
1206	<	return e == null? null :
1206	>	return (e == null) ? null :
1207		new AbstractMap.SimpleImmutableEntry<K,V>(e);
1208		}
1209
#	Line 1211 | Line 1211 | public class TreeMap<K,V>
1211		* Return key for entry, or null if null
1212		*/
1213		static <K,V> K keyOrNull(TreeMap.Entry<K,V> e) {
1214	<	return e == null? null : e.key;
1214	>	return (e == null) ? null : e.key;
1215		}
1216
1217		/**
#	Line 1411 | Line 1411 | public class TreeMap<K,V>
1411		}
1412
1413		public final V get(Object key) {
1414	<	return !inRange(key)? null :  m.get(key);
1414	>	return !inRange(key) ? null :  m.get(key);
1415		}
1416
1417		public final V remove(Object key) {
1418	<	return !inRange(key)? null  : m.remove(key);
1418	>	return !inRange(key) ? null  : m.remove(key);
1419		}
1420
1421		public final Map.Entry<K,V> ceilingEntry(K key) {

Diff Legend

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