7 files changed, 100 insertions, 19 deletions

diff --git a/enigma/src/main/java/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java b/enigma/src/main/java/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java
index b09f7ac..4633ace 100644
--- a/enigma/src/main/java/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java
@@ -60,9 +60,7 @@ public class MethodImplementationsTreeNode extends DefaultMutableTreeNode {
         @Override
         public String toString() {
                 MethodEntry translatedEntry = translator.translate(entry);
-                String className = translatedEntry.getParent().getFullName();
-                String methodName = translatedEntry.getName();
-                return className + "." + methodName + "()";
+                return translatedEntry.getFullName() + "()";
         }
 
         public void load(JarIndex index) {
diff --git a/enigma/src/main/java/cuchaz/enigma/analysis/MethodInheritanceTreeNode.java b/enigma/src/main/java/cuchaz/enigma/analysis/MethodInheritanceTreeNode.java
index 7bee4dc..455456f 100644
--- a/enigma/src/main/java/cuchaz/enigma/analysis/MethodInheritanceTreeNode.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/MethodInheritanceTreeNode.java
@@ -62,13 +62,11 @@ public class MethodInheritanceTreeNode extends DefaultMutableTreeNode {
         @Override
         public String toString() {
                 MethodEntry translatedEntry = translator.translate(entry);
-                String className = translatedEntry.getContainingClass().getFullName();
 
                 if (!this.implemented) {
-                        return className;
+                        return translatedEntry.getParent().getFullName();
                 } else {
-                        String methodName = translatedEntry.getName();
-                        return className + "." + methodName + "()";
+                        return translatedEntry.getFullName() + "()";
                 }
         }
 
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 47319e0..fe56611 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 6fd412a..8a81c54 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/FieldEntry.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/FieldEntry.java
index 3c54468..5ddd33d 100644
--- a/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/FieldEntry.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/FieldEntry.java
@@ -93,7 +93,7 @@ public class FieldEntry extends ParentedEntry<ClassEntry> implements Comparable<
 
         @Override
         public String toString() {
-                return this.parent.getFullName() + "." + this.name + ":" + this.desc;
+                return this.getFullName() + ":" + this.desc;
         }
 
         @Override
diff --git a/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/MethodEntry.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/MethodEntry.java
index 4698aa4..864a580 100644
--- a/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/MethodEntry.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/MethodEntry.java
@@ -102,7 +102,7 @@ public class MethodEntry extends ParentedEntry<ClassEntry> implements Comparable
 
         @Override
         public String toString() {
-                return this.parent.getFullName() + "." + this.name + this.descriptor;
+                return this.getFullName() + this.descriptor;
         }
 
         @Override
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 b12f9d0..5634891 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