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.21 by dl, Fri Sep 16 23:17:05 2005 UTC vs.
Revision 1.24 by dl, Sat Sep 17 13:21:19 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 <        int mask = elements.length - 1;
494 <        int front = (i - head) & mask;
495 <        int back  = (tail - i) & mask;
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 >= ((tail - head) & mask))
501 >        if (front >= ((t - h) & mask))
502              throw new ConcurrentModificationException();
503  
504          // Optimize for least element motion
505          if (front < back) {
506 <            if (head <= i) {
507 <                System.arraycopy(elements, head, elements, head + 1, front);
506 >            if (h <= i) {
507 >                System.arraycopy(elements, h, elements, h + 1, front);
508              } else { // Wrap around
506                elements[0] = elements[mask];
509                  System.arraycopy(elements, 0, elements, 1, i);
510 <                System.arraycopy(elements, head, elements, head + 1, mask - head);
510 >                elements[0] = elements[mask];
511 >                System.arraycopy(elements, h, elements, h + 1, mask - h);
512              }
513 <            elements[head] = null;
514 <            head = (head + 1) & mask;
515 <            return false;
513 >            elements[h] = null;
514 >            head = (h + 1) & mask;
515 >            return false;
516          } else {
514            int t = tail;
515            tail = (tail - 1) & mask;
517              if (i < t) { // Copy the null tail as well
518                  System.arraycopy(elements, i + 1, elements, i, back);
519 <            } else {     // Wrap around
520 <                elements[mask] = elements[0];
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;
526 >            return true;
527          }
528      }
529  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines