Extended Context Menu API

Konloch · Konloch · commit 9e08f06327c4 · 2021-07-29T20:28:10.000-07:00
This extends the right-click context menu API to support interactions on the search box panel
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/BuildContextMenuItem.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/BuildContextMenuItem.java
@@ -1,6 +1,7 @@
-package the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu;
+package the.bytecode.club.bytecodeviewer.gui.contextmenu;
 
 import the.bytecode.club.bytecodeviewer.gui.resourcelist.ResourceTree;
+import the.bytecode.club.bytecodeviewer.searching.LDCSearchTreeNodeResult;
 
 import javax.swing.*;
 import javax.swing.tree.TreePath;
@@ -29,5 +30,5 @@
  */
 public interface BuildContextMenuItem
 {
-	void buildMenu(ResourceTree tree, TreePath selPath, JPopupMenu menu);
+	void buildMenu(ResourceTree tree, TreePath selPath, LDCSearchTreeNodeResult result, JPopupMenu menu);
 }
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/ContextMenu.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/ContextMenu.java
@@ -1,13 +1,15 @@
-package the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu;
+package the.bytecode.club.bytecodeviewer.gui.contextmenu;
 
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
-import the.bytecode.club.bytecodeviewer.Constants;
 import the.bytecode.club.bytecodeviewer.gui.resourcelist.ResourceTree;
-import the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.impl.*;
+import the.bytecode.club.bytecodeviewer.gui.contextmenu.resourcelist.*;
+import the.bytecode.club.bytecodeviewer.searching.LDCSearchTreeNodeResult;
+import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 
 import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreePath;
+import java.awt.event.ActionEvent;
 import java.util.ArrayList;
 
 /***************************************************************************
@@ -39,50 +41,69 @@ public class ContextMenu
 	
 	static
 	{
+		//resource list
 		addContext(new Remove()); //TODO rename to delete and add support for resources & whole parent nodes (directories)
 		addContext(new New());
 		addContext(new Open());
 		addContext(new QuickOpen());
 		addContext(new QuickEdit());
 		addContext(new Expand());
 		addContext(new Collapse());
+		
+		//search box
+		addContext(new the.bytecode.club.bytecodeviewer.gui.contextmenu.searchbox.Open());
+		addContext(new the.bytecode.club.bytecodeviewer.gui.contextmenu.searchbox.QuickOpen());
+		addContext(new the.bytecode.club.bytecodeviewer.gui.contextmenu.searchbox.QuickEdit());
 	}
 	
 	public static void addContext(ContextMenuItem menuItem)
 	{
 		SINGLETON.contextMenuItems.add(menuItem);
 	}
 	
-	public static void buildMenu(ResourceTree tree, TreePath selPath, JPopupMenu menu)
+	public static void buildMenu(ResourceTree tree, TreePath selPath, LDCSearchTreeNodeResult selectedNode, JPopupMenu menu)
 	{
 		menu.removeAll();
 		
-		boolean isContainerSelected = selPath.getParentPath() != null && selPath.getParentPath().getParentPath() == null;
+		boolean searchBoxPane = selectedNode != null;
+		boolean isContainerSelected = !searchBoxPane && selPath.getParentPath() != null && selPath.getParentPath().getParentPath() == null;
+		boolean isResourceSelected = false;
 		
 		//TODO this is hacky - there is probably a better way to do this
-		tree.setSelectionPath(selPath);
-		DefaultMutableTreeNode node = (DefaultMutableTreeNode) tree.getLastSelectedPathComponent();
-		boolean isResourceSelected = !node.children().hasMoreElements();
+		if(!searchBoxPane)
+		{
+			tree.setSelectionPath(selPath);
+			DefaultMutableTreeNode node = (DefaultMutableTreeNode) tree.getLastSelectedPathComponent();
+			isResourceSelected = !node.children().hasMoreElements();
+		}
 		
 		for(ContextMenuItem item : SINGLETON.contextMenuItems)
 		{
 			switch(item.getMenuType())
 			{
 				case CONTAINER:
-					if(!isContainerSelected)
+					if(!isContainerSelected || searchBoxPane)
 						continue;
 					break;
 				case RESOURCE:
-					if(!isResourceSelected || isContainerSelected)
+					if(!isResourceSelected || isContainerSelected || searchBoxPane)
 						continue;
 					break;
 				case DIRECTORY:
-					if(isResourceSelected)
+					if(isResourceSelected || searchBoxPane)
+						continue;
+					break;
+				case RESOURCE_LIST:
+					if(searchBoxPane)
+						continue;
+					break;
+				case SEARCH_BOX_RESULT:
+					if(!searchBoxPane)
 						continue;
 					break;
 			}
 			
-			item.getBuildContextMenuItem().buildMenu(tree, selPath, menu);
+			item.getBuildContextMenuItem().buildMenu(tree, selPath, selectedNode, menu);
 		}
 	}
 }
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/ContextMenuItem.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/ContextMenuItem.java
@@ -1,4 +1,4 @@
-package the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu;
+package the.bytecode.club.bytecodeviewer.gui.contextmenu;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/ContextMenuType.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/ContextMenuType.java
@@ -1,4 +1,4 @@
-package the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu;
+package the.bytecode.club.bytecodeviewer.gui.contextmenu;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
@@ -24,8 +24,9 @@
  */
 public enum ContextMenuType
 {
-	ALL,
+	RESOURCE_LIST,
 	RESOURCE,
 	DIRECTORY,
 	CONTAINER,
+	SEARCH_BOX_RESULT,
 }
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/resourcelist/Collapse.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/resourcelist/Collapse.java
@@ -1,8 +1,8 @@
-package the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.impl;
+package the.bytecode.club.bytecodeviewer.gui.contextmenu.resourcelist;
 
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
-import the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.ContextMenuItem;
-import the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.ContextMenuType;
+import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuItem;
+import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuType;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 
 import javax.swing.*;
@@ -34,7 +34,7 @@ public class Collapse extends ContextMenuItem
 {
 	public Collapse()
 	{
-		super(ContextMenuType.DIRECTORY, ((tree, selPath, menu) ->
+		super(ContextMenuType.DIRECTORY, ((tree, selPath, result, menu) ->
 		{
 			menu.add(new AbstractAction(TranslatedStrings.COLLAPSE.toString())
 			{
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/resourcelist/Expand.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/resourcelist/Expand.java
@@ -1,8 +1,8 @@
-package the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.impl;
+package the.bytecode.club.bytecodeviewer.gui.contextmenu.resourcelist;
 
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
-import the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.ContextMenuItem;
-import the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.ContextMenuType;
+import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuItem;
+import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuType;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 
 import javax.swing.*;
@@ -34,7 +34,7 @@ public class Expand extends ContextMenuItem
 {
 	public Expand()
 	{
-		super(ContextMenuType.DIRECTORY, ((tree, selPath, menu) ->
+		super(ContextMenuType.DIRECTORY, ((tree, selPath, result, menu) ->
 		{
 			menu.add(new AbstractAction(TranslatedStrings.EXPAND.toString())
 			{
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/resourcelist/New.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/resourcelist/New.java
@@ -1,18 +1,16 @@
-package the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.impl;
+package the.bytecode.club.bytecodeviewer.gui.contextmenu.resourcelist;
 
 import org.apache.commons.io.FilenameUtils;
 import org.objectweb.asm.tree.ClassNode;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.Constants;
 import the.bytecode.club.bytecodeviewer.api.ASMUtil;
-import the.bytecode.club.bytecodeviewer.decompilers.Decompiler;
-import the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.ContextMenuItem;
-import the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.ContextMenuType;
+import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuItem;
+import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuType;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 
 import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.MutableTreeNode;
 import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
 import java.util.Enumeration;
@@ -43,7 +41,7 @@ public class New extends ContextMenuItem
 {
 	public New()
 	{
-		super(ContextMenuType.ALL, ((tree, selPath, menu) ->
+		super(ContextMenuType.RESOURCE_LIST, ((tree, selPath, result, menu) ->
 		{
 			JMenu quickOpen = new JMenu(TranslatedStrings.NEW.toString());
 			quickOpen.add(createMenu("Class", FileType.CLASS, selPath));
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/resourcelist/Open.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/resourcelist/Open.java
@@ -1,8 +1,8 @@
-package the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.impl;
+package the.bytecode.club.bytecodeviewer.gui.contextmenu.resourcelist;
 
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
-import the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.ContextMenuItem;
-import the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.ContextMenuType;
+import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuItem;
+import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuType;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 
 import javax.swing.*;
@@ -34,7 +34,7 @@ public class Open extends ContextMenuItem
 {
 	public Open()
 	{
-		super(ContextMenuType.RESOURCE, ((tree, selPath, menu) ->
+		super(ContextMenuType.RESOURCE, ((tree, selPath, result, menu) ->
 		{
 			menu.add(new AbstractAction(TranslatedStrings.OPEN_UNSTYLED.toString())
 			{
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/resourcelist/QuickEdit.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/resourcelist/QuickEdit.java
@@ -1,9 +1,9 @@
-package the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.impl;
+package the.bytecode.club.bytecodeviewer.gui.contextmenu.resourcelist;
 
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.decompilers.Decompiler;
-import the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.ContextMenuItem;
-import the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.ContextMenuType;
+import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuItem;
+import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuType;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 
 import javax.swing.*;
@@ -34,7 +34,7 @@ public class QuickEdit extends ContextMenuItem
 {
 	public QuickEdit()
 	{
-		super(ContextMenuType.RESOURCE, ((tree, selPath, menu) ->
+		super(ContextMenuType.RESOURCE, ((tree, selPath, result, menu) ->
 		{
 			JMenu quickOpen = new JMenu("Quick Edit");
 			quickOpen.add(createMenu(TranslatedStrings.KRAKATAU.toString(), ()->
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/resourcelist/QuickOpen.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/resourcelist/QuickOpen.java
@@ -1,9 +1,9 @@
-package the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.impl;
+package the.bytecode.club.bytecodeviewer.gui.contextmenu.resourcelist;
 
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.decompilers.Decompiler;
-import the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.ContextMenuItem;
-import the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.ContextMenuType;
+import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuItem;
+import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuType;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 
 import javax.swing.*;
@@ -34,7 +34,7 @@ public class QuickOpen extends ContextMenuItem
 {
 	public QuickOpen()
 	{
-		super(ContextMenuType.RESOURCE, ((tree, selPath, menu) ->
+		super(ContextMenuType.RESOURCE, ((tree, selPath, result, menu) ->
 		{
 			JMenu quickOpen = new JMenu(TranslatedStrings.QUICK_OPEN.toString());
 			quickOpen.add(createMenu(TranslatedStrings.PROCYON.toString(), ()->BytecodeViewer.viewer.resourcePane.quickDecompile(Decompiler.PROCYON_DECOMPILER, selPath, false)));
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/resourcelist/Remove.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/resourcelist/Remove.java
@@ -1,8 +1,8 @@
-package the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.impl;
+package the.bytecode.club.bytecodeviewer.gui.contextmenu.resourcelist;
 
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
-import the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.ContextMenuItem;
-import the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.ContextMenuType;
+import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuItem;
+import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuType;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 
 import javax.swing.*;
@@ -34,7 +34,7 @@ public class Remove extends ContextMenuItem
 {
 	public Remove()
 	{
-		super(ContextMenuType.CONTAINER, ((tree, selPath, menu) ->
+		super(ContextMenuType.CONTAINER, ((tree, selPath, result, menu) ->
 		{
 			menu.add(new AbstractAction(TranslatedStrings.REMOVE.toString())
 			{
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/searchbox/Open.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/searchbox/Open.java
@@ -0,0 +1,49 @@
+package the.bytecode.club.bytecodeviewer.gui.contextmenu.searchbox;
+
+import the.bytecode.club.bytecodeviewer.BytecodeViewer;
+import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuItem;
+import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuType;
+import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
+
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+
+/***************************************************************************
+ * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
+ * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com  *
+ *                                                                         *
+ * This program is free software: you can redistribute it and/or modify    *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation, either version 3 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+/**
+ * @author Konloch
+ * @since 7/29/2021
+ */
+public class Open extends ContextMenuItem
+{
+	public Open()
+	{
+		super(ContextMenuType.SEARCH_BOX_RESULT, ((tree, selPath, result, menu) ->
+		{
+			menu.add(new AbstractAction(TranslatedStrings.OPEN_UNSTYLED.toString())
+			{
+				@Override
+				public void actionPerformed(ActionEvent e)
+				{
+					BytecodeViewer.viewer.workPane.addClassResource(result.container, result.resourceWorkingName);
+				}
+			});
+		}));
+	}
+}
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/searchbox/QuickEdit.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/searchbox/QuickEdit.java
@@ -0,0 +1,52 @@
+package the.bytecode.club.bytecodeviewer.gui.contextmenu.searchbox;
+
+import the.bytecode.club.bytecodeviewer.BytecodeViewer;
+import the.bytecode.club.bytecodeviewer.decompilers.Decompiler;
+import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuItem;
+import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuType;
+import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
+
+import javax.swing.*;
+
+/***************************************************************************
+ * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
+ * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com  *
+ *                                                                         *
+ * This program is free software: you can redistribute it and/or modify    *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation, either version 3 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+/**
+ * @author Konloch
+ * @since 7/27/2021
+ */
+public class QuickEdit extends ContextMenuItem
+{
+	public QuickEdit()
+	{
+		super(ContextMenuType.SEARCH_BOX_RESULT, ((tree, selPath, result, menu) ->
+		{
+			JMenu quickOpen = new JMenu("Quick Edit");
+			quickOpen.add(createMenu(TranslatedStrings.KRAKATAU.toString(), ()->
+					BytecodeViewer.viewer.searchBoxPane.quickDecompile(Decompiler.KRAKATAU_DISASSEMBLER, result, true)));
+			menu.add(quickOpen);
+		}));
+	}
+	
+	private static JMenuItem createMenu(String name, Runnable onClick)
+	{
+		JMenuItem menu = new JMenuItem(name);
+		menu.addActionListener((e)->onClick.run());
+		return menu;
+	}
+}
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/searchbox/QuickOpen.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/searchbox/QuickOpen.java
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourcelist/ResourceListPane.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourcelist/ResourceListPane.java
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourcesearch/SearchBoxPane.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourcesearch/SearchBoxPane.java

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`		`-package the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu;`
	`1`	`+package the.bytecode.club.bytecodeviewer.gui.contextmenu;`
`2`	`2`
`3`	`3`	`import the.bytecode.club.bytecodeviewer.gui.resourcelist.ResourceTree;`
	`4`	`+import the.bytecode.club.bytecodeviewer.searching.LDCSearchTreeNodeResult;`
`4`	`5`
`5`	`6`	`import javax.swing.*;`
`6`	`7`	`import javax.swing.tree.TreePath;`
`@@ -29,5 +30,5 @@`
`29`	`30`	`*/`
`30`	`31`	`public interface BuildContextMenuItem`
`31`	`32`	`{`
`32`		`- void buildMenu(ResourceTree tree, TreePath selPath, JPopupMenu menu);`
	`33`	`+ void buildMenu(ResourceTree tree, TreePath selPath, LDCSearchTreeNodeResult result, JPopupMenu menu);`
`33`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu;`
	`1`	`+package the.bytecode.club.bytecodeviewer.gui.contextmenu;`
`2`	`2`
`3`	`3`	`/***************************************************************************`
`4`	`4`	`* Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite *`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`		`-package the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.impl;`
	`1`	`+package the.bytecode.club.bytecodeviewer.gui.contextmenu.resourcelist;`
`2`	`2`
`3`	`3`	`import the.bytecode.club.bytecodeviewer.BytecodeViewer;`
`4`		`-import the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.ContextMenuItem;`
`5`		`-import the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.ContextMenuType;`
	`4`	`+import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuItem;`
	`5`	`+import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuType;`
`6`	`6`	`import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;`
`7`	`7`
`8`	`8`	`import javax.swing.*;`
`@@ -34,7 +34,7 @@ public class Collapse extends ContextMenuItem`
`34`	`34`	`{`
`35`	`35`	`public Collapse()`
`36`	`36`	`{`
`37`		`- super(ContextMenuType.DIRECTORY, ((tree, selPath, menu) ->`
	`37`	`+ super(ContextMenuType.DIRECTORY, ((tree, selPath, result, menu) ->`
`38`	`38`	`{`
`39`	`39`	`menu.add(new AbstractAction(TranslatedStrings.COLLAPSE.toString())`
`40`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`		`-package the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.impl;`
	`1`	`+package the.bytecode.club.bytecodeviewer.gui.contextmenu.resourcelist;`
`2`	`2`
`3`	`3`	`import the.bytecode.club.bytecodeviewer.BytecodeViewer;`
`4`	`4`	`import the.bytecode.club.bytecodeviewer.decompilers.Decompiler;`
`5`		`-import the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.ContextMenuItem;`
`6`		`-import the.bytecode.club.bytecodeviewer.gui.resourcelist.contextmenu.ContextMenuType;`
	`5`	`+import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuItem;`
	`6`	`+import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuType;`
`7`	`7`	`import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;`
`8`	`8`
`9`	`9`	`import javax.swing.*;`
`@@ -34,7 +34,7 @@ public class QuickEdit extends ContextMenuItem`
`34`	`34`	`{`
`35`	`35`	`public QuickEdit()`
`36`	`36`	`{`
`37`		`- super(ContextMenuType.RESOURCE, ((tree, selPath, menu) ->`
	`37`	`+ super(ContextMenuType.RESOURCE, ((tree, selPath, result, menu) ->`
`38`	`38`	`{`
`39`	`39`	`JMenu quickOpen = new JMenu("Quick Edit");`
`40`	`40`	`quickOpen.add(createMenu(TranslatedStrings.KRAKATAU.toString(), ()->`