Merge pull request #320 from YanisBft/deobfuscated-panel

Add popup menu to deobf panel to quickly rename a package/class

5 files changed, 53 insertions, 5 deletions

diff --git a/build.gradle b/build.gradle
index 64fa167c..81c96fb9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,7 @@ subprojects {
     }
 
     group = 'cuchaz'
-    version = '0.21.4'
+    version = '0.21.5'
 
     def buildNumber = System.getenv("BUILD_NUMBER")
     version = version + "+" + (buildNumber ? "build.$buildNumber" : "local")
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/Gui.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/Gui.java
index 323d304a..cbc9688e 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/Gui.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/Gui.java
@@ -37,10 +37,7 @@ import cuchaz.enigma.gui.config.UiConfig;
 import cuchaz.enigma.gui.dialog.CrashDialog;
 import cuchaz.enigma.gui.dialog.JavadocDialog;
 import cuchaz.enigma.gui.dialog.SearchDialog;
-import cuchaz.enigma.gui.elements.CollapsibleTabbedPane;
-import cuchaz.enigma.gui.elements.EditorTabPopupMenu;
-import cuchaz.enigma.gui.elements.MenuBar;
-import cuchaz.enigma.gui.elements.ValidatableUi;
+import cuchaz.enigma.gui.elements.*;
 import cuchaz.enigma.gui.events.EditorActionListener;
 import cuchaz.enigma.gui.panels.*;
 import cuchaz.enigma.gui.util.History;
@@ -107,6 +104,7 @@ public class Gui implements LanguageChangeListener {
         private JLabel statusLabel;
 
         private final EditorTabPopupMenu editorTabPopupMenu;
+        private final DeobfPanelPopupMenu deobfPanelPopupMenu;
         private final JTabbedPane openFiles;
         private final HashBiMap<ClassEntry, EditorPanel> editors = HashBiMap.create();
 
@@ -292,6 +290,19 @@ public class Gui implements LanguageChangeListener {
                         }
                 });
 
+                deobfPanelPopupMenu = new DeobfPanelPopupMenu(this);
+                deobfPanel.deobfClasses.addMouseListener(new MouseAdapter() {
+                        @Override
+                        public void mousePressed(MouseEvent e) {
+                                if (SwingUtilities.isRightMouseButton(e)) {
+                                        int i = deobfPanel.deobfClasses.getRowForPath(deobfPanel.deobfClasses.getSelectionPath());
+                                        if (i != -1) {
+                                                deobfPanelPopupMenu.show(deobfPanel.deobfClasses, e.getX(), e.getY());
+                                        }
+                                }
+                        }
+                });
+
                 // layout controls
                 JPanel centerPanel = new JPanel();
                 centerPanel.setLayout(new BorderLayout());
@@ -893,6 +904,7 @@ public class Gui implements LanguageChangeListener {
                 this.menuBar.retranslateUi();
                 this.obfPanel.retranslateUi();
                 this.deobfPanel.retranslateUi();
+                this.deobfPanelPopupMenu.retranslateUi();
                 this.infoPanel.retranslateUi();
                 this.editors.values().forEach(EditorPanel::retranslateUi);
         }
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/DeobfPanelPopupMenu.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/DeobfPanelPopupMenu.java
new file mode 100644
index 00000000..a4d749c2
--- /dev/null
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/DeobfPanelPopupMenu.java
@@ -0,0 +1,34 @@
+package cuchaz.enigma.gui.elements;
+
+import cuchaz.enigma.gui.ClassSelector;
+import cuchaz.enigma.gui.Gui;
+import cuchaz.enigma.utils.I18n;
+
+import javax.swing.*;
+import java.awt.*;
+
+public class DeobfPanelPopupMenu {
+
+    private final JPopupMenu ui;
+    private final JMenuItem rename;
+
+    public DeobfPanelPopupMenu(Gui gui) {
+        this.ui = new JPopupMenu();
+
+        ClassSelector deobfClasses = gui.getDeobfPanel().deobfClasses;
+
+        this.rename = new JMenuItem();
+        this.rename.addActionListener(a -> deobfClasses.getUI().startEditingAtPath(deobfClasses, deobfClasses.getSelectionPath()));
+        this.ui.add(this.rename);
+
+        this.retranslateUi();
+    }
+
+    public void show(Component invoker, int x, int y) {
+        this.ui.show(invoker, x, y);
+    }
+
+    public void retranslateUi() {
+        this.rename.setText(I18n.translate("popup_menu.deobf_panel.rename"));
+    }
+}
diff --git a/enigma/src/main/resources/lang/en_us.json b/enigma/src/main/resources/lang/en_us.json
index b08962d5..caf179e2 100644
--- a/enigma/src/main/resources/lang/en_us.json
+++ b/enigma/src/main/resources/lang/en_us.json
@@ -78,6 +78,7 @@
         "popup_menu.editor_tab.close_others": "Close Others",
         "popup_menu.editor_tab.close_left": "Close All to the Left",
         "popup_menu.editor_tab.close_right": "Close All to the Right",
+        "popup_menu.deobf_panel.rename": "Rename",
 
         "editor.decompiling": "Decompiling...",
         "editor.decompile_error": "An error was encountered while decompiling.",
diff --git a/enigma/src/main/resources/lang/fr_fr.json b/enigma/src/main/resources/lang/fr_fr.json
index aad8f29e..b40a904f 100644
--- a/enigma/src/main/resources/lang/fr_fr.json
+++ b/enigma/src/main/resources/lang/fr_fr.json
@@ -73,6 +73,7 @@
         "popup_menu.editor_tab.close_others": "Fermer les autres",
         "popup_menu.editor_tab.close_left": "Tout fermer sur la gauche",
         "popup_menu.editor_tab.close_right": "Tout fermer sur la droite",
+        "popup_menu.deobf_panel.rename": "Renommer",
 
         "editor.decompiling": "Décompilation...",
         "editor.decompile_error": "Une erreur est survenue lors de la décompilation.",