From c5c1ce56cd02ac5a8a5670768f27ad22e30022db Mon Sep 17 00:00:00 2001
From: gegy1000
Date: Tue, 18 Jun 2019 20:38:11 +0200
Subject: Drop invalid mappings menu

---
 src/main/java/cuchaz/enigma/EnigmaProject.java           | 1 -
 src/main/java/cuchaz/enigma/analysis/index/JarIndex.java | 8 ++++----
 src/main/java/cuchaz/enigma/gui/GuiController.java       | 6 ++++++
 src/main/java/cuchaz/enigma/gui/elements/MenuBar.java    | 7 +++++++
 4 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/main/java/cuchaz/enigma/EnigmaProject.java b/src/main/java/cuchaz/enigma/EnigmaProject.java
index dd1f9fa..bb2f7fa 100644
--- a/src/main/java/cuchaz/enigma/EnigmaProject.java
+++ b/src/main/java/cuchaz/enigma/EnigmaProject.java
@@ -37,7 +37,6 @@ import java.util.jar.JarEntry;
 import java.util.jar.JarOutputStream;
 import java.util.stream.Collectors;
 
-// TODO: Naming?
 public class EnigmaProject {
 	private final Enigma enigma;
 
diff --git a/src/main/java/cuchaz/enigma/analysis/index/JarIndex.java b/src/main/java/cuchaz/enigma/analysis/index/JarIndex.java
index 38d2b08..763282b 100644
--- a/src/main/java/cuchaz/enigma/analysis/index/JarIndex.java
+++ b/src/main/java/cuchaz/enigma/analysis/index/JarIndex.java
@@ -59,16 +59,16 @@ public class JarIndex implements JarIndexer {
 	public void indexJar(ClassCache classCache, ProgressListener progress) {
 		progress.init(4, "Indexing jar");
 
-		progress.step(1, "Entries");
+		progress.step(1, "Entries...");
 		classCache.visit(() -> new IndexClassVisitor(this, Opcodes.ASM5), ClassReader.SKIP_CODE);
 
-		progress.step(2, "Entry references");
+		progress.step(2, "Entry references...");
 		classCache.visit(() -> new IndexReferenceVisitor(this, Opcodes.ASM5), ClassReader.SKIP_FRAMES);
 
-		progress.step(3, "Bridge methods");
+		progress.step(3, "Bridge methods...");
 		bridgeMethodIndex.findBridgeMethods();
 
-		progress.step(4, "Processing");
+		progress.step(4, "Processing...");
 		processIndex(this);
 	}
 
diff --git a/src/main/java/cuchaz/enigma/gui/GuiController.java b/src/main/java/cuchaz/enigma/gui/GuiController.java
index a55d2cd..4410bf3 100644
--- a/src/main/java/cuchaz/enigma/gui/GuiController.java
+++ b/src/main/java/cuchaz/enigma/gui/GuiController.java
@@ -160,6 +160,12 @@ public class GuiController {
 		refreshCurrentClass();
 	}
 
+	public void dropMappings() {
+		if (project == null) return;
+
+		ProgressDialog.runOffThread(this.gui.getFrame(), progress -> project.dropMappings(progress));
+	}
+
 	public void exportSource(final Path path) {
 		if (project == null) return;
 
diff --git a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
index 5578325..a3bd2fe 100644
--- a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
+++ b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
@@ -29,6 +29,7 @@ public class MenuBar extends JMenuBar {
 	public final JMenuItem saveMappingEnigmaDirectoryMenu;
 	public final JMenuItem saveMappingsSrgMenu;
 	public final JMenuItem closeMappingsMenu;
+	public final JMenuItem dropMappingsMenu;
 	public final JMenuItem exportSourceMenu;
 	public final JMenuItem exportJarMenu;
 	private final Gui gui;
@@ -149,6 +150,12 @@ public class MenuBar extends JMenuBar {
 				});
 				this.closeMappingsMenu = item;
 			}
+			{
+				JMenuItem item = new JMenuItem("Drop Invalid Mappings");
+				menu.add(item);
+				item.addActionListener(event -> this.gui.getController().dropMappings());
+				this.dropMappingsMenu = item;
+			}
 			menu.addSeparator();
 			{
 				JMenuItem item = new JMenuItem("Export Source...");
-- 
cgit v1.2.3