2 files changed, 25 insertions, 1 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 8384cb71..4d8ceea4 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
@@ -49,7 +49,7 @@ public class IdentifierPanel {
                 this.gui = gui;
 
                 this.ui.setLayout(new GridBagLayout());
-                this.ui.setPreferredSize(ScaleUtil.getDimension(0, 120));
+                this.ui.setPreferredSize(ScaleUtil.getDimension(0, 135));
                 this.ui.setBorder(BorderFactory.createTitledBorder(I18n.translate("info_panel.identifier")));
                 this.ui.setEnabled(false);
         }
@@ -96,15 +96,26 @@ public class IdentifierPanel {
                         this.ui.setEnabled(false);
                 } else {
                         this.ui.setEnabled(true);
+                        boolean renamed = gui.getController().project.getMapper().getDeobfMapping(entry).targetName() != null;
 
                         if (deobfEntry instanceof ClassEntry) {
                                 ClassEntry ce = (ClassEntry) deobfEntry;
                                 String name = ce.isInnerClass() ? ce.getName() : ce.getFullName();
                                 this.nameField = th.addRenameTextField(EditableType.CLASS, name);
+
+                                if (renamed) {
+                                        th.addCopiableStringRow(I18n.translate("info_panel.identifier.original_name"), entry.getName());
+                                }
+
                                 th.addModifierRow(I18n.translate("info_panel.identifier.modifier"), EditableType.CLASS, this::onModifierChanged);
                         } else if (deobfEntry instanceof FieldEntry) {
                                 FieldEntry fe = (FieldEntry) deobfEntry;
                                 this.nameField = th.addRenameTextField(EditableType.FIELD, fe.getName());
+
+                                if (renamed) {
+                                        th.addCopiableStringRow(I18n.translate("info_panel.identifier.original_name"), entry.getName());
+                                }
+
                                 th.addCopiableStringRow(I18n.translate("info_panel.identifier.class"), fe.getParent().getFullName());
                                 th.addCopiableStringRow(I18n.translate("info_panel.identifier.type_descriptor"), fe.getDesc().toString());
                                 th.addModifierRow(I18n.translate("info_panel.identifier.modifier"), EditableType.FIELD, this::onModifierChanged);
@@ -120,6 +131,13 @@ public class IdentifierPanel {
                                         }
                                 } else {
                                         this.nameField = th.addRenameTextField(EditableType.METHOD, me.getName());
+                                }
+
+                                if (renamed) {
+                                        th.addCopiableStringRow(I18n.translate("info_panel.identifier.original_name"), entry.getName());
+                                }
+
+                                if (!me.isConstructor()) {
                                         th.addCopiableStringRow(I18n.translate("info_panel.identifier.class"), me.getParent().getFullName());
                                 }
 
@@ -136,6 +154,11 @@ public class IdentifierPanel {
                                 }
 
                                 this.nameField = th.addRenameTextField(type, lve.getName());
+
+                                if (renamed) {
+                                        th.addCopiableStringRow(I18n.translate("info_panel.identifier.original_name"), entry.getName());
+                                }
+
                                 th.addCopiableStringRow(I18n.translate("info_panel.identifier.class"), lve.getContainingClass().getFullName());
                                 th.addCopiableStringRow(I18n.translate("info_panel.identifier.method"), lve.getParent().getName());
                                 th.addCopiableStringRow(I18n.translate("info_panel.identifier.index"), Integer.toString(lve.getIndex()));
diff --git a/enigma/src/main/resources/lang/en_us.json b/enigma/src/main/resources/lang/en_us.json
index 3919b9e2..5d7ee258 100644
--- a/enigma/src/main/resources/lang/en_us.json
+++ b/enigma/src/main/resources/lang/en_us.json
@@ -106,6 +106,7 @@
         "info_panel.identifier.method": "Method",
         "info_panel.identifier.constructor": "Constructor",
         "info_panel.identifier.class": "Class",
+        "info_panel.identifier.original_name": "Original Name",
         "info_panel.identifier.type_descriptor": "Type Descriptor",
         "info_panel.identifier.method_descriptor": "Method Descriptor",
         "info_panel.identifier.modifier": "Modifier",