Reorganize entry names

3 files changed, 95 insertions, 10 deletions

diff --git a/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/ClassEntry.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/ClassEntry.java
index 47319e0d..fe56611b 100644
--- a/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/ClassEntry.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/ClassEntry.java
@@ -59,8 +59,26 @@ public class ClassEntry extends ParentedEntry<ClassEntry> implements Comparable<
                 return this.name;
         }
 
+        @Override
+        public String getSimpleName() {
+                int packagePos = name.lastIndexOf('/');
+                if (packagePos > 0) {
+                        return name.substring(packagePos + 1);
+                }
+                return name;
+        }
+
+        @Override
         public String getFullName() {
-                return fullName;
+                return this.fullName;
+        }
+
+        @Override
+        public String getContextualName() {
+                if (this.isInnerClass()) {
+                        return this.parent.getSimpleName() + "$" + this.name;
+                }
+                return this.getSimpleName();
         }
 
         @Override
@@ -126,14 +144,6 @@ public class ClassEntry extends ParentedEntry<ClassEntry> implements Comparable<
                 return getPackageName(fullName);
         }
 
-        public String getSimpleName() {
-                int packagePos = name.lastIndexOf('/');
-                if (packagePos > 0) {
-                        return name.substring(packagePos + 1);
-                }
-                return name;
-        }
-
         /**
          * Returns whether this class entry has a parent, and therefore is an inner class.
          */
diff --git a/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/Entry.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/Entry.java
index 6fd412a0..8a81c54a 100644
--- a/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/Entry.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/Entry.java
@@ -21,8 +21,68 @@ import cuchaz.enigma.translation.mapping.IdentifierValidation;
 import cuchaz.enigma.utils.validation.ValidationContext;
 
 public interface Entry<P extends Entry<?>> extends Translatable {
+        /**
+         * Returns the default name of this entry.
+         *
+         * <p>For methods, fields and inner classes, it's the same as {@link #getSimpleName()}.</p>
+         * <p>For other classes, it's the same as {@link #getFullName()}.</p>
+         *
+         * <br><p>Examples:</p>
+         * <ul>
+         *     <li>Outer class: "domain.name.ClassA"</li>
+         *     <li>Inner class: "ClassB"</li>
+         *     <li>Method: "methodC"</li>
+         * </ul>
+         */
         String getName();
 
+        /**
+         * Returns the simple name of this entry.
+         *
+         * <p>For methods, fields and inner classes, it's the same as {@link #getName()}.</p>
+         * <p>For other classes, it's their name without the package name.</p>
+         *
+         * <br><p>Examples:</p>
+         * <ul>
+         *     <li>Outer class: "ClassA"</li>
+         *     <li>Inner class: "ClassB"</li>
+         *     <li>Method: "methodC"</li>
+         * </ul>
+         */
+        String getSimpleName();
+
+        /**
+         * Returns the full name of this entry.
+         *
+         * <p>For methods, fields and inner classes, it's their name prefixed with the full name
+         * of their parent entry.</p>
+         * <p>For other classes, it's their name prefixed with their package name.</p>
+         *
+         * <br><p>Examples:</p>
+         * <ul>
+         *     <li>Outer class: "domain.name.ClassA"</li>
+         *     <li>Inner class: "domain.name.ClassA$ClassB"</li>
+         *     <li>Method: "domain.name.ClassA.methodC"</li>
+         * </ul>
+         */
+        String getFullName();
+
+        /**
+         * Returns the contextual name of this entry.
+         *
+         * <p>For methods, fields and inner classes, it's their name prefixed with the contextual
+         * name of their parent entry.</p>
+         * <p>For other classes, it's only their simple name.</p>
+         *
+         * <br><p>Examples:</p>
+         * <ul>
+         *     <li>Outer class: "ClassA"</li>
+         *     <li>Inner class: "ClassA$ClassB"</li>
+         *     <li>Method: "ClassA.methodC"</li>
+         * </ul>
+         */
+        String getContextualName();
+
         String getJavadocs();
 
         default String getSourceRemapName() {
diff --git a/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/ParentedEntry.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/ParentedEntry.java
index b12f9d01..56348915 100644
--- a/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/ParentedEntry.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/ParentedEntry.java
@@ -45,7 +45,22 @@ public abstract class ParentedEntry<P extends Entry<?>> implements Entry<P> {
 
         @Override
         public String getName() {
-                return name;
+                return this.name;
+        }
+
+        @Override
+        public String getSimpleName() {
+                return this.name;
+        }
+
+        @Override
+        public String getFullName() {
+                return this.parent.getFullName() + "." + this.name;
+        }
+
+        @Override
+        public String getContextualName() {
+                return this.parent.getContextualName() + "." + this.name;
         }
 
         @Override