1 files changed, 14 insertions, 7 deletions

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 c888e4f7..9481412e 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
@@ -11,15 +11,22 @@ import java.awt.*;
 public class DeobfPanelPopupMenu {
 
     private final JPopupMenu ui;
-    private final JMenuItem renamePackage;
-    private final JMenuItem renameClass;
+    private final JMenuItem renamePackage = new JMenuItem();
+    private final JMenuItem renameClass = new JMenuItem();
+    private final JMenuItem expandAll = new JMenuItem();
+    private final JMenuItem collapseAll = new JMenuItem();
 
     public DeobfPanelPopupMenu(Gui gui) {
         this.ui = new JPopupMenu();
 
+        this.ui.add(this.renamePackage);
+        this.ui.add(this.renameClass);
+        this.ui.addSeparator();
+        this.ui.add(this.expandAll);
+        this.ui.add(this.collapseAll);
+
         ClassSelector deobfClasses = gui.getDeobfPanel().deobfClasses;
 
-        this.renamePackage = new JMenuItem();
         this.renamePackage.addActionListener(a -> {
             TreePath path;
 
@@ -33,11 +40,9 @@ public class DeobfPanelPopupMenu {
 
             deobfClasses.getUI().startEditingAtPath(deobfClasses, path);
         });
-        this.ui.add(this.renamePackage);
-
-        this.renameClass = new JMenuItem();
         this.renameClass.addActionListener(a -> deobfClasses.getUI().startEditingAtPath(deobfClasses, deobfClasses.getSelectionPath()));
-        this.ui.add(this.renameClass);
+        this.expandAll.addActionListener(a -> deobfClasses.expandAll());
+        this.collapseAll.addActionListener(a -> deobfClasses.collapseAll());
 
         this.retranslateUi();
     }
@@ -52,5 +57,7 @@ public class DeobfPanelPopupMenu {
     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"));
+        this.expandAll.setText(I18n.translate("popup_menu.deobf_panel.expand_all"));
+        this.collapseAll.setText(I18n.translate("popup_menu.deobf_panel.collapse_all"));
     }
 }