2 files changed, 19 insertions, 25 deletions

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) {
diff --git a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
index 14ad53d..d7be1a9 100644
--- a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
+++ b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
@@ -5,7 +5,6 @@ import cuchaz.enigma.config.Themes;
 import cuchaz.enigma.gui.Gui;
 import cuchaz.enigma.gui.dialog.AboutDialog;
 import cuchaz.enigma.gui.dialog.SearchDialog;
-import cuchaz.enigma.throwables.MappingParseException;
 import cuchaz.enigma.translation.mapping.serde.MappingFormat;
 
 import javax.swing.*;
@@ -68,15 +67,9 @@ public class MenuBar extends JMenuBar {
                                 openMenu.add(item);
                                 item.addActionListener(event -> {
                                         if (this.gui.enigmaMappingsFileChooser.showOpenDialog(this.gui.getFrame()) == JFileChooser.APPROVE_OPTION) {
-                                                try {
-                                                        File selectedFile = this.gui.enigmaMappingsFileChooser.getSelectedFile();
-                                                        MappingFormat format = selectedFile.isDirectory() ? MappingFormat.ENIGMA_DIRECTORY : MappingFormat.ENIGMA_FILE;
-                                                        this.gui.getController().openMappings(format, selectedFile.toPath());
-                                                } catch (IOException ex) {
-                                                        throw new Error(ex);
-                                                } catch (MappingParseException ex) {
-                                                        JOptionPane.showMessageDialog(this.gui.getFrame(), ex.getMessage());
-                                                }
+                                                File selectedFile = this.gui.enigmaMappingsFileChooser.getSelectedFile();
+                                                MappingFormat format = selectedFile.isDirectory() ? MappingFormat.ENIGMA_DIRECTORY : MappingFormat.ENIGMA_FILE;
+                                                this.gui.getController().openMappings(format, selectedFile.toPath());
                                         }
                                 });
                                 this.openEnigmaMappingsMenu = item;
@@ -87,13 +80,7 @@ public class MenuBar extends JMenuBar {
                                         this.gui.tinyMappingsFileChooser.setVisible(true);
                                         File file = new File(this.gui.tinyMappingsFileChooser.getDirectory() + File.separator + this.gui.tinyMappingsFileChooser.getFile());
                                         if (file.exists()) {
-                                                try {
-                                                        this.gui.getController().openMappings(MappingFormat.TINY_FILE, file.toPath());
-                                                } catch (IOException ex) {
-                                                        throw new Error(ex);
-                                                } catch (MappingParseException ex) {
-                                                        JOptionPane.showMessageDialog(this.gui.getFrame(), ex.getMessage());
-                                                }
+                                                this.gui.getController().openMappings(MappingFormat.TINY_FILE, file.toPath());
                                         }
                                 });
                                 this.openTinyMappingsMenu = item;