summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar jeff2014-09-03 00:29:48 -0400
committerGravatar jeff2014-09-03 00:29:48 -0400
commit3632307d9c5665edfca976e08931dc6cadf510a0 (patch)
tree28d64a01dafeebb901a17037fc0c45f20562f2ef
parentbig refactor to better model class/method mappings with no deobf name (diff)
downloadenigma-3632307d9c5665edfca976e08931dc6cadf510a0.tar.gz
enigma-3632307d9c5665edfca976e08931dc6cadf510a0.tar.xz
enigma-3632307d9c5665edfca976e08931dc6cadf510a0.zip
fixed issue with method renaming
-rw-r--r--src/cuchaz/enigma/gui/GuiController.java2
-rw-r--r--src/cuchaz/enigma/mapping/ClassMapping.java2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/cuchaz/enigma/gui/GuiController.java b/src/cuchaz/enigma/gui/GuiController.java
index 5057db2d..c0fb2e40 100644
--- a/src/cuchaz/enigma/gui/GuiController.java
+++ b/src/cuchaz/enigma/gui/GuiController.java
@@ -167,8 +167,6 @@ public class GuiController
167 167
168 public boolean entryHasMapping( Entry deobfEntry ) 168 public boolean entryHasMapping( Entry deobfEntry )
169 { 169 {
170 // TEMP
171 System.out.println( deobfEntry + " -> " + m_deobfuscator.obfuscateEntry( deobfEntry ) );
172 return m_deobfuscator.hasMapping( m_deobfuscator.obfuscateEntry( deobfEntry ) ); 170 return m_deobfuscator.hasMapping( m_deobfuscator.obfuscateEntry( deobfEntry ) );
173 } 171 }
174 172
diff --git a/src/cuchaz/enigma/mapping/ClassMapping.java b/src/cuchaz/enigma/mapping/ClassMapping.java
index bce16cc5..6a89df7f 100644
--- a/src/cuchaz/enigma/mapping/ClassMapping.java
+++ b/src/cuchaz/enigma/mapping/ClassMapping.java
@@ -255,7 +255,7 @@ public class ClassMapping implements Serializable, Comparable<ClassMapping>
255 { 255 {
256 methodMapping = createMethodMapping( obfName, obfSignature ); 256 methodMapping = createMethodMapping( obfName, obfSignature );
257 } 257 }
258 else 258 else if( methodMapping.getDeobfName() != null )
259 { 259 {
260 boolean wasRemoved = m_methodsByDeobf.remove( getMethodKey( methodMapping.getDeobfName(), methodMapping.getDeobfSignature() ) ) != null; 260 boolean wasRemoved = m_methodsByDeobf.remove( getMethodKey( methodMapping.getDeobfName(), methodMapping.getDeobfSignature() ) ) != null;
261 assert( wasRemoved ); 261 assert( wasRemoved );