From 2bb3582195d07f7b7decad0f9d4be90c1c2ec03d Mon Sep 17 00:00:00 2001
From: inkwellsiesta <leslie.g.watkins@gmail.com>
Date: Wed, 1 Jun 2016 16:00:44 -0400
Subject: [PATCH] fixed iterator remove() methods so they dont skip container
 elements

---
 core/src/processing/data/FloatDict.java  | 2 ++
 core/src/processing/data/FloatList.java  | 1 +
 core/src/processing/data/IntDict.java    | 2 ++
 core/src/processing/data/IntList.java    | 1 +
 core/src/processing/data/StringDict.java | 2 ++
 core/src/processing/data/StringList.java | 3 ++-
 6 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/core/src/processing/data/FloatDict.java b/core/src/processing/data/FloatDict.java
index 5fcc50737..cfb9adc99 100644
--- a/core/src/processing/data/FloatDict.java
+++ b/core/src/processing/data/FloatDict.java
@@ -158,6 +158,7 @@ public class FloatDict {
 
       public void remove() {
         removeIndex(index);
+        index--;
       }
 
       public String next() {
@@ -218,6 +219,7 @@ public class FloatDict {
 
       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
index c2ff82367..daf01cbfe 100644
--- a/core/src/processing/data/FloatList.java
+++ b/core/src/processing/data/FloatList.java
@@ -793,6 +793,7 @@ public class FloatList implements Iterable<Float> {
 
       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
index 316f4a73d..9c9a2b943 100644
--- a/core/src/processing/data/IntDict.java
+++ b/core/src/processing/data/IntDict.java
@@ -159,6 +159,7 @@ public class IntDict {
 
       public void remove() {
         removeIndex(index);
+        index--;
       }
 
       public String next() {
@@ -219,6 +220,7 @@ public class IntDict {
 
       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
index cb5dc560b..5147d7569 100644
--- a/core/src/processing/data/IntList.java
+++ b/core/src/processing/data/IntList.java
@@ -737,6 +737,7 @@ public class IntList implements Iterable<Integer> {
 
       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
index 330d362c9..1e2128a12 100644
--- a/core/src/processing/data/StringDict.java
+++ b/core/src/processing/data/StringDict.java
@@ -160,6 +160,7 @@ public class StringDict {
 
       public void remove() {
         removeIndex(index);
+        index--;
       }
 
       public String next() {
@@ -219,6 +220,7 @@ public class StringDict {
 
       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
index a647a9191..215bc7adb 100644
--- a/core/src/processing/data/StringList.java
+++ b/core/src/processing/data/StringList.java
@@ -657,6 +657,7 @@ public class StringList implements Iterable<String> {
 
       public void remove() {
         StringList.this.remove(index);
+        index--;
       }
 
       public String next() {
@@ -768,4 +769,4 @@ public class StringList implements Iterable<String> {
     sb.append(" ]");
     return sb.toString();
   }
-}
\ No newline at end of file
+}