src/share/classes/java/util/TreeMap.java
Print this page
rev 3186 : 6880112: Project Coin: Port JDK core library code to use diamond operator
@@ -531,11 +531,11 @@
// TBD:
// 5045147: (coll) Adding null to an empty TreeSet should
// throw NullPointerException
//
// compare(key, key); // type check
- root = new Entry<K,V>(key, value, null);
+ root = new Entry<>(key, value, null);
size = 1;
modCount++;
return null;
}
int cmp;
@@ -567,11 +567,11 @@
t = t.right;
else
return t.setValue(value);
} while (t != null);
}
- Entry<K,V> e = new Entry<K,V>(key, value, parent);
+ Entry<K,V> e = new Entry<>(key, value, parent);
if (cmp < 0)
parent.left = e;
else
parent.right = e;
fixAfterInsertion(e);
@@ -1067,18 +1067,18 @@
m.remove(o);
return size() != oldSize;
}
public NavigableSet<E> subSet(E fromElement, boolean fromInclusive,
E toElement, boolean toInclusive) {
- return new KeySet<E>(m.subMap(fromElement, fromInclusive,
+ return new KeySet<>(m.subMap(fromElement, fromInclusive,
toElement, toInclusive));
}
public NavigableSet<E> headSet(E toElement, boolean inclusive) {
- return new KeySet<E>(m.headMap(toElement, inclusive));
+ return new KeySet<>(m.headMap(toElement, inclusive));
}
public NavigableSet<E> tailSet(E fromElement, boolean inclusive) {
- return new KeySet<E>(m.tailMap(fromElement, inclusive));
+ return new KeySet<>(m.tailMap(fromElement, inclusive));
}
public SortedSet<E> subSet(E fromElement, E toElement) {
return subSet(fromElement, true, toElement, false);
}
public SortedSet<E> headSet(E toElement) {
@@ -1203,11 +1203,11 @@
/**
* Return SimpleImmutableEntry for entry, or null if null
*/
static <K,V> Map.Entry<K,V> exportEntry(TreeMap.Entry<K,V> e) {
return (e == null) ? null :
- new AbstractMap.SimpleImmutableEntry<K,V>(e);
+ new AbstractMap.SimpleImmutableEntry<>(e);
}
/**
* Return key for entry, or null if null
*/
@@ -2404,11 +2404,11 @@
} else { // use stream
key = (K) str.readObject();
value = (defaultVal != null ? defaultVal : (V) str.readObject());
}
- Entry<K,V> middle = new Entry<K,V>(key, value, null);
+ Entry<K,V> middle = new Entry<>(key, value, null);
// color nodes in non-full bottommost level red
if (level == redLevel)
middle.color = RED;