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.28 by jsr166, Tue Nov 12 23:23:05 2013 UTC vs.
Revision 1.34 by jsr166, Tue Mar 22 15:27:58 2016 UTC

# Line 145 | Line 145 | package java.util;
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   * {@code null} is used as a special return value by various methods
148 < * to indicated that the deque is empty.
148 > * to indicate that the deque is empty.
149   *
150   * <p>{@code Deque} implementations generally do not define
151   * element-based versions of the {@code equals} and {@code hashCode}
# Line 159 | Line 159 | package java.util;
159   * @author Doug Lea
160   * @author Josh Bloch
161   * @since  1.6
162 < * @param <E> the type of elements held in this collection
162 > * @param <E> the type of elements held in this deque
163   */
164   public interface Deque<E> extends Queue<E> {
165      /**
# Line 315 | Line 315 | public interface Deque<E> extends Queue<
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 <     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>
319 <     * (if such an element exists).
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       *
# Line 324 | Line 323 | public interface Deque<E> extends Queue<
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>)
326 >     * (<a href="{@docRoot}/../api/java/util/Collection.html#optional-restrictions">optional</a>)
327 >     * @throws NullPointerException if the specified element is null and this
328 >     *         deque does not permit null elements
329 >     * (<a href="{@docRoot}/../api/java/util/Collection.html#optional-restrictions">optional</a>)
330       */
331      boolean removeFirstOccurrence(Object o);
332  
# Line 334 | Line 334 | public interface Deque<E> extends Queue<
334       * Removes the last occurrence of the specified element from this deque.
335       * If the deque does not contain the element, it is unchanged.
336       * More formally, removes the last element {@code e} such that
337 <     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>
338 <     * (if such an element exists).
337 >     * {@code Objects.equals(o, e)} (if such an element exists).
338       * Returns {@code true} if this deque contained the specified element
339       * (or equivalently, if this deque changed as a result of the call).
340       *
# Line 343 | Line 342 | public interface Deque<E> extends Queue<
342       * @return {@code true} if an element was removed as a result of this call
343       * @throws ClassCastException if the class of the specified element
344       *         is incompatible with this deque
345 <     *         (<a href="../Collection.html#optional-restrictions">optional</a>)
346 <     * @throws NullPointerException if the specified element is null
347 <     *         (<a href="../Collection.html#optional-restrictions">optional</a>)
345 >     * (<a href="{@docRoot}/../api/java/util/Collection.html#optional-restrictions">optional</a>)
346 >     * @throws NullPointerException if the specified element is null and this
347 >     *         deque does not permit null elements
348 >     * (<a href="{@docRoot}/../api/java/util/Collection.html#optional-restrictions">optional</a>)
349       */
350      boolean removeLastOccurrence(Object o);
351  
# Line 490 | Line 490 | public interface Deque<E> extends Queue<
490       * Removes the first occurrence of the specified element from this deque.
491       * If the deque does not contain the element, it is unchanged.
492       * More formally, removes the first element {@code e} such that
493 <     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>
494 <     * (if such an element exists).
493 >     * {@code Objects.equals(o, e)} (if such an element exists).
494       * Returns {@code true} if this deque contained the specified element
495       * (or equivalently, if this deque changed as a result of the call).
496       *
# Line 501 | Line 500 | public interface Deque<E> extends Queue<
500       * @return {@code true} if an element was removed as a result of this call
501       * @throws ClassCastException if the class of the specified element
502       *         is incompatible with this deque
503 <     *         (<a href="../Collection.html#optional-restrictions">optional</a>)
504 <     * @throws NullPointerException if the specified element is null
505 <     *         (<a href="../Collection.html#optional-restrictions">optional</a>)
503 >     * (<a href="{@docRoot}/../api/java/util/Collection.html#optional-restrictions">optional</a>)
504 >     * @throws NullPointerException if the specified element is null and this
505 >     *         deque does not permit null elements
506 >     * (<a href="{@docRoot}/../api/java/util/Collection.html#optional-restrictions">optional</a>)
507       */
508      boolean remove(Object o);
509  
510      /**
511       * Returns {@code true} if this deque contains the specified element.
512       * More formally, returns {@code true} if and only if this deque contains
513 <     * at least one element {@code e} such that
514 <     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>.
513 >     * at least one element {@code e} such that {@code Objects.equals(o, e)}.
514       *
515       * @param o element whose presence in this deque is to be tested
516       * @return {@code true} if this deque contains the specified element
517       * @throws ClassCastException if the class of the specified element
518       *         is incompatible with this deque
519 <     *         (<a href="../Collection.html#optional-restrictions">optional</a>)
520 <     * @throws NullPointerException if the specified element is null
521 <     *         (<a href="../Collection.html#optional-restrictions">optional</a>)
519 >     * (<a href="{@docRoot}/../api/java/util/Collection.html#optional-restrictions">optional</a>)
520 >     * @throws NullPointerException if the specified element is null and this
521 >     *         deque does not permit null elements
522 >     * (<a href="{@docRoot}/../api/java/util/Collection.html#optional-restrictions">optional</a>)
523       */
524      boolean contains(Object o);
525  
# Line 528 | Line 528 | public interface Deque<E> extends Queue<
528       *
529       * @return the number of elements in this deque
530       */
531 <    public int size();
531 >    int size();
532  
533      /**
534       * Returns an iterator over the elements in this deque in proper sequence.

Diff Legend

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