Switch to param as key for SettingsEntry map

Author: rcx

src/main/java/the/bytecode/club/jda/decompilers/ProcyonDecompiler.java

@@ -46,22 +46,21 @@ public String getName() {
     }
 
     public DecompilerSettings getDecompilerSettings() {
-        System.out.println(settings.getEntry("Do not escape non-ASCII characters").getBool());
         DecompilerSettings procyonSettings = new DecompilerSettings();
-        procyonSettings.setFlattenSwitchBlocks(settings.getEntry("Flatten switch blocks").getBool());
-        procyonSettings.setForceExplicitImports(!settings.getEntry("Use wildcard imports").getBool());
-        procyonSettings.setForceExplicitTypeArguments(settings.getEntry("Explicit type arguments").getBool());
-        procyonSettings.setRetainRedundantCasts(settings.getEntry("Retain redundant casts").getBool());
-        procyonSettings.setShowSyntheticMembers(settings.getEntry("Show synthetic members").getBool());
-        procyonSettings.setExcludeNestedTypes(settings.getEntry("Exclude nested types").getBool());
+        procyonSettings.setFlattenSwitchBlocks(settings.getEntry("fsb").getBool());
+        procyonSettings.setForceExplicitImports(!settings.getEntry("ci").getBool());
+        procyonSettings.setForceExplicitTypeArguments(settings.getEntry("ei").getBool());
+        procyonSettings.setRetainRedundantCasts(settings.getEntry("ec").getBool());
+        procyonSettings.setShowSyntheticMembers(settings.getEntry("ss").getBool());
+        procyonSettings.setExcludeNestedTypes(settings.getEntry("ent").getBool());
 //        procyonSettings.setOutputDirectory(options.getOutputDirectory());
-        procyonSettings.setIncludeLineNumbersInBytecode(settings.getEntry("Show LVT comments").getBool());
-        procyonSettings.setRetainPointlessSwitches(settings.getEntry("Retain pointless switches").getBool());
-        procyonSettings.setUnicodeOutputEnabled(settings.getEntry("Do not escape non-ASCII characters").getBool());
-        procyonSettings.setMergeVariables(settings.getEntry("Merge variables aggressively").getBool());
-        procyonSettings.setShowDebugLineNumbers(settings.getEntry("Show LVT comments").getBool());
-        procyonSettings.setSimplifyMemberReferences(settings.getEntry("Simplify member references").getBool());
-        procyonSettings.setDisableForEachTransforms(settings.getEntry("Disable 'for each'").getBool());
+        procyonSettings.setIncludeLineNumbersInBytecode(settings.getEntry("dl").getBool());
+        procyonSettings.setRetainPointlessSwitches(settings.getEntry("ps").getBool());
+        procyonSettings.setUnicodeOutputEnabled(settings.getEntry("unicode").getBool());
+        procyonSettings.setMergeVariables(settings.getEntry("mv").getBool());
+        procyonSettings.setShowDebugLineNumbers(settings.getEntry("dl").getBool());
+        procyonSettings.setSimplifyMemberReferences(settings.getEntry("sm").getBool());
+        procyonSettings.setDisableForEachTransforms(settings.getEntry("disable-foreach").getBool());
         procyonSettings.setTypeLoader(new InputTypeLoader());
 //        procyonSettings.setLanguage(Languages.bytecode());
 //        procyonSettings.setLanguage(settings.getEntry("Unoptimized AST").getBool() ? Languages.bytecodeAstUnoptimized() : Languages.bytecodeAst());

src/main/java/the/bytecode/club/jda/decompilers/bytecode/BytecodeDecompiler.java

@@ -76,7 +76,7 @@ protected PrefixedStringBuilder decompile(PrefixedStringBuilder sb, ArrayList<St
                 sb.append(JDA.nl);
         }
 
-        if (settings.getEntry("Decompile Inner Classes").getBool())
+        if (settings.getEntry("decompile-inner-classes").getBool())
             for (InnerClassNode innerClassNode : cn.innerClasses) {
                 String innerClassName = innerClassNode.name;
                 if ((innerClassName != null) && !decompiledClasses.contains(innerClassName)) {

src/main/java/the/bytecode/club/jda/decompilers/bytecode/MethodNodeDecompiler.java

@@ -255,14 +255,14 @@ protected static String getAccessString(int access) {
     }
 
     boolean createComments() {
-        return parent.getSettings().getEntry("Debug Helpers").getBool();
+        return parent.getSettings().getEntry("debug-helpers").getBool();
     }
 
     boolean createLabelBrackets() {
-        return parent.getSettings().getEntry("Append Brackets to Labels").getBool();
+        return parent.getSettings().getEntry("append-brackets-to-labels").getBool();
     }
 
     boolean createDescriptors() {
-        return parent.getSettings().getEntry("Show Method Descriptors").getBool();
+        return parent.getSettings().getEntry("show-method-descriptors").getBool();
     }
 }

src/main/java/the/bytecode/club/jda/settings/DecompilerSettings.java

@@ -66,7 +66,7 @@ public Set<SettingsEntry> getEntries() {
     }
 
     public void registerSetting(SettingsEntry entry) {
-        entries.put(entry.key, entry);
+        entries.put(entry.param, entry);
 
         JComponent item;
         switch(entry.getType()) {