A little bit of clean up

4 files changed, 27 insertions, 51 deletions

diff --git a/src/main/java/cuchaz/enigma/gui/ClassSelector.java b/src/main/java/cuchaz/enigma/gui/ClassSelector.java
index 98880cd..92fcaba 100644
--- a/src/main/java/cuchaz/enigma/gui/ClassSelector.java
+++ b/src/main/java/cuchaz/enigma/gui/ClassSelector.java
@@ -22,8 +22,6 @@ import cuchaz.enigma.throwables.IllegalNameException;
 import javax.swing.*;
 import javax.swing.event.CellEditorListener;
 import javax.swing.event.ChangeEvent;
-import javax.swing.event.TreeModelEvent;
-import javax.swing.event.TreeModelListener;
 import javax.swing.tree.*;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
@@ -278,7 +276,7 @@ public class ClassSelector extends JTree {
             TreePath path = tree.getPathForRow(i);
             if (i == row || isDescendant(path, rowPath)) {
                 if (tree.isExpanded(path)) {
-                    buf.append("," + String.valueOf(i - row));
+                    buf.append(",").append(String.valueOf(i - row));
                 }
             } else {
                 break;
diff --git a/src/main/java/cuchaz/enigma/gui/Gui.java b/src/main/java/cuchaz/enigma/gui/Gui.java
index 46d3b5c..b523859 100644
--- a/src/main/java/cuchaz/enigma/gui/Gui.java
+++ b/src/main/java/cuchaz/enigma/gui/Gui.java
@@ -639,26 +639,21 @@ public class Gui {
 
         m_implementationsTree.setModel(null);
 
-        if (m_reference.entry instanceof ClassEntry) {
-            // get the class implementations
-            ClassImplementationsTreeNode node = this.controller.getClassImplementations((ClassEntry) m_reference.entry);
-            if (node != null) {
-                // show the tree at the root
-                TreePath path = getPathToRoot(node);
-                m_implementationsTree.setModel(new DefaultTreeModel((TreeNode) path.getPathComponent(0)));
-                m_implementationsTree.expandPath(path);
-                m_implementationsTree.setSelectionRow(m_implementationsTree.getRowForPath(path));
-            }
-        } else if (m_reference.entry instanceof MethodEntry) {
-            // get the method implementations
-            MethodImplementationsTreeNode node = this.controller.getMethodImplementations((MethodEntry) m_reference.entry);
-            if (node != null) {
-                // show the tree at the root
-                TreePath path = getPathToRoot(node);
-                m_implementationsTree.setModel(new DefaultTreeModel((TreeNode) path.getPathComponent(0)));
-                m_implementationsTree.expandPath(path);
-                m_implementationsTree.setSelectionRow(m_implementationsTree.getRowForPath(path));
-            }
+        DefaultMutableTreeNode node = null;
+
+        // get the class implementations
+        if (m_reference.entry instanceof ClassEntry)
+            node = this.controller.getClassImplementations((ClassEntry) m_reference.entry);
+        else // get the method implementations
+            if (m_reference.entry instanceof MethodEntry)
+                node = this.controller.getMethodImplementations((MethodEntry) m_reference.entry);
+
+        if (node != null) {
+            // show the tree at the root
+            TreePath path = getPathToRoot(node);
+            m_implementationsTree.setModel(new DefaultTreeModel((TreeNode) path.getPathComponent(0)));
+            m_implementationsTree.expandPath(path);
+            m_implementationsTree.setSelectionRow(m_implementationsTree.getRowForPath(path));
         }
 
         m_tabs.setSelectedIndex(1);
diff --git a/src/main/java/cuchaz/enigma/gui/GuiTricks.java b/src/main/java/cuchaz/enigma/gui/GuiTricks.java
index da2ec74..85b65b0 100644
--- a/src/main/java/cuchaz/enigma/gui/GuiTricks.java
+++ b/src/main/java/cuchaz/enigma/gui/GuiTricks.java
@@ -10,16 +10,11 @@
  ******************************************************************************/
 package cuchaz.enigma.gui;
 
-import java.awt.Font;
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionListener;
-import java.awt.event.MouseEvent;
 import java.util.Arrays;
 
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.ToolTipManager;
-
 public class GuiTricks {
 
     public static JLabel unboldLabel(JLabel label) {
@@ -28,15 +23,6 @@ public class GuiTricks {
         return label;
     }
 
-    public static void showToolTipNow(JComponent component) {
-        // HACKHACK: trick the tooltip manager into showing the tooltip right now
-        ToolTipManager manager = ToolTipManager.sharedInstance();
-        int oldDelay = manager.getInitialDelay();
-        manager.setInitialDelay(0);
-        manager.mouseMoved(new MouseEvent(component, MouseEvent.MOUSE_MOVED, System.currentTimeMillis(), 0, 0, 0, 0, false));
-        manager.setInitialDelay(oldDelay);
-    }
-
     public static void deactivateButton(JButton button) {
         button.setEnabled(false);
         button.setText("");
diff --git a/src/main/java/cuchaz/enigma/gui/MemberMatchingGui.java b/src/main/java/cuchaz/enigma/gui/MemberMatchingGui.java
index 9e90dae..4383465 100644
--- a/src/main/java/cuchaz/enigma/gui/MemberMatchingGui.java
+++ b/src/main/java/cuchaz/enigma/gui/MemberMatchingGui.java
@@ -287,23 +287,20 @@ public class MemberMatchingGui<T extends Entry> {
 
     private void highlightEntries(CodeReader reader, Deobfuscator deobfuscator, Collection<T> obfMatchedEntries, Collection<T> obfUnmatchedEntries) {
         reader.clearHighlights();
-        SourceIndex index = reader.getSourceIndex();
-
         // matched fields
-        for (T obfT : obfMatchedEntries) {
-            T deobfT = deobfuscator.deobfuscateEntry(obfT);
-            Token token = index.getDeclarationToken(deobfT);
-            if (token != null) {
-                reader.setHighlightedToken(token, m_matchedHighlightPainter);
-            }
-        }
-
+        updateHighlighted(obfMatchedEntries, deobfuscator, reader, m_matchedHighlightPainter);
         // unmatched fields
-        for (T obfT : obfUnmatchedEntries) {
+        updateHighlighted(obfUnmatchedEntries, deobfuscator, reader, m_unmatchedHighlightPainter);
+    }
+
+    private void updateHighlighted(Collection<T> entries, Deobfuscator deobfuscator, CodeReader reader, HighlightPainter painter)
+    {
+        SourceIndex index = reader.getSourceIndex();
+        for (T obfT : entries) {
             T deobfT = deobfuscator.deobfuscateEntry(obfT);
             Token token = index.getDeclarationToken(deobfT);
             if (token != null) {
-                reader.setHighlightedToken(token, m_unmatchedHighlightPainter);
+                reader.setHighlightedToken(token, painter);
             }
         }
     }