Refactor getName() into JDANamespacedComponent

rcx · rcx · commit a0cad77bdaea · 2018-05-31T12:07:40.000-04:00
diff --git a/mapleir/src/main/java/org/mapleir/jdaplugin/ILDecompiler.java b/mapleir/src/main/java/org/mapleir/jdaplugin/ILDecompiler.java
@@ -1,6 +1,7 @@
 package org.mapleir.jdaplugin;
 
 import club.bytecode.the.jda.FileContainer;
+import club.bytecode.the.jda.api.JDANamespace;
 import club.bytecode.the.jda.decompilers.JDADecompiler;
 import org.mapleir.ir.algorithms.BoissinotDestructor;
 import org.mapleir.ir.cfg.ControlFlowGraph;
@@ -34,14 +35,14 @@ protected ControlFlowGraph getCfg(MethodNode mn) {
         cp.print(cn);
         return sw.toString();
     }
-    
-    @Override
-    public void decompileToZip(String zipName) {
-
-    }
 
     @Override
     public String getName() {
         return "MapleIL";
     }
+
+    @Override
+    public JDANamespace getNamespace() {
+        return MaplePlugin.getInstance().getNamespace();
+    }
 }
diff --git a/mapleir/src/main/java/org/mapleir/jdaplugin/IRDecompiler.java b/mapleir/src/main/java/org/mapleir/jdaplugin/IRDecompiler.java
@@ -1,5 +1,6 @@
 package org.mapleir.jdaplugin;
 
+import club.bytecode.the.jda.api.JDANamespace;
 import club.bytecode.the.jda.decompilers.bytecode.*;
 import org.mapleir.ir.algorithms.BoissinotDestructor;
 import org.mapleir.ir.cfg.ControlFlowGraph;
@@ -17,14 +18,15 @@ protected MethodNodeDecompiler getMethodNodeDecompiler(PrefixedStringBuilder sb,
         return new IRMethodDecompiler(this, sb, it.next(), cn);
     }
 
-    @Override
-    public void decompileToZip(String zipName) {
-    }
-
     @Override
     public String getName() {
         return "MapleIR";
     }
+    
+    @Override
+    public JDANamespace getNamespace() {
+        return MaplePlugin.getInstance().getNamespace();
+    }
 }
 
 class IRMethodDecompiler extends MethodNodeDecompiler {
diff --git a/mapleir/src/main/java/org/mapleir/jdaplugin/MaplePlugin.java b/mapleir/src/main/java/org/mapleir/jdaplugin/MaplePlugin.java
@@ -2,6 +2,7 @@
 
 import club.bytecode.the.jda.FileContainer;
 import club.bytecode.the.jda.api.JDAPlugin;
+import club.bytecode.the.jda.api.JDAPluginNamespace;
 import club.bytecode.the.jda.decompilers.Decompilers;
 import club.bytecode.the.jda.decompilers.JDADecompiler;
 import org.mapleir.DefaultInvocationResolver;
@@ -18,21 +19,34 @@
 import java.util.Map;
 
 public class MaplePlugin implements JDAPlugin {
-	public static final Map<FileContainer, AnalysisContext> cxts = new HashMap<>();
-	public static final JDADecompiler MAPLEIR = new IRDecompiler();
-	public static final JDADecompiler MAPLEIL = new ILDecompiler();
+	private static MaplePlugin instance;
+	
+	public final Map<FileContainer, AnalysisContext> cxts = new HashMap<>();
+	private final JDADecompiler MAPLEIR = new IRDecompiler();
+	private final JDADecompiler MAPLEIL = new ILDecompiler();
+	public final JDAPluginNamespace namespace = new JDAPluginNamespace(this);
 	
 	public MaplePlugin() {
+		instance = this;
 	}
 
 	public static void main(String[] args) {
 		throw new NotImplementedException();
 	}
+	
+	public static MaplePlugin getInstance() {
+		return instance;
+	}
 
 	@Override
 	public String getName() {
 		return "MapleIR";
 	}
+	
+	@Override
+	public JDAPluginNamespace getNamespace() {
+		return namespace;
+	}
 
 	@Override
 	public void onLoad() {
diff --git a/src/main/java/club/bytecode/the/jda/JDA.java b/src/main/java/club/bytecode/the/jda/JDA.java
@@ -1,6 +1,7 @@
 package club.bytecode.the.jda;
 
 import club.bytecode.the.jda.api.ExceptionUI;
+import club.bytecode.the.jda.api.JDANamespace;
 import club.bytecode.the.jda.api.JDAPlugin;
 import club.bytecode.the.jda.api.PluginLoader;
 import club.bytecode.the.jda.gui.MainViewerGUI;
@@ -47,8 +48,9 @@ public class JDA {
     private static List<String> recentFiles = new ArrayList<>();
     public static String lastDirectory = "";
     public static List<Process> createdProcesses = new ArrayList<>();
-    private static List<JDAPlugin> plugins = new ArrayList<>();
     private static final AtomicInteger jobCount = new AtomicInteger(0);
+    public static final JDANamespace namespace = JDADefaultNamespace.INSTANCE; 
+    private static List<JDAPlugin> plugins = new ArrayList<>();
     
     public static Supplier<JDAPlugin> injectedPlugin = null; // for testing purposes only.
 
diff --git a/src/main/java/club/bytecode/the/jda/JDADefaultNamespace.java b/src/main/java/club/bytecode/the/jda/JDADefaultNamespace.java
@@ -0,0 +1,20 @@
+package club.bytecode.the.jda;
+
+import club.bytecode.the.jda.api.JDANamespace;
+
+public class JDADefaultNamespace implements JDANamespace {
+    public static final JDADefaultNamespace INSTANCE = new JDADefaultNamespace();
+    
+    private JDADefaultNamespace() {
+    }
+    
+    @Override
+    public String getName() {
+        return "JDA";
+    }
+    
+    @Override
+    public String toString() {
+        return getName();
+    }
+}
diff --git a/src/main/java/club/bytecode/the/jda/api/JDANamespace.java b/src/main/java/club/bytecode/the/jda/api/JDANamespace.java
@@ -0,0 +1,5 @@
+package club.bytecode.the.jda.api;
+
+public interface JDANamespace {
+    String getName();
+}
diff --git a/src/main/java/club/bytecode/the/jda/api/JDANamespacedComponent.java b/src/main/java/club/bytecode/the/jda/api/JDANamespacedComponent.java
@@ -0,0 +1,11 @@
+package club.bytecode.the.jda.api;
+
+public interface JDANamespacedComponent {
+    String getName();
+    
+    JDANamespace getNamespace();
+    
+    default String getFullName() {
+        return getName() + ":" + getNamespace();
+    }
+}
diff --git a/src/main/java/club/bytecode/the/jda/api/JDAPlugin.java b/src/main/java/club/bytecode/the/jda/api/JDAPlugin.java
@@ -2,11 +2,7 @@
 
 import club.bytecode.the.jda.FileContainer;
 
-public interface JDAPlugin {
-    /**
-     * Should return the human-readable name of the plugin.
-     */
-    String getName();
+public interface JDAPlugin extends JDANamespacedComponent{
     
     /**
      * Callback for when the plugin is loaded.
@@ -44,4 +40,10 @@ public interface JDAPlugin {
      * Called when the plugin's button in the Edit/Plugins menu is pressed.
      */
     void onPluginButton();
+
+    /**
+     * Should return the JDAPluginNamespace for this plugin
+     */
+    @Override
+    JDAPluginNamespace getNamespace();
 }
diff --git a/src/main/java/club/bytecode/the/jda/api/JDAPluginNamespace.java b/src/main/java/club/bytecode/the/jda/api/JDAPluginNamespace.java
@@ -0,0 +1,23 @@
+package club.bytecode.the.jda.api;
+
+public class JDAPluginNamespace implements JDANamespace {
+    private final JDAPlugin plugin;
+    
+    public JDAPluginNamespace(JDAPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    public JDAPlugin getPlugin() {
+            return plugin;
+        }
+    
+    @Override
+    public String getName() {
+        return plugin.getName();
+    }
+    
+    @Override
+    public String toString() {
+        return getName();
+    }
+}
diff --git a/src/main/java/club/bytecode/the/jda/decompilers/CFRDecompiler.java b/src/main/java/club/bytecode/the/jda/decompilers/CFRDecompiler.java
@@ -2,10 +2,9 @@
 
 import club.bytecode.the.jda.FileContainer;
 import club.bytecode.the.jda.JDA;
-import club.bytecode.the.jda.JarUtils;
+import club.bytecode.the.jda.api.JDANamespace;
 import club.bytecode.the.jda.settings.JDADecompilerSettings;
 import club.bytecode.the.jda.settings.JDADecompilerSettings.SettingsEntry;
-import org.apache.commons.io.FileUtils;
 import org.benf.cfr.reader.bytecode.analysis.types.JavaTypeInstance;
 import org.benf.cfr.reader.entities.ClassFile;
 import org.benf.cfr.reader.entities.Method;
@@ -23,11 +22,7 @@
 import org.benf.cfr.reader.util.getopt.OptionsImpl;
 import org.benf.cfr.reader.util.output.*;
 import org.objectweb.asm.tree.ClassNode;
-import org.zeroturnaround.zip.ZipUtil;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Set;
@@ -94,6 +89,11 @@ public JDADecompilerSettings getSettings() {
     public String getName() {
         return "CFR";
     }
+    
+    @Override
+    public JDANamespace getNamespace() {
+        return JDA.namespace;
+    }
 
     @Override
     public String decompileClassNode(FileContainer container, ClassNode cn) {
@@ -108,38 +108,6 @@ public String decompileClassNode(FileContainer container, ClassNode cn) {
         }
     }
 
-    @Override
-    public void decompileToZip(String zipName) {
-        try {
-            Path outputDir = Files.createTempDirectory("cfr_output");
-            Path tempJar = Files.createTempFile("cfr_input", ".jar");
-            File output = new File(zipName);
-            try {
-                JarUtils.saveAsJar(JDA.getLoadedBytes(), tempJar.toAbsolutePath().toString());
-                Options options = new GetOptParser().parse(generateMainMethod(), OptionsImpl.getFactory());
-                ClassFileSourceImpl classFileSource = new ClassFileSourceImpl(options);
-                DCCommonState dcCommonState = new DCCommonState(options, classFileSource);
-                doJar(dcCommonState, tempJar.toAbsolutePath(), outputDir.toAbsolutePath());
-                ZipUtil.pack(outputDir.toFile(), output);
-            } catch (Exception e) {
-                handleException(e);
-            } finally {
-                try {
-                    FileUtils.deleteDirectory(outputDir.toFile());
-                } catch (IOException e) {
-                    handleException(e);
-                }
-                try {
-                    Files.delete(tempJar);
-                } catch (IOException e) {
-                    handleException(e);
-                }
-            }
-        } catch (Exception e) {
-            handleException(e);
-        }
-    }
-
     public String[] generateMainMethod() {
         Set<SettingsEntry> entries = settings.getEntries();
         String[] result = new String[entries.size() * 2 + 1];
diff --git a/src/main/java/club/bytecode/the/jda/decompilers/FernflowerDecompiler.java b/src/main/java/club/bytecode/the/jda/decompilers/FernflowerDecompiler.java
@@ -2,6 +2,7 @@
 
 import club.bytecode.the.jda.FileContainer;
 import club.bytecode.the.jda.JDA;
+import club.bytecode.the.jda.api.JDANamespace;
 import club.bytecode.the.jda.settings.JDADecompilerSettings.SettingsEntry;
 import club.bytecode.the.jda.settings.Setting;
 import org.jetbrains.java.decompiler.main.decompiler.BaseDecompiler;
@@ -52,6 +53,11 @@ public String getName() {
         return "Fernflower";
     }
 
+    @Override
+    public JDANamespace getNamespace() {
+        return JDA.namespace;
+    }
+
     @Override
     public String decompileClassNode(FileContainer container, final ClassNode cn) {
         try {
@@ -137,11 +143,6 @@ public void closeArchive(String s, String s1) {
         }
     }
 
-    @Override
-    public void decompileToZip(String zipName) {
-        throw new UnsupportedOperationException();
-    }
-
     private Map<String, Object> generateFernflowerArgs() {
         Map<String, Object> options = new HashMap<>();
         for (SettingsEntry setting : settings.getEntries()) {
diff --git a/src/main/java/club/bytecode/the/jda/decompilers/JDADecompiler.java b/src/main/java/club/bytecode/the/jda/decompilers/JDADecompiler.java
@@ -2,7 +2,7 @@
 
 import club.bytecode.the.jda.FileContainer;
 import club.bytecode.the.jda.JDA;
-import club.bytecode.the.jda.api.ExceptionUI;
+import club.bytecode.the.jda.api.JDANamespacedComponent;
 import club.bytecode.the.jda.settings.JDADecompilerSettings;
 import org.objectweb.asm.tree.ClassNode;
 
@@ -15,15 +15,11 @@
  * @author Konloch
  */
 
-public abstract class JDADecompiler {
+public abstract class JDADecompiler implements JDANamespacedComponent {
     protected JDADecompilerSettings settings = new JDADecompilerSettings(this);
 
     public abstract String decompileClassNode(FileContainer container, ClassNode cn);
 
-    public abstract void decompileToZip(String zipName);
-
-    public abstract String getName();
-
     public JDADecompilerSettings getSettings() {
         return settings;
     }
@@ -39,8 +35,4 @@ protected String parseException(Throwable e) {
                 JDA.nl +
                 exception;
     }
-
-    protected void handleException(Exception e) {
-        new ExceptionUI(e);
-    }
 }
diff --git a/src/main/java/club/bytecode/the/jda/decompilers/ProcyonDecompiler.java b/src/main/java/club/bytecode/the/jda/decompilers/ProcyonDecompiler.java
@@ -2,6 +2,7 @@
 
 import club.bytecode.the.jda.FileContainer;
 import club.bytecode.the.jda.JDA;
+import club.bytecode.the.jda.api.JDANamespace;
 import club.bytecode.the.jda.settings.JDADecompilerSettings.SettingsEntry;
 import com.strobel.assembler.InputTypeLoader;
 import com.strobel.assembler.metadata.*;
@@ -45,6 +46,11 @@ public ProcyonDecompiler() {
     public String getName() {
         return "Procyon";
     }
+    
+    @Override
+    public JDANamespace getNamespace() {
+        return JDA.namespace;
+    }
 
     public DecompilerSettings getDecompilerSettings() {
         DecompilerSettings procyonSettings = new DecompilerSettings();
@@ -111,11 +117,5 @@ public boolean tryLoadType(String s, Buffer buffer) {
             return parseException(e);
         }
     }
-
-    @Override
-    public void decompileToZip(String zipName) {
-        // todo: rewrite
-        throw new UnsupportedOperationException();
-    }
 }
 
diff --git a/src/main/java/club/bytecode/the/jda/decompilers/bytecode/BytecodeDecompiler.java b/src/main/java/club/bytecode/the/jda/decompilers/bytecode/BytecodeDecompiler.java
diff --git a/src/main/java/club/bytecode/the/jda/decompilers/filter/DecompileFilter.java b/src/main/java/club/bytecode/the/jda/decompilers/filter/DecompileFilter.java
diff --git a/src/main/java/club/bytecode/the/jda/decompilers/filter/DecompileFilters.java b/src/main/java/club/bytecode/the/jda/decompilers/filter/DecompileFilters.java
