From 54d17da93c6708e54c296d63783a60f1c024797b Mon Sep 17 00:00:00 2001
From: jeff
Date: Mon, 2 Mar 2015 01:01:51 -0500
Subject: finished most of the matching gui

---
 src/cuchaz/enigma/gui/ClassSelector.java | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'src/cuchaz/enigma/gui/ClassSelector.java')

diff --git a/src/cuchaz/enigma/gui/ClassSelector.java b/src/cuchaz/enigma/gui/ClassSelector.java
index 654bfbe..e5f550b 100644
--- a/src/cuchaz/enigma/gui/ClassSelector.java
+++ b/src/cuchaz/enigma/gui/ClassSelector.java
@@ -41,21 +41,32 @@ public class ClassSelector extends JTree {
 	public static Comparator<ClassEntry> ObfuscatedClassEntryComparator;
 	public static Comparator<ClassEntry> DeobfuscatedClassEntryComparator;
 	
+	private static String getClassEntryDisplayName(ClassEntry entry) {
+		if (entry instanceof DecoratedClassEntry) {
+			return ((DecoratedClassEntry)entry).getDecoration() + entry.getName();
+		}
+		return entry.getName();
+	}
+	
 	static {
 		ObfuscatedClassEntryComparator = new Comparator<ClassEntry>() {
 			@Override
 			public int compare(ClassEntry a, ClassEntry b) {
-				if (a.getName().length() != b.getName().length()) {
-					return a.getName().length() - b.getName().length();
+				String aname = getClassEntryDisplayName(a);
+				String bname = getClassEntryDisplayName(b);
+				if (aname.length() != bname.length()) {
+					return aname.length() - bname.length();
 				}
-				return a.getName().compareTo(b.getName());
+				return aname.compareTo(bname);
 			}
 		};
 		
 		DeobfuscatedClassEntryComparator = new Comparator<ClassEntry>() {
 			@Override
 			public int compare(ClassEntry a, ClassEntry b) {
-				return a.getName().compareTo(b.getName());
+				String aname = getClassEntryDisplayName(a);
+				String bname = getClassEntryDisplayName(b);
+				return aname.compareTo(bname);
 			}
 		};
 	}
-- 
cgit v1.2.3