jdk-sandbox: comparison jdk/src/java.base/share/classes/java/util/Deque.java

equal deleted inserted replaced

-:299a81977f48
+:b27c76b82713
 * Framework</a>.
 *
 * @author Doug Lea
 * @author Josh Bloch
 * @since  1.6
-* @param <E> the type of elements held in this collection
+* @param <E> the type of elements held in this deque
 */
 public interface Deque<E> extends Queue<E> {
 /**
 * Inserts the specified element at the front of this deque if it is
 * possible to do so immediately without violating capacity restrictions,
 /**
 * Removes the first occurrence of the specified element from this deque.
 * If the deque does not contain the element, it is unchanged.
 * More formally, removes the first element {@code e} such that
-* <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>
+* {@code Objects.equals(o, e)} (if such an element exists).
-* (if such an element exists).
 * Returns {@code true} if this deque contained the specified element
 * (or equivalently, if this deque changed as a result of the call).
 *
 * @param o element to be removed from this deque, if present
 * @return {@code true} if an element was removed as a result of this call
 * @throws ClassCastException if the class of the specified element
 *         is incompatible with this deque
-* (<a href="Collection.html#optional-restrictions">optional</a>)
+* (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
 * @throws NullPointerException if the specified element is null and this
 *         deque does not permit null elements
-* (<a href="Collection.html#optional-restrictions">optional</a>)
+* (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
 */
 boolean removeFirstOccurrence(Object o);
 /**
 * Removes the last occurrence of the specified element from this deque.
 * If the deque does not contain the element, it is unchanged.
 * More formally, removes the last element {@code e} such that
-* <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>
+* {@code Objects.equals(o, e)} (if such an element exists).
-* (if such an element exists).
 * Returns {@code true} if this deque contained the specified element
 * (or equivalently, if this deque changed as a result of the call).
 *
 * @param o element to be removed from this deque, if present
 * @return {@code true} if an element was removed as a result of this call
 * @throws ClassCastException if the class of the specified element
 *         is incompatible with this deque
-* (<a href="Collection.html#optional-restrictions">optional</a>)
+* (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
 * @throws NullPointerException if the specified element is null and this
 *         deque does not permit null elements
-* (<a href="Collection.html#optional-restrictions">optional</a>)
+* (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
 */
 boolean removeLastOccurrence(Object o);
 // *** Queue methods ***
 /**
 * Removes the first occurrence of the specified element from this deque.
 * If the deque does not contain the element, it is unchanged.
 * More formally, removes the first element {@code e} such that
-* <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>
+* {@code Objects.equals(o, e)} (if such an element exists).
-* (if such an element exists).
 * Returns {@code true} if this deque contained the specified element
 * (or equivalently, if this deque changed as a result of the call).
 *
 * <p>This method is equivalent to {@link #removeFirstOccurrence(Object)}.
 *
 * @param o element to be removed from this deque, if present
 * @return {@code true} if an element was removed as a result of this call
 * @throws ClassCastException if the class of the specified element
 *         is incompatible with this deque
-* (<a href="Collection.html#optional-restrictions">optional</a>)
+* (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
 * @throws NullPointerException if the specified element is null and this
 *         deque does not permit null elements
-* (<a href="Collection.html#optional-restrictions">optional</a>)
+* (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
 */
 boolean remove(Object o);
 /**
 * Returns {@code true} if this deque contains the specified element.
 * More formally, returns {@code true} if and only if this deque contains
-* at least one element {@code e} such that
+* at least one element {@code e} such that {@code Objects.equals(o, e)}.
-* <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>.
 *
 * @param o element whose presence in this deque is to be tested
 * @return {@code true} if this deque contains the specified element
-* @throws ClassCastException if the type of the specified element
+* @throws ClassCastException if the class of the specified element
 *         is incompatible with this deque
-* (<a href="Collection.html#optional-restrictions">optional</a>)
+* (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
 * @throws NullPointerException if the specified element is null and this
 *         deque does not permit null elements
-* (<a href="Collection.html#optional-restrictions">optional</a>)
+* (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
 */
 boolean contains(Object o);
 /**
 * Returns the number of elements in this deque.
 *
 * @return the number of elements in this deque
 */
-public int size();
+int size();
 /**
 * Returns an iterator over the elements in this deque in proper sequence.
 * The elements will be returned in order from first (head) to last (tail).
 *

changeset 32991	b27c76b82713
parent 25859	3317bb8137f4
child 36955	737dcba2ba50