zjkuki/jace
1
0
Fork 0
forked from Apple-2-Tools/jace
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed duplication from config panel (hopefully without side-effects).

Browse Source
This commit is contained in:
Brendan Robert 2015-02-28 23:47:28 -06:00
parent a6a1bf681b
commit 36173ab5f4
2 changed files with 10 additions and 9 deletions
.gitignore
src/main/java/jace/config
Configuration.java

2
.gitignore vendored

@ -12,4 +12,4 @@
hs_err_pid* hs_err_pid*
/jace/nbproject/private/ /jace/nbproject/private/
/jace/target/ /jace/target/
*.jace.conf *.jace.conf

17
src/main/java/jace/config/Configuration.java

@ -106,7 +106,7 @@ public class Configuration implements Reconfigurable {
} }
return subject.getName(); return subject.getName();
} }
public ConfigNode(Reconfigurable subject) { public ConfigNode(Reconfigurable subject) {
this(null, subject); this(null, subject);
this.root = null; this.root = null;
@ -164,7 +164,7 @@ public class Configuration implements Reconfigurable {
private ConfigNode findChild(String childName) { private ConfigNode findChild(String childName) {
for (ConfigNode node : children) { for (ConfigNode node : children) {
if (childName.equalsIgnoreCase(String.valueOf(node.getValue()))) { if (childName.equalsIgnoreCase(node.toString())) {
return node; return node;
} }
} }
@ -175,27 +175,28 @@ public class Configuration implements Reconfigurable {
removeChild(childName); removeChild(childName);
int index = 0; int index = 0;
for (ConfigNode node : children) { for (ConfigNode node : children) {
if (String.valueOf(node.getValue()).compareToIgnoreCase(childName) > 0) { int compare = node.toString().compareToIgnoreCase(childName);
if (compare >= 0) {
break; break;
} else { } else {
index++; index++;
} }
} }
children.add(index, newChild); children.add(index, newChild);
} }
} }
public final static ConfigNode BASE; public static ConfigNode BASE;
public static EmulatorUILogic ui = Emulator.logic; public static EmulatorUILogic ui = Emulator.logic;
public static Computer emulator = Emulator.computer; public static Computer emulator = Emulator.computer;
@ConfigurableField(name = "Autosave Changes", description = "If unchecked, changes are only saved when the Save button is pressed.") @ConfigurableField(name = "Autosave Changes", description = "If unchecked, changes are only saved when the Save button is pressed.")
public static boolean saveAutomatically = false; public static boolean saveAutomatically = false;
static { static {
BASE = new ConfigNode(new Configuration());
buildTree(); buildTree();
} }
public static void buildTree() { public static void buildTree() {
BASE = new ConfigNode(new Configuration());
buildTree(BASE, new LinkedHashSet()); buildTree(BASE, new LinkedHashSet());
} }
@ -424,9 +425,9 @@ public class Configuration implements Reconfigurable {
buildTree(oldRoot, new HashSet()); buildTree(oldRoot, new HashSet());
} }
newRoot.getChildren().stream().forEach((child) -> { newRoot.getChildren().stream().forEach((child) -> {
String childName = child.getValue().toString(); String childName = child.toString();
// System.out.println("Applying settings for " + childName); // System.out.println("Applying settings for " + childName);
applyConfigTree(newRoot.findChild(childName), oldRoot.findChild(childName)); applyConfigTree(child, oldRoot.findChild(childName));
}); });
} }