refactored jar,translation index. fixed bug with field renaming when fields are shadowed by subclasses

3 files changed, 45 insertions, 20 deletions

diff --git a/src/cuchaz/enigma/mapping/Mappings.java b/src/cuchaz/enigma/mapping/Mappings.java
index 378d4c0..f52094f 100644
--- a/src/cuchaz/enigma/mapping/Mappings.java
+++ b/src/cuchaz/enigma/mapping/Mappings.java
@@ -24,8 +24,7 @@ import com.beust.jcommander.internal.Sets;
 import com.google.common.collect.Maps;
 
 import cuchaz.enigma.Util;
-import cuchaz.enigma.analysis.Ancestries;
-import cuchaz.enigma.analysis.DeobfuscatedAncestries;
+import cuchaz.enigma.analysis.TranslationIndex;
 import cuchaz.enigma.mapping.SignatureUpdater.ClassNameUpdater;
 
 public class Mappings implements Serializable
@@ -108,12 +107,27 @@ public class Mappings implements Serializable
                 return m_classesByDeobf.get( deobfName );
         }
         
-        public Translator getTranslator( Ancestries ancestries, TranslationDirection direction )
+        public Translator getTranslator( TranslationIndex index, TranslationDirection direction )
         {
+                if( direction == TranslationDirection.Obfuscating )
+                {
+                        // deobfuscate the index
+                        index = new TranslationIndex( index );
+                        Map<String,String> renames = Maps.newHashMap();
+                        for( ClassMapping classMapping : classes() )
+                        {
+                                renames.put( classMapping.getObfName(), classMapping.getDeobfName() );
+                                for( ClassMapping innerClassMapping : classMapping.innerClasses() )
+                                {
+                                        renames.put( innerClassMapping.getObfName(), innerClassMapping.getDeobfName() );
+                                }
+                        }
+                        index.renameClasses( renames );
+                }
                 return new Translator(
                         direction,
                         direction.choose( m_classesByObf, m_classesByDeobf ),
-                        direction.choose( ancestries, new DeobfuscatedAncestries( ancestries, m_classesByObf, m_classesByDeobf ) )
+                        index
                 );
         }
         
diff --git a/src/cuchaz/enigma/mapping/Renamer.java b/src/cuchaz/enigma/mapping/MappingsRenamer.java
index 15d9af4..9d036d8 100644
--- a/src/cuchaz/enigma/mapping/Renamer.java
+++ b/src/cuchaz/enigma/mapping/MappingsRenamer.java
@@ -18,12 +18,12 @@ import java.util.zip.GZIPOutputStream;
 
 import cuchaz.enigma.analysis.JarIndex;
 
-public class Renamer
+public class MappingsRenamer
 {
         private JarIndex m_index;
         private Mappings m_mappings;
         
-        public Renamer( JarIndex index, Mappings mappings )
+        public MappingsRenamer( JarIndex index, Mappings mappings )
         {
                 m_index = index;
                 m_mappings = mappings;
@@ -77,8 +77,8 @@ public class Renamer
                         MethodEntry targetEntry = new MethodEntry( entry.getClassEntry(), deobfName, entry.getSignature() );
                         if( m_mappings.containsDeobfMethod( entry.getClassEntry(), deobfName, entry.getSignature() ) || m_index.containsObfMethod( targetEntry ) )
                         {
-                                String className = m_mappings.getTranslator( m_index.getAncestries(), TranslationDirection.Deobfuscating ).translateClass( entry.getClassName() );
-                                throw new IllegalNameException( deobfName, "There is already a method with that name and signature in class " + className );
+                                String deobfClassName = getTranslator( TranslationDirection.Deobfuscating ).translateClass( entry.getClassName() );
+                                throw new IllegalNameException( deobfName, "There is already a method with that name and signature in class " + deobfClassName );
                         }
                 }
                 
@@ -94,12 +94,12 @@ public class Renamer
                 MethodEntry targetEntry = new MethodEntry( obf.getClassEntry(), deobfName, obf.getSignature() );
                 if( m_mappings.containsDeobfMethod( obf.getClassEntry(), deobfName, obf.getSignature() ) || m_index.containsObfMethod( targetEntry ) )
                 {
-                        String className = m_mappings.getTranslator( m_index.getAncestries(), TranslationDirection.Deobfuscating ).translateClass( obf.getClassName() );
-                        throw new IllegalNameException( deobfName, "There is already a method with that name and signature in class " + className );
+                        String deobfClassName = getTranslator( TranslationDirection.Deobfuscating ).translateClass( obf.getClassName() );
+                        throw new IllegalNameException( deobfName, "There is already a method with that name and signature in class " + deobfClassName );
                 }
                 
                 ClassMapping classMapping = getOrCreateClassMappingOrInnerClassMapping( obf.getClassEntry() );
-                String deobfSignature = m_mappings.getTranslator( m_index.getAncestries(), TranslationDirection.Deobfuscating ).translateSignature( obf.getSignature() );
+                String deobfSignature = getTranslator( TranslationDirection.Deobfuscating ).translateSignature( obf.getSignature() );
                 classMapping.setMethodNameAndSignature( obf.getName(), obf.getSignature(), deobfName, deobfSignature );
         }
         
@@ -151,10 +151,14 @@ public class Renamer
         
         private void updateDeobfMethodSignatures( )
         {
-                Translator translator = m_mappings.getTranslator( m_index.getAncestries(), TranslationDirection.Deobfuscating );
                 for( ClassMapping classMapping : m_mappings.m_classesByObf.values() )
                 {
-                        classMapping.updateDeobfMethodSignatures( translator );
+                        classMapping.updateDeobfMethodSignatures( getTranslator( TranslationDirection.Deobfuscating ) );
                 }
         }
+        
+        private Translator getTranslator( TranslationDirection direction )
+        {
+                return m_mappings.getTranslator( m_index.getTranslationIndex(), direction );
+        }
 }
diff --git a/src/cuchaz/enigma/mapping/Translator.java b/src/cuchaz/enigma/mapping/Translator.java
index 23bf095..f5aafdd 100644
--- a/src/cuchaz/enigma/mapping/Translator.java
+++ b/src/cuchaz/enigma/mapping/Translator.java
@@ -16,27 +16,27 @@ import java.util.Map;
 
 import com.beust.jcommander.internal.Maps;
 
-import cuchaz.enigma.analysis.Ancestries;
+import cuchaz.enigma.analysis.TranslationIndex;
 import cuchaz.enigma.mapping.SignatureUpdater.ClassNameUpdater;
 
 public class Translator
 {
         private TranslationDirection m_direction;
-        public Map<String,ClassMapping> m_classes;
-        private Ancestries m_ancestries;
+        private Map<String,ClassMapping> m_classes;
+        private TranslationIndex m_index;
         
         public Translator( )
         {
                 m_direction = null;
                 m_classes = Maps.newHashMap();
-                m_ancestries = new Ancestries();
+                m_index = new TranslationIndex();
         }
         
-        protected Translator( TranslationDirection direction, Map<String,ClassMapping> classes, Ancestries ancestries )
+        public Translator( TranslationDirection direction, Map<String,ClassMapping> classes, TranslationIndex index )
         {
                 m_direction = direction;
                 m_classes = classes;
-                m_ancestries = ancestries;
+                m_index = index;
         }
         
         @SuppressWarnings( "unchecked" )
@@ -145,6 +145,13 @@ public class Translator
                                         return translatedName;
                                 }
                         }
+                        
+                        // is the field implemented in this class?
+                        if( m_index.containsField( className, in.getName() ) )
+                        {
+                                // stop traversing the superclass chain
+                                break;
+                        }
                 }
                 return null;
         }
@@ -291,7 +298,7 @@ public class Translator
         {
                 List<String> ancestry = new ArrayList<String>();
                 ancestry.add( className );
-                ancestry.addAll( m_ancestries.getAncestry( className ) );
+                ancestry.addAll( m_index.getAncestry( className ) );
                 return ancestry;
         }