summaryrefslogtreecommitdiff
path: root/src/cuchaz/enigma/mapping/MethodMapping.java
diff options
context:
space:
mode:
authorGravatar jeff2014-08-31 16:14:45 -0400
committerGravatar jeff2014-08-31 16:14:45 -0400
commit4e9c52d5fc5d23e8a77857e712654596203acb31 (patch)
treec4a48493e6d60dfec9df326dac2b1ef229aedffd /src/cuchaz/enigma/mapping/MethodMapping.java
parentfixed lots of bugs in the mappings converter. It's finally ready. =) (diff)
downloadenigma-fork-4e9c52d5fc5d23e8a77857e712654596203acb31.tar.gz
enigma-fork-4e9c52d5fc5d23e8a77857e712654596203acb31.tar.xz
enigma-fork-4e9c52d5fc5d23e8a77857e712654596203acb31.zip
fixed mapping conversion bug with class rename order
Diffstat (limited to '')
-rw-r--r--src/cuchaz/enigma/mapping/MethodMapping.java16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/cuchaz/enigma/mapping/MethodMapping.java b/src/cuchaz/enigma/mapping/MethodMapping.java
index fe4e29b..b0f7ba8 100644
--- a/src/cuchaz/enigma/mapping/MethodMapping.java
+++ b/src/cuchaz/enigma/mapping/MethodMapping.java
@@ -142,21 +142,27 @@ public class MethodMapping implements Serializable, Comparable<MethodMapping>
142 return ( m_obfName + m_obfSignature ).compareTo( ( other.m_obfName + other.m_obfSignature ) ); 142 return ( m_obfName + m_obfSignature ).compareTo( ( other.m_obfName + other.m_obfSignature ) );
143 } 143 }
144 144
145 public void renameObfClasses( final Map<String,String> nameMap ) 145 public boolean renameObfClass( final String oldObfClassName, final String newObfClassName )
146 { 146 {
147 // rename obf classes in the signature 147 // rename obf classes in the signature
148 m_obfSignature = SignatureUpdater.update( m_obfSignature, new ClassNameUpdater( ) 148 String newSignature = SignatureUpdater.update( m_obfSignature, new ClassNameUpdater( )
149 { 149 {
150 @Override 150 @Override
151 public String update( String className ) 151 public String update( String className )
152 { 152 {
153 String newName = nameMap.get( className ); 153 if( className.equals( oldObfClassName ) )
154 if( newName != null )
155 { 154 {
156 return newName; 155 return newObfClassName;
157 } 156 }
158 return className; 157 return className;
159 } 158 }
160 } ); 159 } );
160
161 if( newSignature != m_obfSignature )
162 {
163 m_obfSignature = newSignature;
164 return true;
165 }
166 return false;
161 } 167 }
162} 168}