diff options
| author | 2020-06-08 22:46:53 +0200 | |
|---|---|---|
| committer | 2020-06-08 16:46:53 -0400 | |
| commit | dd892bb6c8ae913021b4caa2b9e3caea3b8c10bb (patch) | |
| tree | 447e24ee533c9dcf57ab3de89907038eeb722fc6 /enigma-swing/src/main/java/cuchaz | |
| parent | Dont count synthetic fields in stats gen (#267) (diff) | |
| download | enigma-fork-dd892bb6c8ae913021b4caa2b9e3caea3b8c10bb.tar.gz enigma-fork-dd892bb6c8ae913021b4caa2b9e3caea3b8c10bb.tar.xz enigma-fork-dd892bb6c8ae913021b4caa2b9e3caea3b8c10bb.zip | |
Fix javadoc loss when renaming entry (#259)
Diffstat (limited to 'enigma-swing/src/main/java/cuchaz')
| -rw-r--r-- | enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java index 10f36b8..15afeed 100644 --- a/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java +++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java | |||
| @@ -28,6 +28,7 @@ import javax.swing.JOptionPane; | |||
| 28 | import javax.swing.SwingUtilities; | 28 | import javax.swing.SwingUtilities; |
| 29 | 29 | ||
| 30 | import com.google.common.collect.Lists; | 30 | import com.google.common.collect.Lists; |
| 31 | |||
| 31 | import cuchaz.enigma.Enigma; | 32 | import cuchaz.enigma.Enigma; |
| 32 | import cuchaz.enigma.EnigmaProfile; | 33 | import cuchaz.enigma.EnigmaProfile; |
| 33 | import cuchaz.enigma.EnigmaProject; | 34 | import cuchaz.enigma.EnigmaProject; |
| @@ -422,7 +423,8 @@ public class GuiController implements ClientPacketHandler { | |||
| 422 | 423 | ||
| 423 | public void rename(ValidationContext vc, EntryReference<Entry<?>, Entry<?>> reference, String newName, boolean refreshClassTree, boolean validateOnly) { | 424 | public void rename(ValidationContext vc, EntryReference<Entry<?>, Entry<?>> reference, String newName, boolean refreshClassTree, boolean validateOnly) { |
| 424 | Entry<?> entry = reference.getNameableEntry(); | 425 | Entry<?> entry = reference.getNameableEntry(); |
| 425 | project.getMapper().mapFromObf(vc, entry, new EntryMapping(newName), true, validateOnly); | 426 | EntryMapping previous = project.getMapper().getDeobfMapping(entry); |
| 427 | project.getMapper().mapFromObf(vc, entry, previous != null ? previous.withName(newName) : new EntryMapping(newName), true, validateOnly); | ||
| 426 | 428 | ||
| 427 | if (validateOnly || !vc.canProceed()) return; | 429 | if (validateOnly || !vc.canProceed()) return; |
| 428 | 430 | ||