--- jsr166/src/jsr166x/LinkedBlockingDeque.java 2009/11/24 03:57:04 1.4 +++ jsr166/src/jsr166x/LinkedBlockingDeque.java 2012/02/21 01:54:03 1.10 @@ -1,7 +1,7 @@ /* * Written by Doug Lea with assistance from members of JCP JSR-166 * Expert Group and released to the public domain, as explained at - * http://creativecommons.org/licenses/publicdomain + * http://creativecommons.org/publicdomain/zero/1.0/ */ package jsr166x; @@ -39,7 +39,7 @@ import java.util.concurrent.locks.*; */ public class LinkedBlockingDeque extends AbstractQueue - implements BlockingDeque, java.io.Serializable { + implements BlockingDeque, java.io.Serializable { /* * Implemented as a simple doubly-linked list protected by a @@ -149,7 +149,7 @@ public class LinkedBlockingDeque } /** - * Remove and return first element, or null if empty + * Removes and returns first element, or null if empty. */ private E unlinkFirst() { Node f = first; @@ -167,7 +167,7 @@ public class LinkedBlockingDeque } /** - * Remove and return last element, or null if empty + * Removes and returns last element, or null if empty. */ private E unlinkLast() { Node l = last; @@ -434,8 +434,8 @@ public class LinkedBlockingDeque // BlockingQueue methods - public void put(E o) throws InterruptedException { putLast(o); } - public E take() throws InterruptedException { return takeFirst(); } + public void put(E o) throws InterruptedException { putLast(o); } + public E take() throws InterruptedException { return takeFirst(); } public boolean offer(E o, long timeout, TimeUnit unit) throws InterruptedException { return offerLast(o, timeout, unit); } public E poll(long timeout, TimeUnit unit) @@ -524,7 +524,7 @@ public class LinkedBlockingDeque * Variant of removeFirstOccurrence needed by iterator.remove. * Searches for the node, not its contents. */ - boolean removeNode(Node e) { + boolean removeNode(Node e) { lock.lock(); try { for (Node p = first; p != null; p = p.next) { @@ -684,8 +684,8 @@ public class LinkedBlockingDeque final ReentrantLock lock = LinkedBlockingDeque.this.lock; lock.lock(); try { - next = (next == null)? first : next.next; - nextItem = (next == null)? null : next.item; + next = (next == null) ? first : next.next; + nextItem = (next == null) ? null : next.item; } finally { lock.unlock(); } @@ -717,7 +717,7 @@ public class LinkedBlockingDeque } /** - * Save the state to a stream (that is, serialize it). + * Saves the state to a stream (that is, serializes it). * * @serialData The capacity (int), followed by elements (each an * Object) in the proper order, followed by a null @@ -740,8 +740,8 @@ public class LinkedBlockingDeque } /** - * Reconstitute this deque instance from a stream (that is, - * deserialize it). + * Reconstitutes this deque instance from a stream (that is, + * deserializes it). * @param s the stream */ private void readObject(java.io.ObjectInputStream s)