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.22 by dl, Fri Sep 16 23:59:27 2005 UTC vs.
Revision 1.23 by dl, Sat Sep 17 12:50:34 2005 UTC

#	Line 490 | Line 490 | public class ArrayDeque<E> extends Abstr
490		* @return true if elements moved backwards
491		*/
492		private boolean delete(int i) {
493	+	final E[] elements = this.elements;
494	+	final int mask = elements.length - 1;
495	+	final int h = head;
496	+	final int t = tail;
497	+	final int front = (i - h) & mask;
498	+	final int back  = (t - i) & mask;
499	+
500	+	// Invariant: head <= i < tail mod circularity
501	+	if (front >= ((t - h) & mask))
502	+	throw new ConcurrentModificationException();
503	+
504	+	// Optimize for least element motion
505	+	if (front < back) {
506	+	if (h <= i) {
507	+	System.arraycopy(elements, h, elements, h + 1, front);
508	+	} else { // Wrap around
509	+	System.arraycopy(elements, 0, elements, 1, i);
510	+	elements[0] = elements[mask];
511	+	System.arraycopy(elements, h, elements, h + 1, mask - h);
512	+	}
513	+	elements[h] = null;
514	+	head = (h + 1) & mask;
515	+	return false;
516	+	} else {
517	+	if (i < t) { // Copy the null tail as well
518	+	System.arraycopy(elements, i + 1, elements, i, back);
519	+	tail = t - 1;
520	+	} else { // Wrap around
521	+	System.arraycopy(elements, i + 1, elements, i, mask - i);
522	+	elements[mask] = elements[0];
523	+	System.arraycopy(elements, 1, elements, 0, t);
524	+	tail = (t - 1) & mask;
525	+	}
526	+	return true;
527	+	}
528	+	}
529	+
530	+	private boolean xdelete(int i) {
531		int mask = elements.length - 1;
532		int front = (i - head) & mask;
533		int back  = (tail - i) & mask;

Diff Legend

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