bug fix for ArrayList

Korben-CHY · Korben-CHY · commit bc2955ec56f0 · 2017-03-13T22:22:43.000+08:00
diff --git a/group20/1107837739/1107837739Learning/src/org/korben/coding/basic/list/KArrayList.java b/group20/1107837739/1107837739Learning/src/org/korben/coding/basic/list/KArrayList.java
@@ -74,7 +74,7 @@ public void clear() {
     @Override
     @SuppressWarnings("unchecked")
     public T get(int index) {
-        if (index < -1 || index >= size) {
+        if (index < 0 || index >= size) {
             throw new IndexOutOfBoundsException();
         }
 
@@ -83,7 +83,7 @@ public T get(int index) {
 
     @Override
     public T set(int index, T element) {
-        if (index < -1 || index >= size) {
+        if (index < 0 || index >= size) {
             throw new IndexOutOfBoundsException();
         }
 
@@ -94,7 +94,7 @@ public T set(int index, T element) {
 
     @Override
     public void add(int index, T element) {
-        if (index < -1 || index > size) {
+        if (index < 0 || index > size) {
             throw new IndexOutOfBoundsException();
         }
 
@@ -109,7 +109,7 @@ public void add(int index, T element) {
     @Override
     @SuppressWarnings("unchecked")
     public T remove(int index) {
-        if (index < -1 || index >= size) {
+        if (index < 0 || index >= size) {
             throw new IndexOutOfBoundsException();
         }
 
@@ -132,7 +132,7 @@ public int indexOf(T o) {
 
     @Override
     public KIterator<T> iterator() {
-        return new ArrayListIterator(this);
+        return new ArrayListIterator();
     }
 
     private void ensureCapacity(int minCapacity) {
@@ -147,21 +147,19 @@ private void ensureCapacity(int minCapacity) {
 
     private class ArrayListIterator implements KIterator<T> {
         private int position;
-        private KArrayList<T> list;
 
-        ArrayListIterator(KArrayList<T> list) {
-            this.list = list;
+        ArrayListIterator() {
         }
 
         @Override
         public boolean hasNext() {
-            return position < list.size();
+            return position < size();
         }
 
         @Override
         public T next() {
             if (hasNext()) {
-                return list.get(position++);
+                return get(position++);
             }
             return null;
         }
diff --git a/group20/1107837739/1107837739Learning/src/org/korben/coding/basic/list/KDoubleLinkedList.java b/group20/1107837739/1107837739Learning/src/org/korben/coding/basic/list/KDoubleLinkedList.java
diff --git a/group20/1107837739/1107837739Learning/src/org/korben/coding/basic/list/KLinkedList.java b/group20/1107837739/1107837739Learning/src/org/korben/coding/basic/list/KLinkedList.java
@@ -150,7 +150,7 @@ public int indexOf(T o) {
 
     @Override
     public KIterator<T> iterator() {
-        return new Iterator(this);
+        return new Iterator();
     }
 
     private Node<T> getNode(int index) {
@@ -474,8 +474,8 @@ private static class Node<T> {
     private class Iterator implements KIterator<T> {
         private Node<T> node;
 
-        Iterator(KLinkedList<T> list) {
-            this.node = list.head;
+        Iterator() {
+            this.node = head;
         }
 
         @Override
