ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/jsr166x/LinkedBlockingDeque.java
(Generate patch)

Comparing jsr166/src/jsr166x/LinkedBlockingDeque.java (file contents):
Revision 1.7 by jsr166, Thu Apr 14 23:16:10 2011 UTC vs.
Revision 1.9 by jsr166, Mon Dec 5 04:48:16 2011 UTC

# Line 39 | Line 39 | import java.util.concurrent.locks.*;
39   */
40   public class LinkedBlockingDeque<E>
41      extends AbstractQueue<E>
42 <    implements BlockingDeque<E>,  java.io.Serializable {
42 >    implements BlockingDeque<E>, java.io.Serializable {
43  
44      /*
45       * Implemented as a simple doubly-linked list protected by a
# Line 434 | Line 434 | public class LinkedBlockingDeque<E>
434  
435      // BlockingQueue methods
436  
437 <    public void put(E o) throws InterruptedException  { putLast(o);  }
438 <    public E take() throws InterruptedException       { return takeFirst(); }
437 >    public void put(E o) throws InterruptedException { putLast(o); }
438 >    public E take() throws InterruptedException      { return takeFirst(); }
439      public boolean offer(E o, long timeout, TimeUnit unit)
440          throws InterruptedException    { return offerLast(o, timeout, unit); }
441      public E poll(long timeout, TimeUnit unit)
# Line 717 | Line 717 | public class LinkedBlockingDeque<E>
717      }
718  
719      /**
720 <     * Save the state to a stream (that is, serialize it).
720 >     * Saves the state to a stream (that is, serializes it).
721       *
722       * @serialData The capacity (int), followed by elements (each an
723       * <tt>Object</tt>) in the proper order, followed by a null
# Line 740 | Line 740 | public class LinkedBlockingDeque<E>
740      }
741  
742      /**
743 <     * Reconstitute this deque instance from a stream (that is,
744 <     * deserialize it).
743 >     * Reconstitutes this deque instance from a stream (that is,
744 >     * deserializes it).
745       * @param s the stream
746       */
747      private void readObject(java.io.ObjectInputStream s)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines