fix more inner class issues

1 files changed, 16 insertions, 5 deletions

diff --git a/src/cuchaz/enigma/mapping/ClassEntry.java b/src/cuchaz/enigma/mapping/ClassEntry.java
index 5f3b5e2..e6400b8 100644
--- a/src/cuchaz/enigma/mapping/ClassEntry.java
+++ b/src/cuchaz/enigma/mapping/ClassEntry.java
@@ -105,20 +105,31 @@ public class ClassEntry implements Entry, Serializable {
         
         public String getOutermostClassName() {
                 if (isInnerClass()) {
-                        return m_name.substring(0, m_name.lastIndexOf('$'));
+                        return m_name.substring(0, m_name.indexOf('$'));
                 }
                 return m_name;
         }
         
-        public String getInnermostClassName() {
+        public ClassEntry getOutermostClassEntry() {
+                return new ClassEntry(getOutermostClassName());
+        }
+        
+        public String getOuterClassName() {
                 if (!isInnerClass()) {
                         throw new Error("This is not an inner class!");
                 }
-                return m_name.substring(m_name.lastIndexOf('$') + 1);
+                return m_name.substring(0, m_name.lastIndexOf('$'));
         }
         
-        public ClassEntry getOutermostClassEntry() {
-                return new ClassEntry(getOutermostClassName());
+        public ClassEntry getOuterClassEntry() {
+                return new ClassEntry(getOuterClassName());
+        }
+        
+        public String getInnermostClassName() {
+                if (!isInnerClass()) {
+                        throw new Error("This is not an inner class!");
+                }
+                return m_name.substring(m_name.lastIndexOf('$') + 1);
         }
         
         public boolean isInDefaultPackage() {