From f0be2737087ae82c986a44d6d5bb648ed9a758b3 Mon Sep 17 00:00:00 2001
From: Thog
Date: Fri, 28 Oct 2016 00:08:07 +0200
Subject: Fix order of packages, hanging of Enigma and classes nodes not
 renamed when package is renamed (#25)

---
 src/main/java/cuchaz/enigma/gui/node/ClassSelectorClassNode.java   | 5 +++++
 src/main/java/cuchaz/enigma/gui/node/ClassSelectorPackageNode.java | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

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

diff --git a/src/main/java/cuchaz/enigma/gui/node/ClassSelectorClassNode.java b/src/main/java/cuchaz/enigma/gui/node/ClassSelectorClassNode.java
index 1c9dad4..8341826 100644
--- a/src/main/java/cuchaz/enigma/gui/node/ClassSelectorClassNode.java
+++ b/src/main/java/cuchaz/enigma/gui/node/ClassSelectorClassNode.java
@@ -49,6 +49,11 @@ public class ClassSelectorClassNode extends DefaultMutableTreeNode {
         super.setUserObject(classEntry);
     }
 
+    @Override public Object getUserObject()
+    {
+        return classEntry;
+    }
+
     public boolean equals(ClassSelectorClassNode other) {
         return this.classEntry.equals(other.classEntry);
     }
diff --git a/src/main/java/cuchaz/enigma/gui/node/ClassSelectorPackageNode.java b/src/main/java/cuchaz/enigma/gui/node/ClassSelectorPackageNode.java
index 629d20c..31b4ebf 100644
--- a/src/main/java/cuchaz/enigma/gui/node/ClassSelectorPackageNode.java
+++ b/src/main/java/cuchaz/enigma/gui/node/ClassSelectorPackageNode.java
@@ -33,9 +33,14 @@ public class ClassSelectorPackageNode extends DefaultMutableTreeNode {
         super.setUserObject(userObject);
     }
 
+    @Override public Object getUserObject()
+    {
+        return packageName;
+    }
+
     @Override
     public String toString() {
-        return Descriptor.toJavaName(this.packageName);
+        return !packageName.equals("(none)") ? Descriptor.toJavaName(this.packageName) : "(none)";
     }
 
     @Override
-- 
cgit v1.2.3