Skip to content

Commit c63432a

Browse files
rcxrcx
committed
Rename Decompiler and DecompilerSettings to avoid name conflicts
1 parent ac1377c commit c63432a

File tree

11 files changed

+55
-68
lines changed

11 files changed

+55
-68
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.zeroturnaround.zip.ZipUtil;
2222
import the.bytecode.club.jda.JDA;
2323
import the.bytecode.club.jda.JarUtils;
24-
import the.bytecode.club.jda.settings.DecompilerSettings;
25-
import the.bytecode.club.jda.settings.DecompilerSettings.SettingsEntry;
24+
import the.bytecode.club.jda.settings.JDADecompilerSettings;
25+
import the.bytecode.club.jda.settings.JDADecompilerSettings.SettingsEntry;
2626

2727
import java.io.File;
2828
import java.io.IOException;
@@ -36,7 +36,7 @@
3636
*
3737
* @author Konloch
3838
*/
39-
public final class CFRDecompiler extends Decompiler {
39+
public final class CFRDecompiler extends JDADecompiler {
4040

4141
public CFRDecompiler() {
4242
settings.registerSetting(new SettingsEntry("decodeenumswitch", "Decode Enum Switch", true));
@@ -85,7 +85,7 @@ public CFRDecompiler() {
8585
}
8686

8787
@Override
88-
public DecompilerSettings getSettings() {
88+
public JDADecompilerSettings getSettings() {
8989
return settings;
9090
}
9191

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

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,23 @@
88
import java.util.Map;
99

1010
public class Decompilers {
11-
static final Map<String, Decompiler> BY_NAME = new LinkedHashMap<>();
11+
static final Map<String, JDADecompiler> BY_NAME = new LinkedHashMap<>();
1212

13-
public final static Decompiler PROCYON = new ProcyonDecompiler();
14-
public final static Decompiler CFR = new CFRDecompiler();
15-
public final static Decompiler FERNFLOWER = new FernflowerDecompiler();
16-
public final static Decompiler BYTECODE = new BytecodeDecompiler();
13+
public final static JDADecompiler PROCYON = new ProcyonDecompiler();
14+
public final static JDADecompiler CFR = new CFRDecompiler();
15+
public final static JDADecompiler FERNFLOWER = new FernflowerDecompiler();
16+
public final static JDADecompiler BYTECODE = new BytecodeDecompiler();
1717

1818

19-
public static Collection<Decompiler> getAllDecompilers() {
19+
public static Collection<JDADecompiler> getAllDecompilers() {
2020
return Collections.unmodifiableCollection(BY_NAME.values());
2121
}
22+
23+
static
24+
{
25+
Decompilers.BY_NAME.put(PROCYON.getName(), PROCYON);
26+
Decompilers.BY_NAME.put(CFR.getName(), CFR);
27+
Decompilers.BY_NAME.put(FERNFLOWER.getName(), FERNFLOWER);
28+
Decompilers.BY_NAME.put(BYTECODE.getName(), BYTECODE);
29+
}
2230
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import org.objectweb.asm.tree.InnerClassNode;
1010
import the.bytecode.club.jda.JDA;
1111
import the.bytecode.club.jda.JarUtils;
12-
import the.bytecode.club.jda.settings.DecompilerSettings.SettingsEntry;
12+
import the.bytecode.club.jda.settings.JDADecompilerSettings.SettingsEntry;
1313
import the.bytecode.club.jda.settings.Setting;
1414

1515
import java.io.File;
@@ -27,7 +27,7 @@
2727
* @author WaterWolf
2828
*/
2929

30-
public final class FernflowerDecompiler extends Decompiler {
30+
public final class FernflowerDecompiler extends JDADecompiler {
3131
public FernflowerDecompiler() {
3232
settings.registerSetting(new SettingsEntry("rbr", "Hide Bridge Methods", true));
3333
settings.registerSetting(new SettingsEntry("rsy", "Hide Synthetic Class Members", false));

src/main/java/the/bytecode/club/jda/decompilers/Decompiler.java renamed to src/main/java/the/bytecode/club/jda/decompilers/JDADecompiler.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import org.objectweb.asm.tree.ClassNode;
44
import the.bytecode.club.jda.JDA;
55
import the.bytecode.club.jda.api.ExceptionUI;
6-
import the.bytecode.club.jda.settings.DecompilerSettings;
6+
import the.bytecode.club.jda.settings.JDADecompilerSettings;
77

88
import java.io.PrintWriter;
99
import java.io.StringWriter;
@@ -14,20 +14,16 @@
1414
* @author Konloch
1515
*/
1616

17-
public abstract class Decompiler {
18-
public Decompiler() {
19-
Decompilers.BY_NAME.put(getName(), this);
20-
}
21-
22-
protected DecompilerSettings settings = new DecompilerSettings(this);
17+
public abstract class JDADecompiler {
18+
protected JDADecompilerSettings settings = new JDADecompilerSettings(this);
2319

2420
public abstract String decompileClassNode(String containerName, ClassNode cn);
2521

2622
public abstract void decompileToZip(String zipName);
2723

2824
public abstract String getName();
2925

30-
public DecompilerSettings getSettings() {
26+
public JDADecompilerSettings getSettings() {
3127
return settings;
3228
}
3329

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
import com.strobel.decompiler.PlainTextOutput;
88
import org.objectweb.asm.tree.ClassNode;
99
import the.bytecode.club.jda.JDA;
10-
import the.bytecode.club.jda.settings.DecompilerSettings.SettingsEntry;
10+
import the.bytecode.club.jda.settings.JDADecompilerSettings.SettingsEntry;
1111

12-
import java.io.*;
13-
import java.util.*;
12+
import java.io.StringWriter;
13+
import java.util.Map;
1414

1515
/**
1616
* Procyon Java Decompiler Wrapper
@@ -19,7 +19,7 @@
1919
* @author DeathMarine
2020
*/
2121

22-
public final class ProcyonDecompiler extends Decompiler {
22+
public final class ProcyonDecompiler extends JDADecompiler {
2323

2424
public ProcyonDecompiler() {
2525
// output modes: Bytecode AST, raw bytecode, Java

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import org.objectweb.asm.tree.InnerClassNode;
77
import org.objectweb.asm.tree.MethodNode;
88
import the.bytecode.club.jda.JDA;
9-
import the.bytecode.club.jda.decompilers.Decompiler;
10-
import the.bytecode.club.jda.settings.DecompilerSettings.SettingsEntry;
9+
import the.bytecode.club.jda.decompilers.JDADecompiler;
10+
import the.bytecode.club.jda.settings.JDADecompilerSettings.SettingsEntry;
1111

1212
import java.util.ArrayList;
1313
import java.util.Iterator;
@@ -18,7 +18,7 @@
1818
* @author Bibl
1919
*/
2020

21-
public class BytecodeDecompiler extends Decompiler {
21+
public class BytecodeDecompiler extends JDADecompiler {
2222

2323
public BytecodeDecompiler() {
2424
settings.registerSetting(new SettingsEntry("debug-helpers", "Debug Helpers", true));

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

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import org.objectweb.asm.tree.ClassNode;
44
import the.bytecode.club.jda.*;
55
import the.bytecode.club.jda.api.ExceptionUI;
6-
import the.bytecode.club.jda.decompilers.Decompiler;
76
import the.bytecode.club.jda.decompilers.Decompilers;
7+
import the.bytecode.club.jda.decompilers.JDADecompiler;
88
import the.bytecode.club.jda.gui.dialogs.AboutWindow;
99
import the.bytecode.club.jda.gui.dialogs.FontOptionsDialog;
1010
import the.bytecode.club.jda.gui.dialogs.IntroWindow;
@@ -65,17 +65,17 @@ public void actionPerformed(ActionEvent arg0) {
6565
public AboutWindow aboutWindow = new AboutWindow();
6666
public IntroWindow introWindow = new IntroWindow();
6767
public List<ButtonGroup> allPanes = Collections.unmodifiableList(Arrays.asList(panelGroup1, panelGroup2, panelGroup3));
68-
public Map<ButtonGroup, Map<JRadioButtonMenuItem, Decompiler>> allDecompilers = new HashMap<>();
69-
public Map<ButtonGroup, Map<Decompiler, JRadioButtonMenuItem>> allDecompilersRev = new HashMap<>();
70-
public Map<ButtonGroup, Map<Decompiler, JCheckBoxMenuItem>> editButtons = new HashMap<>();
68+
public Map<ButtonGroup, Map<JRadioButtonMenuItem, JDADecompiler>> allDecompilers = new HashMap<>();
69+
public Map<ButtonGroup, Map<JDADecompiler, JRadioButtonMenuItem>> allDecompilersRev = new HashMap<>();
70+
public Map<ButtonGroup, Map<JDADecompiler, JCheckBoxMenuItem>> editButtons = new HashMap<>();
7171
public JMenu mnRecentFiles = new JMenu("Recent Files");
7272
private JMenuItem spinnerMenu = new JMenuItem("");
7373
public FontOptionsDialog fontOptionsDialog = new FontOptionsDialog();
7474

7575
public MainViewerGUI() {
7676
initializeWindows();
7777

78-
Decompiler.ensureInitted();
78+
JDADecompiler.ensureInitted();
7979
allDecompilers.put(panelGroup1, new HashMap<>());
8080
allDecompilers.put(panelGroup2, new HashMap<>());
8181
allDecompilers.put(panelGroup3, new HashMap<>());
@@ -258,7 +258,7 @@ private void initializeMenubar() {
258258

259259
settingsMenu.add(new JSeparator());
260260

261-
for (Decompiler decompiler : Decompilers.getAllDecompilers()) {
261+
for (JDADecompiler decompiler : Decompilers.getAllDecompilers()) {
262262
JMenuItem settingsButton = new JMenuItem(decompiler.getName());
263263
settingsButton.addActionListener(e -> decompiler.getSettings().displayDialog());
264264
settingsMenu.add(settingsButton);
@@ -361,24 +361,6 @@ public void windowClosing(WindowEvent e) {
361361
dialog.setVisible(true);
362362
}
363363

364-
// private JMenu generateDecompilerMenu(Decompiler decompiler, int panelId) {
365-
// ButtonGroup group = allPanes.get(panelId);
366-
// JMenu menu = new JMenu(decompiler.getName());
367-
// JRadioButtonMenuItem java = new JRadioButtonMenuItem("Java");
368-
// java.addActionListener(listener);
369-
// JRadioButtonMenuItem bytecode = new JRadioButtonMenuItem("Bytecode");
370-
// JCheckBoxMenuItem editable = new JCheckBoxMenuItem("Editable");
371-
// JSeparator separator = new JSeparator();
372-
// menu.add(java);
373-
// group.add(java);
374-
// allDecompilers.get(group).put(java, decompiler);
375-
// allDecompilersRev.get(group).put(decompiler, java);
376-
// menu.add(separator);
377-
// menu.add(editable);
378-
// editButtons.get(group).put(decompiler, editable);
379-
// return menu;
380-
// }
381-
382364
private JMenu generatePane(int id) {
383365
JMenu menu = new JMenu("Pane " + (id + 1));
384366
ButtonGroup group = allPanes.get(id);
@@ -390,7 +372,7 @@ private JMenu generatePane(int id) {
390372
menu.add(none);
391373
menu.add(new JSeparator());
392374

393-
for (Decompiler decompiler : Decompilers.getAllDecompilers()) {
375+
for (JDADecompiler decompiler : Decompilers.getAllDecompilers()) {
394376
JRadioButtonMenuItem button = new JRadioButtonMenuItem(decompiler.getName());
395377
allDecompilers.get(group).put(button, decompiler);
396378
allDecompilersRev.get(group).put(decompiler, button);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.fife.ui.rtextarea.RTextScrollPane;
66
import the.bytecode.club.jda.JDA;
77
import the.bytecode.club.jda.api.ExceptionUI;
8-
import the.bytecode.club.jda.decompilers.Decompiler;
8+
import the.bytecode.club.jda.decompilers.JDADecompiler;
99
import the.bytecode.club.jda.gui.fileviewer.ClassViewer;
1010
import the.bytecode.club.jda.settings.Settings;
1111

@@ -19,13 +19,13 @@
1919
*/
2020
public class PaneUpdaterThread extends Thread {
2121

22-
private Decompiler decompiler;
22+
private JDADecompiler decompiler;
2323
private int paneId;
2424
private JPanel target;
2525
private ClassViewer viewer;
2626
private JButton button;
2727

28-
public PaneUpdaterThread(ClassViewer viewer, Decompiler decompiler, int paneId, JPanel target, JButton button) {
28+
public PaneUpdaterThread(ClassViewer viewer, JDADecompiler decompiler, int paneId, JPanel target, JButton button) {
2929
this.decompiler = decompiler;
3030
this.paneId = paneId;
3131
this.target = target;

‎src/main/java/the/bytecode/club/jda/gui/fileviewer/ClassViewer.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
44
import org.objectweb.asm.tree.ClassNode;
55
import the.bytecode.club.jda.JDA;
6-
import the.bytecode.club.jda.decompilers.Decompiler;
6+
import the.bytecode.club.jda.decompilers.JDADecompiler;
77
import the.bytecode.club.jda.gui.PaneUpdaterThread;
88

99
import javax.swing.*;
@@ -31,7 +31,7 @@ public class ClassViewer extends Viewer {
3131
public void setPanes() {
3232
for (int i = 0; i < JDA.viewer.allPanes.size(); i++) {
3333
ButtonGroup group = JDA.viewer.allPanes.get(i);
34-
for (Map.Entry<JRadioButtonMenuItem, Decompiler> entry : JDA.viewer.allDecompilers.get(group).entrySet()) {
34+
for (Map.Entry<JRadioButtonMenuItem, JDADecompiler> entry : JDA.viewer.allDecompilers.get(group).entrySet()) {
3535
if (group.isSelected(entry.getKey().getModel())) {
3636
decompilers.set(i, entry.getValue());
3737
}
@@ -42,14 +42,14 @@ public void setPanes() {
4242
public boolean isPaneEditable(int pane) {
4343
setPanes();
4444
ButtonGroup buttonGroup = JDA.viewer.allPanes.get(pane);
45-
Decompiler selected = decompilers.get(pane);
45+
JDADecompiler selected = decompilers.get(pane);
4646
if (buttonGroup != null && JDA.viewer.editButtons.get(buttonGroup) != null && JDA.viewer.editButtons.get(buttonGroup).get(selected) != null && JDA.viewer.editButtons.get(buttonGroup).get(selected).isSelected()) {
4747
return true;
4848
}
4949
return false;
5050
}
5151

52-
public void updatePane(int pane, RSyntaxTextArea text, Decompiler decompiler) {
52+
public void updatePane(int pane, RSyntaxTextArea text, JDADecompiler decompiler) {
5353
javas.set(pane, text);
5454
SearchPanel search = new SearchPanel(text);
5555
searches.set(pane, search);
@@ -93,7 +93,7 @@ public void hierarchyChanged(HierarchyEvent e) {
9393
JSplitPane sp;
9494
JSplitPane sp2;
9595
// todo: fix this dumb hack
96-
public List<Decompiler> decompilers = Arrays.asList(null, null, null);
96+
public List<JDADecompiler> decompilers = Arrays.asList(null, null, null);
9797
public List<JPanel> panels = Arrays.asList(new JPanel(new BorderLayout()), new JPanel(new BorderLayout()), new JPanel(new BorderLayout()));
9898
public List<RSyntaxTextArea> javas = Arrays.asList(null, null, null);
9999
public List<SearchPanel> searches = Arrays.asList(null, null, null);

src/main/java/the/bytecode/club/jda/settings/DecompilerSettings.java renamed to src/main/java/the/bytecode/club/jda/settings/JDADecompilerSettings.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
import com.eclipsesource.json.JsonObject;
44
import net.miginfocom.swing.MigLayout;
5-
import the.bytecode.club.jda.decompilers.Decompiler;
5+
import the.bytecode.club.jda.decompilers.JDADecompiler;
66

77
import javax.swing.*;
88
import java.awt.*;
99
import java.util.*;
1010

11-
public class DecompilerSettings {
12-
private final Decompiler decompiler;
11+
public class JDADecompilerSettings {
12+
private final JDADecompiler decompiler;
1313

1414
private final JScrollPane dialogPane;
1515
private final JPanel dialog;
@@ -23,7 +23,7 @@ public class DecompilerSettings {
2323
private Map<SettingsEntry, JTextArea> stringSettings = new HashMap<>();
2424
private Map<SettingsEntry, JSpinner> intSettings = new HashMap<>();
2525

26-
public DecompilerSettings(Decompiler decompiler) {
26+
public JDADecompilerSettings(JDADecompiler decompiler) {
2727
this.decompiler = decompiler;
2828
dialog = new JPanel();
2929
dialog.setLayout(new MigLayout("gap rel 0", "grow"));

0 commit comments

Comments
 (0)