src/share/classes/java/util/TreeSet.java

rev 4788 : Fix bunch of generics warnings

*** 300,310 ****
          if (m.size()==0 && c.size() > 0 &&
              c instanceof SortedSet &&
              m instanceof TreeMap) {
              SortedSet<? extends E> set = (SortedSet<? extends E>) c;
              TreeMap<E,Object> map = (TreeMap<E, Object>) m;
!             Comparator<? super E> cc = (Comparator<? super E>) set.comparator();
              Comparator<? super E> mc = map.comparator();
              if (cc==mc || (cc != null && cc.equals(mc))) {
                  map.addAllForTreeSet(set, PRESENT);
                  return true;
              }
--- 300,310 ----
          if (m.size()==0 && c.size() > 0 &&
              c instanceof SortedSet &&
              m instanceof TreeMap) {
              SortedSet<? extends E> set = (SortedSet<? extends E>) c;
              TreeMap<E,Object> map = (TreeMap<E, Object>) m;
!             Comparator<?> cc = set.comparator();
              Comparator<? super E> mc = map.comparator();
              if (cc==mc || (cc != null && cc.equals(mc))) {
                  map.addAllForTreeSet(set, PRESENT);
                  return true;
              }
*** 467,478 ****
       * Returns a shallow copy of this {@code TreeSet} instance. (The elements
       * themselves are not cloned.)
       *
       * @return a shallow copy of this set
       */
      public Object clone() {
!         TreeSet<E> clone = null;
          try {
              clone = (TreeSet<E>) super.clone();
          } catch (CloneNotSupportedException e) {
              throw new InternalError(e);
          }
--- 467,479 ----
       * Returns a shallow copy of this {@code TreeSet} instance. (The elements
       * themselves are not cloned.)
       *
       * @return a shallow copy of this set
       */
+     @SuppressWarnings("unchecked")
      public Object clone() {
!         TreeSet<E> clone;
          try {
              clone = (TreeSet<E>) super.clone();
          } catch (CloneNotSupportedException e) {
              throw new InternalError(e);
          }
*** 517,534 ****
          throws java.io.IOException, ClassNotFoundException {
          // Read in any hidden stuff
          s.defaultReadObject();
  
          // Read in Comparator
          Comparator<? super E> c = (Comparator<? super E>) s.readObject();
  
          // Create backing TreeMap
!         TreeMap<E,Object> tm;
!         if (c==null)
!             tm = new TreeMap<>();
!         else
!             tm = new TreeMap<>(c);
          m = tm;
  
          // Read in size
          int size = s.readInt();
  
--- 518,532 ----
          throws java.io.IOException, ClassNotFoundException {
          // Read in any hidden stuff
          s.defaultReadObject();
  
          // Read in Comparator
+         @SuppressWarnings("unchecked")
              Comparator<? super E> c = (Comparator<? super E>) s.readObject();
  
          // Create backing TreeMap
!         TreeMap<E,Object> tm = new TreeMap<>(c);
          m = tm;
  
          // Read in size
          int size = s.readInt();