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

Comparing jsr166/src/main/java/util/Deque.java (file contents):
Revision 1.7 by jsr166, Mon May 2 17:34:02 2005 UTC vs.
Revision 1.29 by jsr166, Sun Nov 23 18:46:47 2014 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea and Josh Bloch with assistance from members of
3   * JCP JSR-166 Expert Group and released to the public domain, as explained
4 < * at http://creativecommons.org/licenses/publicdomain
4 > * at http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7   package java.util;
# Line 9 | Line 9 | package java.util;
9   /**
10   * A linear collection that supports element insertion and removal at
11   * both ends.  The name <i>deque</i> is short for "double ended queue"
12 < * and is usually pronounced "deck".  Most <tt>Deque</tt>
12 > * and is usually pronounced "deck".  Most {@code Deque}
13   * implementations place no fixed limits on the number of elements
14   * they may contain, but this interface supports capacity-restricted
15   * deques as well as those with no fixed size limit.
# Line 18 | Line 18 | package java.util;
18   * ends of the deque.  Methods are provided to insert, remove, and
19   * examine the element.  Each of these methods exists in two forms:
20   * one throws an exception if the operation fails, the other returns a
21 < * special value (either <tt>null</tt> or <tt>false</tt>, depending on
21 > * special value (either {@code null} or {@code false}, depending on
22   * the operation).  The latter form of the insert operation is
23   * designed specifically for use with capacity-restricted
24 < * <tt>Deque</tt> implementations; in most implementations, insert
24 > * {@code Deque} implementations; in most implementations, insert
25   * operations cannot fail.
26   *
27   * <p>The twelve methods described above are summarized in the
28   * following table:
29   *
30 * <p>
30   * <table BORDER CELLPADDING=3 CELLSPACING=1>
31 + * <caption>Summary of Deque methods</caption>
32   *  <tr>
33   *    <td></td>
34   *    <td ALIGN=CENTER COLSPAN = 2> <b>First Element (Head)</b></td>
# Line 37 | Line 37 | package java.util;
37   *  <tr>
38   *    <td></td>
39   *    <td ALIGN=CENTER><em>Throws exception</em></td>
40 < *    <td ALIGN=CENTER><em>Returns special value</em></td>
40 > *    <td ALIGN=CENTER><em>Special value</em></td>
41   *    <td ALIGN=CENTER><em>Throws exception</em></td>
42 < *    <td ALIGN=CENTER><em>Returns special value</em></td>
42 > *    <td ALIGN=CENTER><em>Special value</em></td>
43   *  </tr>
44   *  <tr>
45   *    <td><b>Insert</b></td>
46 < *    <td>{@link #addFirst addFirst(e)}</td>
47 < *    <td>{@link #offerFirst offerFirst(e)}</td>
48 < *    <td>{@link #addLast addLast(e)}</td>
49 < *    <td>{@link #offerLast offerLast(e)}</td>
46 > *    <td>{@link Deque#addFirst addFirst(e)}</td>
47 > *    <td>{@link Deque#offerFirst offerFirst(e)}</td>
48 > *    <td>{@link Deque#addLast addLast(e)}</td>
49 > *    <td>{@link Deque#offerLast offerLast(e)}</td>
50   *  </tr>
51   *  <tr>
52   *    <td><b>Remove</b></td>
53 < *    <td>{@link #removeFirst removeFirst()}</td>
54 < *    <td>{@link #pollFirst pollFirst()}</td>
55 < *    <td>{@link #removeLast removeLast()}</td>
56 < *    <td>{@link #pollLast pollLast()}</td>
53 > *    <td>{@link Deque#removeFirst removeFirst()}</td>
54 > *    <td>{@link Deque#pollFirst pollFirst()}</td>
55 > *    <td>{@link Deque#removeLast removeLast()}</td>
56 > *    <td>{@link Deque#pollLast pollLast()}</td>
57   *  </tr>
58   *  <tr>
59   *    <td><b>Examine</b></td>
60 < *    <td>{@link #getFirst getFirst()}</td>
61 < *    <td>{@link #peekFirst peekFirst()}</td>
62 < *    <td>{@link #getLast getLast()}</td>
63 < *    <td>{@link #peekLast peekLast()}</td>
60 > *    <td>{@link Deque#getFirst getFirst()}</td>
61 > *    <td>{@link Deque#peekFirst peekFirst()}</td>
62 > *    <td>{@link Deque#getLast getLast()}</td>
63 > *    <td>{@link Deque#peekLast peekLast()}</td>
64   *  </tr>
65   * </table>
66   *
67   * <p>This interface extends the {@link Queue} interface.  When a deque is
68   * used as a queue, FIFO (First-In-First-Out) behavior results.  Elements are
69   * added at the end of the deque and removed from the beginning.  The methods
70 < * inherited from the <tt>Queue</tt> interface are precisely equivalent to
71 < * <tt>Deque</tt> methods as indicated in the following table:
70 > * inherited from the {@code Queue} interface are precisely equivalent to
71 > * {@code Deque} methods as indicated in the following table:
72   *
73 * <p>
73   * <table BORDER CELLPADDING=3 CELLSPACING=1>
74 + * <caption>Comparison of Queue and Deque methods</caption>
75   *  <tr>
76 < *    <td ALIGN=CENTER> <b><tt>Queue</tt> Method</b></td>
77 < *    <td ALIGN=CENTER> <b>Equivalent <tt>Deque</tt> Method</b></td>
78 < *  </tr>
79 < *  <tr>
80 < *    <td>{@link java.util.Queue#offer offer(e)}</td>
81 < *    <td>{@link #offerLast offerLast(e)}</td>
76 > *    <td ALIGN=CENTER> <b>{@code Queue} Method</b></td>
77 > *    <td ALIGN=CENTER> <b>Equivalent {@code Deque} Method</b></td>
78   *  </tr>
79   *  <tr>
80   *    <td>{@link java.util.Queue#add add(e)}</td>
81   *    <td>{@link #addLast addLast(e)}</td>
82   *  </tr>
83   *  <tr>
84 < *    <td>{@link java.util.Queue#poll poll()}</td>
85 < *    <td>{@link #pollFirst pollFirst()}</td>
84 > *    <td>{@link java.util.Queue#offer offer(e)}</td>
85 > *    <td>{@link #offerLast offerLast(e)}</td>
86   *  </tr>
87   *  <tr>
88   *    <td>{@link java.util.Queue#remove remove()}</td>
89   *    <td>{@link #removeFirst removeFirst()}</td>
90   *  </tr>
91   *  <tr>
92 < *    <td>{@link java.util.Queue#peek peek()}</td>
93 < *    <td>{@link #peek peekFirst()}</td>
92 > *    <td>{@link java.util.Queue#poll poll()}</td>
93 > *    <td>{@link #pollFirst pollFirst()}</td>
94   *  </tr>
95   *  <tr>
96   *    <td>{@link java.util.Queue#element element()}</td>
97   *    <td>{@link #getFirst getFirst()}</td>
98   *  </tr>
99 + *  <tr>
100 + *    <td>{@link java.util.Queue#peek peek()}</td>
101 + *    <td>{@link #peek peekFirst()}</td>
102 + *  </tr>
103   * </table>
104   *
105   * <p>Deques can also be used as LIFO (Last-In-First-Out) stacks.  This
106   * interface should be used in preference to the legacy {@link Stack} class.
107   * When a deque is used as a stack, elements are pushed and popped from the
108   * beginning of the deque.  Stack methods are precisely equivalent to
109 < * <tt>Deque</tt> methods as indicated in the table below:
109 > * {@code Deque} methods as indicated in the table below:
110   *
111 * <p>
111   * <table BORDER CELLPADDING=3 CELLSPACING=1>
112 + * <caption>Comparison of Stack and Deque methods</caption>
113   *  <tr>
114   *    <td ALIGN=CENTER> <b>Stack Method</b></td>
115 < *    <td ALIGN=CENTER> <b>Equivalent <tt>Deque</tt> Method</b></td>
115 > *    <td ALIGN=CENTER> <b>Equivalent {@code Deque} Method</b></td>
116   *  </tr>
117   *  <tr>
118   *    <td>{@link #push push(e)}</td>
# Line 134 | Line 134 | package java.util;
134   *
135   * <p>This interface provides two methods to remove interior
136   * elements, {@link #removeFirstOccurrence removeFirstOccurrence} and
137 < * {@link #removeLastOccurrence removeLastOccurrence}.  Unlike the
138 < * {@link List} interface, this interface does not provide support for
139 < * indexed access to elements.
137 > * {@link #removeLastOccurrence removeLastOccurrence}.
138 > *
139 > * <p>Unlike the {@link List} interface, this interface does not
140 > * provide support for indexed access to elements.
141   *
142 < * <p>While <tt>Deque</tt> implementations are not strictly required
142 > * <p>While {@code Deque} implementations are not strictly required
143   * to prohibit the insertion of null elements, they are strongly
144 < * encouraged to do so.  Users of any <tt>Deque</tt> implementations
144 > * encouraged to do so.  Users of any {@code Deque} implementations
145   * that do allow null elements are strongly encouraged <i>not</i> to
146   * take advantage of the ability to insert nulls.  This is so because
147 < * <tt>null</tt> is used as a special return value by various methods
147 > * {@code null} is used as a special return value by various methods
148   * to indicated that the deque is empty.
149   *
150 < * <p><tt>Deque</tt> implementations generally do not define
151 < * element-based versions of the <tt>equals</tt> and <tt>hashCode</tt>
150 > * <p>{@code Deque} implementations generally do not define
151 > * element-based versions of the {@code equals} and {@code hashCode}
152   * methods, but instead inherit the identity-based versions from class
153 < * <tt>Object</tt>.
153 > * {@code Object}.
154   *
155   * <p>This interface is a member of the <a
156 < * href="{@docRoot}/../guide/collections/index.html"> Java Collections
156 > * href="{@docRoot}/../technotes/guides/collections/index.html"> Java Collections
157   * Framework</a>.
158   *
159   * @author Doug Lea
# Line 160 | Line 161 | package java.util;
161   * @since  1.6
162   * @param <E> the type of elements held in this collection
163   */
163
164   public interface Deque<E> extends Queue<E> {
165      /**
166 +     * Inserts the specified element at the front of this deque if it is
167 +     * possible to do so immediately without violating capacity restrictions,
168 +     * throwing an {@code IllegalStateException} if no space is currently
169 +     * available.  When using a capacity-restricted deque, it is generally
170 +     * preferable to use method {@link #offerFirst}.
171 +     *
172 +     * @param e the element to add
173 +     * @throws IllegalStateException if the element cannot be added at this
174 +     *         time due to capacity restrictions
175 +     * @throws ClassCastException if the class of the specified element
176 +     *         prevents it from being added to this deque
177 +     * @throws NullPointerException if the specified element is null and this
178 +     *         deque does not permit null elements
179 +     * @throws IllegalArgumentException if some property of the specified
180 +     *         element prevents it from being added to this deque
181 +     */
182 +    void addFirst(E e);
183 +
184 +    /**
185 +     * Inserts the specified element at the end of this deque if it is
186 +     * possible to do so immediately without violating capacity restrictions,
187 +     * throwing an {@code IllegalStateException} if no space is currently
188 +     * available.  When using a capacity-restricted deque, it is generally
189 +     * preferable to use method {@link #offerLast}.
190 +     *
191 +     * <p>This method is equivalent to {@link #add}.
192 +     *
193 +     * @param e the element to add
194 +     * @throws IllegalStateException if the element cannot be added at this
195 +     *         time due to capacity restrictions
196 +     * @throws ClassCastException if the class of the specified element
197 +     *         prevents it from being added to this deque
198 +     * @throws NullPointerException if the specified element is null and this
199 +     *         deque does not permit null elements
200 +     * @throws IllegalArgumentException if some property of the specified
201 +     *         element prevents it from being added to this deque
202 +     */
203 +    void addLast(E e);
204 +
205 +    /**
206       * Inserts the specified element at the front of this deque unless it would
207       * violate capacity restrictions.  When using a capacity-restricted deque,
208 <     * this method is generally preferable to method <tt>addFirst</tt>, which
209 <     * can fail to insert an element only by throwing an exception.
208 >     * this method is generally preferable to the {@link #addFirst} method,
209 >     * which can fail to insert an element only by throwing an exception.
210       *
211 <     * @param e the element to insert
212 <     * @return <tt>true</tt> if it was possible to insert the element,
213 <     *     else <tt>false</tt>
211 >     * @param e the element to add
212 >     * @return {@code true} if the element was added to this deque, else
213 >     *         {@code false}
214 >     * @throws ClassCastException if the class of the specified element
215 >     *         prevents it from being added to this deque
216       * @throws NullPointerException if the specified element is null and this
217 <     *     deque does not permit null elements
217 >     *         deque does not permit null elements
218 >     * @throws IllegalArgumentException if some property of the specified
219 >     *         element prevents it from being added to this deque
220       */
221      boolean offerFirst(E e);
222  
223      /**
224       * Inserts the specified element at the end of this deque unless it would
225       * violate capacity restrictions.  When using a capacity-restricted deque,
226 <     * this method is generally preferable to method <tt>addLast</tt> which
227 <     * can fail to insert an element only by throwing an exception.
226 >     * this method is generally preferable to the {@link #addLast} method,
227 >     * which can fail to insert an element only by throwing an exception.
228       *
229 <     * @param e the element to insert
230 <     * @return <tt>true</tt> if it was possible to insert the element,
231 <     *     else <tt>false</tt>
229 >     * @param e the element to add
230 >     * @return {@code true} if the element was added to this deque, else
231 >     *         {@code false}
232 >     * @throws ClassCastException if the class of the specified element
233 >     *         prevents it from being added to this deque
234       * @throws NullPointerException if the specified element is null and this
235 <     *     deque does not permit null elements
235 >     *         deque does not permit null elements
236 >     * @throws IllegalArgumentException if some property of the specified
237 >     *         element prevents it from being added to this deque
238       */
239      boolean offerLast(E e);
240  
241      /**
242 <     * Inserts the specified element at the front of this deque unless it
243 <     * would violate capacity restrictions.
242 >     * Retrieves and removes the first element of this deque.  This method
243 >     * differs from {@link #pollFirst pollFirst} only in that it throws an
244 >     * exception if this deque is empty.
245       *
246 <     * @param e the element to insert
247 <     * @throws IllegalStateException if it was not possible to insert
199 <     *    the element due to capacity restrictions
200 <     * @throws NullPointerException if the specified element is null and this
201 <     *     deque does not permit null elements
246 >     * @return the head of this deque
247 >     * @throws NoSuchElementException if this deque is empty
248       */
249 <    void addFirst(E e);
249 >    E removeFirst();
250  
251      /**
252 <     * Inserts the specified element at the end of this deque unless it would
253 <     * violate capacity restrictions.
252 >     * Retrieves and removes the last element of this deque.  This method
253 >     * differs from {@link #pollLast pollLast} only in that it throws an
254 >     * exception if this deque is empty.
255       *
256 <     * @param e the element to insert
257 <     * @throws IllegalStateException if it was not possible to insert
211 <     *    the element due to capacity restrictions
212 <     * @throws NullPointerException if the specified element is null and this
213 <     *     deque does not permit null elements
256 >     * @return the tail of this deque
257 >     * @throws NoSuchElementException if this deque is empty
258       */
259 <    void addLast(E e);
259 >    E removeLast();
260  
261      /**
262 <     * Retrieves and removes the first element of this deque, or
263 <     * <tt>null</tt> if this deque is empty.
262 >     * Retrieves and removes the first element of this deque,
263 >     * or returns {@code null} if this deque is empty.
264       *
265 <     * @return the first element of this deque, or <tt>null</tt> if
222 <     *     this deque is empty
265 >     * @return the head of this deque, or {@code null} if this deque is empty
266       */
267      E pollFirst();
268  
269      /**
270 <     * Retrieves and removes the last element of this deque, or
271 <     * <tt>null</tt> if this deque is empty.
270 >     * Retrieves and removes the last element of this deque,
271 >     * or returns {@code null} if this deque is empty.
272       *
273 <     * @return the last element of this deque, or <tt>null</tt> if
231 <     *     this deque is empty
273 >     * @return the tail of this deque, or {@code null} if this deque is empty
274       */
275      E pollLast();
276  
277      /**
278 <     * Retrieves and removes the first element of this deque.  This method
279 <     * differs from the {@link #pollFirst} method only in that it throws an
280 <     * exception if this deque is empty.
278 >     * Retrieves, but does not remove, the first element of this deque.
279 >     *
280 >     * This method differs from {@link #peekFirst peekFirst} only in that it
281 >     * throws an exception if this deque is empty.
282       *
283 <     * @return the first element of this deque
283 >     * @return the head of this deque
284       * @throws NoSuchElementException if this deque is empty
285       */
286 <    E removeFirst();
286 >    E getFirst();
287  
288      /**
289 <     * Retrieves and removes the last element of this deque.  This method
290 <     * differs from the {@link #pollLast} method only in that it throws an
291 <     * exception if this deque is empty.
289 >     * Retrieves, but does not remove, the last element of this deque.
290 >     * This method differs from {@link #peekLast peekLast} only in that it
291 >     * throws an exception if this deque is empty.
292       *
293 <     * @return the last element of this deque
293 >     * @return the tail of this deque
294       * @throws NoSuchElementException if this deque is empty
295       */
296 <    E removeLast();
296 >    E getLast();
297  
298      /**
299       * Retrieves, but does not remove, the first element of this deque,
300 <     * returning <tt>null</tt> if this deque is empty.
300 >     * or returns {@code null} if this deque is empty.
301       *
302 <     * @return the first element of this deque, or <tt>null</tt> if
260 <     *     this deque is empty
302 >     * @return the head of this deque, or {@code null} if this deque is empty
303       */
304      E peekFirst();
305  
306      /**
307       * Retrieves, but does not remove, the last element of this deque,
308 <     * returning <tt>null</tt> if this deque is empty.
308 >     * or returns {@code null} if this deque is empty.
309       *
310 <     * @return the last element of this deque, or <tt>null</tt> if this deque
269 <     *     is empty
310 >     * @return the tail of this deque, or {@code null} if this deque is empty
311       */
312      E peekLast();
313  
314      /**
315 <     * Retrieves, but does not remove, the first element of this
316 <     * deque.  This method differs from the {@link #peekFirst} method only
317 <     * in that it throws an exception if this deque is empty.
318 <     *
319 <     * @return the first element of this deque
320 <     * @throws NoSuchElementException if this deque is empty
280 <     */
281 <    E getFirst();
282 <
283 <    /**
284 <     * Retrieves, but does not remove, the last element of this
285 <     * deque.  This method differs from the {@link #peekLast} method only
286 <     * in that it throws an exception if this deque is empty.
287 <     *
288 <     * @return the last element of this deque
289 <     * @throws NoSuchElementException if this deque is empty
290 <     */
291 <    E getLast();
292 <
293 <    /**
294 <     * Removes the first occurrence of the specified element in this
295 <     * deque.  If the deque does not contain the element, it is
296 <     * unchanged.  More formally, removes the first element <tt>e</tt>
297 <     * such that <tt>(o==null ? e==null : o.equals(e))</tt> (if
298 <     * such an element exists).
315 >     * Removes the first occurrence of the specified element from this deque.
316 >     * If the deque does not contain the element, it is unchanged.
317 >     * More formally, removes the first element {@code e} such that
318 >     * {@code Objects.equals(o, e)} (if such an element exists).
319 >     * Returns {@code true} if this deque contained the specified element
320 >     * (or equivalently, if this deque changed as a result of the call).
321       *
322       * @param o element to be removed from this deque, if present
323 <     * @return <tt>true</tt> if the deque contained the specified element
324 <     * @throws NullPointerException if the specified element is null and this
325 <     *     deque does not permit null elements
323 >     * @return {@code true} if an element was removed as a result of this call
324 >     * @throws ClassCastException if the class of the specified element
325 >     *         is incompatible with this deque
326 >     *         (<a href="../Collection.html#optional-restrictions">optional</a>)
327 >     * @throws NullPointerException if the specified element is null
328 >     *         (<a href="../Collection.html#optional-restrictions">optional</a>)
329       */
330      boolean removeFirstOccurrence(Object o);
331  
332      /**
333 <     * Removes the last occurrence of the specified element in this
334 <     * deque.  If the deque does not contain the element, it is
335 <     * unchanged.  More formally, removes the last element <tt>e</tt>
336 <     * such that <tt>(o==null ? e==null : o.equals(e))</tt> (if
337 <     * such an element exists).
333 >     * Removes the last occurrence of the specified element from this deque.
334 >     * If the deque does not contain the element, it is unchanged.
335 >     * More formally, removes the last element {@code e} such that
336 >     * {@code Objects.equals(o, e)} (if such an element exists).
337 >     * Returns {@code true} if this deque contained the specified element
338 >     * (or equivalently, if this deque changed as a result of the call).
339       *
340       * @param o element to be removed from this deque, if present
341 <     * @return <tt>true</tt> if the deque contained the specified element
342 <     * @throws NullPointerException if the specified element is null and this
343 <     *     deque does not permit null elements
341 >     * @return {@code true} if an element was removed as a result of this call
342 >     * @throws ClassCastException if the class of the specified element
343 >     *         is incompatible with this deque
344 >     *         (<a href="../Collection.html#optional-restrictions">optional</a>)
345 >     * @throws NullPointerException if the specified element is null
346 >     *         (<a href="../Collection.html#optional-restrictions">optional</a>)
347       */
348      boolean removeLastOccurrence(Object o);
349  
321
350      // *** Queue methods ***
351  
352      /**
353       * Inserts the specified element into the queue represented by this deque
354 <     * unless it would violate capacity restrictions.  In other words, inserts
355 <     * the specified element at the end of this deque.  When using a
356 <     * capacity-restricted deque, this method is generally preferable to the
357 <     * {@link #add} method, which can fail to insert an element only by
358 <     * throwing an exception.
359 <     *
332 <     * <p>This method is equivalent to {@link #offerLast}.
333 <     *
334 <     * @param e the element to insert
335 <     * @return <tt>true</tt> if it was possible to insert the element,
336 <     *     else <tt>false</tt>
337 <     * @throws NullPointerException if the specified element is null and this
338 <     *     deque does not permit null elements
339 <     */
340 <    boolean offer(E e);
341 <
342 <    /**
343 <     * Inserts the specified element into the queue represented by this
344 <     * deque unless it would violate capacity restrictions.  In other words,
345 <     * inserts the specified element as the last element of this deque.
354 >     * (in other words, at the tail of this deque) if it is possible to do so
355 >     * immediately without violating capacity restrictions, returning
356 >     * {@code true} upon success and throwing an
357 >     * {@code IllegalStateException} if no space is currently available.
358 >     * When using a capacity-restricted deque, it is generally preferable to
359 >     * use {@link #offer(Object) offer}.
360       *
361       * <p>This method is equivalent to {@link #addLast}.
362       *
363 <     * @param e the element to insert
364 <     * @return <tt>true</tt> (as per the spec for {@link Collection#add})
365 <     * @throws IllegalStateException if it was not possible to insert
366 <     *    the element due to capacity restrictions
363 >     * @param e the element to add
364 >     * @return {@code true} (as specified by {@link Collection#add})
365 >     * @throws IllegalStateException if the element cannot be added at this
366 >     *         time due to capacity restrictions
367 >     * @throws ClassCastException if the class of the specified element
368 >     *         prevents it from being added to this deque
369       * @throws NullPointerException if the specified element is null and this
370 <     *     deque does not permit null elements
370 >     *         deque does not permit null elements
371 >     * @throws IllegalArgumentException if some property of the specified
372 >     *         element prevents it from being added to this deque
373       */
374      boolean add(E e);
375  
376      /**
377 <     * Retrieves and removes the head of the queue represented by
378 <     * this deque, or <tt>null</tt> if this deque is empty.  In other words,
379 <     * retrieves and removes the first element of this deque, or <tt>null</tt>
380 <     * if this deque is empty.
377 >     * Inserts the specified element into the queue represented by this deque
378 >     * (in other words, at the tail of this deque) if it is possible to do so
379 >     * immediately without violating capacity restrictions, returning
380 >     * {@code true} upon success and {@code false} if no space is currently
381 >     * available.  When using a capacity-restricted deque, this method is
382 >     * generally preferable to the {@link #add} method, which can fail to
383 >     * insert an element only by throwing an exception.
384       *
385 <     * <p>This method is equivalent to {@link #pollFirst()}.
385 >     * <p>This method is equivalent to {@link #offerLast}.
386       *
387 <     * @return the first element of this deque, or <tt>null</tt> if
388 <     *     this deque is empty
387 >     * @param e the element to add
388 >     * @return {@code true} if the element was added to this deque, else
389 >     *         {@code false}
390 >     * @throws ClassCastException if the class of the specified element
391 >     *         prevents it from being added to this deque
392 >     * @throws NullPointerException if the specified element is null and this
393 >     *         deque does not permit null elements
394 >     * @throws IllegalArgumentException if some property of the specified
395 >     *         element prevents it from being added to this deque
396       */
397 <    E poll();
397 >    boolean offer(E e);
398  
399      /**
400 <     * Retrieves and removes the head of the queue represented by this deque.
401 <     * This method differs from the {@link #poll} method only in that it
402 <     * throws an exception if this deque is empty.
400 >     * Retrieves and removes the head of the queue represented by this deque
401 >     * (in other words, the first element of this deque).
402 >     * This method differs from {@link #poll poll} only in that it throws an
403 >     * exception if this deque is empty.
404       *
405       * <p>This method is equivalent to {@link #removeFirst()}.
406       *
# Line 381 | Line 410 | public interface Deque<E> extends Queue<
410      E remove();
411  
412      /**
413 <     * Retrieves, but does not remove, the head of the queue represented by
414 <     * this deque, returning <tt>null</tt> if this deque is empty.
413 >     * Retrieves and removes the head of the queue represented by this deque
414 >     * (in other words, the first element of this deque), or returns
415 >     * {@code null} if this deque is empty.
416       *
417 <     * <p>This method is equivalent to {@link #peekFirst()}.
417 >     * <p>This method is equivalent to {@link #pollFirst()}.
418       *
419 <     * @return the head of the queue represented by this deque, or
420 <     *     <tt>null</tt> if this deque is empty
419 >     * @return the first element of this deque, or {@code null} if
420 >     *         this deque is empty
421       */
422 <    E peek();
422 >    E poll();
423  
424      /**
425       * Retrieves, but does not remove, the head of the queue represented by
426 <     * this deque.  This method differs from the {@link #peek} method only in
427 <     * that it throws an exception if this deque is empty.
426 >     * this deque (in other words, the first element of this deque).
427 >     * This method differs from {@link #peek peek} only in that it throws an
428 >     * exception if this deque is empty.
429       *
430       * <p>This method is equivalent to {@link #getFirst()}.
431       *
# Line 403 | Line 434 | public interface Deque<E> extends Queue<
434       */
435      E element();
436  
437 +    /**
438 +     * Retrieves, but does not remove, the head of the queue represented by
439 +     * this deque (in other words, the first element of this deque), or
440 +     * returns {@code null} if this deque is empty.
441 +     *
442 +     * <p>This method is equivalent to {@link #peekFirst()}.
443 +     *
444 +     * @return the head of the queue represented by this deque, or
445 +     *         {@code null} if this deque is empty
446 +     */
447 +    E peek();
448 +
449  
450      // *** Stack methods ***
451  
452      /**
453 <     * Pushes an element onto the stack represented by this deque.  In other
454 <     * words, inserts the element at the front of this deque unless it would
455 <     * violate capacity restrictions.
453 >     * Pushes an element onto the stack represented by this deque (in other
454 >     * words, at the head of this deque) if it is possible to do so
455 >     * immediately without violating capacity restrictions, throwing an
456 >     * {@code IllegalStateException} if no space is currently available.
457       *
458       * <p>This method is equivalent to {@link #addFirst}.
459       *
460       * @param e the element to push
461 <     * @throws IllegalStateException if it was not possible to insert
462 <     *    the element due to capacity restrictions
461 >     * @throws IllegalStateException if the element cannot be added at this
462 >     *         time due to capacity restrictions
463 >     * @throws ClassCastException if the class of the specified element
464 >     *         prevents it from being added to this deque
465       * @throws NullPointerException if the specified element is null and this
466 <     *     deque does not permit null elements
466 >     *         deque does not permit null elements
467 >     * @throws IllegalArgumentException if some property of the specified
468 >     *         element prevents it from being added to this deque
469       */
470      void push(E e);
471  
# Line 428 | Line 476 | public interface Deque<E> extends Queue<
476       * <p>This method is equivalent to {@link #removeFirst()}.
477       *
478       * @return the element at the front of this deque (which is the top
479 <     *     of the stack represented by this deque)
479 >     *         of the stack represented by this deque)
480       * @throws NoSuchElementException if this deque is empty
481       */
482      E pop();
483  
484  
485 <    // *** Collection Method ***
485 >    // *** Collection methods ***
486  
487      /**
488 <     * Returns an iterator over the elements in this deque.  The elements
489 <     * will be ordered from first (head) to last (tail).
488 >     * Removes the first occurrence of the specified element from this deque.
489 >     * If the deque does not contain the element, it is unchanged.
490 >     * More formally, removes the first element {@code e} such that
491 >     * {@code Objects.equals(o, e)} (if such an element exists).
492 >     * Returns {@code true} if this deque contained the specified element
493 >     * (or equivalently, if this deque changed as a result of the call).
494       *
495 <     * @return an <tt>Iterator</tt> over the elements in this deque
495 >     * <p>This method is equivalent to {@link #removeFirstOccurrence(Object)}.
496 >     *
497 >     * @param o element to be removed from this deque, if present
498 >     * @return {@code true} if an element was removed as a result of this call
499 >     * @throws ClassCastException if the class of the specified element
500 >     *         is incompatible with this deque
501 >     *         (<a href="../Collection.html#optional-restrictions">optional</a>)
502 >     * @throws NullPointerException if the specified element is null
503 >     *         (<a href="../Collection.html#optional-restrictions">optional</a>)
504 >     */
505 >    boolean remove(Object o);
506 >
507 >    /**
508 >     * Returns {@code true} if this deque contains the specified element.
509 >     * More formally, returns {@code true} if and only if this deque contains
510 >     * at least one element {@code e} such that {@code Objects.equals(o, e)}.
511 >     *
512 >     * @param o element whose presence in this deque is to be tested
513 >     * @return {@code true} if this deque contains the specified element
514 >     * @throws ClassCastException if the class of the specified element
515 >     *         is incompatible with this deque
516 >     *         (<a href="../Collection.html#optional-restrictions">optional</a>)
517 >     * @throws NullPointerException if the specified element is null
518 >     *         (<a href="../Collection.html#optional-restrictions">optional</a>)
519 >     */
520 >    boolean contains(Object o);
521 >
522 >    /**
523 >     * Returns the number of elements in this deque.
524 >     *
525 >     * @return the number of elements in this deque
526 >     */
527 >    public int size();
528 >
529 >    /**
530 >     * Returns an iterator over the elements in this deque in proper sequence.
531 >     * The elements will be returned in order from first (head) to last (tail).
532 >     *
533 >     * @return an iterator over the elements in this deque in proper sequence
534       */
535      Iterator<E> iterator();
536 +
537 +    /**
538 +     * Returns an iterator over the elements in this deque in reverse
539 +     * sequential order.  The elements will be returned in order from
540 +     * last (tail) to first (head).
541 +     *
542 +     * @return an iterator over the elements in this deque in reverse
543 +     * sequence
544 +     */
545 +    Iterator<E> descendingIterator();
546 +
547   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines