fix method/argument renaming edge cases, add method/argument name rebuilder, add Package to Access enum

2 files changed, 14 insertions, 0 deletions

diff --git a/src/main/java/cuchaz/enigma/gui/GuiController.java b/src/main/java/cuchaz/enigma/gui/GuiController.java
index 1deb7d2..3188ff0 100644
--- a/src/main/java/cuchaz/enigma/gui/GuiController.java
+++ b/src/main/java/cuchaz/enigma/gui/GuiController.java
@@ -100,6 +100,10 @@ public class GuiController {
         refreshCurrentClass();
     }
 
+    public void rebuildMethodNames() {
+        ProgressDialog.runInThread(this.gui.getFrame(), progress -> this.deobfuscator.rebuildMethodNames(progress));
+    }
+
     public void exportSource(final File dirOut) {
         ProgressDialog.runInThread(this.gui.getFrame(), progress -> this.deobfuscator.writeSources(dirOut, progress));
     }
diff --git a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
index befe129..dcd7c93 100644
--- a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
+++ b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
@@ -25,6 +25,7 @@ public class MenuBar extends JMenuBar {
     public final JMenuItem saveMappingsSrgMenu;
     public final JMenuItem closeMappingsMenu;
 
+    public final JMenuItem rebuildMethodNamesMenu;
 
     public final JMenuItem exportSourceMenu;
     public final JMenuItem exportJarMenu;
@@ -174,6 +175,15 @@ public class MenuBar extends JMenuBar {
             }
             menu.addSeparator();
             {
+                JMenuItem item = new JMenuItem("Rebuild Method Names");
+                menu.add(item);
+                item.addActionListener(event -> {
+                    this.gui.getController().rebuildMethodNames();
+                });
+                this.rebuildMethodNamesMenu = item;
+            }
+            menu.addSeparator();
+            {
                 JMenuItem item = new JMenuItem("Export Source...");
                 menu.add(item);
                 item.addActionListener(event -> {