From f2c52cfc823486d6bc1c169f3a88b7e7696777a5 Mon Sep 17 00:00:00 2001
From: lclc98
Date: Mon, 4 Jul 2016 15:25:46 +1000
Subject: Fixed Obf Class list order

---
 src/main/java/cuchaz/enigma/gui/panels/PanelDeobf.java |  2 +-
 src/main/java/cuchaz/enigma/gui/panels/PanelObf.java   | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

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

diff --git a/src/main/java/cuchaz/enigma/gui/panels/PanelDeobf.java b/src/main/java/cuchaz/enigma/gui/panels/PanelDeobf.java
index d89de36..2cc8b76 100644
--- a/src/main/java/cuchaz/enigma/gui/panels/PanelDeobf.java
+++ b/src/main/java/cuchaz/enigma/gui/panels/PanelDeobf.java
@@ -17,7 +17,7 @@ public class PanelDeobf extends JPanel {
     public PanelDeobf(Gui gui) {
         this.gui = gui;
 
-        this.deobfClasses = new ClassSelector(ClassSelector.DeobfuscatedClassEntryComparator);
+        this.deobfClasses = new ClassSelector(ClassSelector.DEOBF_CLASS_COMPARATOR);
         this.deobfClasses.setListener(gui::navigateTo);
 
         this.setLayout(new BorderLayout());
diff --git a/src/main/java/cuchaz/enigma/gui/panels/PanelObf.java b/src/main/java/cuchaz/enigma/gui/panels/PanelObf.java
index 745cb2e..3e0374e 100644
--- a/src/main/java/cuchaz/enigma/gui/panels/PanelObf.java
+++ b/src/main/java/cuchaz/enigma/gui/panels/PanelObf.java
@@ -1,6 +1,7 @@
 package cuchaz.enigma.gui.panels;
 
 import java.awt.BorderLayout;
+import java.util.Comparator;
 
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -8,6 +9,7 @@ import javax.swing.JScrollPane;
 
 import cuchaz.enigma.gui.ClassSelector;
 import cuchaz.enigma.gui.Gui;
+import cuchaz.enigma.mapping.ClassEntry;
 
 public class PanelObf extends JPanel {
 
@@ -17,7 +19,16 @@ public class PanelObf extends JPanel {
     public PanelObf(Gui gui) {
         this.gui = gui;
 
-        this.obfClasses = new ClassSelector(ClassSelector.ObfuscatedClassEntryComparator);
+        Comparator<ClassEntry>  obfClassComparator = (a, b) -> {
+            String aname = a.getName();
+            String bname = b.getName();
+            if (aname.length() != bname.length()) {
+                return aname.length() - bname.length();
+            }
+            return aname.compareTo(bname);
+        };
+
+        this.obfClasses = new ClassSelector(obfClassComparator);
         this.obfClasses.setListener(gui::navigateTo);
 
         this.setLayout(new BorderLayout());
-- 
cgit v1.2.3