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.86 by dl, Tue Jan 22 19:28:05 2013 UTC vs.
Revision 1.87 by dl, Fri Feb 1 01:02:25 2013 UTC

# Line 27 | Line 27 | package java.util;
27   import java.util.stream.Stream;
28   import java.util.Spliterator;
29   import java.util.stream.Streams;
30 < import java.util.function.Block;
30 > import java.util.function.Consumer;
31  
32   /**
33   * An unbounded priority {@linkplain Queue queue} based on a priority heap.
# Line 64 | Line 64 | import java.util.function.Block;
64   * Multiple threads should not access a {@code PriorityQueue}
65   * instance concurrently if any of the threads modifies the queue.
66   * Instead, use the thread-safe {@link
67 < * java.util.concurrent.PriorityBlockingQueue} class.
67 > * java.util.concurrent.PriorityConsumeringQueue} class.
68   *
69   * <p>Implementation note: this implementation provides
70   * O(log(n)) time for the enqueing and dequeing methods
# Line 823 | Line 823 | public class PriorityQueue<E> extends Ab
823                                                  expectedModCount);
824          }
825  
826 <        public void forEach(Block<? super E> block) {
826 >        public void forEach(Consumer<? super E> block) {
827              Object[] a; int i, hi; // hoist accesses and checks from loop
828              if (block == null)
829                  throw new NullPointerException();
# Line 839 | Line 839 | public class PriorityQueue<E> extends Ab
839              }
840          }
841  
842 <        public boolean tryAdvance(Block<? super E> block) {
842 >        public boolean tryAdvance(Consumer<? super E> block) {
843              if (index >= 0 && index < fence) {
844                  @SuppressWarnings("unchecked") E e =
845                      (E)pq.queue[index++];

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines