From 36173ab5f4c431ff07a1167cb72167ab3d7980cb Mon Sep 17 00:00:00 2001
From: Brendan Robert <brendan.robert@gmail.com>
Date: Sat, 28 Feb 2015 23:47:28 -0600
Subject: [PATCH] Removed duplication from config panel (hopefully without
 side-effects).

---
 .gitignore                                   |  2 +-
 src/main/java/jace/config/Configuration.java | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7f30f15..c33b472 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,4 @@
 hs_err_pid*
 /jace/nbproject/private/
 /jace/target/
-*.jace.conf
+*.jace.conf
\ No newline at end of file
diff --git a/src/main/java/jace/config/Configuration.java b/src/main/java/jace/config/Configuration.java
index 5db73d4..8fa71c6 100644
--- a/src/main/java/jace/config/Configuration.java
+++ b/src/main/java/jace/config/Configuration.java
@@ -106,7 +106,7 @@ public class Configuration implements Reconfigurable {
             }
             return subject.getName();
         }
-
+        
         public ConfigNode(Reconfigurable subject) {
             this(null, subject);
             this.root = null;
@@ -164,7 +164,7 @@ public class Configuration implements Reconfigurable {
 
         private ConfigNode findChild(String childName) {
             for (ConfigNode node : children) {
-                if (childName.equalsIgnoreCase(String.valueOf(node.getValue()))) {
+                if (childName.equalsIgnoreCase(node.toString())) {
                     return node;
                 }
             }
@@ -175,27 +175,28 @@ public class Configuration implements Reconfigurable {
             removeChild(childName);
             int index = 0;
             for (ConfigNode node : children) {
-                if (String.valueOf(node.getValue()).compareToIgnoreCase(childName) > 0) {
+                int compare = node.toString().compareToIgnoreCase(childName);
+                if (compare >= 0) {
                     break;
                 } else {
                     index++;
                 }
-            }
+            }            
             children.add(index, newChild);
         }
     }
-    public final static ConfigNode BASE;
+    public static ConfigNode BASE;
     public static EmulatorUILogic ui = Emulator.logic;
     public static Computer emulator = Emulator.computer;
     @ConfigurableField(name = "Autosave Changes", description = "If unchecked, changes are only saved when the Save button is pressed.")
     public static boolean saveAutomatically = false;
 
     static {
-        BASE = new ConfigNode(new Configuration());
         buildTree();
     }
 
     public static void buildTree() {
+        BASE = new ConfigNode(new Configuration());
         buildTree(BASE, new LinkedHashSet());
     }
 
@@ -424,9 +425,9 @@ public class Configuration implements Reconfigurable {
             buildTree(oldRoot, new HashSet());
         }
         newRoot.getChildren().stream().forEach((child) -> {
-            String childName = child.getValue().toString();
+            String childName = child.toString();
             //            System.out.println("Applying settings for " + childName);
-            applyConfigTree(newRoot.findChild(childName), oldRoot.findChild(childName));
+            applyConfigTree(child, oldRoot.findChild(childName));
         });
     }