fix: Fix renaming class in newly made package hiding package

Col-E · Jan 1, 2021 · ce2a6aa · ce2a6aa
1 parent f3ef18f
commit ce2a6aa
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>me.coley</groupId>
 	<artifactId>recaf</artifactId>
 	<url>https://github.com/Col-E/Recaf/</url>
-	<version>2.16.7</version>
+	<version>2.16.8</version>
 	<name>Recaf</name>
 	<description>A modern java bytecode editor</description>
 	<!-- Variables -->

diff --git a/src/main/java/me/coley/recaf/Recaf.java b/src/main/java/me/coley/recaf/Recaf.java
@@ -30,7 +30,7 @@
  * @author Matt
  */
 public class Recaf {
-	public static final String VERSION = "2.16.7";
+	public static final String VERSION = "2.16.8";
 	public static final String DOC_URL = "https://col-e.github.io/Recaf-documentation/";
 	public static final int ASM_VERSION = Opcodes.ASM9;
 	private static Controller currentController;

diff --git a/src/main/java/me/coley/recaf/ui/controls/tree/DirectoryItem.java b/src/main/java/me/coley/recaf/ui/controls/tree/DirectoryItem.java
@@ -28,6 +28,21 @@ public DirectoryItem(JavaResource resource, String local) {
 		this.local = local;
 	}
 
+	@Override
+	public void removeSourceChild(TreeItem<JavaResource> child) {
+		boolean isClass = child instanceof ClassItem;
+		boolean isDir = child instanceof PackageItem;
+		if (isClass || isDir) {
+			String childLocal = ((DirectoryItem) child).local;
+			if (isClass)
+				localToLeaf.remove(childLocal);
+			else
+				localToDir.remove(childLocal);
+		}
+		super.removeSourceChild(child);
+	}
+
+
 	/**
 	 * Used for display.
 	 *