1 files changed, 91 insertions, 139 deletions

diff --git a/src/cuchaz/enigma/mapping/Mappings.java b/src/cuchaz/enigma/mapping/Mappings.java
index 3a39d10..c5e38f4 100644
--- a/src/cuchaz/enigma/mapping/Mappings.java
+++ b/src/cuchaz/enigma/mapping/Mappings.java
@@ -26,230 +26,182 @@ import com.google.common.collect.Sets;
 import cuchaz.enigma.Util;
 import cuchaz.enigma.mapping.SignatureUpdater.ClassNameUpdater;
 
-public class Mappings implements Serializable
-{
+public class Mappings implements Serializable {
+        
         private static final long serialVersionUID = 4649790259460259026L;
         
         protected Map<String,ClassMapping> m_classesByObf;
         protected Map<String,ClassMapping> m_classesByDeobf;
         
-        public Mappings( )
-        {
+        public Mappings() {
                 m_classesByObf = Maps.newHashMap();
                 m_classesByDeobf = Maps.newHashMap();
         }
         
-        public Mappings( Iterable<ClassMapping> classes )
-        {
+        public Mappings(Iterable<ClassMapping> classes) {
                 this();
                 
-                for( ClassMapping classMapping : classes )
-                {
-                        m_classesByObf.put( classMapping.getObfName(), classMapping );
-                        if( classMapping.getDeobfName() != null )
-                        {
-                                m_classesByDeobf.put( classMapping.getDeobfName(), classMapping );
+                for (ClassMapping classMapping : classes) {
+                        m_classesByObf.put(classMapping.getObfName(), classMapping);
+                        if (classMapping.getDeobfName() != null) {
+                                m_classesByDeobf.put(classMapping.getDeobfName(), classMapping);
                         }
                 }
         }
         
-        public static Mappings newFromResource( String resource )
-        throws IOException
-        {
+        public static Mappings newFromResource(String resource) throws IOException {
                 InputStream in = null;
-                try
-                {
-                        in = Mappings.class.getResourceAsStream( resource );
-                        return newFromStream( in );
-                }
-                finally
-                {
-                        Util.closeQuietly( in );
+                try {
+                        in = Mappings.class.getResourceAsStream(resource);
+                        return newFromStream(in);
+                } finally {
+                        Util.closeQuietly(in);
                 }
         }
         
-        public Collection<ClassMapping> classes( )
-        {
-                assert( m_classesByObf.size() >= m_classesByDeobf.size() );
+        public Collection<ClassMapping> classes() {
+                assert (m_classesByObf.size() >= m_classesByDeobf.size());
                 return m_classesByObf.values();
         }
         
-        public void addClassMapping( ClassMapping classMapping )
-        {
-                if( m_classesByObf.containsKey( classMapping.getObfName() ) )
-                {
-                        throw new Error( "Already have mapping for " + classMapping.getObfName() );
+        public void addClassMapping(ClassMapping classMapping) {
+                if (m_classesByObf.containsKey(classMapping.getObfName())) {
+                        throw new Error("Already have mapping for " + classMapping.getObfName());
                 }
-                boolean obfWasAdded = m_classesByObf.put( classMapping.getObfName(), classMapping ) == null;
-                assert( obfWasAdded );
-                if( classMapping.getDeobfName() != null )
-                {
-                        if( m_classesByDeobf.containsKey( classMapping.getDeobfName() ) )
-                        {
-                                throw new Error( "Already have mapping for " + classMapping.getDeobfName() );
+                boolean obfWasAdded = m_classesByObf.put(classMapping.getObfName(), classMapping) == null;
+                assert (obfWasAdded);
+                if (classMapping.getDeobfName() != null) {
+                        if (m_classesByDeobf.containsKey(classMapping.getDeobfName())) {
+                                throw new Error("Already have mapping for " + classMapping.getDeobfName());
                         }
-                        boolean deobfWasAdded = m_classesByDeobf.put( classMapping.getDeobfName(), classMapping ) == null;
-                        assert( deobfWasAdded );
+                        boolean deobfWasAdded = m_classesByDeobf.put(classMapping.getDeobfName(), classMapping) == null;
+                        assert (deobfWasAdded);
                 }
         }
         
-        public void removeClassMapping( ClassMapping classMapping )
-        {
-                boolean obfWasRemoved = m_classesByObf.remove( classMapping.getObfName() ) != null;
-                assert( obfWasRemoved );
-                if( classMapping.getDeobfName() != null )
-                {
-                        boolean deobfWasRemoved = m_classesByDeobf.remove( classMapping.getDeobfName() ) != null;
-                        assert( deobfWasRemoved );
+        public void removeClassMapping(ClassMapping classMapping) {
+                boolean obfWasRemoved = m_classesByObf.remove(classMapping.getObfName()) != null;
+                assert (obfWasRemoved);
+                if (classMapping.getDeobfName() != null) {
+                        boolean deobfWasRemoved = m_classesByDeobf.remove(classMapping.getDeobfName()) != null;
+                        assert (deobfWasRemoved);
                 }
         }
         
-        public ClassMapping getClassByObf( ClassEntry entry )
-        {
-                return getClassByObf( entry.getName() );
+        public ClassMapping getClassByObf(ClassEntry entry) {
+                return getClassByObf(entry.getName());
         }
         
-        public ClassMapping getClassByObf( String obfName )
-        {
-                return m_classesByObf.get( obfName );
+        public ClassMapping getClassByObf(String obfName) {
+                return m_classesByObf.get(obfName);
         }
         
-        public ClassMapping getClassByDeobf( ClassEntry entry )
-        {
-                return getClassByDeobf( entry.getName() );
+        public ClassMapping getClassByDeobf(ClassEntry entry) {
+                return getClassByDeobf(entry.getName());
         }
         
-        public ClassMapping getClassByDeobf( String deobfName )
-        {
-                return m_classesByDeobf.get( deobfName );
+        public ClassMapping getClassByDeobf(String deobfName) {
+                return m_classesByDeobf.get(deobfName);
         }
         
-        public Translator getTranslator( TranslationDirection direction )
-        {
-                switch( direction )
-                {
+        public Translator getTranslator(TranslationDirection direction) {
+                switch (direction) {
                         case Deobfuscating:
                                 
-                                return new Translator( direction, m_classesByObf );
+                                return new Translator(direction, m_classesByObf);
                                 
                         case Obfuscating:
                                 
                                 // fill in the missing deobf class entries with obf entries
                                 Map<String,ClassMapping> classes = Maps.newHashMap();
-                                for( ClassMapping classMapping : classes() )
-                                {
-                                        if( classMapping.getDeobfName() != null )
-                                        {
-                                                classes.put( classMapping.getDeobfName(), classMapping );
-                                        }
-                                        else
-                                        {
-                                                classes.put( classMapping.getObfName(), classMapping );
+                                for (ClassMapping classMapping : classes()) {
+                                        if (classMapping.getDeobfName() != null) {
+                                                classes.put(classMapping.getDeobfName(), classMapping);
+                                        } else {
+                                                classes.put(classMapping.getObfName(), classMapping);
                                         }
                                 }
                                 
-                                return new Translator( direction, classes );
+                                return new Translator(direction, classes);
                                 
                         default:
-                                throw new Error( "Invalid translation direction!" );
+                                throw new Error("Invalid translation direction!");
                 }
         }
         
-        public static Mappings newFromStream( InputStream in )
-        throws IOException
-        {
-                try
-                {
-                        return (Mappings)new ObjectInputStream( new GZIPInputStream( in ) ).readObject();
-                }
-                catch( ClassNotFoundException ex )
-                {
-                        throw new Error( ex );
+        public static Mappings newFromStream(InputStream in) throws IOException {
+                try {
+                        return (Mappings)new ObjectInputStream(new GZIPInputStream(in)).readObject();
+                } catch (ClassNotFoundException ex) {
+                        throw new Error(ex);
                 }
         }
         
         @Override
-        public String toString( )
-        {
+        public String toString() {
                 StringBuilder buf = new StringBuilder();
-                for( ClassMapping classMapping : m_classesByObf.values() )
-                {
-                        buf.append( classMapping.toString() );
-                        buf.append( "\n" );
+                for (ClassMapping classMapping : m_classesByObf.values()) {
+                        buf.append(classMapping.toString());
+                        buf.append("\n");
                 }
                 return buf.toString();
         }
         
-        public void renameObfClass( String oldObfName, String newObfName )
-        {
-                for( ClassMapping classMapping : new ArrayList<ClassMapping>( classes() ) )
-                {
-                        if( classMapping.renameObfClass( oldObfName, newObfName ) )
-                        {
-                                boolean wasRemoved = m_classesByObf.remove( oldObfName ) != null;
-                                assert( wasRemoved );
-                                boolean wasAdded = m_classesByObf.put( newObfName, classMapping ) == null;
-                                assert( wasAdded );
+        public void renameObfClass(String oldObfName, String newObfName) {
+                for (ClassMapping classMapping : new ArrayList<ClassMapping>(classes())) {
+                        if (classMapping.renameObfClass(oldObfName, newObfName)) {
+                                boolean wasRemoved = m_classesByObf.remove(oldObfName) != null;
+                                assert (wasRemoved);
+                                boolean wasAdded = m_classesByObf.put(newObfName, classMapping) == null;
+                                assert (wasAdded);
                         }
                 }
         }
         
-        public Set<String> getAllObfClassNames( )
-        {
+        public Set<String> getAllObfClassNames() {
                 final Set<String> classNames = Sets.newHashSet();
-                for( ClassMapping classMapping : classes() )
-                {
+                for (ClassMapping classMapping : classes()) {
                         // add the class name
-                        classNames.add( classMapping.getObfName() );
+                        classNames.add(classMapping.getObfName());
                         
                         // add classes from method signatures
-                        for( MethodMapping methodMapping : classMapping.methods() )
-                        {
-                                SignatureUpdater.update( methodMapping.getObfSignature(), new ClassNameUpdater( )
-                                {
+                        for (MethodMapping methodMapping : classMapping.methods()) {
+                                SignatureUpdater.update(methodMapping.getObfSignature(), new ClassNameUpdater() {
                                         @Override
-                                        public String update( String className )
-                                        {
-                                                classNames.add( className );
+                                        public String update(String className) {
+                                                classNames.add(className);
                                                 return className;
                                         }
-                                } );
+                                });
                         }
                 }
                 return classNames;
         }
-
-        public boolean containsDeobfClass( String deobfName )
-        {
-                return m_classesByDeobf.containsKey( deobfName );
+        
+        public boolean containsDeobfClass(String deobfName) {
+                return m_classesByDeobf.containsKey(deobfName);
         }
         
-        public boolean containsDeobfField( ClassEntry obfClassEntry, String deobfName )
-        {
-                ClassMapping classMapping = m_classesByObf.get( obfClassEntry.getName() );
-                if( classMapping != null )
-                {
-                        return classMapping.containsDeobfField( deobfName );
+        public boolean containsDeobfField(ClassEntry obfClassEntry, String deobfName) {
+                ClassMapping classMapping = m_classesByObf.get(obfClassEntry.getName());
+                if (classMapping != null) {
+                        return classMapping.containsDeobfField(deobfName);
                 }
                 return false;
         }
-
-        public boolean containsDeobfMethod( ClassEntry obfClassEntry, String deobfName, String deobfSignature )
-        {
-                ClassMapping classMapping = m_classesByObf.get( obfClassEntry.getName() );
-                if( classMapping != null )
-                {
-                        return classMapping.containsDeobfMethod( deobfName, deobfSignature );
+        
+        public boolean containsDeobfMethod(ClassEntry obfClassEntry, String deobfName, String deobfSignature) {
+                ClassMapping classMapping = m_classesByObf.get(obfClassEntry.getName());
+                if (classMapping != null) {
+                        return classMapping.containsDeobfMethod(deobfName, deobfSignature);
                 }
                 return false;
         }
-
-        public boolean containsArgument( BehaviorEntry obfBehaviorEntry, String name )
-        {
-                ClassMapping classMapping = m_classesByObf.get( obfBehaviorEntry.getClassName() );
-                if( classMapping != null )
-                {
-                        return classMapping.containsArgument( obfBehaviorEntry, name );
+        
+        public boolean containsArgument(BehaviorEntry obfBehaviorEntry, String name) {
+                ClassMapping classMapping = m_classesByObf.get(obfBehaviorEntry.getClassName());
+                if (classMapping != null) {
+                        return classMapping.containsArgument(obfBehaviorEntry, name);
                 }
                 return false;
         }