Make sure to use UTF-8 in any case for I/O, change "Mark as deobfuscated" key and clean up

2 files changed, 5 insertions, 11 deletions

diff --git a/src/main/java/cuchaz/enigma/gui/MemberMatchingGui.java b/src/main/java/cuchaz/enigma/gui/MemberMatchingGui.java
index 4383465..5055091 100644
--- a/src/main/java/cuchaz/enigma/gui/MemberMatchingGui.java
+++ b/src/main/java/cuchaz/enigma/gui/MemberMatchingGui.java
@@ -172,11 +172,8 @@ public class MemberMatchingGui<T extends Entry> {
         KeyAdapter keyListener = new KeyAdapter() {
             @Override
             public void keyPressed(KeyEvent event) {
-                switch (event.getKeyCode()) {
-                    case KeyEvent.VK_M:
-                        m_matchButton.doClick();
-                        break;
-                }
+                if (event.getKeyCode() == KeyEvent.VK_M)
+                    m_matchButton.doClick();
             }
         };
         m_sourceReader.addKeyListener(keyListener);
@@ -376,7 +373,7 @@ public class MemberMatchingGui<T extends Entry> {
 
     private void setSource(T obfEntry) {
         if (obfEntry == null) {
-            m_obfSourceEntry = obfEntry;
+            m_obfSourceEntry = null;
             m_sourceLabel.setText("");
         } else {
             m_obfSourceEntry = obfEntry;
@@ -386,7 +383,7 @@ public class MemberMatchingGui<T extends Entry> {
 
     private void setDest(T obfEntry) {
         if (obfEntry == null) {
-            m_obfDestEntry = obfEntry;
+            m_obfDestEntry = null;
             m_destLabel.setText("");
         } else {
             m_obfDestEntry = obfEntry;
diff --git a/src/main/java/cuchaz/enigma/gui/elements/PopupMenuBar.java b/src/main/java/cuchaz/enigma/gui/elements/PopupMenuBar.java
index 07c8a32..2b06342 100644
--- a/src/main/java/cuchaz/enigma/gui/elements/PopupMenuBar.java
+++ b/src/main/java/cuchaz/enigma/gui/elements/PopupMenuBar.java
@@ -10,8 +10,6 @@ import cuchaz.enigma.gui.Gui;
 
 public class PopupMenuBar extends JPopupMenu {
 
-    private final Gui gui;
-
     public final JMenuItem renameMenu;
     public final JMenuItem showInheritanceMenu;
     public final JMenuItem showImplementationsMenu;
@@ -21,7 +19,6 @@ public class PopupMenuBar extends JPopupMenu {
     public final JMenuItem toggleMappingMenu;
 
     public PopupMenuBar(Gui gui) {
-        this.gui = gui;
         {
             JMenuItem menu = new JMenuItem("Rename");
             menu.addActionListener(event -> gui.startRename());
@@ -73,7 +70,7 @@ public class PopupMenuBar extends JPopupMenu {
         {
             JMenuItem menu = new JMenuItem("Mark as deobfuscated");
             menu.addActionListener(event -> gui.toggleMapping());
-            menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_T, 0));
+            menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, 0));
             menu.setEnabled(false);
             this.add(menu);
             this.toggleMappingMenu = menu;