--- jsr166/src/main/java/util/Queue.java 2003/09/12 15:38:26 1.17 +++ jsr166/src/main/java/util/Queue.java 2003/09/13 18:51:06 1.18 @@ -96,7 +96,8 @@ public interface Queue extends Collec boolean offer(E o); /** - * Retrieves and removes the head of this queue, if it is available. + * Retrieves and removes the head of this queue, or null + * if this queue is empty. * * @return the head of this queue, or null if this * queue is empty. @@ -104,10 +105,9 @@ public interface Queue extends Collec E poll(); /** - * Retrieves and removes the head of this queue. - * This method differs - * from the poll method in that it throws an exception if this - * queue is empty. + * Retrieves and removes the head of this queue. This method + * differs from the poll method in that it throws an + * exception if this queue is empty. * * @return the head of this queue. * @throws NoSuchElementException if this queue is empty. @@ -115,12 +115,11 @@ public interface Queue extends Collec E remove(); /** - * Retrieves, but does not remove, the head of this queue. - * This method differs from the poll - * method only in that this method does not remove the head element from - * this queue. + * Retrieves, but does not remove, the head of this queue, + * returning null if this queue is empty. * - * @return the head of this queue, or null if this queue is empty. + * @return the head of this queue, or null if this queue + * is empty. */ E peek();