--- a/jdk/src/share/classes/java/util/Collections.java Tue Sep 11 19:58:36 2012 +0400
+++ b/jdk/src/share/classes/java/util/Collections.java Fri Aug 31 13:42:47 2012 -0700
@@ -213,7 +213,7 @@
* @throws IllegalArgumentException (optional) if the comparator is
* found to violate the {@link Comparator} contract
*/
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings({"unchecked", "rawtypes"})
public static <T> void sort(List<T> list, Comparator<? super T> c) {
Object[] a = list.toArray();
Arrays.sort(a, (Comparator)c);
@@ -418,7 +418,7 @@
* @throws UnsupportedOperationException if the specified list or
* its list-iterator does not support the <tt>set</tt> operation.
*/
- @SuppressWarnings({ "rawtypes", "unchecked" })
+ @SuppressWarnings({"rawtypes", "unchecked"})
public static void reverse(List<?> list) {
int size = list.size();
if (size < REVERSE_THRESHOLD || list instanceof RandomAccess) {
@@ -497,7 +497,7 @@
* @throws UnsupportedOperationException if the specified list or its
* list-iterator does not support the <tt>set</tt> operation.
*/
- @SuppressWarnings({ "rawtypes", "unchecked" })
+ @SuppressWarnings({"rawtypes", "unchecked"})
public static void shuffle(List<?> list, Random rnd) {
int size = list.size();
if (size < SHUFFLE_THRESHOLD || list instanceof RandomAccess) {
@@ -535,7 +535,7 @@
* || j < 0 || j >= list.size()).
* @since 1.4
*/
- @SuppressWarnings({ "rawtypes", "unchecked" })
+ @SuppressWarnings({"rawtypes", "unchecked"})
public static void swap(List<?> list, int i, int j) {
// instead of using a raw type here, it's possible to capture
// the wildcard but it will require a call to a supplementary
@@ -669,7 +669,7 @@
* @throws NoSuchElementException if the collection is empty.
* @see Comparable
*/
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings({"unchecked", "rawtypes"})
public static <T> T min(Collection<? extends T> coll, Comparator<? super T> comp) {
if (comp==null)
return (T)min((Collection) coll);
@@ -740,7 +740,7 @@
* @throws NoSuchElementException if the collection is empty.
* @see Comparable
*/
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings({"unchecked", "rawtypes"})
public static <T> T max(Collection<? extends T> coll, Comparator<? super T> comp) {
if (comp==null)
return (T)max((Collection) coll);
@@ -1403,7 +1403,7 @@
extends UnmodifiableSet<Map.Entry<K,V>> {
private static final long serialVersionUID = 7854390611657943733L;
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings({"unchecked", "rawtypes"})
UnmodifiableEntrySet(Set<? extends Map.Entry<? extends K, ? extends V>> s) {
// Need to cast to raw in order to work around a limitation in the type system
super((Set)s);
@@ -3172,7 +3172,7 @@
*
* @see #emptySet()
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public static final Set EMPTY_SET = new EmptySet<>();
/**
@@ -3271,10 +3271,13 @@
return new EmptySortedSet<>();
}
- public Comparator comparator() {
+ @Override
+ public Comparator<? super E> comparator() {
return null;
}
+ @Override
+ @SuppressWarnings("unchecked")
public SortedSet<E> subSet(Object fromElement, Object toElement) {
Objects.requireNonNull(fromElement);
Objects.requireNonNull(toElement);
@@ -3294,6 +3297,7 @@
return emptySortedSet();
}
+ @Override
public SortedSet<E> headSet(Object toElement) {
Objects.requireNonNull(toElement);
@@ -3304,6 +3308,7 @@
return emptySortedSet();
}
+ @Override
public SortedSet<E> tailSet(Object fromElement) {
Objects.requireNonNull(fromElement);
@@ -3314,10 +3319,12 @@
return emptySortedSet();
}
+ @Override
public E first() {
throw new NoSuchElementException();
}
+ @Override
public E last() {
throw new NoSuchElementException();
}
@@ -3328,7 +3335,7 @@
*
* @see #emptyList()
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public static final List EMPTY_LIST = new EmptyList<>();
/**
@@ -3402,7 +3409,7 @@
* @see #emptyMap()
* @since 1.3
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public static final Map EMPTY_MAP = new EmptyMap<>();
/**
@@ -3685,6 +3692,7 @@
return a;
}
+ @SuppressWarnings("unchecked")
public <T> T[] toArray(T[] a) {
final int n = this.n;
if (a.length < n) {
@@ -3731,6 +3739,7 @@
* the <tt>Comparable</tt> interface.
* @see Comparable
*/
+ @SuppressWarnings("unchecked")
public static <T> Comparator<T> reverseOrder() {
return (Comparator<T>) ReverseComparator.REVERSE_ORDER;
}