Skip to content

Commit 48c62ac

Browse files
rcxrcx
committed
Rename Settings field members
1 parent 15b64c6 commit 48c62ac

File tree

5 files changed

+30
-30
lines changed

5 files changed

+30
-30
lines changed

‎src/main/java/the/bytecode/club/jda/decompilers/CFRDecompiler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public String[] generateMainMethod() {
145145
result[0] = "bytecodeviewer";
146146
int index = 1;
147147
for (SettingsEntry setting : entries) {
148-
result[index++] = "--" + setting.param;
148+
result[index++] = "--" + setting.key;
149149
result[index++] = String.valueOf(setting.getBool());
150150
}
151151
return result;

‎src/main/java/the/bytecode/club/jda/decompilers/FernflowerDecompiler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public void decompileToZip(String zipName) {
158158
private Map<String, Object> generateFernflowerArgs() {
159159
Map<String, Object> options = new HashMap<>();
160160
for (SettingsEntry setting : settings.getEntries()) {
161-
options.put(setting.param, setting.get());
161+
options.put(setting.key, setting.get());
162162
}
163163
return options;
164164
}

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public Set<SettingsEntry> getEntries() {
6666
}
6767

6868
public void registerSetting(SettingsEntry entry) {
69-
entries.put(entry.param, entry);
69+
entries.put(entry.key, entry);
7070

7171
JComponent item;
7272
switch(entry.getType()) {
@@ -94,7 +94,7 @@ public void registerSetting(SettingsEntry entry) {
9494
}
9595

9696
dialogPane.add(item, "align right");
97-
dialogPane.add(new JLabel(entry.key), "wrap");
97+
dialogPane.add(new JLabel(entry.name), "wrap");
9898
}
9999

100100
public void loadFrom(JsonObject rootSettings) {
@@ -104,20 +104,20 @@ public void loadFrom(JsonObject rootSettings) {
104104
JsonObject thisDecompiler = decompilerSection.get(decompiler.getName()).asObject();
105105

106106
for (Map.Entry<SettingsEntry, JCheckBox> entry : booleanSettings.entrySet()) {
107-
if (thisDecompiler.get(entry.getKey().param) != null) {
108-
entry.getValue().setSelected(thisDecompiler.get(entry.getKey().param).asBoolean());
107+
if (thisDecompiler.get(entry.getKey().key) != null) {
108+
entry.getValue().setSelected(thisDecompiler.get(entry.getKey().key).asBoolean());
109109
}
110110
}
111111

112112
for (Map.Entry<SettingsEntry, JTextArea> entry : stringSettings.entrySet()) {
113-
if (thisDecompiler.get(entry.getKey().param) != null) {
114-
entry.getValue().setText(thisDecompiler.get(entry.getKey().param).asString());
113+
if (thisDecompiler.get(entry.getKey().key) != null) {
114+
entry.getValue().setText(thisDecompiler.get(entry.getKey().key).asString());
115115
}
116116
}
117117

118118
for (Map.Entry<SettingsEntry, JSpinner> entry : intSettings.entrySet()) {
119-
if (thisDecompiler.get(entry.getKey().param) != null) {
120-
entry.getValue().setValue(thisDecompiler.get(entry.getKey().param).asInt());
119+
if (thisDecompiler.get(entry.getKey().key) != null) {
120+
entry.getValue().setValue(thisDecompiler.get(entry.getKey().key).asInt());
121121
}
122122
}
123123
}
@@ -134,27 +134,27 @@ public void saveTo(JsonObject rootSettings) {
134134
}
135135
JsonObject thisDecompiler = decompilerSection.get(decompiler.getName()).asObject();
136136
for (Map.Entry<SettingsEntry, JCheckBox> entry : booleanSettings.entrySet()) {
137-
thisDecompiler.add(entry.getKey().param, entry.getValue().isSelected());
137+
thisDecompiler.add(entry.getKey().key, entry.getValue().isSelected());
138138
}
139139
for (Map.Entry<SettingsEntry, JTextArea> entry : stringSettings.entrySet()) {
140-
thisDecompiler.add(entry.getKey().param, entry.getValue().getText());
140+
thisDecompiler.add(entry.getKey().key, entry.getValue().getText());
141141
}
142142
for (Map.Entry<SettingsEntry, JSpinner> entry : intSettings.entrySet()) {
143-
thisDecompiler.add(entry.getKey().param, (Integer)entry.getValue().getValue());
143+
thisDecompiler.add(entry.getKey().key, (Integer)entry.getValue().getValue());
144144
}
145145
}
146146

147147
// TODO: Refactor to have a default entry class for each type of entry, etc.
148148
public static class SettingsEntry extends Setting {
149-
public final String param;
149+
public final String key;
150150

151-
public SettingsEntry(String param, String key, Object value, SettingType type) {
152-
super(null, key, value, type);
153-
this.param = param;
151+
public SettingsEntry(String key, String name, Object value, SettingType type) {
152+
super(null, name, value, type);
153+
this.key = key;
154154
}
155155

156-
public SettingsEntry(String param, String key, Object value) {
157-
this(param, key, value, SettingType.BOOLEAN);
156+
public SettingsEntry(String key, String name, Object value) {
157+
this(key, name, value, SettingType.BOOLEAN);
158158
}
159159
}
160160
}

‎src/main/java/the/bytecode/club/jda/settings/Setting.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,27 @@
44

55
public class Setting {
66
public final String node; //TODO: convert to JSON node or something
7-
public final String key;
7+
public final String name;
88
public final SettingType type;
99
private Object value;
1010

11-
public Setting(String node, String key, Object value, SettingType type) {
11+
public Setting(String node, String name, Object value, SettingType type) {
1212
this.node = node;
13-
this.key = key;
13+
this.name = name;
1414
this.value = value;
1515
this.type = type;
1616
}
1717

18-
public Setting(String node, String key, Object value) {
19-
this(node, key, value, STRING);
18+
public Setting(String node, String name, Object value) {
19+
this(node, name, value, STRING);
2020
}
2121

22-
public Setting(String key, Object value, SettingType type) {
23-
this("settings", key, value, type);
22+
public Setting(String name, Object value, SettingType type) {
23+
this("settings", name, value, type);
2424
}
2525

26-
public Setting(String key, String value) {
27-
this(key, (Object)value, STRING);
26+
public Setting(String name, String value) {
27+
this(name, (Object)value, STRING);
2828
}
2929

3030
public String get() {

‎src/main/java/the/bytecode/club/jda/settings/Settings.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public static void saveGUI() {
5555
decompiler.getSettings().saveTo(settings);
5656

5757
for (Setting setting : Settings.ALL_SETTINGS) {
58-
getNode(settings, setting.node).add(setting.key, setting.get());
58+
getNode(settings, setting.node).add(setting.name, setting.get());
5959
}
6060

6161
if (settings.get("windows") == null)
@@ -106,7 +106,7 @@ public static void loadGUI() {
106106
String nodeId = setting.node;
107107
JsonValue nodeValue = settings.get(nodeId);
108108
if (nodeValue != null) {
109-
if ((nodeValue = nodeValue.asObject().get(setting.key)) != null)
109+
if ((nodeValue = nodeValue.asObject().get(setting.name)) != null)
110110
setting.set(nodeValue.asString());
111111
}
112112
}

0 commit comments

Comments
 (0)