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.84 by jsr166, Sat Jan 19 18:11:56 2013 UTC vs.
Revision 1.86 by dl, Tue Jan 22 19:28:05 2013 UTC

# Line 453 | Line 453 | public class PriorityQueue<E> extends Ab
453       */
454      @SuppressWarnings("unchecked")
455      public <T> T[] toArray(T[] a) {
456 +        final int size = this.size;
457          if (a.length < size)
458              // Make a new array of a's runtime type, but my contents:
459              return (T[]) Arrays.copyOf(queue, size, a.getClass());
# Line 802 | Line 803 | public class PriorityQueue<E> extends Ab
803      }
804  
805      /** Index-based split-by-two Spliterator */
806 <    static final class PriorityQueueSpliterator<E>
806 <        implements Spliterator<E>, Iterator<E> {
806 >    static final class PriorityQueueSpliterator<E> implements Spliterator<E> {
807          private final PriorityQueue<E> pq;
808          private int index;           // current index, modified on advance/split
809          private final int fence;     // one past last index
# Line 820 | Line 820 | public class PriorityQueue<E> extends Ab
820              int lo = index, mid = (lo + fence) >>> 1;
821              return (lo >= mid) ? null :
822                  new PriorityQueueSpliterator<E>(pq, lo, index = mid,
823 <                                            expectedModCount);
823 >                                                expectedModCount);
824          }
825  
826          public void forEach(Block<? super E> block) {
# Line 841 | Line 841 | public class PriorityQueue<E> extends Ab
841  
842          public boolean tryAdvance(Block<? super E> block) {
843              if (index >= 0 && index < fence) {
844 –                if (pq.modCount != expectedModCount)
845 –                    throw new ConcurrentModificationException();
844                  @SuppressWarnings("unchecked") E e =
845                      (E)pq.queue[index++];
846                  block.accept(e);
847 +                if (pq.modCount != expectedModCount)
848 +                    throw new ConcurrentModificationException();
849                  return true;
850              }
851              return false;
# Line 854 | Line 854 | public class PriorityQueue<E> extends Ab
854          public long estimateSize() { return (long)(fence - index); }
855          public boolean hasExactSize() { return true; }
856          public boolean hasExactSplits() { return true; }
857 –
858 –        // Iterator support
859 –        public Iterator<E> iterator() { return this; }
860 –        public void remove() { throw new UnsupportedOperationException(); }
861 –        public boolean hasNext() { return index >= 0 && index < fence; }
862 –
863 –        public E next() {
864 –            if (index < 0 || index >= fence)
865 –                throw new NoSuchElementException();
866 –            if (pq.modCount != expectedModCount)
867 –                throw new ConcurrentModificationException();
868 –            @SuppressWarnings("unchecked") E e =
869 –                (E) pq.queue[index++];
870 –            return e;
871 –        }
857      }
858   }

Diff Legend

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