--- jsr166/src/main/java/util/Deque.java 2014/12/31 22:40:51 1.31 +++ jsr166/src/main/java/util/Deque.java 2016/03/22 15:27:58 1.34 @@ -145,7 +145,7 @@ package java.util; * that do allow null elements are strongly encouraged not to * take advantage of the ability to insert nulls. This is so because * {@code null} is used as a special return value by various methods - * to indicated that the deque is empty. + * to indicate that the deque is empty. * *

{@code Deque} implementations generally do not define * element-based versions of the {@code equals} and {@code hashCode} @@ -323,9 +323,10 @@ public interface Deque extends Queue< * @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 - * (optional) - * @throws NullPointerException if the specified element is null - * (optional) + * (optional) + * @throws NullPointerException if the specified element is null and this + * deque does not permit null elements + * (optional) */ boolean removeFirstOccurrence(Object o); @@ -341,9 +342,10 @@ public interface Deque extends Queue< * @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 - * (optional) - * @throws NullPointerException if the specified element is null - * (optional) + * (optional) + * @throws NullPointerException if the specified element is null and this + * deque does not permit null elements + * (optional) */ boolean removeLastOccurrence(Object o); @@ -498,9 +500,10 @@ public interface Deque extends Queue< * @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 - * (optional) - * @throws NullPointerException if the specified element is null - * (optional) + * (optional) + * @throws NullPointerException if the specified element is null and this + * deque does not permit null elements + * (optional) */ boolean remove(Object o); @@ -513,9 +516,10 @@ public interface Deque extends Queue< * @return {@code true} if this deque contains the specified element * @throws ClassCastException if the class of the specified element * is incompatible with this deque - * (optional) - * @throws NullPointerException if the specified element is null - * (optional) + * (optional) + * @throws NullPointerException if the specified element is null and this + * deque does not permit null elements + * (optional) */ boolean contains(Object o);