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

Comparing jsr166/src/jdk7/java/util/Queue.java (file contents):
Revision 1.1 by dl, Sun Dec 16 20:55:09 2012 UTC vs.
Revision 1.2 by jsr166, Wed Jan 16 01:39:37 2013 UTC

# Line 12 | Line 12 | package java.util;
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
15 > * value (either {@code null} or {@code false}, depending on the
16   * operation).  The latter form of the insert operation is designed
17 < * specifically for use with capacity-restricted <tt>Queue</tt>
17 > * specifically for use with capacity-restricted {@code Queue}
18   * implementations; in most implementations, insert operations cannot
19   * fail.
20   *
# Line 51 | Line 51 | package java.util;
51   * element which would be removed by a call to {@link #remove() } or
52   * {@link #poll()}.  In a FIFO queue, all new elements are inserted at
53   * the <em>tail</em> of the queue. Other kinds of queues may use
54 < * different placement rules.  Every <tt>Queue</tt> implementation
54 > * different placement rules.  Every {@code Queue} implementation
55   * must specify its ordering properties.
56   *
57   * <p>The {@link #offer offer} method inserts an element if possible,
58 < * otherwise returning <tt>false</tt>.  This differs from the {@link
58 > * otherwise returning {@code false}.  This differs from the {@link
59   * java.util.Collection#add Collection.add} method, which can fail to
60   * add an element only by throwing an unchecked exception.  The
61 < * <tt>offer</tt> method is designed for use when failure is a normal,
61 > * {@code offer} method is designed for use when failure is a normal,
62   * rather than exceptional occurrence, for example, in fixed-capacity
63   * (or &quot;bounded&quot;) queues.
64   *
# Line 66 | Line 66 | package java.util;
66   * return the head of the queue.
67   * Exactly which element is removed from the queue is a
68   * function of the queue's ordering policy, which differs from
69 < * implementation to implementation. The <tt>remove()</tt> and
70 < * <tt>poll()</tt> methods differ only in their behavior when the
71 < * queue is empty: the <tt>remove()</tt> method throws an exception,
72 < * while the <tt>poll()</tt> method returns <tt>null</tt>.
69 > * implementation to implementation. The {@code remove()} and
70 > * {@code poll()} methods differ only in their behavior when the
71 > * queue is empty: the {@code remove()} method throws an exception,
72 > * while the {@code poll()} method returns {@code null}.
73   *
74   * <p>The {@link #element()} and {@link #peek()} methods return, but do
75   * not remove, the head of the queue.
76   *
77 < * <p>The <tt>Queue</tt> interface does not define the <i>blocking queue
77 > * <p>The {@code Queue} interface does not define the <i>blocking queue
78   * methods</i>, which are common in concurrent programming.  These methods,
79   * which wait for elements to appear or for space to become available, are
80   * defined in the {@link java.util.concurrent.BlockingQueue} interface, which
81   * extends this interface.
82   *
83 < * <p><tt>Queue</tt> implementations generally do not allow insertion
84 < * of <tt>null</tt> elements, although some implementations, such as
85 < * {@link LinkedList}, do not prohibit insertion of <tt>null</tt>.
86 < * Even in the implementations that permit it, <tt>null</tt> should
87 < * not be inserted into a <tt>Queue</tt>, as <tt>null</tt> is also
88 < * used as a special return value by the <tt>poll</tt> method to
83 > * <p>{@code Queue} implementations generally do not allow insertion
84 > * of {@code null} elements, although some implementations, such as
85 > * {@link LinkedList}, do not prohibit insertion of {@code null}.
86 > * Even in the implementations that permit it, {@code null} should
87 > * not be inserted into a {@code Queue}, as {@code null} is also
88 > * used as a special return value by the {@code poll} method to
89   * indicate that the queue contains no elements.
90   *
91 < * <p><tt>Queue</tt> implementations generally do not define
92 < * element-based versions of methods <tt>equals</tt> and
93 < * <tt>hashCode</tt> but instead inherit the identity based versions
94 < * from class <tt>Object</tt>, because element-based equality is not
91 > * <p>{@code Queue} implementations generally do not define
92 > * element-based versions of methods {@code equals} and
93 > * {@code hashCode} but instead inherit the identity based versions
94 > * from class {@code Object}, because element-based equality is not
95   * always well-defined for queues with the same elements but different
96   * ordering properties.
97   *
# Line 116 | Line 116 | public interface Queue<E> extends Collec
116      /**
117       * Inserts the specified element into this queue if it is possible to do so
118       * immediately without violating capacity restrictions, returning
119 <     * <tt>true</tt> upon success and throwing an <tt>IllegalStateException</tt>
119 >     * {@code true} upon success and throwing an {@code IllegalStateException}
120       * if no space is currently available.
121       *
122       * @param e the element to add
123 <     * @return <tt>true</tt> (as specified by {@link Collection#add})
123 >     * @return {@code true} (as specified by {@link Collection#add})
124       * @throws IllegalStateException if the element cannot be added at this
125       *         time due to capacity restrictions
126       * @throws ClassCastException if the class of the specified element
# Line 140 | Line 140 | public interface Queue<E> extends Collec
140       * by throwing an exception.
141       *
142       * @param e the element to add
143 <     * @return <tt>true</tt> if the element was added to this queue, else
144 <     *         <tt>false</tt>
143 >     * @return {@code true} if the element was added to this queue, else
144 >     *         {@code false}
145       * @throws ClassCastException if the class of the specified element
146       *         prevents it from being added to this queue
147       * @throws NullPointerException if the specified element is null and
# Line 163 | Line 163 | public interface Queue<E> extends Collec
163  
164      /**
165       * Retrieves and removes the head of this queue,
166 <     * or returns <tt>null</tt> if this queue is empty.
166 >     * or returns {@code null} if this queue is empty.
167       *
168 <     * @return the head of this queue, or <tt>null</tt> if this queue is empty
168 >     * @return the head of this queue, or {@code null} if this queue is empty
169       */
170      E poll();
171  
# Line 181 | Line 181 | public interface Queue<E> extends Collec
181  
182      /**
183       * Retrieves, but does not remove, the head of this queue,
184 <     * or returns <tt>null</tt> if this queue is empty.
184 >     * or returns {@code null} if this queue is empty.
185       *
186 <     * @return the head of this queue, or <tt>null</tt> if this queue is empty
186 >     * @return the head of this queue, or {@code null} if this queue is empty
187       */
188      E peek();
189   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines