From aff69c295e547e05712afb4a24c05c7739fd931f Mon Sep 17 00:00:00 2001 From: Konloch Date: Wed, 2 Oct 2024 17:42:38 -0600 Subject: [PATCH] Merged The Two ASMifier Disassemblers --- .../components/DecompilerViewComponent.java | 19 ++++++++++--------- .../DecompilerSelectionPane.java | 15 ++++++++------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/DecompilerViewComponent.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/DecompilerViewComponent.java index f08289c0..75da03ec 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/DecompilerViewComponent.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/DecompilerViewComponent.java @@ -57,13 +57,16 @@ public class DecompilerViewComponent private void createMenu() { - if (type == JAVA || type == JAVA_NON_EDITABLE || type == JAVA_AND_BYTECODE) + if (type == JAVA || type == JAVA_NON_EDITABLE + || type == JAVA_AND_BYTECODE || type == JAVA_AND_BYTECODE_NON_EDITABLE) menu.add(java); - if (type == BYTECODE || type == JAVA_AND_BYTECODE || type == BYTECODE_NON_EDITABLE) + if (type == BYTECODE || type == BYTECODE_NON_EDITABLE + || type == JAVA_AND_BYTECODE || type == JAVA_AND_BYTECODE_NON_EDITABLE) menu.add(bytecode); - if (type != JAVA_NON_EDITABLE && type != BYTECODE_NON_EDITABLE) + if (type != JAVA_NON_EDITABLE && type != BYTECODE_NON_EDITABLE + && type != JAVA_AND_BYTECODE_NON_EDITABLE) { menu.add(new JSeparator()); menu.add(editable); @@ -74,11 +77,8 @@ public class DecompilerViewComponent public void addToGroup(ButtonGroup group) { - if (type == JAVA || type == JAVA_NON_EDITABLE || type == JAVA_AND_BYTECODE) - group.add(java); - - if (type == BYTECODE || type == JAVA_AND_BYTECODE || type == BYTECODE_NON_EDITABLE) - group.add(bytecode); + group.add(java); + group.add(bytecode); } public JMenu getMenu() @@ -117,6 +117,7 @@ public class DecompilerViewComponent JAVA_NON_EDITABLE, BYTECODE, BYTECODE_NON_EDITABLE, - JAVA_AND_BYTECODE; + JAVA_AND_BYTECODE, + JAVA_AND_BYTECODE_NON_EDITABLE; } } diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/DecompilerSelectionPane.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/DecompilerSelectionPane.java index c331ffdc..0a032f10 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/DecompilerSelectionPane.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/DecompilerSelectionPane.java @@ -55,15 +55,16 @@ public class DecompilerSelectionPane //disassemblers private final DecompilerViewComponent bytecodeViewer = new DecompilerViewComponent("Bytecode", BYTECODE_NON_EDITABLE, Decompiler.BYTECODE_DISASSEMBLER); private final DecompilerViewComponent javapDisassembler = new DecompilerViewComponent("Javap", BYTECODE_NON_EDITABLE, Decompiler.JAVAP_DISASSEMBLER); - private final DecompilerViewComponent asmDisassembler = new DecompilerViewComponent("ASM Disassembler", BYTECODE_NON_EDITABLE, Decompiler.ASM_DISASSEMBLER); private final DecompilerViewComponent krakatauDecompiler = new DecompilerViewComponent("Krakatau", JAVA_AND_BYTECODE, Decompiler.KRAKATAU_DECOMPILER, Decompiler.KRAKATAU_DISASSEMBLER); private final DecompilerViewComponent smaliDisassembler = new DecompilerViewComponent("Smali", BYTECODE, Decompiler.SMALI_DISASSEMBLER); - //code-gen - private final DecompilerViewComponent asmifierCodeGen = new DecompilerViewComponent("ASMifier", JAVA_NON_EDITABLE, Decompiler.ASMIFIER_CODE_GEN); + //code-gen / etc + private final DecompilerViewComponent asmifierCodeGen = new DecompilerViewComponent("ASMifier", JAVA_AND_BYTECODE_NON_EDITABLE, Decompiler.ASMIFIER_CODE_GEN, Decompiler.ASM_DISASSEMBLER); //TODO when adding new decompilers insert the DecompilerViewComponent object into here // also in the group, then finally the build menu - public List components = new ArrayList<>(Arrays.asList(procyonDecompiler, CFRDecompiler, JADXDecompiler, JDCoreDecompiler, fernFlowerDecompiler, krakatauDecompiler, smaliDisassembler, bytecodeViewer, asmDisassembler, asmifierCodeGen, javapDisassembler)); + public List components = new ArrayList<>(Arrays.asList( + procyonDecompiler, CFRDecompiler, JADXDecompiler, JDCoreDecompiler, fernFlowerDecompiler, + krakatauDecompiler, smaliDisassembler, bytecodeViewer, asmifierCodeGen, javapDisassembler)); public DecompilerSelectionPane(int paneID) { @@ -118,9 +119,9 @@ public class DecompilerSelectionPane String cmd = decompiler.name(); //TODO this is pretty janky and will break if a decompiler doesn't end with _DECOMPILER suffix - if (cmd.endsWith("DECOMPILER")) + if (cmd.endsWith("_DECOMPILER") || cmd.endsWith("_CODE_GEN")) component.getJava().setActionCommand(cmd); - else// if(cmd.endsWith("DISASSEMBLER")) + else// if(cmd.endsWith("_DISASSEMBLER")) component.getBytecode().setActionCommand(cmd); } } @@ -161,7 +162,6 @@ public class DecompilerSelectionPane menu.add(new JSeparator()); menu.add(bytecodeViewer.getMenu()); menu.add(javapDisassembler.getMenu()); - menu.add(asmDisassembler.getMenu()); menu.add(asmifierCodeGen.getMenu()); menu.add(new JSeparator()); menu.add(hexcodeViewer); @@ -179,6 +179,7 @@ public class DecompilerSelectionPane while (it.hasMoreElements()) { AbstractButton button = it.nextElement(); + if (button.getActionCommand().equals(decompiler.name())) { group.setSelected(button.getModel(), true);