From bb20ce047a2e20866b9532c441c7433b1973ba5b Mon Sep 17 00:00:00 2001
From: gegy1000
Date: Sat, 23 Feb 2019 19:42:00 +0200
Subject: Fix #110 and remap indices with matched bridge method names

---
 src/main/java/cuchaz/enigma/gui/GuiController.java | 23 ++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'src/main/java/cuchaz/enigma/gui/GuiController.java')

diff --git a/src/main/java/cuchaz/enigma/gui/GuiController.java b/src/main/java/cuchaz/enigma/gui/GuiController.java
index 45c6131..15211e0 100644
--- a/src/main/java/cuchaz/enigma/gui/GuiController.java
+++ b/src/main/java/cuchaz/enigma/gui/GuiController.java
@@ -32,6 +32,7 @@ import cuchaz.enigma.translation.representation.entry.MethodEntry;
 import cuchaz.enigma.utils.ReadableToken;
 
 import javax.annotation.Nullable;
+import javax.swing.*;
 import java.awt.event.ItemEvent;
 import java.io.File;
 import java.io.IOException;
@@ -80,16 +81,22 @@ public class GuiController {
 		this.gui.onCloseJar();
 	}
 
-	public void openMappings(MappingFormat format, Path path) throws IOException, MappingParseException {
-		EntryTree<EntryMapping> mappings = format.read(path);
-		deobfuscator.setMappings(mappings);
+	public void openMappings(MappingFormat format, Path path) {
+		ProgressDialog.runInThread(this.gui.getFrame(), progress -> {
+			try {
+				EntryTree<EntryMapping> mappings = format.read(path, progress);
+				deobfuscator.setMappings(mappings, progress);
 
-		gui.setMappingsFile(path);
-		loadedMappingFormat = format;
-		loadedMappingPath = path;
+				gui.setMappingsFile(path);
+				loadedMappingFormat = format;
+				loadedMappingPath = path;
 
-		refreshClasses();
-		refreshCurrentClass();
+				refreshClasses();
+				refreshCurrentClass();
+			} catch (MappingParseException e) {
+				JOptionPane.showMessageDialog(this.gui.getFrame(), e.getMessage());
+			}
+		});
 	}
 
 	public void saveMappings(Path path) {
-- 
cgit v1.2.3