--- jsr166/src/jsr166x/LinkedBlockingDeque.java	2009/11/24 03:57:04	1.4
+++ jsr166/src/jsr166x/LinkedBlockingDeque.java	2012/12/29 23:55:19	1.13
@@ -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;
@@ -14,7 +14,7 @@ import java.util.concurrent.locks.*;
  * An optionally-bounded {@linkplain BlockingDeque blocking deque} based on
  * linked nodes.
  *
- * <p> The optional capacity bound constructor argument serves as a
+ * <p>The optional capacity bound constructor argument serves as a
  * way to prevent excessive expansion. The capacity, if unspecified,
  * is equal to {@link Integer#MAX_VALUE}.  Linked nodes are
  * dynamically created upon each insertion unless this would bring the
@@ -39,7 +39,7 @@ import java.util.concurrent.locks.*;
  */
 public class LinkedBlockingDeque<E>
     extends AbstractQueue<E>
-    implements BlockingDeque<E>,  java.io.Serializable {
+    implements BlockingDeque<E>, java.io.Serializable {
 
     /*
      * Implemented as a simple doubly-linked list protected by a
@@ -149,7 +149,7 @@ public class LinkedBlockingDeque<E>
     }
 
     /**
-     * Remove and return first element, or null if empty
+     * Removes and returns first element, or null if empty.
      */
     private E unlinkFirst() {
         Node<E> f = first;
@@ -167,7 +167,7 @@ public class LinkedBlockingDeque<E>
     }
 
     /**
-     * Remove and return last element, or null if empty
+     * Removes and returns last element, or null if empty.
      */
     private E unlinkLast() {
         Node<E> l = last;
@@ -434,8 +434,8 @@ public class LinkedBlockingDeque<E>
 
     // 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)
@@ -444,7 +444,7 @@ public class LinkedBlockingDeque<E>
     /**
      * Returns the number of elements in this deque.
      *
-     * @return  the number of elements in this deque.
+     * @return  the number of elements in this deque
      */
     public int size() {
         lock.lock();
@@ -524,7 +524,7 @@ public class LinkedBlockingDeque<E>
      * Variant of removeFirstOccurrence needed by iterator.remove.
      * Searches for the node, not its contents.
      */
-   boolean removeNode(Node<E> e) {
+    boolean removeNode(Node<E> e) {
         lock.lock();
         try {
             for (Node<E> p = first; p != null; p = p.next) {
@@ -647,7 +647,7 @@ public class LinkedBlockingDeque<E>
      * construction of the iterator, and may (but is not guaranteed to)
      * reflect any modifications subsequent to construction.
      *
-     * @return an iterator over the elements in this deque in proper sequence.
+     * @return an iterator over the elements in this deque in proper sequence
      */
     public Iterator<E> iterator() {
         return new Itr();
@@ -664,7 +664,7 @@ public class LinkedBlockingDeque<E>
          * an element exists in hasNext(), we must return item read
          * under lock (in advance()) even if it was in the process of
          * being removed when hasNext() was called.
-         **/
+         */
         private E nextItem;
 
         /**
@@ -684,8 +684,8 @@ public class LinkedBlockingDeque<E>
             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<E>
     }
 
     /**
-     * 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
      * <tt>Object</tt>) in the proper order, followed by a null
@@ -740,8 +740,8 @@ public class LinkedBlockingDeque<E>
     }
 
     /**
-     * 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)