Merge pull request #62 from OpenModLoader/asm

ASM based class translator

9 files changed, 53 insertions, 67 deletions

diff --git a/src/main/java/cuchaz/enigma/gui/ClassSelector.java b/src/main/java/cuchaz/enigma/gui/ClassSelector.java
index ed84ef2..93c5d4b 100644
--- a/src/main/java/cuchaz/enigma/gui/ClassSelector.java
+++ b/src/main/java/cuchaz/enigma/gui/ClassSelector.java
@@ -17,7 +17,7 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import cuchaz.enigma.gui.node.ClassSelectorClassNode;
 import cuchaz.enigma.gui.node.ClassSelectorPackageNode;
-import cuchaz.enigma.mapping.ClassEntry;
+import cuchaz.enigma.mapping.entry.ClassEntry;
 import cuchaz.enigma.throwables.IllegalNameException;
 
 import javax.swing.*;
@@ -328,8 +328,12 @@ public class ClassSelector extends JTree {
         }
 
         public ClassSelectorPackageNode getPackageNode(ClassEntry entry) {
+                String packageName = entry.getPackageName();
+                if (packageName == null){
+                        packageName = "(none)";
+                }
                 for (ClassSelectorPackageNode packageNode : packageNodes()) {
-                        if (packageNode.getPackageName().equals(entry.getPackageName())) {
+                        if (packageNode.getPackageName().equals(packageName)) {
                                 return packageNode;
                         }
                 }
diff --git a/src/main/java/cuchaz/enigma/gui/CodeReader.java b/src/main/java/cuchaz/enigma/gui/CodeReader.java
index f76dc89..ac45b4a 100644
--- a/src/main/java/cuchaz/enigma/gui/CodeReader.java
+++ b/src/main/java/cuchaz/enigma/gui/CodeReader.java
@@ -17,8 +17,8 @@ import cuchaz.enigma.analysis.EntryReference;
 import cuchaz.enigma.analysis.SourceIndex;
 import cuchaz.enigma.analysis.Token;
 import cuchaz.enigma.gui.highlight.SelectionHighlightPainter;
-import cuchaz.enigma.mapping.ClassEntry;
-import cuchaz.enigma.mapping.Entry;
+import cuchaz.enigma.mapping.entry.ClassEntry;
+import cuchaz.enigma.mapping.entry.Entry;
 import de.sciss.syntaxpane.DefaultSyntaxKit;
 
 import javax.swing.*;
@@ -162,7 +162,7 @@ public class CodeReader extends JEditorPane {
                         // couldn't find the class declaration token, might be an anonymous class
                         // look for any declaration in that class instead
                         for (Entry entry : sourceIndex.declarations()) {
-                                if (entry.getClassEntry().equals(classEntry)) {
+                                if (entry.getOwnerClassEntry().equals(classEntry)) {
                                         token = sourceIndex.getDeclarationToken(entry);
                                         break;
                                 }
diff --git a/src/main/java/cuchaz/enigma/gui/Gui.java b/src/main/java/cuchaz/enigma/gui/Gui.java
index 4a891cf..cfac8ad 100644
--- a/src/main/java/cuchaz/enigma/gui/Gui.java
+++ b/src/main/java/cuchaz/enigma/gui/Gui.java
@@ -32,10 +32,10 @@ import cuchaz.enigma.gui.panels.PanelEditor;
 import cuchaz.enigma.gui.panels.PanelIdentifier;
 import cuchaz.enigma.gui.panels.PanelObf;
 import cuchaz.enigma.mapping.*;
+import cuchaz.enigma.mapping.entry.*;
 import cuchaz.enigma.throwables.IllegalNameException;
 import cuchaz.enigma.utils.Utils;
 import de.sciss.syntaxpane.DefaultSyntaxKit;
-import javassist.bytecode.Descriptor;
 
 import javax.swing.*;
 import javax.swing.text.BadLocationException;
@@ -48,8 +48,10 @@ import java.awt.*;
 import java.awt.event.*;
 import java.io.File;
 import java.io.IOException;
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
+import java.util.Vector;
 import java.util.function.Function;
 
 public class Gui {
@@ -438,14 +440,10 @@ public class Gui {
                         showFieldEntry((FieldEntry) this.reference.entry);
                 } else if (this.reference.entry instanceof MethodEntry) {
                         showMethodEntry((MethodEntry) this.reference.entry);
-                } else if (this.reference.entry instanceof ConstructorEntry) {
-                        showConstructorEntry((ConstructorEntry) this.reference.entry);
-                } else if (this.reference.entry instanceof ArgumentEntry) {
-                        showArgumentEntry((ArgumentEntry) this.reference.entry);
                 } else if (this.reference.entry instanceof LocalVariableEntry) {
                         showLocalVariableEntry((LocalVariableEntry) this.reference.entry);
                 } else {
-                        throw new Error("Unknown entry type: " + this.reference.entry.getClass().getName());
+                        throw new Error("Unknown entry desc: " + this.reference.entry.getClass().getName());
                 }
 
                 redraw();
@@ -453,10 +451,9 @@ public class Gui {
 
         private void showLocalVariableEntry(LocalVariableEntry entry) {
                 addNameValue(infoPanel, "Variable", entry.getName());
-                addNameValue(infoPanel, "Class", entry.getClassEntry().getName());
-                addNameValue(infoPanel, "Method", entry.getBehaviorEntry().getName());
+                addNameValue(infoPanel, "Class", entry.getOwnerClassEntry().getName());
+                addNameValue(infoPanel, "Method", entry.getOwnerEntry().getName());
                 addNameValue(infoPanel, "Index", Integer.toString(entry.getIndex()));
-                addNameValue(infoPanel, "Type", entry.getType().toString());
         }
 
         private void showClassEntry(ClassEntry entry) {
@@ -466,32 +463,20 @@ public class Gui {
 
         private void showFieldEntry(FieldEntry entry) {
                 addNameValue(infoPanel, "Field", entry.getName());
-                addNameValue(infoPanel, "Class", entry.getClassEntry().getName());
-                addNameValue(infoPanel, "Type", entry.getType().toString());
+                addNameValue(infoPanel, "Class", entry.getOwnerClassEntry().getName());
+                addNameValue(infoPanel, "TypeDescriptor", entry.getDesc().toString());
                 addModifierComboBox(infoPanel, "Modifier", entry);
         }
 
         private void showMethodEntry(MethodEntry entry) {
-                addNameValue(infoPanel, "Method", entry.getName());
-                addNameValue(infoPanel, "Class", entry.getClassEntry().getName());
-                addNameValue(infoPanel, "Signature", entry.getSignature().toString());
-                addModifierComboBox(infoPanel, "Modifier", entry);
-
-        }
-
-        private void showConstructorEntry(ConstructorEntry entry) {
-                addNameValue(infoPanel, "Constructor", entry.getClassEntry().getName());
-                if (!entry.isStatic()) {
-                        addNameValue(infoPanel, "Signature", entry.getSignature().toString());
-                        addModifierComboBox(infoPanel, "Modifier", entry);
+                if (entry.isConstructor()) {
+                        addNameValue(infoPanel, "Constructor", entry.getOwnerClassEntry().getName());
+                } else {
+                        addNameValue(infoPanel, "Method", entry.getName());
+                        addNameValue(infoPanel, "Class", entry.getOwnerClassEntry().getName());
                 }
-        }
-
-        private void showArgumentEntry(ArgumentEntry entry) {
-                addNameValue(infoPanel, "Argument", entry.getName());
-                addNameValue(infoPanel, "Class", entry.getClassEntry().getName());
-                addNameValue(infoPanel, "Method", entry.getBehaviorEntry().getName());
-                addNameValue(infoPanel, "Index", Integer.toString(entry.getIndex()));
+                addNameValue(infoPanel, "MethodDescriptor", entry.getDesc().toString());
+                addModifierComboBox(infoPanel, "Modifier", entry);
         }
 
         private void addNameValue(JPanel container, String name, String value) {
@@ -532,8 +517,8 @@ public class Gui {
                 reference = this.controller.getDeobfReference(token);
                 boolean isClassEntry = isToken && reference.entry instanceof ClassEntry;
                 boolean isFieldEntry = isToken && reference.entry instanceof FieldEntry;
-                boolean isMethodEntry = isToken && reference.entry instanceof MethodEntry;
-                boolean isConstructorEntry = isToken && reference.entry instanceof ConstructorEntry;
+                boolean isMethodEntry = isToken && reference.entry instanceof MethodEntry && !((MethodEntry) reference.entry).isConstructor();
+                boolean isConstructorEntry = isToken && reference.entry instanceof MethodEntry && ((MethodEntry) reference.entry).isConstructor();
                 boolean isInJar = isToken && this.controller.entryIsInJar(reference.entry);
                 boolean isRenameable = isToken && this.controller.referenceIsRenameable(reference);
 
@@ -710,16 +695,13 @@ public class Gui {
                 if (reference.entry instanceof ClassEntry) {
                         // look for calls to the default constructor
                         // TODO: get a list of all the constructors and find calls to all of them
-                        BehaviorReferenceTreeNode node = this.controller.getMethodReferences(new ConstructorEntry((ClassEntry) reference.entry, new Signature("()V")));
+                        MethodReferenceTreeNode node = this.controller.getMethodReferences(new MethodEntry((ClassEntry) reference.entry, "<init>", new MethodDescriptor("()V")));
                         callsTree.setModel(new DefaultTreeModel(node));
                 } else if (reference.entry instanceof FieldEntry) {
                         FieldReferenceTreeNode node = this.controller.getFieldReferences((FieldEntry) reference.entry);
                         callsTree.setModel(new DefaultTreeModel(node));
                 } else if (reference.entry instanceof MethodEntry) {
-                        BehaviorReferenceTreeNode node = this.controller.getMethodReferences((MethodEntry) reference.entry);
-                        callsTree.setModel(new DefaultTreeModel(node));
-                } else if (reference.entry instanceof ConstructorEntry) {
-                        BehaviorReferenceTreeNode node = this.controller.getMethodReferences((ConstructorEntry) reference.entry);
+                        MethodReferenceTreeNode node = this.controller.getMethodReferences((MethodEntry) reference.entry);
                         callsTree.setModel(new DefaultTreeModel(node));
                 }
 
@@ -790,7 +772,6 @@ public class Gui {
                 // package rename
                 if (data instanceof String) {
                         for (int i = 0; i < node.getChildCount(); i++) {
-                                data = Descriptor.toJvmName((String) data);
                                 DefaultMutableTreeNode childNode = (DefaultMutableTreeNode) node.getChildAt(i);
                                 ClassEntry prevDataChild = (ClassEntry) childNode.getUserObject();
                                 ClassEntry dataChild = new ClassEntry(data + "/" + prevDataChild.getSimpleName());
@@ -807,15 +788,15 @@ public class Gui {
         }
 
         public void moveClassTree(EntryReference<Entry, Entry> deobfReference, String newName) {
-                String oldEntry = deobfReference.entry.getClassEntry().getPackageName();
-                String newEntry = new ClassEntry(Descriptor.toJvmName(newName)).getPackageName();
+                String oldEntry = deobfReference.entry.getOwnerClassEntry().getPackageName();
+                String newEntry = new ClassEntry(newName).getPackageName();
                 moveClassTree(deobfReference, newName, oldEntry == null,
                         newEntry == null);
         }
 
         public void moveClassTree(EntryReference<Entry, Entry> deobfReference, String newName, boolean isOldOb, boolean isNewOb) {
-                ClassEntry oldEntry = deobfReference.entry.getClassEntry();
-                ClassEntry newEntry = new ClassEntry(Descriptor.toJvmName(newName));
+                ClassEntry oldEntry = deobfReference.entry.getOwnerClassEntry();
+                ClassEntry newEntry = new ClassEntry(newName);
 
                 // Ob -> deob
                 if (isOldOb && !isNewOb) {
diff --git a/src/main/java/cuchaz/enigma/gui/GuiController.java b/src/main/java/cuchaz/enigma/gui/GuiController.java
index 6d98743..ae1b652 100644
--- a/src/main/java/cuchaz/enigma/gui/GuiController.java
+++ b/src/main/java/cuchaz/enigma/gui/GuiController.java
@@ -18,6 +18,10 @@ import cuchaz.enigma.Deobfuscator;
 import cuchaz.enigma.analysis.*;
 import cuchaz.enigma.gui.dialog.ProgressDialog;
 import cuchaz.enigma.mapping.*;
+import cuchaz.enigma.mapping.entry.ClassEntry;
+import cuchaz.enigma.mapping.entry.Entry;
+import cuchaz.enigma.mapping.entry.FieldEntry;
+import cuchaz.enigma.mapping.entry.MethodEntry;
 import cuchaz.enigma.throwables.MappingParseException;
 import cuchaz.enigma.utils.ReadableToken;
 
@@ -51,10 +55,10 @@ public class GuiController {
                 return this.isDirty;
         }
 
-        public void openJar(final JarFile jar) {
+        public void openJar(final JarFile jar) throws IOException {
                 this.gui.onStartOpenJar();
                 this.deobfuscator = new Deobfuscator(jar);
-                this.gui.onFinishOpenJar(this.deobfuscator.getJarName());
+                this.gui.onFinishOpenJar(jar.getName());
                 refreshClasses();
         }
 
@@ -161,24 +165,24 @@ public class GuiController {
 
         public ClassInheritanceTreeNode getClassInheritance(ClassEntry deobfClassEntry) {
                 ClassEntry obfClassEntry = this.deobfuscator.obfuscateEntry(deobfClassEntry);
-                ClassInheritanceTreeNode rootNode = this.deobfuscator.getJarIndex().getClassInheritance(this.deobfuscator.getTranslator(TranslationDirection.Deobfuscating), obfClassEntry);
+                ClassInheritanceTreeNode rootNode = this.deobfuscator.getJarIndex().getClassInheritance(this.deobfuscator.getTranslator(TranslationDirection.DEOBFUSCATING), obfClassEntry);
                 return ClassInheritanceTreeNode.findNode(rootNode, obfClassEntry);
         }
 
         public ClassImplementationsTreeNode getClassImplementations(ClassEntry deobfClassEntry) {
                 ClassEntry obfClassEntry = this.deobfuscator.obfuscateEntry(deobfClassEntry);
-                return this.deobfuscator.getJarIndex().getClassImplementations(this.deobfuscator.getTranslator(TranslationDirection.Deobfuscating), obfClassEntry);
+                return this.deobfuscator.getJarIndex().getClassImplementations(this.deobfuscator.getTranslator(TranslationDirection.DEOBFUSCATING), obfClassEntry);
         }
 
         public MethodInheritanceTreeNode getMethodInheritance(MethodEntry deobfMethodEntry) {
                 MethodEntry obfMethodEntry = this.deobfuscator.obfuscateEntry(deobfMethodEntry);
-                MethodInheritanceTreeNode rootNode = this.deobfuscator.getJarIndex().getMethodInheritance(this.deobfuscator.getTranslator(TranslationDirection.Deobfuscating), obfMethodEntry);
+                MethodInheritanceTreeNode rootNode = this.deobfuscator.getJarIndex().getMethodInheritance(this.deobfuscator.getTranslator(TranslationDirection.DEOBFUSCATING), obfMethodEntry);
                 return MethodInheritanceTreeNode.findNode(rootNode, obfMethodEntry);
         }
 
         public MethodImplementationsTreeNode getMethodImplementations(MethodEntry deobfMethodEntry) {
                 MethodEntry obfMethodEntry = this.deobfuscator.obfuscateEntry(deobfMethodEntry);
-                List<MethodImplementationsTreeNode> rootNodes = this.deobfuscator.getJarIndex().getMethodImplementations(this.deobfuscator.getTranslator(TranslationDirection.Deobfuscating), obfMethodEntry);
+                List<MethodImplementationsTreeNode> rootNodes = this.deobfuscator.getJarIndex().getMethodImplementations(this.deobfuscator.getTranslator(TranslationDirection.DEOBFUSCATING), obfMethodEntry);
                 if (rootNodes.isEmpty()) {
                         return null;
                 }
@@ -190,14 +194,14 @@ public class GuiController {
 
         public FieldReferenceTreeNode getFieldReferences(FieldEntry deobfFieldEntry) {
                 FieldEntry obfFieldEntry = this.deobfuscator.obfuscateEntry(deobfFieldEntry);
-                FieldReferenceTreeNode rootNode = new FieldReferenceTreeNode(this.deobfuscator.getTranslator(TranslationDirection.Deobfuscating), obfFieldEntry);
+                FieldReferenceTreeNode rootNode = new FieldReferenceTreeNode(this.deobfuscator.getTranslator(TranslationDirection.DEOBFUSCATING), obfFieldEntry);
                 rootNode.load(this.deobfuscator.getJarIndex(), true);
                 return rootNode;
         }
 
-        public BehaviorReferenceTreeNode getMethodReferences(BehaviorEntry deobfBehaviorEntry) {
-                BehaviorEntry obfBehaviorEntry = this.deobfuscator.obfuscateEntry(deobfBehaviorEntry);
-                BehaviorReferenceTreeNode rootNode = new BehaviorReferenceTreeNode(this.deobfuscator.getTranslator(TranslationDirection.Deobfuscating), obfBehaviorEntry);
+        public MethodReferenceTreeNode getMethodReferences(MethodEntry deobfMethodEntry) {
+                MethodEntry obfMethodEntry = this.deobfuscator.obfuscateEntry(deobfMethodEntry);
+                MethodReferenceTreeNode rootNode = new MethodReferenceTreeNode(this.deobfuscator.getTranslator(TranslationDirection.DEOBFUSCATING), obfMethodEntry);
                 rootNode.load(this.deobfuscator.getJarIndex(), true);
                 return rootNode;
         }
diff --git a/src/main/java/cuchaz/enigma/gui/GuiTricks.java b/src/main/java/cuchaz/enigma/gui/GuiTricks.java
index 8bf57d3..9208455 100644
--- a/src/main/java/cuchaz/enigma/gui/GuiTricks.java
+++ b/src/main/java/cuchaz/enigma/gui/GuiTricks.java
@@ -14,7 +14,6 @@ package cuchaz.enigma.gui;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionListener;
-import java.util.Arrays;
 
 public class GuiTricks {
 
@@ -27,7 +26,7 @@ public class GuiTricks {
         public static void deactivateButton(JButton button) {
                 button.setEnabled(false);
                 button.setText("");
-                for (ActionListener listener : Arrays.asList(button.getActionListeners())) {
+                for (ActionListener listener : button.getActionListeners()) {
                         button.removeActionListener(listener);
                 }
         }
@@ -35,7 +34,7 @@ public class GuiTricks {
         public static void activateButton(JButton button, String text, ActionListener newListener) {
                 button.setText(text);
                 button.setEnabled(true);
-                for (ActionListener listener : Arrays.asList(button.getActionListeners())) {
+                for (ActionListener listener : button.getActionListeners()) {
                         button.removeActionListener(listener);
                 }
                 button.addActionListener(newListener);
diff --git a/src/main/java/cuchaz/enigma/gui/ScoredClassEntry.java b/src/main/java/cuchaz/enigma/gui/ScoredClassEntry.java
index 1fd2fa8..34ec26e 100644
--- a/src/main/java/cuchaz/enigma/gui/ScoredClassEntry.java
+++ b/src/main/java/cuchaz/enigma/gui/ScoredClassEntry.java
@@ -11,7 +11,7 @@
 
 package cuchaz.enigma.gui;
 
-import cuchaz.enigma.mapping.ClassEntry;
+import cuchaz.enigma.mapping.entry.ClassEntry;
 
 public class ScoredClassEntry extends ClassEntry {
 
diff --git a/src/main/java/cuchaz/enigma/gui/node/ClassSelectorClassNode.java b/src/main/java/cuchaz/enigma/gui/node/ClassSelectorClassNode.java
index dc933cd..a965a8f 100644
--- a/src/main/java/cuchaz/enigma/gui/node/ClassSelectorClassNode.java
+++ b/src/main/java/cuchaz/enigma/gui/node/ClassSelectorClassNode.java
@@ -11,7 +11,7 @@
 
 package cuchaz.enigma.gui.node;
 
-import cuchaz.enigma.mapping.ClassEntry;
+import cuchaz.enigma.mapping.entry.ClassEntry;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 
diff --git a/src/main/java/cuchaz/enigma/gui/node/ClassSelectorPackageNode.java b/src/main/java/cuchaz/enigma/gui/node/ClassSelectorPackageNode.java
index f80abba..caa985c 100644
--- a/src/main/java/cuchaz/enigma/gui/node/ClassSelectorPackageNode.java
+++ b/src/main/java/cuchaz/enigma/gui/node/ClassSelectorPackageNode.java
@@ -11,8 +11,6 @@
 
 package cuchaz.enigma.gui.node;
 
-import javassist.bytecode.Descriptor;
-
 import javax.swing.tree.DefaultMutableTreeNode;
 
 public class ClassSelectorPackageNode extends DefaultMutableTreeNode {
@@ -41,7 +39,7 @@ public class ClassSelectorPackageNode extends DefaultMutableTreeNode {
 
         @Override
         public String toString() {
-                return !packageName.equals("(none)") ? Descriptor.toJavaName(this.packageName) : "(none)";
+                return !packageName.equals("(none)") ? this.packageName : "(none)";
         }
 
         @Override
diff --git a/src/main/java/cuchaz/enigma/gui/panels/PanelObf.java b/src/main/java/cuchaz/enigma/gui/panels/PanelObf.java
index 4bbd32b..9eb8f8f 100644
--- a/src/main/java/cuchaz/enigma/gui/panels/PanelObf.java
+++ b/src/main/java/cuchaz/enigma/gui/panels/PanelObf.java
@@ -2,7 +2,7 @@ package cuchaz.enigma.gui.panels;
 
 import cuchaz.enigma.gui.ClassSelector;
 import cuchaz.enigma.gui.Gui;
-import cuchaz.enigma.mapping.ClassEntry;
+import cuchaz.enigma.mapping.entry.ClassEntry;
 
 import javax.swing.*;
 import java.awt.*;