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.76 by jsr166, Fri Dec 2 14:37:32 2011 UTC vs.
Revision 1.79 by jsr166, Sat Dec 15 22:26:29 2012 UTC

# Line 56 | Line 56 | package java.util;
56   * the priority queue in any particular order. If you need ordered
57   * traversal, consider using {@code Arrays.sort(pq.toArray())}.
58   *
59 < * <p> <strong>Note that this implementation is not synchronized.</strong>
59 > * <p><strong>Note that this implementation is not synchronized.</strong>
60   * Multiple threads should not access a {@code PriorityQueue}
61   * instance concurrently if any of the threads modifies the queue.
62   * Instead, use the thread-safe {@link
63   * java.util.concurrent.PriorityBlockingQueue} class.
64   *
65   * <p>Implementation note: this implementation provides
66 < * O(log(n)) time for the enqueing and dequeing methods
66 > * O(log(n)) time for the enqueuing and dequeuing methods
67   * ({@code offer}, {@code poll}, {@code remove()} and {@code add});
68   * linear time for the {@code remove(Object)} and {@code contains(Object)}
69   * methods; and constant time for the retrieval methods
# Line 725 | Line 725 | public class PriorityQueue<E> extends Ab
725      }
726  
727      /**
728 <     * Saves the state of the instance to a stream (that
729 <     * is, serializes it).
728 >     * Saves this queue to a stream (that is, serializes it).
729       *
730       * @serialData The length of the array backing the instance is
731       *             emitted (int), followed by all of its elements
732       *             (each an {@code Object}) in the proper order.
734 –     * @param s the stream
733       */
734      private void writeObject(java.io.ObjectOutputStream s)
735          throws java.io.IOException {
# Line 747 | Line 745 | public class PriorityQueue<E> extends Ab
745      }
746  
747      /**
748 <     * Reconstitutes the {@code PriorityQueue} instance from a stream
751 <     * (that is, deserializes it).
752 <     *
753 <     * @param s the stream
748 >     * Reconstitutes this queue from a stream (that is, deserializes it).
749       */
750      private void readObject(java.io.ObjectInputStream s)
751          throws java.io.IOException, ClassNotFoundException {

Diff Legend

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