diff options
| author | 2020-06-24 13:52:45 +0200 | |
|---|---|---|
| committer | 2020-06-24 13:52:45 +0200 | |
| commit | c2c207a8c01a5c4b34ee34d41f828e134c0cdc9b (patch) | |
| tree | 0c217a82bf66b836a7741a867822c7a454e8b132 /enigma-swing/src/main/java/cuchaz | |
| parent | Fix inner class name validation (diff) | |
| download | enigma-c2c207a8c01a5c4b34ee34d41f828e134c0cdc9b.tar.gz enigma-c2c207a8c01a5c4b34ee34d41f828e134c0cdc9b.tar.xz enigma-c2c207a8c01a5c4b34ee34d41f828e134c0cdc9b.zip | |
Fix inner classes getting the full path to the class filled in the rename field
Diffstat (limited to 'enigma-swing/src/main/java/cuchaz')
| -rw-r--r-- | enigma-swing/src/main/java/cuchaz/enigma/gui/panels/IdentifierPanel.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/IdentifierPanel.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/IdentifierPanel.java index 10f8eb5a..be316ee4 100644 --- a/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/IdentifierPanel.java +++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/IdentifierPanel.java | |||
| @@ -1,6 +1,10 @@ | |||
| 1 | package cuchaz.enigma.gui.panels; | 1 | package cuchaz.enigma.gui.panels; |
| 2 | 2 | ||
| 3 | import java.awt.*; | 3 | import java.awt.Component; |
| 4 | import java.awt.Container; | ||
| 5 | import java.awt.GridBagConstraints; | ||
| 6 | import java.awt.GridBagLayout; | ||
| 7 | import java.awt.Insets; | ||
| 4 | import java.awt.event.ItemEvent; | 8 | import java.awt.event.ItemEvent; |
| 5 | import java.util.function.Consumer; | 9 | import java.util.function.Consumer; |
| 6 | 10 | ||
| @@ -19,7 +23,11 @@ import cuchaz.enigma.gui.util.ScaleUtil; | |||
| 19 | import cuchaz.enigma.network.packet.RenameC2SPacket; | 23 | import cuchaz.enigma.network.packet.RenameC2SPacket; |
| 20 | import cuchaz.enigma.translation.mapping.AccessModifier; | 24 | import cuchaz.enigma.translation.mapping.AccessModifier; |
| 21 | import cuchaz.enigma.translation.mapping.EntryMapping; | 25 | import cuchaz.enigma.translation.mapping.EntryMapping; |
| 22 | import cuchaz.enigma.translation.representation.entry.*; | 26 | import cuchaz.enigma.translation.representation.entry.ClassEntry; |
| 27 | import cuchaz.enigma.translation.representation.entry.Entry; | ||
| 28 | import cuchaz.enigma.translation.representation.entry.FieldEntry; | ||
| 29 | import cuchaz.enigma.translation.representation.entry.LocalVariableEntry; | ||
| 30 | import cuchaz.enigma.translation.representation.entry.MethodEntry; | ||
| 23 | import cuchaz.enigma.utils.I18n; | 31 | import cuchaz.enigma.utils.I18n; |
| 24 | import cuchaz.enigma.utils.validation.ValidationContext; | 32 | import cuchaz.enigma.utils.validation.ValidationContext; |
| 25 | 33 | ||
| @@ -86,7 +94,8 @@ public class IdentifierPanel { | |||
| 86 | 94 | ||
| 87 | if (deobfEntry instanceof ClassEntry) { | 95 | if (deobfEntry instanceof ClassEntry) { |
| 88 | ClassEntry ce = (ClassEntry) deobfEntry; | 96 | ClassEntry ce = (ClassEntry) deobfEntry; |
| 89 | this.nameField = th.addRenameTextField(I18n.translate("info_panel.identifier.class"), ce.getFullName()); | 97 | String name = ce.isInnerClass() ? ce.getName() : ce.getFullName(); |
| 98 | this.nameField = th.addRenameTextField(I18n.translate("info_panel.identifier.class"), name); | ||
| 90 | th.addModifierRow(I18n.translate("info_panel.identifier.modifier"), this::onModifierChanged); | 99 | th.addModifierRow(I18n.translate("info_panel.identifier.modifier"), this::onModifierChanged); |
| 91 | } else if (deobfEntry instanceof FieldEntry) { | 100 | } else if (deobfEntry instanceof FieldEntry) { |
| 92 | FieldEntry fe = (FieldEntry) deobfEntry; | 101 | FieldEntry fe = (FieldEntry) deobfEntry; |