ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/main/java/util/PriorityQueue.java
(Generate patch)

Comparing jsr166/src/main/java/util/PriorityQueue.java (file contents):
Revision 1.103 by jsr166, Wed Dec 31 09:37:20 2014 UTC vs.
Revision 1.109 by jsr166, Wed Jun 1 16:08:04 2016 UTC

# Line 1 | Line 1
1   /*
2 < * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
2 > * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
3   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4   *
5   * This code is free software; you can redistribute it and/or modify it
# Line 99 | Line 99 | public class PriorityQueue<E> extends Ab
99      /**
100       * The number of elements in the priority queue.
101       */
102 <    private int size;
102 >    int size;
103  
104      /**
105       * The comparator, or null if priority queue uses elements'
# Line 111 | Line 111 | public class PriorityQueue<E> extends Ab
111       * The number of times this priority queue has been
112       * <i>structurally modified</i>.  See AbstractList for gory details.
113       */
114 <    transient int modCount = 0; // non-private to simplify nested class access
114 >    transient int modCount;     // non-private to simplify nested class access
115  
116      /**
117       * Creates a {@code PriorityQueue} with the default initial
# Line 136 | Line 136 | public class PriorityQueue<E> extends Ab
136      }
137  
138      /**
139 +     * Creates a {@code PriorityQueue} with the default initial capacity and
140 +     * whose elements are ordered according to the specified comparator.
141 +     *
142 +     * @param  comparator the comparator that will be used to order this
143 +     *         priority queue.  If {@code null}, the {@linkplain Comparable
144 +     *         natural ordering} of the elements will be used.
145 +     * @since 1.8
146 +     */
147 +    public PriorityQueue(Comparator<? super E> comparator) {
148 +        this(DEFAULT_INITIAL_CAPACITY, comparator);
149 +    }
150 +
151 +    /**
152       * Creates a {@code PriorityQueue} with the specified initial capacity
153       * that orders its elements according to the specified comparator.
154       *
# Line 245 | Line 258 | public class PriorityQueue<E> extends Ab
258              a = Arrays.copyOf(a, a.length, Object[].class);
259          int len = a.length;
260          if (len == 1 || this.comparator != null)
261 <            for (int i = 0; i < len; i++)
262 <                if (a[i] == null)
261 >            for (Object e : a)
262 >                if (e == null)
263                      throw new NullPointerException();
264          this.queue = a;
265          this.size = a.length;
# Line 324 | Line 337 | public class PriorityQueue<E> extends Ab
337          int i = size;
338          if (i >= queue.length)
339              grow(i + 1);
340 +        siftUp(i, e);
341          size = i + 1;
328 –        if (i == 0)
329 –            queue[0] = e;
330 –        else
331 –            siftUp(i, e);
342          return true;
343      }
344  
# Line 435 | Line 445 | public class PriorityQueue<E> extends Ab
445       * The following code can be used to dump the queue into a newly
446       * allocated array of {@code String}:
447       *
448 <     *  <pre> {@code String[] y = x.toArray(new String[0]);}</pre>
448 >     * <pre> {@code String[] y = x.toArray(new String[0]);}</pre>
449       *
450       * Note that {@code toArray(new Object[0])} is identical in function to
451       * {@code toArray()}.
# Line 596 | Line 606 | public class PriorityQueue<E> extends Ab
606       * avoid missing traversing elements.
607       */
608      @SuppressWarnings("unchecked")
609 <    private E removeAt(int i) {
609 >    E removeAt(int i) {
610          // assert i >= 0 && i < size;
611          modCount++;
612          int s = --size;
# Line 786 | Line 796 | public class PriorityQueue<E> extends Ab
796          heapify();
797      }
798  
789 –    public Spliterator<E> spliterator() {
790 –        return new PriorityQueueSpliterator<E>(this, 0, -1, 0);
791 –    }
792 –
799      /**
800 <     * This is very similar to ArrayList Spliterator, except for extra
801 <     * null checks.
800 >     * Creates a <em><a href="Spliterator.html#binding">late-binding</a></em>
801 >     * and <em>fail-fast</em> {@link Spliterator} over the elements in this
802 >     * queue.
803 >     *
804 >     * <p>The {@code Spliterator} reports {@link Spliterator#SIZED},
805 >     * {@link Spliterator#SUBSIZED}, and {@link Spliterator#NONNULL}.
806 >     * Overriding implementations should document the reporting of additional
807 >     * characteristic values.
808 >     *
809 >     * @return a {@code Spliterator} over the elements in this queue
810 >     * @since 1.8
811       */
812 +    public final Spliterator<E> spliterator() {
813 +        return new PriorityQueueSpliterator<>(this, 0, -1, 0);
814 +    }
815 +
816      static final class PriorityQueueSpliterator<E> implements Spliterator<E> {
817 +        /*
818 +         * This is very similar to ArrayList Spliterator, except for
819 +         * extra null checks.
820 +         */
821          private final PriorityQueue<E> pq;
822          private int index;            // current index, modified on advance/split
823          private int fence;            // -1 until first use
824          private int expectedModCount; // initialized when fence set
825  
826 <        /** Creates new spliterator covering the given range */
826 >        /** Creates new spliterator covering the given range. */
827          PriorityQueueSpliterator(PriorityQueue<E> pq, int origin, int fence,
828 <                             int expectedModCount) {
828 >                                 int expectedModCount) {
829              this.pq = pq;
830              this.index = origin;
831              this.fence = fence;
# Line 818 | Line 841 | public class PriorityQueue<E> extends Ab
841              return hi;
842          }
843  
844 <        public Spliterator<E> trySplit() {
844 >        public PriorityQueueSpliterator<E> trySplit() {
845              int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
846              return (lo >= mid) ? null :
847 <                new PriorityQueueSpliterator<E>(pq, lo, index = mid,
848 <                                                expectedModCount);
847 >                new PriorityQueueSpliterator<>(pq, lo, index = mid,
848 >                                               expectedModCount);
849          }
850  
851          @SuppressWarnings("unchecked")
# Line 856 | Line 879 | public class PriorityQueue<E> extends Ab
879          }
880  
881          public boolean tryAdvance(Consumer<? super E> action) {
882 +            if (action == null)
883 +                throw new NullPointerException();
884              int hi = getFence(), lo = index;
885              if (lo >= 0 && lo < hi) {
886                  index = lo + 1;

Diff Legend

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