Merge pull request processing#4519 from inkwellsiesta/master

benfry · benfry · commit 34304e26e813 · 2016-06-01T16:20:01.000-04:00
fixed iterator remove() methods so they dont skip container elements
diff --git a/core/src/processing/data/FloatDict.java b/core/src/processing/data/FloatDict.java
@@ -158,6 +158,7 @@ public Iterator<String> keyIterator() {
 
       public void remove() {
         removeIndex(index);
+        index--;
       }
 
       public String next() {
@@ -218,6 +219,7 @@ public Iterator<Float> valueIterator() {
 
       public void remove() {
         removeIndex(index);
+        index--;
       }
 
       public Float next() {
diff --git a/core/src/processing/data/FloatList.java b/core/src/processing/data/FloatList.java
@@ -793,6 +793,7 @@ public Iterator<Float> iterator() {
 
       public void remove() {
         FloatList.this.remove(index);
+        index--;
       }
 
       public Float next() {
diff --git a/core/src/processing/data/IntDict.java b/core/src/processing/data/IntDict.java
@@ -159,6 +159,7 @@ public Iterator<String> keyIterator() {
 
       public void remove() {
         removeIndex(index);
+        index--;
       }
 
       public String next() {
@@ -219,6 +220,7 @@ public Iterator<Integer> valueIterator() {
 
       public void remove() {
         removeIndex(index);
+        index--;
       }
 
       public Integer next() {
diff --git a/core/src/processing/data/IntList.java b/core/src/processing/data/IntList.java
@@ -737,6 +737,7 @@ public Iterator<Integer> iterator() {
 
       public void remove() {
         IntList.this.remove(index);
+        index--;
       }
 
       public Integer next() {
diff --git a/core/src/processing/data/StringDict.java b/core/src/processing/data/StringDict.java
@@ -160,6 +160,7 @@ public Iterator<String> keyIterator() {
 
       public void remove() {
         removeIndex(index);
+        index--;
       }
 
       public String next() {
@@ -219,6 +220,7 @@ public Iterator<String> valueIterator() {
 
       public void remove() {
         removeIndex(index);
+        index--;
       }
 
       public String next() {
diff --git a/core/src/processing/data/StringList.java b/core/src/processing/data/StringList.java
@@ -657,6 +657,7 @@ public Iterator<String> iterator() {
 
       public void remove() {
         StringList.this.remove(index);
+        index--;
       }
 
       public String next() {
@@ -768,4 +769,4 @@ public String toString() {
     sb.append(" ]");
     return sb.toString();
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,7 @@ public Iterator<String> keyIterator() {`
`158`	`158`
`159`	`159`	`public void remove() {`
`160`	`160`	`removeIndex(index);`
	`161`	`+ index--;`
`161`	`162`	`}`
`162`	`163`
`163`	`164`	`public String next() {`
`@@ -218,6 +219,7 @@ public Iterator<Float> valueIterator() {`
`218`	`219`
`219`	`220`	`public void remove() {`
`220`	`221`	`removeIndex(index);`
	`222`	`+ index--;`
`221`	`223`	`}`
`222`	`224`
`223`	`225`	`public Float next() {`
Original file line number	Diff line number	Diff line change
`@@ -793,6 +793,7 @@ public Iterator<Float> iterator() {`
`793`	`793`
`794`	`794`	`public void remove() {`
`795`	`795`	`FloatList.this.remove(index);`
	`796`	`+ index--;`
`796`	`797`	`}`
`797`	`798`
`798`	`799`	`public Float next() {`
Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,7 @@ public Iterator<String> keyIterator() {`
`159`	`159`
`160`	`160`	`public void remove() {`
`161`	`161`	`removeIndex(index);`
	`162`	`+ index--;`
`162`	`163`	`}`
`163`	`164`
`164`	`165`	`public String next() {`
`@@ -219,6 +220,7 @@ public Iterator<Integer> valueIterator() {`
`219`	`220`
`220`	`221`	`public void remove() {`
`221`	`222`	`removeIndex(index);`
	`223`	`+ index--;`
`222`	`224`	`}`
`223`	`225`
`224`	`226`	`public Integer next() {`
Original file line number	Diff line number	Diff line change
`@@ -737,6 +737,7 @@ public Iterator<Integer> iterator() {`
`737`	`737`
`738`	`738`	`public void remove() {`
`739`	`739`	`IntList.this.remove(index);`
	`740`	`+ index--;`
`740`	`741`	`}`
`741`	`742`
`742`	`743`	`public Integer next() {`
Original file line number	Diff line number	Diff line change
`@@ -160,6 +160,7 @@ public Iterator<String> keyIterator() {`
`160`	`160`
`161`	`161`	`public void remove() {`
`162`	`162`	`removeIndex(index);`
	`163`	`+ index--;`
`163`	`164`	`}`
`164`	`165`
`165`	`166`	`public String next() {`
`@@ -219,6 +220,7 @@ public Iterator<String> valueIterator() {`
`219`	`220`
`220`	`221`	`public void remove() {`
`221`	`222`	`removeIndex(index);`
	`223`	`+ index--;`
`222`	`224`	`}`
`223`	`225`
`224`	`226`	`public String next() {`
Original file line number	Diff line number	Diff line change
`@@ -657,6 +657,7 @@ public Iterator<String> iterator() {`
`657`	`657`
`658`	`658`	`public void remove() {`
`659`	`659`	`StringList.this.remove(index);`
	`660`	`+ index--;`
`660`	`661`	`}`
`661`	`662`
`662`	`663`	`public String next() {`
`@@ -768,4 +769,4 @@ public String toString() {`
`768`	`769`	`sb.append(" ]");`
`769`	`770`	`return sb.toString();`
`770`	`771`	`}`
`771`		`-}`
	`772`	`+}`