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.131 by jsr166, Wed Aug 23 22:41:49 2017 UTC vs.
Revision 1.134 by jsr166, Sat Jun 30 22:35:55 2018 UTC

#	Line 9 | Line 9 | import java.io.Serializable;
9		import java.util.function.Consumer;
10		import java.util.function.Predicate;
11		import java.util.function.UnaryOperator;
12	+	import jdk.internal.misc.SharedSecrets;
13
14		/**
15		* Resizable-array implementation of the {@link Deque} interface.  Array
#	Line 180 | Line 181 | public class ArrayDeque<E> extends Abstr
181		* sufficient to hold 16 elements.
182		*/
183		public ArrayDeque() {
184	<	elements = new Object[16];
184	>	elements = new Object[16 + 1];
185		}
186
187		/**
#	Line 208 | Line 209 | public class ArrayDeque<E> extends Abstr
209		*/
210		public ArrayDeque(Collection<? extends E> c) {
211		this(c.size());
212	<	addAll(c);
212	>	copyElements(c);
213		}
214
215		/**
#	Line 324 | Line 325 | public class ArrayDeque<E> extends Abstr
325		final int s, needed;
326		if ((needed = (s = size()) + c.size() + 1 - elements.length) > 0)
327		grow(needed);
328	<	c.forEach(this::addLast);
328	>	copyElements(c);
329		// checkInvariants();
330		return size() > s;
331		}
332
333	+	private void copyElements(Collection<? extends E> c) {
334	+	c.forEach(this::addLast);
335	+	}
336	+
337		/**
338		* Inserts the specified element at the front of this deque.
339		*
#	Line 1235 | Line 1240 | public class ArrayDeque<E> extends Abstr
1240
1241		// Read in size and allocate array
1242		int size = s.readInt();
1243	+	SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Object[].class, size + 1);
1244		elements = new Object[size + 1];
1245		this.tail = size;
1246

Diff Legend

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