From eb93bc2cb083409c123463a20844f7e1ed58deab Mon Sep 17 00:00:00 2001
From: asiekierka
Date: Tue, 18 Oct 2016 17:35:11 +0200
Subject: remove none/ prefix

---
 src/main/java/cuchaz/enigma/gui/Gui.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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

diff --git a/src/main/java/cuchaz/enigma/gui/Gui.java b/src/main/java/cuchaz/enigma/gui/Gui.java
index 0ccb3f7..a81ad06 100644
--- a/src/main/java/cuchaz/enigma/gui/Gui.java
+++ b/src/main/java/cuchaz/enigma/gui/Gui.java
@@ -574,8 +574,7 @@ public class Gui {
 
         int offset = text.getText().lastIndexOf('/') + 1;
         // If it's a class and isn't in the default package, assume that it's deobfuscated.
-        if (m_reference.getNameableEntry() instanceof ClassEntry && !text.getText().startsWith(Constants.NONE_PACKAGE)
-                && offset != 0)
+        if (m_reference.getNameableEntry() instanceof ClassEntry && text.getText().contains("/") && offset != 0)
             text.select(offset, text.getText().length());
         else
             text.selectAll();
@@ -778,9 +777,8 @@ public class Gui {
     {
         String oldEntry = deobfReference.entry.getClassEntry().getPackageName();
         String newEntry = new ClassEntry(Descriptor.toJvmName(newName)).getPackageName();
-        if (oldEntry != null && newEntry != null)
-            moveClassTree(deobfReference, newName, oldEntry.equals(Constants.NONE_PACKAGE),
-                    newEntry.equals(Constants.NONE_PACKAGE));
+        moveClassTree(deobfReference, newName, oldEntry == null,
+                newEntry == null);
     }
 
     public void moveClassTree(EntryReference<Entry, Entry> deobfReference, String newName, boolean isOldOb, boolean isNewOb)
-- 
cgit v1.2.3