Add shutdown and startup hooks for plugins

Author: rcx

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

@@ -5,6 +5,8 @@
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.tree.ClassNode;
 import the.bytecode.club.jda.api.ExceptionUI;
+import the.bytecode.club.jda.api.Plugin;
+import the.bytecode.club.jda.api.PluginLoader;
 import the.bytecode.club.jda.gui.FileNavigationPane;
 import the.bytecode.club.jda.gui.MainViewerGUI;
 import the.bytecode.club.jda.settings.Settings;
@@ -37,11 +39,12 @@ public class JDA {
     private static final long start = System.currentTimeMillis();
     /*the rest*/
     public static MainViewerGUI viewer = null;
-    public static ArrayList<FileContainer> files = new ArrayList<>(); //all of BCV's loaded files/classes/etc
+    public static List<FileContainer> files = new ArrayList<>(); //all of BCV's loaded files/classes/etc
     private static int maxRecentFiles = 25;
     private static List<String> recentFiles = new ArrayList<>();
     public static String lastDirectory = "";
-    public static ArrayList<Process> createdProcesses = new ArrayList<>();
+    public static List<Process> createdProcesses = new ArrayList<>();
+    public static List<Plugin> plugins = new ArrayList<>();
 
     /**
      * Main startup
@@ -88,39 +91,27 @@ else if (!pluginsDir.isDirectory())
                 System.out.println("Skipping non-jar " + pluginFile.getName());
                 continue;
             }
-            PluginLoader.tryLoadPlugin(pluginFile);
+            Plugin pluginInstance = PluginLoader.tryLoadPlugin(pluginFile);
+            if (pluginInstance != null)
+                plugins.add(pluginInstance);
         }
     }
 
+    public static void onGUILoad() {
+        plugins.forEach(Plugin::onGUILoad);
+    }
+
+    // todo: rewrite
     /**
      * The version checker thread
      */
-    private static final Thread versionChecker = new Thread() {
-        // todo: rewrite
-        @Override
-        public void run() {
-        }
-    };
+    private static final Thread versionChecker = new Thread(() -> {});
 
     /**
      * Boot after all of the libraries have been loaded
      */
     public static void boot(String[] args) {
-        Runtime.getRuntime().addShutdownHook(new Thread() {
-            @Override
-            public void run() {
-                for (Process proc : createdProcesses)
-                    proc.destroy();
-                try {
-                    FileUtils.writeLines(recentsFile, recentFiles);
-                } catch (IOException e) {
-                    new ExceptionUI(e);
-                }
-                if (!viewer.isMaximized)
-                    viewer.unmaximizedPos = viewer.getLocation();
-                Settings.saveGUI();
-            }
-        });
+        Runtime.getRuntime().addShutdownHook(new Thread(JDA::onExit));
 
         resetRecentFilesMenu();
 
@@ -139,6 +130,21 @@ public void run() {
             }
     }
 
+    private static void onExit() {
+        plugins.forEach(Plugin::onExit);
+
+        for (Process proc : createdProcesses)
+            proc.destroy();
+        try {
+            FileUtils.writeLines(recentsFile, recentFiles);
+        } catch (IOException e) {
+            new ExceptionUI(e);
+        }
+        if (!viewer.isMaximized)
+            viewer.unmaximizedPos = viewer.getLocation();
+        Settings.saveGUI();
+    }
+
     /**
      * Returns the currently opened ClassNode
      *

src/main/java/the/bytecode/club/jda/api/ClassNodeLoader.java

@@ -0,0 +1,7 @@
+package the.bytecode.club.jda.api;
+
+public interface Plugin {
+    int onGUILoad();
+
+    int onExit();
+}

src/main/java/the/bytecode/club/jda/api/Plugin.java

@@ -1,13 +1,12 @@
-package the.bytecode.club.jda;
+package the.bytecode.club.jda.api;
 
 import java.io.*;
-import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 
 public class PluginLoader {
-    public static void tryLoadPlugin(File pluginFile) throws MalformedURLException {
+    public static Plugin tryLoadPlugin(File pluginFile) throws MalformedURLException {
         String pluginFileName = pluginFile.getName();
         try {
             ClassLoader loader = new URLClassLoader(new URL[] { pluginFile.toURI().toURL() }) {
@@ -22,21 +21,21 @@ public URL getResource(String name) {
             InputStream metaInfStream = loader.getResourceAsStream("\0JDA-hack:META-INF/MANIFEST.MF");
             if (metaInfStream == null) {
                 System.out.println("Invalid plugin " + pluginFileName + ": no manifest");
-                return;
+                return null;
             }
 
             String mainClass = parseManifest(metaInfStream);
             if (mainClass == null) {
                 System.out.println("Invalid plugin " + pluginFileName + ": unable to parse manifest");
-                return;
+                return null;
             }
 
-            Class<?> clazz = Class.forName(mainClass, true, loader);
-            Method mainMethod = clazz.getMethod("main", String[].class);
-            mainMethod.invoke(null, (Object) new String[0]);
+            Class<? extends Plugin> clazz = Class.forName(mainClass, true, loader).asSubclass(Plugin.class);
+            return clazz.getConstructor().newInstance();
         } catch (ReflectiveOperationException e) {
             System.err.println("Failed to load plugin " + pluginFileName);
             e.printStackTrace();
+            return null;
         }
     }
 

…/the/bytecode/club/jda/PluginLoader.java …/bytecode/club/jda/api/PluginLoader.javasrc/main/java/the/bytecode/club/jda/PluginLoader.java renamed to src/main/java/the/bytecode/club/jda/api/PluginLoader.java src/main/java/the/bytecode/club/jda/PluginLoader.java renamed to src/main/java/the/bytecode/club/jda/api/PluginLoader.java

@@ -34,7 +34,7 @@
  *
  * @author Konloch
  */
-public class CFRDecompiler extends Decompiler {
+public final class CFRDecompiler extends Decompiler {
 
     public CFRDecompiler() {
         for (Settings setting : Settings.values()) {

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

@@ -26,7 +26,7 @@
  * @author WaterWolf
  */
 
-public class FernflowerDecompiler extends Decompiler {
+public final class FernflowerDecompiler extends Decompiler {
 
     public FernflowerDecompiler() {
         for (Settings setting : Settings.values()) {

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

@@ -26,7 +26,7 @@
  * @author DeathMarine
  */
 
-public class ProcyonDecompiler extends Decompiler {
+public final class ProcyonDecompiler extends Decompiler {
 
     public ProcyonDecompiler() {
         for (Settings setting : Settings.values()) {

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

@@ -139,6 +139,8 @@ public void componentMoved(ComponentEvent e) {
         unmaximizedPos = getLocation();
 
         this.setLocationRelativeTo(null);
+
+        JDA.onGUILoad();
     }
 
     private void initializeMenubar() {