summaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorGravatar Thog2016-08-30 14:34:42 +0200
committerGravatar Thog2016-08-30 14:34:42 +0200
commit8b470d9e7e2f9103da76b388613dbe15246c38e8 (patch)
tree2aab13b5db61ab0c4dab41e7f930011fc21bcdff /src/main/java
parentFix mapping not beeing saving in the right directory in some case (diff)
downloadenigma-8b470d9e7e2f9103da76b388613dbe15246c38e8.tar.gz
enigma-8b470d9e7e2f9103da76b388613dbe15246c38e8.tar.xz
enigma-8b470d9e7e2f9103da76b388613dbe15246c38e8.zip
Fix #14
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/cuchaz/enigma/gui/Gui.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/cuchaz/enigma/gui/Gui.java b/src/main/java/cuchaz/enigma/gui/Gui.java
index 29d5fec6..46d3b5cc 100644
--- a/src/main/java/cuchaz/enigma/gui/Gui.java
+++ b/src/main/java/cuchaz/enigma/gui/Gui.java
@@ -774,10 +774,11 @@ public class Gui {
774 774
775 public void moveClassTree(EntryReference<Entry, Entry> deobfReference, String newName) 775 public void moveClassTree(EntryReference<Entry, Entry> deobfReference, String newName)
776 { 776 {
777 ClassEntry oldEntry = deobfReference.entry.getClassEntry(); 777 String oldEntry = deobfReference.entry.getClassEntry().getPackageName();
778 ClassEntry newEntry = new ClassEntry(Descriptor.toJvmName(newName)); 778 String newEntry = new ClassEntry(Descriptor.toJvmName(newName)).getPackageName();
779 moveClassTree(deobfReference, newName, oldEntry.getPackageName().equals(Constants.NONE_PACKAGE), 779 if (oldEntry != null && newEntry != null)
780 newEntry.getClassEntry().getPackageName().equals(Constants.NONE_PACKAGE)); 780 moveClassTree(deobfReference, newName, oldEntry.equals(Constants.NONE_PACKAGE),
781 newEntry.equals(Constants.NONE_PACKAGE));
781 } 782 }
782 783
783 public void moveClassTree(EntryReference<Entry, Entry> deobfReference, String newName, boolean isOldOb, boolean isNewOb) 784 public void moveClassTree(EntryReference<Entry, Entry> deobfReference, String newName, boolean isOldOb, boolean isNewOb)