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.26 by dl, Sat Jul 20 18:00:11 2013 UTC vs.
Revision 1.29 by jsr166, Sun Nov 23 18:46:47 2014 UTC

# Line 27 | Line 27 | package java.util;
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>
# Line 71 | Line 70 | package java.util;
70   * inherited from the {@code Queue} interface are precisely equivalent to
71   * {@code Deque} methods as indicated in the following table:
72   *
74 – * <p>
73   * <table BORDER CELLPADDING=3 CELLSPACING=1>
74   * <caption>Comparison of Queue and Deque methods</caption>
75   *  <tr>
# Line 110 | Line 108 | package java.util;
108   * beginning of the deque.  Stack methods are precisely equivalent to
109   * {@code Deque} methods as indicated in the table below:
110   *
113 – * <p>
111   * <table BORDER CELLPADDING=3 CELLSPACING=1>
112   * <caption>Comparison of Stack and Deque methods</caption>
113   *  <tr>
# Line 318 | 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>
322 <     * (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       *
322       * @param o element to be removed from this deque, if present
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 (optional)
326 <     * @throws NullPointerException if the specified element is null and this
327 <     *         deque does not permit null elements (optional)
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  
# Line 336 | Line 333 | public interface Deque<E> extends Queue<
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 <     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>
340 <     * (if such an element exists).
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 {@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 (optional)
344 <     * @throws NullPointerException if the specified element is null and this
345 <     *         deque does not permit null elements (optional)
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  
# Line 491 | Line 488 | public interface Deque<E> extends Queue<
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 <     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>
495 <     * (if such an element exists).
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       *
# Line 501 | Line 497 | public interface Deque<E> extends Queue<
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 (optional)
501 <     * @throws NullPointerException if the specified element is null and this
502 <     *         deque does not permit null elements (optional)
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
514 <     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>.
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 type of the specified element
515 <     *         is incompatible with this deque (optional)
516 <     * @throws NullPointerException if the specified element is null and this
517 <     *         deque does not permit null elements (optional)
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  

Diff Legend

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