From b4aaff683d78ab92b83f3a7257c33b8e27d1affa Mon Sep 17 00:00:00 2001 From: Thog Date: Tue, 7 Mar 2017 21:24:39 +0100 Subject: Drop unix case style and implement hashCode when equals is overrided Also update Guava to version 21 --- src/test/java/cuchaz/enigma/TokenChecker.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/test/java/cuchaz/enigma/TokenChecker.java') diff --git a/src/test/java/cuchaz/enigma/TokenChecker.java b/src/test/java/cuchaz/enigma/TokenChecker.java index 7afb4cf..0746320 100644 --- a/src/test/java/cuchaz/enigma/TokenChecker.java +++ b/src/test/java/cuchaz/enigma/TokenChecker.java @@ -25,20 +25,20 @@ import cuchaz.enigma.mapping.Entry; public class TokenChecker { - private Deobfuscator m_deobfuscator; + private Deobfuscator deobfuscator; protected TokenChecker(JarFile jarFile) throws IOException { - m_deobfuscator = new Deobfuscator(jarFile); + deobfuscator = new Deobfuscator(jarFile); } protected String getDeclarationToken(Entry entry) { // decompile the class - CompilationUnit tree = m_deobfuscator.getSourceTree(entry.getClassName()); + CompilationUnit tree = deobfuscator.getSourceTree(entry.getClassName()); // DEBUG // tree.acceptVisitor( new TreeDumpVisitor( new File( "tree." + entry.getClassName().replace( '/', '.' ) + ".txt" ) ), null ); - String source = m_deobfuscator.getSource(tree); - SourceIndex index = m_deobfuscator.getSourceIndex(tree, source); + String source = deobfuscator.getSource(tree); + SourceIndex index = deobfuscator.getSourceIndex(tree, source); // get the token value Token token = index.getDeclarationToken(entry); @@ -51,9 +51,9 @@ public class TokenChecker { @SuppressWarnings("unchecked") protected Collection getReferenceTokens(EntryReference reference) { // decompile the class - CompilationUnit tree = m_deobfuscator.getSourceTree(reference.context.getClassName()); - String source = m_deobfuscator.getSource(tree); - SourceIndex index = m_deobfuscator.getSourceIndex(tree, source); + CompilationUnit tree = deobfuscator.getSourceTree(reference.context.getClassName()); + String source = deobfuscator.getSource(tree); + SourceIndex index = deobfuscator.getSourceIndex(tree, source); // get the token values List values = Lists.newArrayList(); -- cgit v1.2.3