--- jsr166/src/main/java/util/Queue.java 2003/06/08 00:44:20 1.5 +++ jsr166/src/main/java/util/Queue.java 2003/06/23 02:26:15 1.6 @@ -10,7 +10,7 @@ package java.util; * A Collection designed for holding elements prior to processing. * Besides basic {@link Collection} operations, queues provide * additional insertion, extraction, and inspection operations. - * +0 * *

Queues typically, but do not necessarily, order elements in a * FIFO (first-in-first-out) manner. Among the exceptions are * priority queues, which order elements according to a supplied @@ -30,7 +30,7 @@ package java.util; * Exactly which element is removed from the queue is a function * of the queue's ordering policy, which differs from implementation * to implementation. Possible orderings include (but are not limited - * to) first-in-first-out (FIFO), element priority, and arbitrary. + * to) first-in-first-out (FIFO), last-in-first-out (LIFO), element priority, and arbitrary. * The remove() and poll() methods differ only in their * behavior when the queue is empty: the remove() method throws an * exception, while the poll() method returns null. @@ -46,8 +46,10 @@ package java.util; * extends this interface. * *

Queue implementations generally do not allow insertion of - * null elements. Even in the few implementations that permit it, - * it is a bad idea, as null is also used as a special return value + * null elements, although some implementations, such as + * {@link LinkedList}, do not prohibit insertion of null. + * Even in the implementations that permit it, null should not be inserted into + * a Queue, as null is also used as a special return value * by the poll method to indicate that the queue contains no * elements. * @@ -58,7 +60,7 @@ package java.util; * @see Collection * @see LinkedList * @see PriorityQueue - * @see LinkedQueue + * @see java.util.concurrent.LinkedQueue * @see java.util.concurrent.BlockingQueue * @see java.util.concurrent.ArrayBlockingQueue * @see java.util.concurrent.LinkedBlockingQueue