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

Comparing jsr166/src/main/java/util/Queue.java (file contents):
Revision 1.17 by dl, Fri Sep 12 15:38:26 2003 UTC vs.
Revision 1.24 by dl, Sun Dec 26 20:13:57 2004 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3 < * Expert Group and released to the public domain. Use, modify, and
4 < * redistribute this code in any way without acknowledgement.
3 > * Expert Group and released to the public domain, as explained at
4 > * http://creativecommons.org/licenses/publicdomain
5   */
6  
7   package java.util;
8  
9   /**
10   * A collection designed for holding elements prior to processing.
11 < * Besides basic {@link java.util.Collection Collection} operations, queues provide
12 < * additional insertion, extraction, and inspection operations.
11 > * Besides basic {@link java.util.Collection Collection} operations,
12 > * queues provide additional insertion, extraction, and inspection
13 > * operations.  Each of these methods exists in two forms: one throws
14 > * an exception if the operation fails, the other returns a special
15 > * value (either <tt>null</tt> or <tt>false</tt>, depending on the
16 > * operation).  The latter form of the insert operation is designed
17 > * specifically for use with capacity-restricted <tt>Queue</tt>
18 > * implementations; in most implementations, insert operations cannot
19 > * fail.
20 > *
21 > * <table BORDER CELLPADDING=3 CELLSPACING=1>
22 > *  <tr>
23 > *    <td></td>
24 > *    <td ALIGN=CENTER><em>Throws exception</em></td>
25 > *    <td ALIGN=CENTER><em>Returns special value</em></td>
26 > *  </tr>
27 > *  <tr>
28 > *    <td><b>Insert</b></td>
29 > *    <td>{@link #add add(e)}</td>
30 > *    <td>{@link #offer offer(e)}</td>
31 > *  </tr>
32 > *  <tr>
33 > *    <td><b>Remove</b></td>
34 > *    <td>{@link #remove remove()}</td>
35 > *    <td>{@link #poll poll()}</td>
36 > *  </tr>
37 > *  <tr>
38 > *    <td><b>Examine</b></td>
39 > *    <td>{@link #element element()}</td>
40 > *    <td>{@link #peek peek()}</td>
41 > *  </tr>
42 > * </table>
43   *
44   * <p>Queues typically, but do not necessarily, order elements in a
45   * FIFO (first-in-first-out) manner.  Among the exceptions are
# Line 79 | Line 109 | package java.util;
109   * @see java.util.concurrent.PriorityBlockingQueue
110   * @since 1.5
111   * @author Doug Lea
112 + * @param <E> the type of elements held in this collection
113   */
114   public interface Queue<E> extends Collection<E> {
115  
116      /**
117 <     * Inserts the specified element to this queue, if possible.  When
117 >     * Inserts the specified element into this queue, if possible.  When
118       * using queues that may impose insertion restrictions (for
119       * example capacity bounds), method <tt>offer</tt> is generally
120       * preferable to method {@link Collection#add}, which can fail to
# Line 96 | Line 127 | public interface Queue<E> extends Collec
127      boolean offer(E o);
128  
129      /**
130 <     * Retrieves and removes the head of this queue, if it is available.
130 >     * Retrieves and removes the head of this queue, or <tt>null</tt>
131 >     * if this queue is empty.
132       *
133       * @return the head of this queue, or <tt>null</tt> if this
134       *         queue is empty.
# Line 104 | Line 136 | public interface Queue<E> extends Collec
136      E poll();
137  
138      /**
139 <     * Retrieves and removes the head of this queue.
140 <     * This method differs
141 <     * from the <tt>poll</tt> method in that it throws an exception if this
110 <     * queue is empty.
139 >     * Retrieves and removes the head of this queue.  This method
140 >     * differs from the <tt>poll</tt> method in that it throws an
141 >     * exception if this queue is empty.
142       *
143       * @return the head of this queue.
144       * @throws NoSuchElementException if this queue is empty.
# Line 115 | Line 146 | public interface Queue<E> extends Collec
146      E remove();
147  
148      /**
149 <     * Retrieves, but does not remove, the head of this queue.
150 <     * This method differs from the <tt>poll</tt>
120 <     * method only in that this method does not remove the head element from
121 <     * this queue.
149 >     * Retrieves, but does not remove, the head of this queue,
150 >     * returning <tt>null</tt> if this queue is empty.
151       *
152 <     * @return the head of this queue, or <tt>null</tt> if this queue is empty.
152 >     * @return the head of this queue, or <tt>null</tt> if this queue
153 >     * is empty.
154       */
155      E peek();
156  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines