Use "." instead of "/" in package render and add ability to use "." in a class renaming scenario (Fix #11)

2 files changed, 7 insertions, 3 deletions

diff --git a/src/main/java/cuchaz/enigma/gui/Gui.java b/src/main/java/cuchaz/enigma/gui/Gui.java
index 9fd824b8..0826f04f 100644
--- a/src/main/java/cuchaz/enigma/gui/Gui.java
+++ b/src/main/java/cuchaz/enigma/gui/Gui.java
@@ -33,6 +33,7 @@ import cuchaz.enigma.mapping.*;
 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;
@@ -759,6 +760,7 @@ public class Gui {
         {
             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());
@@ -773,7 +775,7 @@ public class Gui {
     public void moveClassTree(EntryReference<Entry, Entry> deobfReference, String newName)
     {
         ClassEntry oldEntry = deobfReference.entry.getClassEntry();
-        ClassEntry newEntry = new ClassEntry(newName);
+        ClassEntry newEntry = new ClassEntry(Descriptor.toJvmName(newName));
         moveClassTree(deobfReference, newName, oldEntry.getPackageName().equals(Constants.NONE_PACKAGE),
                 newEntry.getClassEntry().getPackageName().equals(Constants.NONE_PACKAGE));
     }
@@ -781,7 +783,7 @@ public class Gui {
     public void moveClassTree(EntryReference<Entry, Entry> deobfReference, String newName, boolean isOldOb, boolean isNewOb)
     {
         ClassEntry oldEntry = deobfReference.entry.getClassEntry();
-        ClassEntry newEntry = new ClassEntry(newName);
+        ClassEntry newEntry = new ClassEntry(Descriptor.toJvmName(newName));
 
         // Ob -> deob
         if (isOldOb && !isNewOb)
diff --git a/src/main/java/cuchaz/enigma/gui/node/ClassSelectorPackageNode.java b/src/main/java/cuchaz/enigma/gui/node/ClassSelectorPackageNode.java
index ee3009ae..d2e421e7 100644
--- a/src/main/java/cuchaz/enigma/gui/node/ClassSelectorPackageNode.java
+++ b/src/main/java/cuchaz/enigma/gui/node/ClassSelectorPackageNode.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package cuchaz.enigma.gui.node;
 
+import javassist.bytecode.Descriptor;
+
 import javax.swing.tree.DefaultMutableTreeNode;
 
 public class ClassSelectorPackageNode extends DefaultMutableTreeNode {
@@ -33,7 +35,7 @@ public class ClassSelectorPackageNode extends DefaultMutableTreeNode {
 
     @Override
     public String toString() {
-        return this.packageName;
+        return Descriptor.toJavaName(this.packageName);
     }
 
     @Override