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.30 by jsr166, Sun May 18 23:47:55 2008 UTC vs.
Revision 1.69 by jsr166, Fri Sep 18 02:06:44 2015 UTC

# Line 1 | Line 1
1   /*
2   * Written by Josh Bloch of Google Inc. and released to the public domain,
3 < * as explained at http://creativecommons.org/licenses/publicdomain.
3 > * as explained at http://creativecommons.org/publicdomain/zero/1.0/.
4   */
5  
6   package java.util;
7 < import java.io.*;
7 >
8 > import java.io.Serializable;
9 > import java.util.function.Consumer;
10  
11   /**
12   * Resizable-array implementation of the {@link Deque} interface.  Array
# Line 15 | Line 17 | import java.io.*;
17   * {@link Stack} when used as a stack, and faster than {@link LinkedList}
18   * when used as a queue.
19   *
20 < * <p>Most <tt>ArrayDeque</tt> 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.
20 > * <p>Most {@code ArrayDeque} operations run in amortized constant 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 <tt>iterator</tt> 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 <tt>remove</tt>
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 34 | Line 38 | import java.io.*;
38   * <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
39   * as it is, generally speaking, impossible to make any hard guarantees in the
40   * presence of unsynchronized concurrent modification.  Fail-fast iterators
41 < * throw <tt>ConcurrentModificationException</tt> on a best-effort basis.
41 > * throw {@code ConcurrentModificationException} on a best-effort basis.
42   * Therefore, it would be wrong to write a program that depended on this
43   * exception for its correctness: <i>the fail-fast behavior of iterators
44   * should be used only to detect bugs.</i>
# Line 49 | Line 53 | import java.io.*;
53   *
54   * @author  Josh Bloch and Doug Lea
55   * @since   1.6
56 < * @param <E> the type of elements held in this collection
56 > * @param <E> the type of elements held in this deque
57   */
58   public class ArrayDeque<E> extends AbstractCollection<E>
59                             implements Deque<E>, Cloneable, Serializable
# Line 64 | Line 68 | public class ArrayDeque<E> extends Abstr
68       * other.  We also guarantee that all array cells not holding
69       * deque elements are always null.
70       */
71 <    private transient E[] elements;
71 >    transient Object[] elements; // non-private to simplify nested class access
72  
73      /**
74       * The index of the element at the head of the deque (which is the
75       * element that would be removed by remove() or pop()); or an
76       * arbitrary number equal to tail if the deque is empty.
77       */
78 <    private transient int head;
78 >    transient int head;
79  
80      /**
81       * The index at which the next element would be added to the tail
82       * of the deque (via addLast(E), add(E), or push(E)).
83       */
84 <    private transient int tail;
84 >    transient int tail;
85  
86      /**
87       * The minimum capacity that we'll use for a newly created deque.
# Line 88 | Line 92 | public class ArrayDeque<E> extends Abstr
92      // ******  Array allocation and resizing utilities ******
93  
94      /**
95 <     * Allocate empty array to hold the given number of elements.
95 >     * Allocates empty array to hold the given number of elements.
96       *
97       * @param numElements  the number of elements to hold
98       */
# Line 108 | Line 112 | public class ArrayDeque<E> extends Abstr
112              if (initialCapacity < 0)   // Too many elements, must back off
113                  initialCapacity >>>= 1;// Good luck allocating 2 ^ 30 elements
114          }
115 <        elements = (E[]) new Object[initialCapacity];
115 >        elements = new Object[initialCapacity];
116      }
117  
118      /**
119 <     * Double the capacity of this deque.  Call only when full, i.e.,
119 >     * Doubles the capacity of this deque.  Call only when full, i.e.,
120       * when head and tail have wrapped around to become equal.
121       */
122      private void doubleCapacity() {
# Line 126 | Line 130 | public class ArrayDeque<E> extends Abstr
130          Object[] a = new Object[newCapacity];
131          System.arraycopy(elements, p, a, 0, r);
132          System.arraycopy(elements, 0, a, r, p);
133 <        elements = (E[])a;
133 >        elements = a;
134          head = 0;
135          tail = n;
136      }
137  
138      /**
135     * Copies the elements from our element array into the specified array,
136     * in order (from first to last element in the deque).  It is assumed
137     * that the array is large enough to hold all elements in the deque.
138     *
139     * @return its argument
140     */
141    private <T> T[] copyElements(T[] a) {
142        if (head < tail) {
143            System.arraycopy(elements, head, a, 0, size());
144        } else if (head > tail) {
145            int headPortionLen = elements.length - head;
146            System.arraycopy(elements, head, a, 0, headPortionLen);
147            System.arraycopy(elements, 0, a, headPortionLen, tail);
148        }
149        return a;
150    }
151
152    /**
139       * Constructs an empty array deque with an initial capacity
140       * sufficient to hold 16 elements.
141       */
142      public ArrayDeque() {
143 <        elements = (E[]) new Object[16];
143 >        elements = new Object[16];
144      }
145  
146      /**
# Line 220 | Line 206 | public class ArrayDeque<E> extends Abstr
206       * Inserts the specified element at the front of this deque.
207       *
208       * @param e the element to add
209 <     * @return <tt>true</tt> (as specified by {@link Deque#offerFirst})
209 >     * @return {@code true} (as specified by {@link Deque#offerFirst})
210       * @throws NullPointerException if the specified element is null
211       */
212      public boolean offerFirst(E e) {
# Line 232 | Line 218 | public class ArrayDeque<E> extends Abstr
218       * Inserts the specified element at the end of this deque.
219       *
220       * @param e the element to add
221 <     * @return <tt>true</tt> (as specified by {@link Deque#offerLast})
221 >     * @return {@code true} (as specified by {@link Deque#offerLast})
222       * @throws NullPointerException if the specified element is null
223       */
224      public boolean offerLast(E e) {
# Line 261 | Line 247 | public class ArrayDeque<E> extends Abstr
247      }
248  
249      public E pollFirst() {
250 <        int h = head;
251 <        E result = elements[h]; // Element is null if deque empty
252 <        if (result == null)
253 <            return null;
254 <        elements[h] = null;     // Must null out slot
255 <        head = (h + 1) & (elements.length - 1);
250 >        final Object[] elements = this.elements;
251 >        final int h = head;
252 >        @SuppressWarnings("unchecked")
253 >        E result = (E) elements[h];
254 >        // Element is null if deque empty
255 >        if (result != null) {
256 >            elements[h] = null; // Must null out slot
257 >            head = (h + 1) & (elements.length - 1);
258 >        }
259          return result;
260      }
261  
262      public E pollLast() {
263 <        int t = (tail - 1) & (elements.length - 1);
264 <        E result = elements[t];
265 <        if (result == null)
266 <            return null;
267 <        elements[t] = null;
268 <        tail = t;
263 >        final Object[] elements = this.elements;
264 >        final int t = (tail - 1) & (elements.length - 1);
265 >        @SuppressWarnings("unchecked")
266 >        E result = (E) elements[t];
267 >        if (result != null) {
268 >            elements[t] = null;
269 >            tail = t;
270 >        }
271          return result;
272      }
273  
# Line 284 | Line 275 | public class ArrayDeque<E> extends Abstr
275       * @throws NoSuchElementException {@inheritDoc}
276       */
277      public E getFirst() {
278 <        E x = elements[head];
279 <        if (x == null)
278 >        @SuppressWarnings("unchecked")
279 >        E result = (E) elements[head];
280 >        if (result == null)
281              throw new NoSuchElementException();
282 <        return x;
282 >        return result;
283      }
284  
285      /**
286       * @throws NoSuchElementException {@inheritDoc}
287       */
288      public E getLast() {
289 <        E x = elements[(tail - 1) & (elements.length - 1)];
290 <        if (x == null)
289 >        @SuppressWarnings("unchecked")
290 >        E result = (E) elements[(tail - 1) & (elements.length - 1)];
291 >        if (result == null)
292              throw new NoSuchElementException();
293 <        return x;
293 >        return result;
294      }
295  
296 +    @SuppressWarnings("unchecked")
297      public E peekFirst() {
298 <        return elements[head]; // elements[head] is null if deque empty
298 >        // elements[head] is null if deque empty
299 >        return (E) elements[head];
300      }
301  
302 +    @SuppressWarnings("unchecked")
303      public E peekLast() {
304 <        return elements[(tail - 1) & (elements.length - 1)];
304 >        return (E) elements[(tail - 1) & (elements.length - 1)];
305      }
306  
307      /**
308       * Removes the first occurrence of the specified element in this
309       * deque (when traversing the deque from head to tail).
310       * If the deque does not contain the element, it is unchanged.
311 <     * More formally, removes the first element <tt>e</tt> such that
312 <     * <tt>o.equals(e)</tt> (if such an element exists).
313 <     * Returns <tt>true</tt> if this deque contained the specified element
311 >     * More formally, removes the first element {@code e} such that
312 >     * {@code o.equals(e)} (if such an element exists).
313 >     * Returns {@code true} if this deque contained the specified element
314       * (or equivalently, if this deque changed as a result of the call).
315       *
316       * @param o element to be removed from this deque, if present
317 <     * @return <tt>true</tt> if the deque contained the specified element
317 >     * @return {@code true} if the deque contained the specified element
318       */
319      public boolean removeFirstOccurrence(Object o) {
320 <        if (o == null)
321 <            return false;
322 <        int mask = elements.length - 1;
323 <        int i = head;
324 <        E x;
325 <        while ( (x = elements[i]) != null) {
326 <            if (o.equals(x)) {
327 <                delete(i);
332 <                return true;
320 >        if (o != null) {
321 >            int mask = elements.length - 1;
322 >            int i = head;
323 >            for (Object x; (x = elements[i]) != null; i = (i + 1) & mask) {
324 >                if (o.equals(x)) {
325 >                    delete(i);
326 >                    return true;
327 >                }
328              }
334            i = (i + 1) & mask;
329          }
330          return false;
331      }
# Line 340 | Line 334 | public class ArrayDeque<E> extends Abstr
334       * Removes the last occurrence of the specified element in this
335       * deque (when traversing the deque from head to tail).
336       * If the deque does not contain the element, it is unchanged.
337 <     * More formally, removes the last element <tt>e</tt> such that
338 <     * <tt>o.equals(e)</tt> (if such an element exists).
339 <     * Returns <tt>true</tt> if this deque contained the specified element
337 >     * More formally, removes the last element {@code e} such that
338 >     * {@code o.equals(e)} (if such an element exists).
339 >     * Returns {@code true} if this deque contained the specified element
340       * (or equivalently, if this deque changed as a result of the call).
341       *
342       * @param o element to be removed from this deque, if present
343 <     * @return <tt>true</tt> if the deque contained the specified element
343 >     * @return {@code true} if the deque contained the specified element
344       */
345      public boolean removeLastOccurrence(Object o) {
346 <        if (o == null)
347 <            return false;
348 <        int mask = elements.length - 1;
349 <        int i = (tail - 1) & mask;
350 <        E x;
351 <        while ( (x = elements[i]) != null) {
352 <            if (o.equals(x)) {
353 <                delete(i);
360 <                return true;
346 >        if (o != null) {
347 >            int mask = elements.length - 1;
348 >            int i = (tail - 1) & mask;
349 >            for (Object x; (x = elements[i]) != null; i = (i - 1) & mask) {
350 >                if (o.equals(x)) {
351 >                    delete(i);
352 >                    return true;
353 >                }
354              }
362            i = (i - 1) & mask;
355          }
356          return false;
357      }
# Line 372 | Line 364 | public class ArrayDeque<E> extends Abstr
364       * <p>This method is equivalent to {@link #addLast}.
365       *
366       * @param e the element to add
367 <     * @return <tt>true</tt> (as specified by {@link Collection#add})
367 >     * @return {@code true} (as specified by {@link Collection#add})
368       * @throws NullPointerException if the specified element is null
369       */
370      public boolean add(E e) {
# Line 386 | Line 378 | public class ArrayDeque<E> extends Abstr
378       * <p>This method is equivalent to {@link #offerLast}.
379       *
380       * @param e the element to add
381 <     * @return <tt>true</tt> (as specified by {@link Queue#offer})
381 >     * @return {@code true} (as specified by {@link Queue#offer})
382       * @throws NullPointerException if the specified element is null
383       */
384      public boolean offer(E e) {
# Line 411 | Line 403 | public class ArrayDeque<E> extends Abstr
403      /**
404       * Retrieves and removes the head of the queue represented by this deque
405       * (in other words, the first element of this deque), or returns
406 <     * <tt>null</tt> if this deque is empty.
406 >     * {@code null} if this deque is empty.
407       *
408       * <p>This method is equivalent to {@link #pollFirst}.
409       *
410       * @return the head of the queue represented by this deque, or
411 <     *         <tt>null</tt> if this deque is empty
411 >     *         {@code null} if this deque is empty
412       */
413      public E poll() {
414          return pollFirst();
# Line 438 | Line 430 | public class ArrayDeque<E> extends Abstr
430  
431      /**
432       * Retrieves, but does not remove, the head of the queue represented by
433 <     * this deque, or returns <tt>null</tt> if this deque is empty.
433 >     * this deque, or returns {@code null} if this deque is empty.
434       *
435       * <p>This method is equivalent to {@link #peekFirst}.
436       *
437       * @return the head of the queue represented by this deque, or
438 <     *         <tt>null</tt> if this deque is empty
438 >     *         {@code null} if this deque is empty
439       */
440      public E peek() {
441          return peekFirst();
# Line 498 | Line 490 | public class ArrayDeque<E> extends Abstr
490       */
491      private boolean delete(int i) {
492          checkInvariants();
493 <        final E[] elements = this.elements;
493 >        final Object[] elements = this.elements;
494          final int mask = elements.length - 1;
495          final int h = head;
496          final int t = tail;
# Line 547 | Line 539 | public class ArrayDeque<E> extends Abstr
539      }
540  
541      /**
542 <     * Returns <tt>true</tt> if this deque contains no elements.
542 >     * Returns {@code true} if this deque contains no elements.
543       *
544 <     * @return <tt>true</tt> if this deque contains no elements
544 >     * @return {@code true} if this deque contains no elements
545       */
546      public boolean isEmpty() {
547          return head == tail;
# Line 596 | Line 588 | public class ArrayDeque<E> extends Abstr
588          public E next() {
589              if (cursor == fence)
590                  throw new NoSuchElementException();
591 <            E result = elements[cursor];
591 >            @SuppressWarnings("unchecked")
592 >            E result = (E) elements[cursor];
593              // This check doesn't catch all possible comodifications,
594              // but does catch the ones that corrupt traversal
595              if (tail != fence || result == null)
# Line 615 | Line 608 | public class ArrayDeque<E> extends Abstr
608              }
609              lastRet = -1;
610          }
611 +
612 +        public void forEachRemaining(Consumer<? super E> action) {
613 +            Objects.requireNonNull(action);
614 +            Object[] a = elements;
615 +            int m = a.length - 1, f = fence, i = cursor;
616 +            cursor = f;
617 +            while (i != f) {
618 +                @SuppressWarnings("unchecked") E e = (E)a[i];
619 +                i = (i + 1) & m;
620 +                if (e == null)
621 +                    throw new ConcurrentModificationException();
622 +                action.accept(e);
623 +            }
624 +        }
625      }
626  
627 +    /**
628 +     * This class is nearly a mirror-image of DeqIterator, using tail
629 +     * instead of head for initial cursor, and head instead of tail
630 +     * for fence.
631 +     */
632      private class DescendingIterator implements Iterator<E> {
621        /*
622         * This class is nearly a mirror-image of DeqIterator, using
623         * tail instead of head for initial cursor, and head instead of
624         * tail for fence.
625         */
633          private int cursor = tail;
634          private int fence = head;
635          private int lastRet = -1;
# Line 635 | Line 642 | public class ArrayDeque<E> extends Abstr
642              if (cursor == fence)
643                  throw new NoSuchElementException();
644              cursor = (cursor - 1) & (elements.length - 1);
645 <            E result = elements[cursor];
645 >            @SuppressWarnings("unchecked")
646 >            E result = (E) elements[cursor];
647              if (head != fence || result == null)
648                  throw new ConcurrentModificationException();
649              lastRet = cursor;
# Line 654 | Line 662 | public class ArrayDeque<E> extends Abstr
662      }
663  
664      /**
665 <     * Returns <tt>true</tt> if this deque contains the specified element.
666 <     * More formally, returns <tt>true</tt> if and only if this deque contains
667 <     * at least one element <tt>e</tt> such that <tt>o.equals(e)</tt>.
665 >     * Returns {@code true} if this deque contains the specified element.
666 >     * More formally, returns {@code true} if and only if this deque contains
667 >     * at least one element {@code e} such that {@code o.equals(e)}.
668       *
669       * @param o object to be checked for containment in this deque
670 <     * @return <tt>true</tt> if this deque contains the specified element
670 >     * @return {@code true} if this deque contains the specified element
671       */
672      public boolean contains(Object o) {
673 <        if (o == null)
674 <            return false;
675 <        int mask = elements.length - 1;
676 <        int i = head;
677 <        E x;
678 <        while ( (x = elements[i]) != null) {
679 <            if (o.equals(x))
672 <                return true;
673 <            i = (i + 1) & mask;
673 >        if (o != null) {
674 >            int mask = elements.length - 1;
675 >            int i = head;
676 >            for (Object x; (x = elements[i]) != null; i = (i + 1) & mask) {
677 >                if (o.equals(x))
678 >                    return true;
679 >            }
680          }
681          return false;
682      }
# Line 678 | Line 684 | public class ArrayDeque<E> extends Abstr
684      /**
685       * Removes a single instance of the specified element from this deque.
686       * If the deque does not contain the element, it is unchanged.
687 <     * More formally, removes the first element <tt>e</tt> such that
688 <     * <tt>o.equals(e)</tt> (if such an element exists).
689 <     * Returns <tt>true</tt> if this deque contained the specified element
687 >     * More formally, removes the first element {@code e} such that
688 >     * {@code o.equals(e)} (if such an element exists).
689 >     * Returns {@code true} if this deque contained the specified element
690       * (or equivalently, if this deque changed as a result of the call).
691       *
692 <     * <p>This method is equivalent to {@link #removeFirstOccurrence}.
692 >     * <p>This method is equivalent to {@link #removeFirstOccurrence(Object)}.
693       *
694       * @param o element to be removed from this deque, if present
695 <     * @return <tt>true</tt> if this deque contained the specified element
695 >     * @return {@code true} if this deque contained the specified element
696       */
697      public boolean remove(Object o) {
698          return removeFirstOccurrence(o);
# Line 724 | Line 730 | public class ArrayDeque<E> extends Abstr
730       * @return an array containing all of the elements in this deque
731       */
732      public Object[] toArray() {
733 <        return copyElements(new Object[size()]);
733 >        final int head = this.head;
734 >        final int tail = this.tail;
735 >        boolean wrap = (tail < head);
736 >        int end = wrap ? tail + elements.length : tail;
737 >        Object[] a = Arrays.copyOfRange(elements, head, end);
738 >        if (wrap)
739 >            System.arraycopy(elements, 0, a, elements.length - head, tail);
740 >        return a;
741      }
742  
743      /**
# Line 738 | Line 751 | public class ArrayDeque<E> extends Abstr
751       * <p>If this deque fits in the specified array with room to spare
752       * (i.e., the array has more elements than this deque), the element in
753       * the array immediately following the end of the deque is set to
754 <     * <tt>null</tt>.
754 >     * {@code null}.
755       *
756       * <p>Like the {@link #toArray()} method, this method acts as bridge between
757       * array-based and collection-based APIs.  Further, this method allows
758       * precise control over the runtime type of the output array, and may,
759       * under certain circumstances, be used to save allocation costs.
760       *
761 <     * <p>Suppose <tt>x</tt> is a deque known to contain only strings.
761 >     * <p>Suppose {@code x} is a deque known to contain only strings.
762       * The following code can be used to dump the deque into a newly
763 <     * allocated array of <tt>String</tt>:
763 >     * allocated array of {@code String}:
764       *
765 <     * <pre>
753 <     *     String[] y = x.toArray(new String[0]);</pre>
765 >     * <pre> {@code String[] y = x.toArray(new String[0]);}</pre>
766       *
767 <     * Note that <tt>toArray(new Object[0])</tt> is identical in function to
768 <     * <tt>toArray()</tt>.
767 >     * Note that {@code toArray(new Object[0])} is identical in function to
768 >     * {@code toArray()}.
769       *
770       * @param a the array into which the elements of the deque are to
771       *          be stored, if it is big enough; otherwise, a new array of the
# Line 764 | Line 776 | public class ArrayDeque<E> extends Abstr
776       *         this deque
777       * @throws NullPointerException if the specified array is null
778       */
779 +    @SuppressWarnings("unchecked")
780      public <T> T[] toArray(T[] a) {
781 <        int size = size();
782 <        if (a.length < size)
783 <            a = (T[])java.lang.reflect.Array.newInstance(
784 <                    a.getClass().getComponentType(), size);
785 <        copyElements(a);
786 <        if (a.length > size)
787 <            a[size] = null;
781 >        final int head = this.head;
782 >        final int tail = this.tail;
783 >        boolean wrap = (tail < head);
784 >        int size = (tail - head) + (wrap ? elements.length : 0);
785 >        int firstLeg = size - (wrap ? tail : 0);
786 >        int len = a.length;
787 >        if (size > len) {
788 >            a = (T[]) Arrays.copyOfRange(elements, head, head + size,
789 >                                         a.getClass());
790 >        } else {
791 >            System.arraycopy(elements, head, a, 0, firstLeg);
792 >            if (size < len)
793 >                a[size] = null;
794 >        }
795 >        if (wrap)
796 >            System.arraycopy(elements, 0, a, firstLeg, tail);
797          return a;
798      }
799  
# Line 784 | Line 806 | public class ArrayDeque<E> extends Abstr
806       */
807      public ArrayDeque<E> clone() {
808          try {
809 +            @SuppressWarnings("unchecked")
810              ArrayDeque<E> result = (ArrayDeque<E>) super.clone();
811              result.elements = Arrays.copyOf(elements, elements.length);
812              return result;
790
813          } catch (CloneNotSupportedException e) {
814              throw new AssertionError();
815          }
816      }
817  
796    /**
797     * Appease the serialization gods.
798     */
818      private static final long serialVersionUID = 2340985798034038923L;
819  
820      /**
821 <     * Serialize this deque.
821 >     * Saves this deque to a stream (that is, serializes it).
822       *
823 <     * @serialData The current size (<tt>int</tt>) of the deque,
823 >     * @param s the stream
824 >     * @throws java.io.IOException if an I/O error occurs
825 >     * @serialData The current size ({@code int}) of the deque,
826       * followed by all of its elements (each an object reference) in
827       * first-to-last order.
828       */
829 <    private void writeObject(ObjectOutputStream s) throws IOException {
829 >    private void writeObject(java.io.ObjectOutputStream s)
830 >            throws java.io.IOException {
831          s.defaultWriteObject();
832  
833          // Write out size
# Line 818 | Line 840 | public class ArrayDeque<E> extends Abstr
840      }
841  
842      /**
843 <     * Deserialize this deque.
843 >     * Reconstitutes this deque from a stream (that is, deserializes it).
844 >     * @param s the stream
845 >     * @throws ClassNotFoundException if the class of a serialized object
846 >     *         could not be found
847 >     * @throws java.io.IOException if an I/O error occurs
848       */
849 <    private void readObject(ObjectInputStream s)
850 <            throws IOException, ClassNotFoundException {
849 >    private void readObject(java.io.ObjectInputStream s)
850 >            throws java.io.IOException, ClassNotFoundException {
851          s.defaultReadObject();
852  
853          // Read in size and allocate array
# Line 832 | Line 858 | public class ArrayDeque<E> extends Abstr
858  
859          // Read in all elements in the proper order.
860          for (int i = 0; i < size; i++)
861 <            elements[i] = (E)s.readObject();
861 >            elements[i] = s.readObject();
862 >    }
863 >
864 >    /**
865 >     * Creates a <em><a href="Spliterator.html#binding">late-binding</a></em>
866 >     * and <em>fail-fast</em> {@link Spliterator} over the elements in this
867 >     * deque.
868 >     *
869 >     * <p>The {@code Spliterator} reports {@link Spliterator#SIZED},
870 >     * {@link Spliterator#SUBSIZED}, {@link Spliterator#ORDERED}, and
871 >     * {@link Spliterator#NONNULL}.  Overriding implementations should document
872 >     * the reporting of additional characteristic values.
873 >     *
874 >     * @return a {@code Spliterator} over the elements in this deque
875 >     * @since 1.8
876 >     */
877 >    public Spliterator<E> spliterator() {
878 >        return new DeqSpliterator<>(this, -1, -1);
879 >    }
880 >
881 >    static final class DeqSpliterator<E> implements Spliterator<E> {
882 >        private final ArrayDeque<E> deq;
883 >        private int fence;  // -1 until first use
884 >        private int index;  // current index, modified on traverse/split
885 >
886 >        /** Creates new spliterator covering the given array and range */
887 >        DeqSpliterator(ArrayDeque<E> deq, int origin, int fence) {
888 >            this.deq = deq;
889 >            this.index = origin;
890 >            this.fence = fence;
891 >        }
892 >
893 >        private int getFence() { // force initialization
894 >            int t;
895 >            if ((t = fence) < 0) {
896 >                t = fence = deq.tail;
897 >                index = deq.head;
898 >            }
899 >            return t;
900 >        }
901 >
902 >        public Spliterator<E> trySplit() {
903 >            int t = getFence(), h = index, n = deq.elements.length;
904 >            if (h != t && ((h + 1) & (n - 1)) != t) {
905 >                if (h > t)
906 >                    t += n;
907 >                int m = ((h + t) >>> 1) & (n - 1);
908 >                return new DeqSpliterator<>(deq, h, index = m);
909 >            }
910 >            return null;
911 >        }
912 >
913 >        public void forEachRemaining(Consumer<? super E> consumer) {
914 >            if (consumer == null)
915 >                throw new NullPointerException();
916 >            Object[] a = deq.elements;
917 >            int m = a.length - 1, f = getFence(), i = index;
918 >            index = f;
919 >            while (i != f) {
920 >                @SuppressWarnings("unchecked") E e = (E)a[i];
921 >                i = (i + 1) & m;
922 >                if (e == null)
923 >                    throw new ConcurrentModificationException();
924 >                consumer.accept(e);
925 >            }
926 >        }
927 >
928 >        public boolean tryAdvance(Consumer<? super E> consumer) {
929 >            if (consumer == null)
930 >                throw new NullPointerException();
931 >            Object[] a = deq.elements;
932 >            int m = a.length - 1, f = getFence(), i = index;
933 >            if (i != f) {
934 >                @SuppressWarnings("unchecked") E e = (E)a[i];
935 >                index = (i + 1) & m;
936 >                if (e == null)
937 >                    throw new ConcurrentModificationException();
938 >                consumer.accept(e);
939 >                return true;
940 >            }
941 >            return false;
942 >        }
943 >
944 >        public long estimateSize() {
945 >            int n = getFence() - index;
946 >            if (n < 0)
947 >                n += deq.elements.length;
948 >            return (long) n;
949 >        }
950 >
951 >        @Override
952 >        public int characteristics() {
953 >            return Spliterator.ORDERED | Spliterator.SIZED |
954 >                Spliterator.NONNULL | Spliterator.SUBSIZED;
955 >        }
956      }
957 +
958   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines