summaryrefslogtreecommitdiff
path: root/src/cuchaz/enigma/Deobfuscator.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/cuchaz/enigma/Deobfuscator.java')
-rw-r--r--src/cuchaz/enigma/Deobfuscator.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cuchaz/enigma/Deobfuscator.java b/src/cuchaz/enigma/Deobfuscator.java
index 9a78f38..49aa1ff 100644
--- a/src/cuchaz/enigma/Deobfuscator.java
+++ b/src/cuchaz/enigma/Deobfuscator.java
@@ -151,12 +151,12 @@ public class Deobfuscator
151 return m_mappings.getTranslator( m_jarIndex.getAncestries(), direction ); 151 return m_mappings.getTranslator( m_jarIndex.getAncestries(), direction );
152 } 152 }
153 153
154 public void getSeparatedClasses( List<String> obfClasses, List<String> deobfClasses ) 154 public void getSeparatedClasses( List<ClassEntry> obfClasses, List<ClassEntry> deobfClasses )
155 { 155 {
156 for( ClassEntry obfClassEntry : m_jarIndex.getObfClassEntries() ) 156 for( ClassEntry obfClassEntry : m_jarIndex.getObfClassEntries() )
157 { 157 {
158 // skip inner classes 158 // skip inner classes
159 if( m_jarIndex.getOuterClass( obfClassEntry.getName() ) != null ) 159 if( obfClassEntry.isInnerClass() )
160 { 160 {
161 continue; 161 continue;
162 } 162 }
@@ -166,17 +166,17 @@ public class Deobfuscator
166 if( !deobfClassEntry.equals( obfClassEntry ) ) 166 if( !deobfClassEntry.equals( obfClassEntry ) )
167 { 167 {
168 // if the class has a mapping, clearly it's deobfuscated 168 // if the class has a mapping, clearly it's deobfuscated
169 deobfClasses.add( deobfClassEntry.getName() ); 169 deobfClasses.add( deobfClassEntry );
170 } 170 }
171 else if( !obfClassEntry.getPackageName().equals( Constants.NonePackage ) ) 171 else if( !obfClassEntry.getPackageName().equals( Constants.NonePackage ) )
172 { 172 {
173 // also call it deobufscated if it's not in the none package 173 // also call it deobufscated if it's not in the none package
174 deobfClasses.add( obfClassEntry.getName() ); 174 deobfClasses.add( obfClassEntry );
175 } 175 }
176 else 176 else
177 { 177 {
178 // otherwise, assume it's still obfuscated 178 // otherwise, assume it's still obfuscated
179 obfClasses.add( obfClassEntry.getName() ); 179 obfClasses.add( obfClassEntry );
180 } 180 }
181 } 181 }
182 } 182 }