move enable to show

2 files changed, 5 insertions, 9 deletions

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 9c0ff704..c56731dc 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/Gui.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/Gui.java
@@ -301,9 +301,6 @@ public class Gui implements LanguageChangeListener {
                                                 deobfPanelPopupMenu.show(deobfPanel.deobfClasses, e.getX(), e.getY());
                                         }
                                 }
-
-                                // Only enable rename class if selected path is a class
-                                deobfPanelPopupMenu.getRenameClass().setEnabled(deobfPanel.deobfClasses.getSelectedClass() != null);
                         }
                 });
 
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
index 16f666d0..c888e4f7 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/DeobfPanelPopupMenu.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/DeobfPanelPopupMenu.java
@@ -42,16 +42,15 @@ public class DeobfPanelPopupMenu {
         this.retranslateUi();
     }
 
-    public void show(Component invoker, int x, int y) {
-        this.ui.show(invoker, x, y);
+    public void show(ClassSelector deobfClasses, int x, int y) {
+        // Only enable rename class if selected path is a class
+        this.renameClass.setEnabled(deobfClasses.getSelectedClass() != null);
+
+        this.ui.show(deobfClasses, x, y);
     }
 
     public void retranslateUi() {
         this.renamePackage.setText(I18n.translate("popup_menu.deobf_panel.rename_package"));
         this.renameClass.setText(I18n.translate("popup_menu.deobf_panel.rename_class"));
     }
-
-    public JMenuItem getRenameClass() {
-        return this.renameClass;
-    }
 }