ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/main/java/util/ArrayDeque.java

Comparing jsr166/src/main/java/util/ArrayDeque.java (file contents):
Revision 1.19 by dl, Fri Sep 16 11:15:41 2005 UTC vs.
Revision 1.40 by jsr166, Sun Feb 26 22:43:03 2012 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.util.*; // for javadoc (till 6280605 is fixed)
8	–	import java.io.*;
7
8		/**
9		* Resizable-array implementation of the {@link Deque} interface.  Array
#	Line 16 | Line 14 | import java.io.*;
14		* {@link Stack} when used as a stack, and faster than {@link LinkedList}
15		* when used as a queue.
16		*
17	<	* <p>Most <tt>ArrayDeque</tt> operations run in amortized constant time.
18	<	* Exceptions include {@link #remove(Object) remove}, {@link
19	<	* #removeFirstOccurrence removeFirstOccurrence}, {@link #removeLastOccurrence
20	<	* removeLastOccurrence}, {@link #contains contains}, {@link #iterator
21	<	* iterator.remove()}, and the bulk operations, all of which run in linear
22	<	* time.
17	>	* <p>Most {@code ArrayDeque} operations run in amortized constant time.
18	>	* Exceptions include
19	>	* {@link #remove(Object) remove},
20	>	* {@link #removeFirstOccurrence removeFirstOccurrence},
21	>	* {@link #removeLastOccurrence removeLastOccurrence},
22	>	* {@link #contains contains},
23	>	* {@link #iterator iterator.remove()},
24	>	* and the bulk operations, all of which run in linear time.
25		*
26	<	* <p>The iterators returned by this class's <tt>iterator</tt> method are
27	<	* <i>fail-fast</i>: If the deque is modified at any time after the iterator
28	<	* is created, in any way except through the iterator's own <tt>remove</tt>
29	<	* method, the iterator will generally throw a {@link
26	>	* <p>The iterators returned by this class's {@link #iterator() iterator}
27	>	* method are <em>fail-fast</em>: If the deque is modified at any time after
28	>	* the iterator is created, in any way except through the iterator's own
29	>	* {@code remove} method, the iterator will generally throw a {@link
30		* ConcurrentModificationException}.  Thus, in the face of concurrent
31		* modification, the iterator fails quickly and cleanly, rather than risking
32		* arbitrary, non-deterministic behavior at an undetermined time in the
#	Line 35 | Line 35 | import java.io.*;
35		* <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
36		* as it is, generally speaking, impossible to make any hard guarantees in the
37		* presence of unsynchronized concurrent modification.  Fail-fast iterators
38	<	* throw <tt>ConcurrentModificationException</tt> on a best-effort basis.
38	>	* throw {@code ConcurrentModificationException} on a best-effort basis.
39		* Therefore, it would be wrong to write a program that depended on this
40		* exception for its correctness: <i>the fail-fast behavior of iterators
41		* should be used only to detect bugs.</i>
#	Line 45 | Line 45 | import java.io.*;
45		* Iterator} interfaces.
46		*
47		* <p>This class is a member of the
48	<	* <a href="{@docRoot}/../guide/collections/index.html">
48	>	* <a href="{@docRoot}/../technotes/guides/collections/index.html">
49		* Java Collections Framework</a>.
50		*
51		* @author  Josh Bloch and Doug Lea
#	Line 53 | Line 53 | import java.io.*;
53		* @param <E> the type of elements held in this collection
54		*/
55		public class ArrayDeque<E> extends AbstractCollection<E>
56	<	implements Deque<E>, Cloneable, Serializable
56	>	implements Deque<E>, Cloneable, java.io.Serializable
57		{
58		/**
59		* The array in which the elements of the deque are stored.
#	Line 65 | Line 65 | public class ArrayDeque<E> extends Abstr
65		* other.  We also guarantee that all array cells not holding
66		* deque elements are always null.
67		*/
68	<	private transient E[] elements;
68	>	private transient Object[] elements;
69
70		/**
71		* The index of the element at the head of the deque (which is the
#	Line 89 | Line 89 | public class ArrayDeque<E> extends Abstr
89		// ******  Array allocation and resizing utilities ******
90
91		/**
92	<	* Allocate empty array to hold the given number of elements.
92	>	* Allocates empty array to hold the given number of elements.
93		*
94		* @param numElements  the number of elements to hold
95		*/
#	Line 109 | Line 109 | public class ArrayDeque<E> extends Abstr
109		if (initialCapacity < 0)   // Too many elements, must back off
110		initialCapacity >>>= 1;// Good luck allocating 2 ^ 30 elements
111		}
112	<	elements = (E[]) new Object[initialCapacity];
112	>	elements = new Object[initialCapacity];
113		}
114
115		/**
116	<	* Double the capacity of this deque.  Call only when full, i.e.,
116	>	* Doubles the capacity of this deque.  Call only when full, i.e.,
117		* when head and tail have wrapped around to become equal.
118		*/
119		private void doubleCapacity() {
#	Line 127 | Line 127 | public class ArrayDeque<E> extends Abstr
127		Object[] a = new Object[newCapacity];
128		System.arraycopy(elements, p, a, 0, r);
129		System.arraycopy(elements, 0, a, r, p);
130	<	elements = (E[])a;
130	>	elements = a;
131		head = 0;
132		tail = n;
133		}
#	Line 155 | Line 155 | public class ArrayDeque<E> extends Abstr
155		* sufficient to hold 16 elements.
156		*/
157		public ArrayDeque() {
158	<	elements = (E[]) new Object[16];
158	>	elements = new Object[16];
159		}
160
161		/**
#	Line 221 | Line 221 | public class ArrayDeque<E> extends Abstr
221		* Inserts the specified element at the front of this deque.
222		*
223		* @param e the element to add
224	<	* @return <tt>true</tt> (as specified by {@link Deque#offerFirst})
224	>	* @return {@code true} (as specified by {@link Deque#offerFirst})
225		* @throws NullPointerException if the specified element is null
226		*/
227		public boolean offerFirst(E e) {
#	Line 233 | Line 233 | public class ArrayDeque<E> extends Abstr
233		* Inserts the specified element at the end of this deque.
234		*
235		* @param e the element to add
236	<	* @return <tt>true</tt> (as specified by {@link Deque#offerLast})
236	>	* @return {@code true} (as specified by {@link Deque#offerLast})
237		* @throws NullPointerException if the specified element is null
238		*/
239		public boolean offerLast(E e) {
#	Line 263 | Line 263 | public class ArrayDeque<E> extends Abstr
263
264		public E pollFirst() {
265		int h = head;
266	<	E result = elements[h]; // Element is null if deque empty
266	>	@SuppressWarnings("unchecked")
267	>	E result = (E) elements[h];
268	>	// Element is null if deque empty
269		if (result == null)
270		return null;
271		elements[h] = null;     // Must null out slot
#	Line 273 | Line 275 | public class ArrayDeque<E> extends Abstr
275
276		public E pollLast() {
277		int t = (tail - 1) & (elements.length - 1);
278	<	E result = elements[t];
278	>	@SuppressWarnings("unchecked")
279	>	E result = (E) elements[t];
280		if (result == null)
281		return null;
282		elements[t] = null;
#	Line 285 | Line 288 | public class ArrayDeque<E> extends Abstr
288		* @throws NoSuchElementException {@inheritDoc}
289		*/
290		public E getFirst() {
291	<	E x = elements[head];
292	<	if (x == null)
291	>	@SuppressWarnings("unchecked")
292	>	E result = (E) elements[head];
293	>	if (result == null)
294		throw new NoSuchElementException();
295	<	return x;
295	>	return result;
296		}
297
298		/**
299		* @throws NoSuchElementException {@inheritDoc}
300		*/
301		public E getLast() {
302	<	E x = elements[(tail - 1) & (elements.length - 1)];
303	<	if (x == null)
302	>	@SuppressWarnings("unchecked")
303	>	E result = (E) elements[(tail - 1) & (elements.length - 1)];
304	>	if (result == null)
305		throw new NoSuchElementException();
306	<	return x;
306	>	return result;
307		}
308
309	+	@SuppressWarnings("unchecked")
310		public E peekFirst() {
311	<	return elements[head]; // elements[head] is null if deque empty
311	>	// elements[head] is null if deque empty
312	>	return (E) elements[head];
313		}
314
315	+	@SuppressWarnings("unchecked")
316		public E peekLast() {
317	<	return elements[(tail - 1) & (elements.length - 1)];
317	>	return (E) elements[(tail - 1) & (elements.length - 1)];
318		}
319
320		/**
321		* Removes the first occurrence of the specified element in this
322		* deque (when traversing the deque from head to tail).
323		* If the deque does not contain the element, it is unchanged.
324	<	* More formally, removes the first element <tt>e</tt> such that
325	<	* <tt>o.equals(e)</tt> (if such an element exists).
326	<	* Returns <tt>true</tt> if this deque contained the specified element
324	>	* More formally, removes the first element {@code e} such that
325	>	* {@code o.equals(e)} (if such an element exists).
326	>	* Returns {@code true} if this deque contained the specified element
327		* (or equivalently, if this deque changed as a result of the call).
328		*
329		* @param o element to be removed from this deque, if present
330	<	* @return <tt>true</tt> if the deque contained the specified element
330	>	* @return {@code true} if the deque contained the specified element
331		*/
332		public boolean removeFirstOccurrence(Object o) {
333		if (o == null)
334		return false;
335		int mask = elements.length - 1;
336		int i = head;
337	<	E x;
337	>	Object x;
338		while ( (x = elements[i]) != null) {
339		if (o.equals(x)) {
340		delete(i);
#	Line 341 | Line 349 | public class ArrayDeque<E> extends Abstr
349		* Removes the last occurrence of the specified element in this
350		* deque (when traversing the deque from head to tail).
351		* If the deque does not contain the element, it is unchanged.
352	<	* More formally, removes the last element <tt>e</tt> such that
353	<	* <tt>o.equals(e)</tt> (if such an element exists).
354	<	* Returns <tt>true</tt> if this deque contained the specified element
352	>	* More formally, removes the last element {@code e} such that
353	>	* {@code o.equals(e)} (if such an element exists).
354	>	* Returns {@code true} if this deque contained the specified element
355		* (or equivalently, if this deque changed as a result of the call).
356		*
357		* @param o element to be removed from this deque, if present
358	<	* @return <tt>true</tt> if the deque contained the specified element
358	>	* @return {@code true} if the deque contained the specified element
359		*/
360		public boolean removeLastOccurrence(Object o) {
361		if (o == null)
362		return false;
363		int mask = elements.length - 1;
364		int i = (tail - 1) & mask;
365	<	E x;
365	>	Object x;
366		while ( (x = elements[i]) != null) {
367		if (o.equals(x)) {
368		delete(i);
#	Line 373 | Line 381 | public class ArrayDeque<E> extends Abstr
381		* <p>This method is equivalent to {@link #addLast}.
382		*
383		* @param e the element to add
384	<	* @return <tt>true</tt> (as specified by {@link Collection#add})
384	>	* @return {@code true} (as specified by {@link Collection#add})
385		* @throws NullPointerException if the specified element is null
386		*/
387		public boolean add(E e) {
#	Line 387 | Line 395 | public class ArrayDeque<E> extends Abstr
395		* <p>This method is equivalent to {@link #offerLast}.
396		*
397		* @param e the element to add
398	<	* @return <tt>true</tt> (as specified by {@link Queue#offer})
398	>	* @return {@code true} (as specified by {@link Queue#offer})
399		* @throws NullPointerException if the specified element is null
400		*/
401		public boolean offer(E e) {
#	Line 412 | Line 420 | public class ArrayDeque<E> extends Abstr
420		/**
421		* Retrieves and removes the head of the queue represented by this deque
422		* (in other words, the first element of this deque), or returns
423	<	* <tt>null</tt> if this deque is empty.
423	>	* {@code null} if this deque is empty.
424		*
425		* <p>This method is equivalent to {@link #pollFirst}.
426		*
427		* @return the head of the queue represented by this deque, or
428	<	*         <tt>null</tt> if this deque is empty
428	>	*         {@code null} if this deque is empty
429		*/
430		public E poll() {
431		return pollFirst();
#	Line 439 | Line 447 | public class ArrayDeque<E> extends Abstr
447
448		/**
449		* Retrieves, but does not remove, the head of the queue represented by
450	<	* this deque, or returns <tt>null</tt> if this deque is empty.
450	>	* this deque, or returns {@code null} if this deque is empty.
451		*
452		* <p>This method is equivalent to {@link #peekFirst}.
453		*
454		* @return the head of the queue represented by this deque, or
455	<	*         <tt>null</tt> if this deque is empty
455	>	*         {@code null} if this deque is empty
456		*/
457		public E peek() {
458		return peekFirst();
#	Line 479 | Line 487 | public class ArrayDeque<E> extends Abstr
487		return removeFirst();
488		}
489
490	+	private void checkInvariants() {
491	+	assert elements[tail] == null;
492	+	assert head == tail ? elements[head] == null :
493	+	(elements[head] != null &&
494	+	elements[(tail - 1) & (elements.length - 1)] != null);
495	+	assert elements[(head - 1) & (elements.length - 1)] == null;
496	+	}
497	+
498		/**
499		* Removes the element at the specified position in the elements array,
500		* adjusting head and tail as necessary.  This can result in motion of
#	Line 490 | Line 506 | public class ArrayDeque<E> extends Abstr
506		* @return true if elements moved backwards
507		*/
508		private boolean delete(int i) {
509	<	int mask = elements.length - 1;
510	<
511	<	// Invariant: head <= i < tail mod circularity
512	<	if (((i - head) & mask) >= ((tail - head) & mask))
513	<	throw new ConcurrentModificationException();
514	<
515	<	// Case 1: Deque doesn't wrap
516	<	// Case 2: Deque does wrap and removed element is in the head portion
517	<	if (i >= head) {
518	<	System.arraycopy(elements, head, elements, head + 1, i - head);
519	<	elements[head] = null;
520	<	head = (head + 1) & mask;
509	>	checkInvariants();
510	>	final Object[] elements = this.elements;
511	>	final int mask = elements.length - 1;
512	>	final int h = head;
513	>	final int t = tail;
514	>	final int front = (i - h) & mask;
515	>	final int back  = (t - i) & mask;
516	>
517	>	// Invariant: head <= i < tail mod circularity
518	>	if (front >= ((t - h) & mask))
519	>	throw new ConcurrentModificationException();
520	>
521	>	// Optimize for least element motion
522	>	if (front < back) {
523	>	if (h <= i) {
524	>	System.arraycopy(elements, h, elements, h + 1, front);
525	>	} else { // Wrap around
526	>	System.arraycopy(elements, 0, elements, 1, i);
527	>	elements[0] = elements[mask];
528	>	System.arraycopy(elements, h, elements, h + 1, mask - h);
529	>	}
530	>	elements[h] = null;
531	>	head = (h + 1) & mask;
532		return false;
533	+	} else {
534	+	if (i < t) { // Copy the null tail as well
535	+	System.arraycopy(elements, i + 1, elements, i, back);
536	+	tail = t - 1;
537	+	} else { // Wrap around
538	+	System.arraycopy(elements, i + 1, elements, i, mask - i);
539	+	elements[mask] = elements[0];
540	+	System.arraycopy(elements, 1, elements, 0, t);
541	+	tail = (t - 1) & mask;
542	+	}
543	+	return true;
544		}
507	–
508	–	// Case 3: Deque wraps and removed element is in the tail portion
509	–	tail--;
510	–	System.arraycopy(elements, i + 1, elements, i, tail - i);
511	–	elements[tail] = null;
512	–	return true;
545		}
546
547		// *** Collection Methods ***
#	Line 524 | Line 556 | public class ArrayDeque<E> extends Abstr
556		}
557
558		/**
559	<	* Returns <tt>true</tt> if this deque contains no elements.
559	>	* Returns {@code true} if this deque contains no elements.
560		*
561	<	* @return <tt>true</tt> if this deque contains no elements
561	>	* @return {@code true} if this deque contains no elements
562		*/
563		public boolean isEmpty() {
564		return head == tail;
#	Line 571 | Line 603 | public class ArrayDeque<E> extends Abstr
603		}
604
605		public E next() {
574	–	E result;
606		if (cursor == fence)
607		throw new NoSuchElementException();
608	+	@SuppressWarnings("unchecked")
609	+	E result = (E) elements[cursor];
610		// This check doesn't catch all possible comodifications,
611		// but does catch the ones that corrupt traversal
612	<	if (tail != fence || (result = elements[cursor]) == null)
612	>	if (tail != fence || result == null)
613		throw new ConcurrentModificationException();
614		lastRet = cursor;
615		cursor = (cursor + 1) & (elements.length - 1);
#	Line 586 | Line 619 | public class ArrayDeque<E> extends Abstr
619		public void remove() {
620		if (lastRet < 0)
621		throw new IllegalStateException();
622	<	if (delete(lastRet)) // if left-shifted, undo increment in next()
622	>	if (delete(lastRet)) { // if left-shifted, undo increment in next()
623		cursor = (cursor - 1) & (elements.length - 1);
624	+	fence = tail;
625	+	}
626		lastRet = -1;
592	–	fence = tail;
627		}
628		}
629
596	–
630		private class DescendingIterator implements Iterator<E> {
631		/*
632		* This class is nearly a mirror-image of DeqIterator, using
633	<	* (tail-1) instead of head for initial cursor, (head-1)
634	<	* instead of tail for fence, and elements.length instead of -1
602	<	* for sentinel. It shares the same structure, but not many
603	<	* actual lines of code.
633	>	* tail instead of head for initial cursor, and head instead of
634	>	* tail for fence.
635		*/
636	<	private int cursor = (tail - 1) & (elements.length - 1);
637	<	private int fence =  (head - 1) & (elements.length - 1);
638	<	private int lastRet = elements.length;
636	>	private int cursor = tail;
637	>	private int fence = head;
638	>	private int lastRet = -1;
639
640		public boolean hasNext() {
641		return cursor != fence;
642		}
643
644		public E next() {
614	–	E result;
645		if (cursor == fence)
646		throw new NoSuchElementException();
647	<	if (((head - 1) & (elements.length - 1)) != fence ||
648	<	(result = elements[cursor]) == null)
647	>	cursor = (cursor - 1) & (elements.length - 1);
648	>	@SuppressWarnings("unchecked")
649	>	E result = (E) elements[cursor];
650	>	if (head != fence || result == null)
651		throw new ConcurrentModificationException();
652		lastRet = cursor;
621	–	cursor = (cursor - 1) & (elements.length - 1);
653		return result;
654		}
655
656		public void remove() {
657	<	if (lastRet >= elements.length)
657	>	if (lastRet < 0)
658		throw new IllegalStateException();
659	<	if (!delete(lastRet))
659	>	if (!delete(lastRet)) {
660		cursor = (cursor + 1) & (elements.length - 1);
661	<	lastRet = elements.length;
662	<	fence = (head - 1) & (elements.length - 1);
661	>	fence = head;
662	>	}
663	>	lastRet = -1;
664		}
665		}
666
667		/**
668	<	* Returns <tt>true</tt> if this deque contains the specified element.
669	<	* More formally, returns <tt>true</tt> if and only if this deque contains
670	<	* at least one element <tt>e</tt> such that <tt>o.equals(e)</tt>.
668	>	* Returns {@code true} if this deque contains the specified element.
669	>	* More formally, returns {@code true} if and only if this deque contains
670	>	* at least one element {@code e} such that {@code o.equals(e)}.
671		*
672		* @param o object to be checked for containment in this deque
673	<	* @return <tt>true</tt> if this deque contains the specified element
673	>	* @return {@code true} if this deque contains the specified element
674		*/
675		public boolean contains(Object o) {
676		if (o == null)
677		return false;
678		int mask = elements.length - 1;
679		int i = head;
680	<	E x;
680	>	Object x;
681		while ( (x = elements[i]) != null) {
682		if (o.equals(x))
683		return true;
#	Line 657 | Line 689 | public class ArrayDeque<E> extends Abstr
689		/**
690		* Removes a single instance of the specified element from this deque.
691		* If the deque does not contain the element, it is unchanged.
692	<	* More formally, removes the first element <tt>e</tt> such that
693	<	* <tt>o.equals(e)</tt> (if such an element exists).
694	<	* Returns <tt>true</tt> if this deque contained the specified element
692	>	* More formally, removes the first element {@code e} such that
693	>	* {@code o.equals(e)} (if such an element exists).
694	>	* Returns {@code true} if this deque contained the specified element
695		* (or equivalently, if this deque changed as a result of the call).
696		*
697		* <p>This method is equivalent to {@link #removeFirstOccurrence}.
698		*
699		* @param o element to be removed from this deque, if present
700	<	* @return <tt>true</tt> if this deque contained the specified element
700	>	* @return {@code true} if this deque contained the specified element
701		*/
702		public boolean remove(Object o) {
703		return removeFirstOccurrence(o);
#	Line 703 | Line 735 | public class ArrayDeque<E> extends Abstr
735		* @return an array containing all of the elements in this deque
736		*/
737		public Object[] toArray() {
738	<	return copyElements(new Object[size()]);
738	>	return copyElements(new Object[size()]);
739		}
740
741		/**
#	Line 717 | Line 749 | public class ArrayDeque<E> extends Abstr
749		* <p>If this deque fits in the specified array with room to spare
750		* (i.e., the array has more elements than this deque), the element in
751		* the array immediately following the end of the deque is set to
752	<	* <tt>null</tt>.
752	>	* {@code null}.
753		*
754		* <p>Like the {@link #toArray()} method, this method acts as bridge between
755		* array-based and collection-based APIs.  Further, this method allows
756		* precise control over the runtime type of the output array, and may,
757		* under certain circumstances, be used to save allocation costs.
758		*
759	<	* <p>Suppose <tt>x</tt> is a deque known to contain only strings.
759	>	* <p>Suppose {@code x} is a deque known to contain only strings.
760		* The following code can be used to dump the deque into a newly
761	<	* allocated array of <tt>String</tt>:
761	>	* allocated array of {@code String}:
762		*
763	<	* <pre>
732	<	*     String[] y = x.toArray(new String[0]);</pre>
763	>	*  <pre> {@code String[] y = x.toArray(new String[0]);}</pre>
764		*
765	<	* Note that <tt>toArray(new Object[0])</tt> is identical in function to
766	<	* <tt>toArray()</tt>.
765	>	* Note that {@code toArray(new Object[0])} is identical in function to
766	>	* {@code toArray()}.
767		*
768		* @param a the array into which the elements of the deque are to
769		*          be stored, if it is big enough; otherwise, a new array of the
#	Line 743 | Line 774 | public class ArrayDeque<E> extends Abstr
774		*         this deque
775		* @throws NullPointerException if the specified array is null
776		*/
777	+	@SuppressWarnings("unchecked")
778		public <T> T[] toArray(T[] a) {
779		int size = size();
780		if (a.length < size)
781		a = (T[])java.lang.reflect.Array.newInstance(
782		a.getClass().getComponentType(), size);
783	<	copyElements(a);
783	>	copyElements(a);
784		if (a.length > size)
785		a[size] = null;
786		return a;
#	Line 763 | Line 795 | public class ArrayDeque<E> extends Abstr
795		*/
796		public ArrayDeque<E> clone() {
797		try {
798	+	@SuppressWarnings("unchecked")
799		ArrayDeque<E> result = (ArrayDeque<E>) super.clone();
800	<	// These two lines are currently faster than cloning the array:
768	<	result.elements = (E[]) new Object[elements.length];
769	<	System.arraycopy(elements, 0, result.elements, 0, elements.length);
800	>	result.elements = Arrays.copyOf(elements, elements.length);
801		return result;
771	–
802		} catch (CloneNotSupportedException e) {
803		throw new AssertionError();
804		}
805		}
806
777	–	/**
778	–	* Appease the serialization gods.
779	–	*/
807		private static final long serialVersionUID = 2340985798034038923L;
808
809		/**
810	<	* Serialize this deque.
810	>	* Saves this deque to a stream (that is, serializes it).
811		*
812	<	* @serialData The current size (<tt>int</tt>) of the deque,
812	>	* @serialData The current size ({@code int}) of the deque,
813		* followed by all of its elements (each an object reference) in
814		* first-to-last order.
815		*/
816	<	private void writeObject(ObjectOutputStream s) throws IOException {
816	>	private void writeObject(java.io.ObjectOutputStream s)
817	>	throws java.io.IOException {
818		s.defaultWriteObject();
819
820		// Write out size
#	Line 799 | Line 827 | public class ArrayDeque<E> extends Abstr
827		}
828
829		/**
830	<	* Deserialize this deque.
830	>	* Reconstitutes this deque from a stream (that is, deserializes it).
831		*/
832	<	private void readObject(ObjectInputStream s)
833	<	throws IOException, ClassNotFoundException {
832	>	private void readObject(java.io.ObjectInputStream s)
833	>	throws java.io.IOException, ClassNotFoundException {
834		s.defaultReadObject();
835
836		// Read in size and allocate array
#	Line 813 | Line 841 | public class ArrayDeque<E> extends Abstr
841
842		// Read in all elements in the proper order.
843		for (int i = 0; i < size; i++)
844	<	elements[i] = (E)s.readObject();
817	<
844	>	elements[i] = s.readObject();
845		}
846		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines