Code cleanup, greatly optimize Procyon wrapper

Author: rcx

mapleir

@@ -7,7 +7,7 @@
  */
 public class MapleInjectedJDA {
     public static void main(String[] args) {
-        JDA.injectedPlugin = MaplePlugin::new;
+        JDA.autoloadPlugin = MaplePlugin::new;
         JDA.main(args);
     }
 }

mapleirInjector/src/org/mapleir/jdaplugin/MapleInjectedJDA.java

@@ -1,10 +1,9 @@
 package club.bytecode.the.jda;
 
-import org.objectweb.asm.ClassReader;
+import club.bytecode.the.jda.util.BytecodeUtils;
 import org.objectweb.asm.tree.ClassNode;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -14,24 +13,22 @@
  */
 
 public class FileContainer {
-    public FileContainer(File f) {
+    public FileContainer(File f, Map<String, byte[]> files) {
         this.file = f;
         this.name = f.getAbsolutePath();
+        this.files = files;
     }
 
     public final File file;
     public final String name;
+    public final Map<String, byte[]> files;
 
-    public HashMap<String, byte[]> files = new HashMap<>(); // this is assigned outside the class?!
 
     public ClassNode loadClassFile(String filename) {
         byte[] bytes = files.get(filename);
         if (bytes == null)
             return null;
-        ClassReader reader = new ClassReader(bytes);
-        ClassNode classNode = new ClassNode();
-        reader.accept(classNode, ClassReader.EXPAND_FRAMES);
-        return classNode;
+        return BytecodeUtils.loadClass(bytes);
     }
 
     public String findClassfile(String className) {

src/main/java/club/bytecode/the/jda/FileContainer.java

@@ -11,6 +11,7 @@
 import club.bytecode.the.jda.gui.fileviewer.ViewerFile;
 import club.bytecode.the.jda.gui.navigation.FileNavigationPane;
 import club.bytecode.the.jda.settings.Settings;
+import club.bytecode.the.jda.util.BytecodeUtils;
 import club.bytecode.the.jda.util.GuiUtils;
 import club.bytecode.the.jda.util.MiscUtils;
 import org.apache.commons.io.FileUtils;
@@ -19,7 +20,6 @@
 import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
 import org.fife.ui.rsyntaxtextarea.folding.CurlyFoldParser;
 import org.fife.ui.rsyntaxtextarea.folding.FoldParserManager;
-import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.tree.ClassNode;
 
 import javax.swing.*;
@@ -35,9 +35,8 @@
 import java.util.function.Supplier;
 
 public class JDA {
-    /*per version*/
     public static final String version = "1.1.1";
-    /* Constants */
+
     public static final String ISSUE_TRACKER_URL = "https://github.com/LLVM-but-worse/jda/issues";
     public static final String fs = System.getProperty("file.separator");
     public static final String nl = System.getProperty("line.separator");
@@ -46,7 +45,7 @@ public class JDA {
     public static final File recentsFile = new File(dataDir, "recentfiles.jda");
     public static final File settingsFile = new File(dataDir, "settings.jda");
     private static final long start = System.currentTimeMillis();
-    /*the rest*/
+
     public static MainViewerGUI viewer = null;
     private static List<FileContainer> files = new ArrayList<>(); //all of BCV's loaded files/classes/etc
     private static int maxRecentFiles = 25;
@@ -57,17 +56,15 @@ public class JDA {
     public static final JDANamespace namespace = JDADefaultNamespace.INSTANCE; 
     private static List<JDAPlugin> plugins = new ArrayList<>();
 
-    public static Supplier<JDAPlugin> injectedPlugin = null; // for testing purposes only.
+    public static Supplier<JDAPlugin> autoloadPlugin = null; // for testing purposes, a plugin to load on startup.
 
     /**
      * Main startup
      *
      * @param args files you want to open or CLI
      */
     public static void main(String[] args) {
-        // Fix antialiasing
-        System.setProperty("awt.useSystemAAFontSettings", "lcd");
-        System.setProperty("swing.aatext", "true");
+        GuiUtils.setAntialiasingSettings();
         if (SystemUtils.IS_OS_LINUX) {
             GuiUtils.setWmClassName("JDA");
         }
@@ -107,10 +104,10 @@ public static List<JDAPlugin> getLoadedPlugins() {
     }
 
     private static void loadPlugins() throws MalformedURLException {
-        if (injectedPlugin != null) {
-            JDAPlugin plugin = injectedPlugin.get();
-            System.out.println("Loading dependency-injected plugin " + plugin.getName());
-            loadPlugin(injectedPlugin.get());
+        if (autoloadPlugin != null) {
+            JDAPlugin plugin = autoloadPlugin.get();
+            System.out.println("Loading statically-loaded plugin " + plugin.getName());
+            loadPlugin(autoloadPlugin.get());
             System.out.println("Skipping other plugins.");
             return;
         }
@@ -142,7 +139,6 @@ public static void onGUILoad() {
         plugins.forEach(JDAPlugin::onGUILoad);
     }
 
-    // todo: rewrite
     /**
      * The version checker thread
      */
@@ -229,7 +225,7 @@ public static boolean hasFile(ViewerFile file) {
 
     // try to get class bytes by exporting classnode, else fallback to getting the bytes from the actual file itself
     public static byte[] getClassBytes(FileContainer container, ClassNode cn) {
-        byte[] result = dumpClassToBytes(cn);
+        byte[] result = BytecodeUtils.dumpClassToBytes(cn);
         if (result != null)
             return result;
         result = getClassFileBytes(container, cn.name);
@@ -242,19 +238,6 @@ public static byte[] getClassFileBytes(FileContainer container, String className
             return null;
         return bytes;
     }
-    
-    public static byte[] dumpClassToBytes(ClassNode cn) {
-        // we have to do this, or else decompile filters don't work.
-        try {
-            ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_MAXS);
-            cn.accept(writer);
-            return writer.toByteArray();
-        } catch (Exception e) {
-            System.err.println("Exception while dumping class " + cn.name + ": ");
-            e.printStackTrace();
-            return null;
-        }
-    }
 
     public static final String HACK_PREFIX = "\0JDA-hack";
 
@@ -279,15 +262,6 @@ public static String getClassName(String fullyQualifiedName) {
         return fullyQualifiedName.substring(fullyQualifiedName.lastIndexOf('/') + 1);
     }
 
-    // WTF????
-    public static Map<String, byte[]> getLoadedBytes() {
-        Map<String, byte[]> data = new HashMap<>();
-        for (FileContainer container : files) {
-            data.putAll(container.getFiles());
-        }
-        return data;
-    }
-
     /**
      * Opens a file, optional if it should append to the recent files menu
      *
@@ -315,7 +289,7 @@ public static void openFiles(final File[] files, boolean recentFiles, FileNaviga
                     if (!fileToOpen.exists()) {
                         showMessage("The file " + fileToOpen.getAbsolutePath() + " could not be found.");
                     } else if (fileToOpen.isDirectory()) {
-                        FileNavigationPane.FileNode newNode = fnp.addTreeElement(new FileContainer(fileToOpen), parent);
+                        FileNavigationPane.FileNode newNode = fnp.addTreeElement(new FileContainer(fileToOpen, new HashMap<>()), parent);
                         openFiles(fileToOpen.listFiles(), false, newNode);
                     } else if (fn.endsWith(".jar") || fn.endsWith(".zip")) {
                         try {
@@ -329,8 +303,7 @@ public static void openFiles(final File[] files, boolean recentFiles, FileNaviga
                         HashMap<String, byte[]> files1 = new HashMap<>();
                         byte[] bytes = JarUtils.getBytes(new FileInputStream(fileToOpen));
                         files1.put(fileToOpen.getName(), bytes);
-                        FileContainer container = new FileContainer(fileToOpen);
-                        container.files = files1;
+                        FileContainer container = new FileContainer(fileToOpen, files1);
                         openFile(container);
                         fnp.addTreeElement(container, parent);
                     }
@@ -363,6 +336,20 @@ public static List<FileContainer> getOpenFiles() {
         return Collections.unmodifiableList(files);
     }
 
+    /**
+     *
+     * @param filename the filename to search all open FileContainers for
+     * @return the FileContainer which holds the specified file or null if not found
+     */
+    public static FileContainer findContainerForFile(String filename) {
+        for (FileContainer container : files) {
+            if (container.getFiles().containsKey(filename)) {
+                return container;
+            }
+        }
+        return null;
+    }
+
     /**
      * Send a message to alert the user
      *
@@ -372,22 +359,34 @@ public static void showMessage(String message) {
         JOptionPane.showMessageDialog(viewer, message);
     }
 
+    /**
+     * Ask a yes/no dialog
+     * @param question the body text of the dialog box to be created
+     * @param title the window title of the dialog box to be created
+     * @return true or false for yes or no
+     */
+    public static boolean askYesNoDialog(String question, String title) {
+        JOptionPane pane = new JOptionPane(question);
+        Object[] options = new String[]{"Yes", "No"};
+        pane.setOptions(options);
+        JDialog dialog = pane.createDialog(viewer, "JDA - " + title);
+        dialog.setVisible(true);
+        Object obj = pane.getValue();
+        for (int k = 0; k < options.length; k++)
+            if (options[k].equals(obj) && k == 0)
+                return true;
+        return false;
+    }
+
     /**
      * Resets the workspace with optional user input required
      *
      * @param ask if should require user input or not
      */
     public static void resetWorkSpace(boolean ask) {
         if (ask) {
-            JOptionPane pane = new JOptionPane("Are you sure you want to reset the workspace?\n\rIt will also reset your file navigator and search.");
-            Object[] options = new String[]{"Yes", "No"};
-            pane.setOptions(options);
-            JDialog dialog = pane.createDialog(viewer, "JDA - Reset Workspace");
-            dialog.setVisible(true);
-            Object obj = pane.getValue();
-            for (int k = 0; k < options.length; k++)
-                if (options[k].equals(obj) && k != 0)
-                    return;
+            if (!askYesNoDialog("Are you sure you want to reset the workspace?\n\rIt will also reset your file navigator and search.", "Reset Workspace"))
+                return;
         }
 
         closeResources(false);
@@ -396,15 +395,8 @@ public static void resetWorkSpace(boolean ask) {
 
     public static void closeResources(boolean ask) {
         if (ask) {
-            JOptionPane pane = new JOptionPane("Are you sure you want to close all resources?");
-            Object[] options = new String[]{"Yes", "No"};
-            pane.setOptions(options);
-            JDialog dialog = pane.createDialog(viewer, "JDA - Close Resources");
-            dialog.setVisible(true);
-            Object obj = pane.getValue();
-            for (int k = 0; k < options.length; k++)
-                if (options[k].equals(obj) && k != 0)
-                    return;
+            if (!askYesNoDialog("Are you sure you want to close all resources?", "Close Resources"))
+                return;
         }
 
         JDA.setBusy(true);
@@ -441,8 +433,6 @@ public static void addRecentFile(File f) {
         resetRecentFilesMenu();
     }
 
-    private static ArrayList<String> killList2 = new ArrayList<>();
-
     /**
      * resets the recent files menu
      */
@@ -459,27 +449,6 @@ public static void resetRecentFilesMenu() {
             }
     }
 
-    public static ArrayList<String> createdRandomizedNames = new ArrayList<>();
-
-    /**
-     * Ensures it will only return a uniquely generated names, contains a dupe checker to be sure
-     *
-     * @return the unique randomized name of 25 characters.
-     */
-    public static String getRandomizedName() {
-        boolean generated = false;
-        String name = "";
-        while (!generated) {
-            String randomizedName = MiscUtils.randomString(25);
-            if (!createdRandomizedNames.contains(randomizedName)) {
-                createdRandomizedNames.add(randomizedName);
-                name = randomizedName;
-                generated = true;
-            }
-        }
-        return name;
-    }
-
     /**
      * Returns the BCV directory
      *
@@ -519,8 +488,6 @@ private static boolean isShiftDown(KeyEvent e) {
 
     /**
      * Checks the hotkeys
-     *
-     * @param e
      */
     public static void checkHotKey(KeyEvent e) {
         if ((e.getKeyCode() == KeyEvent.VK_O) && isCtrlDown(e)) {