From b4aaff683d78ab92b83f3a7257c33b8e27d1affa Mon Sep 17 00:00:00 2001
From: Thog
Date: Tue, 7 Mar 2017 21:24:39 +0100
Subject: Drop unix case style and implement hashCode when equals is overrided

Also update Guava to version 21
---
 .../java/cuchaz/enigma/gui/elements/MenuBar.java     | 20 ++++++++------------
 .../cuchaz/enigma/gui/elements/PopupMenuBar.java     |  2 +-
 2 files changed, 9 insertions(+), 13 deletions(-)

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

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 {
                 item.addActionListener(event -> {
                     if (this.gui.jarFileChooser.showOpenDialog(this.gui.getFrame()) == JFileChooser.APPROVE_OPTION) {
                         // load the jar in a separate thread
-                        new Thread() {
-                            @Override
-                            public void run() {
-                                try {
-                                    gui.getController().openJar(new JarFile(gui.jarFileChooser.getSelectedFile()));
-                                } catch (IOException ex) {
-                                    throw new Error(ex);
-                                }
+                        new Thread(() ->
+                        {
+                            try {
+                                gui.getController().openJar(new JarFile(gui.jarFileChooser.getSelectedFile()));
+                            } catch (IOException ex) {
+                                throw new Error(ex);
                             }
-                        }.start();
+                        }).start();
                     }
                 });
             }
@@ -177,9 +175,7 @@ public class MenuBar extends JMenuBar {
             {
                 JMenuItem item = new JMenuItem("Rebuild Method Names");
                 menu.add(item);
-                item.addActionListener(event -> {
-                    this.gui.getController().rebuildMethodNames();
-                });
+                item.addActionListener(event -> this.gui.getController().rebuildMethodNames());
                 this.rebuildMethodNamesMenu = item;
             }
             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 {
         }
         {
             JMenuItem menu = new JMenuItem("Go to Declaration");
-            menu.addActionListener(event -> gui.navigateTo(gui.m_reference.entry));
+            menu.addActionListener(event -> gui.navigateTo(gui.reference.entry));
             menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N, 0));
             menu.setEnabled(false);
             this.add(menu);
-- 
cgit v1.2.3