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

rev 3186 : 6880112: Project Coin: Port JDK core library code to use diamond operator

*** 136,146 ****
       * @param comparator the comparator that will be used to order this set.
       *        If {@code null}, the {@linkplain Comparable natural
       *        ordering} of the elements will be used.
       */
      public TreeSet(Comparator<? super E> comparator) {
!         this(new TreeMap<E,Object>(comparator));
      }
  
      /**
       * Constructs a new tree set containing the elements in the specified
       * collection, sorted according to the <i>natural ordering</i> of its
--- 136,146 ----
       * @param comparator the comparator that will be used to order this set.
       *        If {@code null}, the {@linkplain Comparable natural
       *        ordering} of the elements will be used.
       */
      public TreeSet(Comparator<? super E> comparator) {
!         this(new TreeMap<>(comparator));
      }
  
      /**
       * Constructs a new tree set containing the elements in the specified
       * collection, sorted according to the <i>natural ordering</i> of its
*** 193,203 ****
  
      /**
       * @since 1.6
       */
      public NavigableSet<E> descendingSet() {
!         return new TreeSet<E>(m.descendingMap());
      }
  
      /**
       * Returns the number of elements in this set (its cardinality).
       *
--- 193,203 ----
  
      /**
       * @since 1.6
       */
      public NavigableSet<E> descendingSet() {
!         return new TreeSet<>(m.descendingMap());
      }
  
      /**
       * Returns the number of elements in this set (its cardinality).
       *
*** 320,330 ****
       * @throws IllegalArgumentException {@inheritDoc}
       * @since 1.6
       */
      public NavigableSet<E> subSet(E fromElement, boolean fromInclusive,
                                    E toElement,   boolean toInclusive) {
!         return new TreeSet<E>(m.subMap(fromElement, fromInclusive,
                                         toElement,   toInclusive));
      }
  
      /**
       * @throws ClassCastException {@inheritDoc}
--- 320,330 ----
       * @throws IllegalArgumentException {@inheritDoc}
       * @since 1.6
       */
      public NavigableSet<E> subSet(E fromElement, boolean fromInclusive,
                                    E toElement,   boolean toInclusive) {
!         return new TreeSet<>(m.subMap(fromElement, fromInclusive,
                                         toElement,   toInclusive));
      }
  
      /**
       * @throws ClassCastException {@inheritDoc}
*** 333,343 ****
       *         not permit null elements
       * @throws IllegalArgumentException {@inheritDoc}
       * @since 1.6
       */
      public NavigableSet<E> headSet(E toElement, boolean inclusive) {
!         return new TreeSet<E>(m.headMap(toElement, inclusive));
      }
  
      /**
       * @throws ClassCastException {@inheritDoc}
       * @throws NullPointerException if {@code fromElement} is null and
--- 333,343 ----
       *         not permit null elements
       * @throws IllegalArgumentException {@inheritDoc}
       * @since 1.6
       */
      public NavigableSet<E> headSet(E toElement, boolean inclusive) {
!         return new TreeSet<>(m.headMap(toElement, inclusive));
      }
  
      /**
       * @throws ClassCastException {@inheritDoc}
       * @throws NullPointerException if {@code fromElement} is null and
*** 345,355 ****
       *         not permit null elements
       * @throws IllegalArgumentException {@inheritDoc}
       * @since 1.6
       */
      public NavigableSet<E> tailSet(E fromElement, boolean inclusive) {
!         return new TreeSet<E>(m.tailMap(fromElement, inclusive));
      }
  
      /**
       * @throws ClassCastException {@inheritDoc}
       * @throws NullPointerException if {@code fromElement} or
--- 345,355 ----
       *         not permit null elements
       * @throws IllegalArgumentException {@inheritDoc}
       * @since 1.6
       */
      public NavigableSet<E> tailSet(E fromElement, boolean inclusive) {
!         return new TreeSet<>(m.tailMap(fromElement, inclusive));
      }
  
      /**
       * @throws ClassCastException {@inheritDoc}
       * @throws NullPointerException if {@code fromElement} or
*** 475,485 ****
              clone = (TreeSet<E>) super.clone();
          } catch (CloneNotSupportedException e) {
              throw new InternalError();
          }
  
!         clone.m = new TreeMap<E,Object>(m);
          return clone;
      }
  
      /**
       * Save the state of the {@code TreeSet} instance to a stream (that is,
--- 475,485 ----
              clone = (TreeSet<E>) super.clone();
          } catch (CloneNotSupportedException e) {
              throw new InternalError();
          }
  
!         clone.m = new TreeMap<>(m);
          return clone;
      }
  
      /**
       * Save the state of the {@code TreeSet} instance to a stream (that is,
*** 522,534 ****
          Comparator<? super E> c = (Comparator<? super E>) s.readObject();
  
          // Create backing TreeMap
          TreeMap<E,Object> tm;
          if (c==null)
!             tm = new TreeMap<E,Object>();
          else
!             tm = new TreeMap<E,Object>(c);
          m = tm;
  
          // Read in size
          int size = s.readInt();
  
--- 522,534 ----
          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();