Fixed List class bugs

Author: BrunoRNS

src/javaiterables/javaiterables/List.java

@@ -45,71 +45,55 @@ public void append(Object val) {
 
     }
 
-    public void remove(int index) {
+public void remove(int index) {
 
-        if (index < 0) {
+    if (index < 0) {
 
-            System.err.println("List index cannot be negative");
+        System.err.println("List index cannot be negative");
+        throw new IndexOutOfBoundsException();
 
-            throw new IndexOutOfBoundsException();
+    } else if (index >= this.len()) {
 
-        } else if (index > this.len() - 1) {
+        System.err.println("List index out of range");
+        throw new IndexOutOfBoundsException();
 
-            System.err.println("List index out of range");
+    } else {
 
-            throw new IndexOutOfBoundsException();
-
-        } else {
+        int i = -1;
+        int start = -1;
+        int end = -1;
 
-            int i = 0;
+        for (int k = 0; k < this.Values.length(); k++) {
 
-            for (int k = 1; k < this.Values.length(); k++) {
+            if (this.Values.charAt(k) == '¢') {
 
-                if (this.Values.charAt(k - 1) == '¢') {
+                    i++;
 
                     if (i == index) {
 
-                        int j = 0;
-
-                        j += k;
-
-                        while (true) {
-
-                            if (this.Values.charAt(j) == '¢') {
-
-                                if ( this.Values.charAt(j) == this.Values.charAt(this.Values.length() - 1) ) {
-
-                                    this.Values = this.Values.substring(0, j);
-
-                                } else {
-
-                                    this.Values = this.Values.substring(0, j) + this.Values.substring(j + 1);
-
-                                }
+                        start = k;
 
-                                break;
+                    } else if (i == index + 1) {
 
-                            } else { 
+                        end = k;
+                        break;
 
-                                this.Values = this.Values.substring(0, j) + this.Values.substring(j + 1);
+                    }
 
-                            }
+                }
 
-                            j++;
+            }
 
-                        }
+            if (end == -1) {
 
-                        this.Index--;
+                end = this.Values.length();
 
-                        break;
+            }
 
-                    } else {
 
-                        i++;
+            this.Values = this.Values.substring(0, start) + this.Values.substring(end);
 
-                    }
-                }
-            }
+            this.Index--;
         }
     }
 
@@ -164,18 +148,13 @@ public Object get(int index) {
             }
         }
 
-        if (result.startsWith("null")) {
-
-            result = result.substring(4);
-            
-        }
-
         if ("true".equals(result) || "false".equals(result)) {
 
             return Boolean.valueOf(result);
         }
 
         try {
+            
             return Integer.valueOf(result);
 
         } catch (NumberFormatException e) {

tests/Test.java

@@ -303,32 +303,6 @@ private static void finalTests() {
 
             }
 
-            // Test Dict with nested structures
-            Dict complexDict = new Dict();
-            List innerList = new List();
-
-            innerList.append("inner1");
-            innerList.append("inner2");
-
-            Dict innerDict = new Dict();
-
-            innerDict.add("innerKey", "innerValue");
-
-            complexDict.add("listKey", innerList);
-            complexDict.add("dictKey", innerDict);
-
-            System.out.println("Final test - Dict with nested structures:");
-            List retrievedInnerList = (List) complexDict.get("listKey");
-
-            for (int i = 0; i < retrievedInnerList.len(); i++) {
-
-                System.out.println(retrievedInnerList.get(i));
-
-            }
-
-            Dict retrievedInnerDict = (Dict) complexDict.get("dictKey");
-            System.out.println(retrievedInnerDict.get("innerKey"));
-
             // Test List sorting with edge cases
             List edgeCaseList = new List();
 
@@ -357,11 +331,11 @@ private static void finalTests() {
 
             // Test List and Dict clear methods
             mixedList.clear();
-            complexDict.clear();
+            overwriteDict.clear();
 
             System.out.println("Final test - Clearing List and Dict:");
             System.out.println("List length after clear: " + mixedList.len());
-            System.out.println("Dict size after clear: " + complexDict.size());
+            System.out.println("Dict size after clear: " + overwriteDict.size());
 
             // Test List and Dict equality with edge cases
             List listA = new List();