diff --git a/src/main/java/ru/j4j/collection/SimpleArrayList.java b/src/main/java/ru/j4j/collection/SimpleArrayList.java index 2a71b84..e8841ec 100644 --- a/src/main/java/ru/j4j/collection/SimpleArrayList.java +++ b/src/main/java/ru/j4j/collection/SimpleArrayList.java @@ -3,6 +3,7 @@ import java.util.*; public class SimpleArrayList implements SimpleList { + private T[] container; private int size; private int modCount; @@ -12,8 +13,8 @@ public SimpleArrayList(int capacity) { } private void grow() { - int newLength = container.length > 0 ? container.length * 2 : 1; - container = Arrays.copyOf(container, newLength); + int newCapacity = container.length > 0 ? container.length * 2 : 1; + container = Arrays.copyOf(container, newCapacity); } @Override @@ -25,6 +26,13 @@ public void add(T value) { modCount++; } + @Override + public T set(int index, T newValue) { + T changedValue = get(index); + container[index] = newValue; + return changedValue; + } + @Override public T remove(int index) { T removedValue = get(index); @@ -34,13 +42,6 @@ public T remove(int index) { return removedValue; } - @Override - public T set(int index, T newValue) { - T changedValue = get(index); - container[index] = newValue; - return changedValue; - } - @Override public T get(int index) { Objects.checkIndex(index, size); @@ -55,12 +56,12 @@ public int size() { @Override public Iterator iterator() { return new Iterator() { - private int index = 0; - public final int expectedModCount = modCount; + int index = 0; + final int expectedModCount = modCount; @Override public boolean hasNext() { - if (modCount != expectedModCount) { + if (expectedModCount != modCount) { throw new ConcurrentModificationException("cannot be changed during iteration"); } return index < size;