summaryrefslogtreecommitdiff
path: root/src/main/java/cuchaz/enigma/gui/elements
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/cuchaz/enigma/gui/elements')
-rw-r--r--src/main/java/cuchaz/enigma/gui/elements/MenuBar.java20
-rw-r--r--src/main/java/cuchaz/enigma/gui/elements/PopupMenuBar.java2
2 files changed, 9 insertions, 13 deletions
diff --git a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
index dcd7c93..0ccd537 100644
--- a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
+++ b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
@@ -42,16 +42,14 @@ public class MenuBar extends JMenuBar {
42 item.addActionListener(event -> { 42 item.addActionListener(event -> {
43 if (this.gui.jarFileChooser.showOpenDialog(this.gui.getFrame()) == JFileChooser.APPROVE_OPTION) { 43 if (this.gui.jarFileChooser.showOpenDialog(this.gui.getFrame()) == JFileChooser.APPROVE_OPTION) {
44 // load the jar in a separate thread 44 // load the jar in a separate thread
45 new Thread() { 45 new Thread(() ->
46 @Override 46 {
47 public void run() { 47 try {
48 try { 48 gui.getController().openJar(new JarFile(gui.jarFileChooser.getSelectedFile()));
49 gui.getController().openJar(new JarFile(gui.jarFileChooser.getSelectedFile())); 49 } catch (IOException ex) {
50 } catch (IOException ex) { 50 throw new Error(ex);
51 throw new Error(ex);
52 }
53 } 51 }
54 }.start(); 52 }).start();
55 } 53 }
56 }); 54 });
57 } 55 }
@@ -177,9 +175,7 @@ public class MenuBar extends JMenuBar {
177 { 175 {
178 JMenuItem item = new JMenuItem("Rebuild Method Names"); 176 JMenuItem item = new JMenuItem("Rebuild Method Names");
179 menu.add(item); 177 menu.add(item);
180 item.addActionListener(event -> { 178 item.addActionListener(event -> this.gui.getController().rebuildMethodNames());
181 this.gui.getController().rebuildMethodNames();
182 });
183 this.rebuildMethodNamesMenu = item; 179 this.rebuildMethodNamesMenu = item;
184 } 180 }
185 menu.addSeparator(); 181 menu.addSeparator();
diff --git a/src/main/java/cuchaz/enigma/gui/elements/PopupMenuBar.java b/src/main/java/cuchaz/enigma/gui/elements/PopupMenuBar.java
index 2b06342..e387ed3 100644
--- a/src/main/java/cuchaz/enigma/gui/elements/PopupMenuBar.java
+++ b/src/main/java/cuchaz/enigma/gui/elements/PopupMenuBar.java
@@ -53,7 +53,7 @@ public class PopupMenuBar extends JPopupMenu {
53 } 53 }
54 { 54 {
55 JMenuItem menu = new JMenuItem("Go to Declaration"); 55 JMenuItem menu = new JMenuItem("Go to Declaration");
56 menu.addActionListener(event -> gui.navigateTo(gui.m_reference.entry)); 56 menu.addActionListener(event -> gui.navigateTo(gui.reference.entry));
57 menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N, 0)); 57 menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N, 0));
58 menu.setEnabled(false); 58 menu.setEnabled(false);
59 this.add(menu); 59 this.add(menu);