Skip to content

Commit eb4c729

Browse files
committed
Rename Setting.get to Setting.getString
1 parent fb0ba37 commit eb4c729

File tree

8 files changed

+14
-8
lines changed

8 files changed

+14
-8
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import org.jetbrains.java.decompiler.main.decompiler.BaseDecompiler;
55
import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
66
import org.jetbrains.java.decompiler.main.decompiler.PrintStreamLogger;
7+
import org.jetbrains.java.decompiler.main.extern.IBytecodeProvider;
78
import org.jetbrains.java.decompiler.main.extern.IResultSaver;
89
import org.objectweb.asm.tree.ClassNode;
910
import org.objectweb.asm.tree.InnerClassNode;
@@ -13,6 +14,7 @@
1314
import the.bytecode.club.jda.settings.Setting;
1415

1516
import java.io.File;
17+
import java.io.IOException;
1618
import java.nio.file.Files;
1719
import java.nio.file.Path;
1820
import java.util.HashMap;
@@ -158,7 +160,7 @@ public void decompileToZip(String zipName) {
158160
private Map<String, Object> generateFernflowerArgs() {
159161
Map<String, Object> options = new HashMap<>();
160162
for (SettingsEntry setting : settings.getEntries()) {
161-
options.put(setting.key, setting.get());
163+
options.put(setting.key, setting.getString());
162164
}
163165
return options;
164166
}

src/main/java/the/bytecode/club/jda/gui/MainViewerGUI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ public void resetWindows() {
346346

347347
public void setOptionalLibrary() {
348348
final JTextField text = new JTextField();
349-
text.setText(Settings.PATH.get());
349+
text.setText(Settings.PATH.getString());
350350
final JDialog dialog = new JDialog();
351351
dialog.setModal(true);
352352
dialog.add(text);

src/main/java/the/bytecode/club/jda/gui/PaneUpdaterThread.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void run() {
4545
panelArea.setCaretPosition(0);
4646
panelArea.setEditable(viewer.isPaneEditable(paneId));
4747
scrollPane.setColumnHeaderView(new JLabel(decompiler.getName() + " Decompiler - Editable: " + panelArea.isEditable()));
48-
panelArea.setFont(new Font(Settings.FONT_FAMILY.get(), Settings.FONT_OPTIONS.getInt(), Settings.FONT_SIZE.getInt()));
48+
panelArea.setFont(new Font(Settings.FONT_FAMILY.getString(), Settings.FONT_OPTIONS.getInt(), Settings.FONT_SIZE.getInt()));
4949

5050
SwingUtilities.invokeLater(() -> target.add(scrollPane));
5151
viewer.updatePane(paneId, panelArea, decompiler);

src/main/java/the/bytecode/club/jda/gui/dialogs/FileChooser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public FileChooser(Setting target, String message) {
1919

2020
public void run() {
2121
File currentFile = new File(
22-
target.get() == null || target.get().isEmpty() ? System.getProperty("user.home") : target.get());
22+
target.getString() == null || target.getString().isEmpty() ? System.getProperty("user.home") : target.getString());
2323
JFileChooser fc = new JFileChooser();
2424
fc.setFileFilter(new FileFilter() {
2525
@Override

src/main/java/the/bytecode/club/jda/gui/dialogs/FontOptionsDialog.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public FontOptionsDialog() {
2020
String[] array = ge.getAvailableFontFamilyNames();
2121
dialog.add(fontBox = new JComboBox<>(array), "span, wrap");
2222
fontBox.setEditable(true);
23-
fontBox.setSelectedItem(Settings.FONT_FAMILY.get());
23+
fontBox.setSelectedItem(Settings.FONT_FAMILY.getString());
2424

2525
dialog.add(new JLabel("Font Size:"));
2626
dialog.add(sizeSpinner = new JSpinner());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void registerSetting(SettingsEntry entry) {
7777
item = checkbox;
7878
break;
7979
case STRING:
80-
JTextArea textArea = new JTextArea(entry.get());
80+
JTextArea textArea = new JTextArea(entry.getString());
8181
textArea.setMaximumSize(new Dimension(42, textArea.getMaximumSize().height));
8282
stringSettings.put(entry, textArea);
8383
item = textArea;

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,14 @@ public Setting(String name, String value) {
2727
this(name, (Object)value, STRING);
2828
}
2929

30-
public String get() {
30+
public String getString() {
3131
return value.toString();
3232
}
3333

34+
public Object get() {
35+
return value;
36+
}
37+
3438
public boolean getBool() {
3539
return (boolean) value;
3640
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public static void saveGUI() {
5656
decompiler.getSettings().saveTo(settings);
5757

5858
for (Setting setting : Settings.ALL_SETTINGS) {
59-
getNode(settings, setting.node).add(setting.name, setting.get());
59+
getNode(settings, setting.node).add(setting.name, setting.getString());
6060
}
6161

6262
if (settings.get("windows") == null)

0 commit comments

Comments
 (0)