diff options
| author | 2020-09-21 21:05:05 +0200 | |
|---|---|---|
| committer | 2020-09-21 21:05:05 +0200 | |
| commit | 2d8511dedd4e11cbf59bd28531375262aac5b103 (patch) | |
| tree | 150f9652fa4e55eeadca23fbc3f79e8d64d74d18 | |
| parent | Merge pull request #310 from idwtd/patch-3 (diff) | |
| parent | Fixed package renaming (diff) | |
| download | enigma-fork-2d8511dedd4e11cbf59bd28531375262aac5b103.tar.gz enigma-fork-2d8511dedd4e11cbf59bd28531375262aac5b103.tar.xz enigma-fork-2d8511dedd4e11cbf59bd28531375262aac5b103.zip | |
Merge pull request #311 from YanisBft/package-renaming
Fixed package renaming
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | enigma-swing/src/main/java/cuchaz/enigma/gui/Gui.java | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/build.gradle b/build.gradle index 6925879..e341c61 100644 --- a/build.gradle +++ b/build.gradle | |||
| @@ -24,7 +24,7 @@ subprojects { | |||
| 24 | } | 24 | } |
| 25 | 25 | ||
| 26 | group = 'cuchaz' | 26 | group = 'cuchaz' |
| 27 | version = '0.21' | 27 | version = '0.21.1' |
| 28 | 28 | ||
| 29 | def buildNumber = System.getenv("BUILD_NUMBER") | 29 | def buildNumber = System.getenv("BUILD_NUMBER") |
| 30 | version = version + "+" + (buildNumber ? "build.$buildNumber" : "local") | 30 | version = version + "+" + (buildNumber ? "build.$buildNumber" : "local") |
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/Gui.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/Gui.java index 92b6e52..2d0c30b 100644 --- a/enigma-swing/src/main/java/cuchaz/enigma/gui/Gui.java +++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/Gui.java | |||
| @@ -747,10 +747,8 @@ public class Gui implements LanguageChangeListener { | |||
| 747 | DefaultMutableTreeNode childNode = (DefaultMutableTreeNode) node.getChildAt(i); | 747 | DefaultMutableTreeNode childNode = (DefaultMutableTreeNode) node.getChildAt(i); |
| 748 | ClassEntry prevDataChild = (ClassEntry) childNode.getUserObject(); | 748 | ClassEntry prevDataChild = (ClassEntry) childNode.getUserObject(); |
| 749 | ClassEntry dataChild = new ClassEntry(data + "/" + prevDataChild.getSimpleName()); | 749 | ClassEntry dataChild = new ClassEntry(data + "/" + prevDataChild.getSimpleName()); |
| 750 | this.controller.rename(vc, new EntryReference<>(prevDataChild, prevDataChild.getFullName()), dataChild.getFullName(), false); | 750 | |
| 751 | if (!vc.canProceed()) return; | 751 | onPanelRename(vc, prevDataChild, dataChild, node); |
| 752 | this.controller.sendPacket(new RenameC2SPacket(prevDataChild, dataChild.getFullName(), false)); | ||
| 753 | childNode.setUserObject(dataChild); | ||
| 754 | } | 752 | } |
| 755 | node.setUserObject(data); | 753 | node.setUserObject(data); |
| 756 | // Ob package will never be modified, just reload deob view | 754 | // Ob package will never be modified, just reload deob view |