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

Comparing jsr166/src/main/java/util/ArrayDeque.java (file contents):
Revision 1.44 by dl, Tue Jan 22 19:28:04 2013 UTC vs.
Revision 1.55 by jsr166, Thu May 2 06:02:17 2013 UTC

# Line 1 | Line 1
1   /*
2 < * Written by Doug Lea with assistance from members of JCP JSR-166
3 < * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/publicdomain/zero/1.0/
2 > * Written by Josh Bloch of Google Inc. and released to the public domain,
3 > * as explained at http://creativecommons.org/publicdomain/zero/1.0/.
4   */
5  
6   package java.util;
7 < import java.util.Spliterator;
7 > import java.io.Serializable;
8 > import java.util.function.Consumer;
9   import java.util.stream.Stream;
10 import java.util.stream.Streams;
11 import java.util.function.Block;
10  
11   /**
12   * Resizable-array implementation of the {@link Deque} interface.  Array
# Line 20 | Line 18 | import java.util.function.Block;
18   * when used as a queue.
19   *
20   * <p>Most {@code ArrayDeque} operations run in amortized constant time.
21 < * Exceptions include {@link #remove(Object) remove}, {@link
22 < * #removeFirstOccurrence removeFirstOccurrence}, {@link #removeLastOccurrence
23 < * removeLastOccurrence}, {@link #contains contains}, {@link #iterator
24 < * iterator.remove()}, and the bulk operations, all of which run in linear
25 < * time.
21 > * Exceptions include
22 > * {@link #remove(Object) remove},
23 > * {@link #removeFirstOccurrence removeFirstOccurrence},
24 > * {@link #removeLastOccurrence removeLastOccurrence},
25 > * {@link #contains contains},
26 > * {@link #iterator iterator.remove()},
27 > * and the bulk operations, all of which run in linear time.
28   *
29 < * <p>The iterators returned by this class's {@code iterator} method are
30 < * <i>fail-fast</i>: If the deque is modified at any time after the iterator
31 < * is created, in any way except through the iterator's own {@code remove}
32 < * method, the iterator will generally throw a {@link
29 > * <p>The iterators returned by this class's {@link #iterator() iterator}
30 > * method are <em>fail-fast</em>: If the deque is modified at any time after
31 > * the iterator is created, in any way except through the iterator's own
32 > * {@code remove} method, the iterator will generally throw a {@link
33   * ConcurrentModificationException}.  Thus, in the face of concurrent
34   * modification, the iterator fails quickly and cleanly, rather than risking
35   * arbitrary, non-deterministic behavior at an undetermined time in the
# Line 56 | Line 56 | import java.util.function.Block;
56   * @param <E> the type of elements held in this collection
57   */
58   public class ArrayDeque<E> extends AbstractCollection<E>
59 <                           implements Deque<E>, Cloneable, java.io.Serializable
59 >                           implements Deque<E>, Cloneable, Serializable
60   {
61      /**
62       * The array in which the elements of the deque are stored.
# Line 136 | Line 136 | public class ArrayDeque<E> extends Abstr
136      }
137  
138      /**
139     * Copies the elements from our element array into the specified array,
140     * in order (from first to last element in the deque).  It is assumed
141     * that the array is large enough to hold all elements in the deque.
142     *
143     * @return its argument
144     */
145    private <T> T[] copyElements(T[] a) {
146        if (head < tail) {
147            System.arraycopy(elements, head, a, 0, size());
148        } else if (head > tail) {
149            int headPortionLen = elements.length - head;
150            System.arraycopy(elements, head, a, 0, headPortionLen);
151            System.arraycopy(elements, 0, a, headPortionLen, tail);
152        }
153        return a;
154    }
155
156    /**
139       * Constructs an empty array deque with an initial capacity
140       * sufficient to hold 16 elements.
141       */
# Line 630 | Line 612 | public class ArrayDeque<E> extends Abstr
612          }
613      }
614  
615 +    /**
616 +     * This class is nearly a mirror-image of DeqIterator, using tail
617 +     * instead of head for initial cursor, and head instead of tail
618 +     * for fence.
619 +     */
620      private class DescendingIterator implements Iterator<E> {
634        /*
635         * This class is nearly a mirror-image of DeqIterator, using
636         * tail instead of head for initial cursor, and head instead of
637         * tail for fence.
638         */
621          private int cursor = tail;
622          private int fence = head;
623          private int lastRet = -1;
# Line 697 | Line 679 | public class ArrayDeque<E> extends Abstr
679       * Returns {@code true} if this deque contained the specified element
680       * (or equivalently, if this deque changed as a result of the call).
681       *
682 <     * <p>This method is equivalent to {@link #removeFirstOccurrence}.
682 >     * <p>This method is equivalent to {@link #removeFirstOccurrence(Object)}.
683       *
684       * @param o element to be removed from this deque, if present
685       * @return {@code true} if this deque contained the specified element
# Line 738 | Line 720 | public class ArrayDeque<E> extends Abstr
720       * @return an array containing all of the elements in this deque
721       */
722      public Object[] toArray() {
723 <        return copyElements(new Object[size()]);
723 >        final int head = this.head;
724 >        final int tail = this.tail;
725 >        boolean wrap = (tail < head);
726 >        int end = wrap ? tail + elements.length : tail;
727 >        Object[] a = Arrays.copyOfRange(elements, head, end);
728 >        if (wrap)
729 >            System.arraycopy(elements, 0, a, elements.length - head, tail);
730 >        return a;
731      }
732  
733      /**
# Line 779 | Line 768 | public class ArrayDeque<E> extends Abstr
768       */
769      @SuppressWarnings("unchecked")
770      public <T> T[] toArray(T[] a) {
771 <        int size = size();
772 <        if (a.length < size)
773 <            a = (T[])java.lang.reflect.Array.newInstance(
774 <                    a.getClass().getComponentType(), size);
775 <        copyElements(a);
776 <        if (a.length > size)
777 <            a[size] = null;
771 >        final int head = this.head;
772 >        final int tail = this.tail;
773 >        boolean wrap = (tail < head);
774 >        int size = (tail - head) + (wrap ? elements.length : 0);
775 >        int firstLeg = size - (wrap ? tail : 0);
776 >        int len = a.length;
777 >        if (size > len) {
778 >            a = (T[]) Arrays.copyOfRange(elements, head, head + size,
779 >                                         a.getClass());
780 >        } else {
781 >            System.arraycopy(elements, head, a, 0, firstLeg);
782 >            if (size < len)
783 >                a[size] = null;
784 >        }
785 >        if (wrap)
786 >            System.arraycopy(elements, 0, a, firstLeg, tail);
787          return a;
788      }
789  
# Line 847 | Line 845 | public class ArrayDeque<E> extends Abstr
845              elements[i] = s.readObject();
846      }
847  
848 <    public Stream<E> stream() {
849 <        int flags = Streams.STREAM_IS_ORDERED | Streams.STREAM_IS_SIZED;
852 <        return Streams.stream
853 <            (() -> new DeqSpliterator<E>(this, head, tail), flags);
854 <    }
855 <    public Stream<E> parallelStream() {
856 <        int flags = Streams.STREAM_IS_ORDERED | Streams.STREAM_IS_SIZED;
857 <        return Streams.parallelStream
858 <            (() -> new DeqSpliterator<E>(this, head, tail), flags);
848 >    public Spliterator<E> spliterator() {
849 >        return new DeqSpliterator<E>(this, -1, -1);
850      }
851  
861
852      static final class DeqSpliterator<E> implements Spliterator<E> {
853          private final ArrayDeque<E> deq;
854 <        private final int fence;  // initially tail
855 <        private int index;        // current index, modified on traverse/split
854 >        private int fence;  // -1 until first use
855 >        private int index;  // current index, modified on traverse/split
856  
857 <        /** Create new spliterator covering the given array and range */
857 >        /** Creates new spliterator covering the given array and range */
858          DeqSpliterator(ArrayDeque<E> deq, int origin, int fence) {
859 <            this.deq = deq; this.index = origin; this.fence = fence;
859 >            this.deq = deq;
860 >            this.index = origin;
861 >            this.fence = fence;
862 >        }
863 >
864 >        private int getFence() { // force initialization
865 >            int t;
866 >            if ((t = fence) < 0) {
867 >                t = fence = deq.tail;
868 >                index = deq.head;
869 >            }
870 >            return t;
871          }
872  
873 <        public DeqSpliterator<E> trySplit() {
874 <            int n = deq.elements.length;
874 <            int h = index, t = fence;
873 >        public Spliterator<E> trySplit() {
874 >            int t = getFence(), h = index, n = deq.elements.length;
875              if (h != t && ((h + 1) & (n - 1)) != t) {
876                  if (h > t)
877                      t += n;
878                  int m = ((h + t) >>> 1) & (n - 1);
879 <                return new DeqSpliterator<E>(deq, h, index = m);
879 >                return new DeqSpliterator<>(deq, h, index = m);
880              }
881              return null;
882          }
883  
884 <        public void forEach(Block<? super E> block) {
885 <            if (block == null)
884 >        public void forEachRemaining(Consumer<? super E> consumer) {
885 >            if (consumer == null)
886                  throw new NullPointerException();
887              Object[] a = deq.elements;
888 <            int m = a.length - 1, f = fence, i = index;
888 >            int m = a.length - 1, f = getFence(), i = index;
889              index = f;
890              while (i != f) {
891                  @SuppressWarnings("unchecked") E e = (E)a[i];
892                  i = (i + 1) & m;
893                  if (e == null)
894                      throw new ConcurrentModificationException();
895 <                block.accept(e);
895 >                consumer.accept(e);
896              }
897          }
898  
899 <        public boolean tryAdvance(Block<? super E> block) {
900 <            if (block == null)
899 >        public boolean tryAdvance(Consumer<? super E> consumer) {
900 >            if (consumer == null)
901                  throw new NullPointerException();
902              Object[] a = deq.elements;
903 <            int m = a.length - 1, i = index;
903 >            int m = a.length - 1, f = getFence(), i = index;
904              if (i != fence) {
905                  @SuppressWarnings("unchecked") E e = (E)a[i];
906                  index = (i + 1) & m;
907                  if (e == null)
908                      throw new ConcurrentModificationException();
909 <                block.accept(e);
909 >                consumer.accept(e);
910                  return true;
911              }
912              return false;
913          }
914  
915        // Other spliterator methods
915          public long estimateSize() {
916 <            int n = fence - index;
916 >            int n = getFence() - index;
917              if (n < 0)
918                  n += deq.elements.length;
919 <            return (long)n;
919 >            return (long) n;
920 >        }
921 >
922 >        @Override
923 >        public int characteristics() {
924 >            return Spliterator.ORDERED | Spliterator.SIZED |
925 >                Spliterator.NONNULL | Spliterator.SUBSIZED;
926          }
922        public boolean hasExactSize() { return true; }
923        public boolean hasExactSplits() { return true; }
927      }
928  
929   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines