From 59e189bef2b5e6d129fb7c2c988ed0b2130e36ac Mon Sep 17 00:00:00 2001 From: lclc98 Date: Mon, 4 Jul 2016 18:14:22 +1000 Subject: Reformat --- .../enigma/analysis/BehaviorReferenceTreeNode.java | 2 - .../analysis/ClassImplementationsTreeNode.java | 2 - .../enigma/analysis/ClassInheritanceTreeNode.java | 2 - .../cuchaz/enigma/analysis/EntryReference.java | 4 +- .../java/cuchaz/enigma/analysis/EntryRenamer.java | 52 ++-------------------- .../enigma/analysis/FieldReferenceTreeNode.java | 2 - .../cuchaz/enigma/analysis/JarClassIterator.java | 8 ---- src/main/java/cuchaz/enigma/analysis/JarIndex.java | 8 ---- .../analysis/MethodImplementationsTreeNode.java | 2 - .../enigma/analysis/MethodInheritanceTreeNode.java | 2 - .../java/cuchaz/enigma/analysis/SourceIndex.java | 4 -- src/main/java/cuchaz/enigma/analysis/Token.java | 4 -- .../cuchaz/enigma/analysis/TranslationIndex.java | 41 +++-------------- 13 files changed, 11 insertions(+), 122 deletions(-) (limited to 'src/main/java/cuchaz/enigma/analysis') diff --git a/src/main/java/cuchaz/enigma/analysis/BehaviorReferenceTreeNode.java b/src/main/java/cuchaz/enigma/analysis/BehaviorReferenceTreeNode.java index 39ff449..98aa12e 100644 --- a/src/main/java/cuchaz/enigma/analysis/BehaviorReferenceTreeNode.java +++ b/src/main/java/cuchaz/enigma/analysis/BehaviorReferenceTreeNode.java @@ -23,8 +23,6 @@ import cuchaz.enigma.mapping.Translator; public class BehaviorReferenceTreeNode extends DefaultMutableTreeNode implements ReferenceTreeNode { - private static final long serialVersionUID = -3658163700783307520L; - private Translator m_deobfuscatingTranslator; private BehaviorEntry m_entry; private EntryReference m_reference; diff --git a/src/main/java/cuchaz/enigma/analysis/ClassImplementationsTreeNode.java b/src/main/java/cuchaz/enigma/analysis/ClassImplementationsTreeNode.java index b1d1dee..f5227bb 100644 --- a/src/main/java/cuchaz/enigma/analysis/ClassImplementationsTreeNode.java +++ b/src/main/java/cuchaz/enigma/analysis/ClassImplementationsTreeNode.java @@ -21,8 +21,6 @@ import cuchaz.enigma.mapping.Translator; public class ClassImplementationsTreeNode extends DefaultMutableTreeNode { - private static final long serialVersionUID = 3112703459157851912L; - private Translator deobfuscatingTranslator; private ClassEntry entry; diff --git a/src/main/java/cuchaz/enigma/analysis/ClassInheritanceTreeNode.java b/src/main/java/cuchaz/enigma/analysis/ClassInheritanceTreeNode.java index beac9d5..8a60fc7 100644 --- a/src/main/java/cuchaz/enigma/analysis/ClassInheritanceTreeNode.java +++ b/src/main/java/cuchaz/enigma/analysis/ClassInheritanceTreeNode.java @@ -21,8 +21,6 @@ import cuchaz.enigma.mapping.Translator; public class ClassInheritanceTreeNode extends DefaultMutableTreeNode { - private static final long serialVersionUID = 4432367405826178490L; - private Translator deobfuscatingTranslator; private String obfClassName; diff --git a/src/main/java/cuchaz/enigma/analysis/EntryReference.java b/src/main/java/cuchaz/enigma/analysis/EntryReference.java index 6a7a4bf..ad4baf8 100644 --- a/src/main/java/cuchaz/enigma/analysis/EntryReference.java +++ b/src/main/java/cuchaz/enigma/analysis/EntryReference.java @@ -13,10 +13,10 @@ package cuchaz.enigma.analysis; import java.util.Arrays; import java.util.List; -import cuchaz.enigma.Util; import cuchaz.enigma.mapping.ClassEntry; import cuchaz.enigma.mapping.ConstructorEntry; import cuchaz.enigma.mapping.Entry; +import cuchaz.enigma.utils.Utils; public class EntryReference { @@ -84,7 +84,7 @@ public class EntryReference { @Override public int hashCode() { if (context != null) { - return Util.combineHashesOrdered(entry.hashCode(), context.hashCode()); + return Utils.combineHashesOrdered(entry.hashCode(), context.hashCode()); } return entry.hashCode(); } diff --git a/src/main/java/cuchaz/enigma/analysis/EntryRenamer.java b/src/main/java/cuchaz/enigma/analysis/EntryRenamer.java index 9a85f6e..f0e7306 100644 --- a/src/main/java/cuchaz/enigma/analysis/EntryRenamer.java +++ b/src/main/java/cuchaz/enigma/analysis/EntryRenamer.java @@ -56,35 +56,6 @@ public class EntryRenamer { } } - @SuppressWarnings("unchecked") - public static T renameMethodsInThing(Map renames, T thing) { - if (thing instanceof MethodEntry) { - MethodEntry methodEntry = (MethodEntry) thing; - MethodEntry newMethodEntry = renames.get(methodEntry); - if (newMethodEntry != null) { - return (T) new MethodEntry( - methodEntry.getClassEntry(), - newMethodEntry.getName(), - methodEntry.getSignature() - ); - } - return thing; - } else if (thing instanceof ArgumentEntry) { - ArgumentEntry argumentEntry = (ArgumentEntry) thing; - return (T) new ArgumentEntry( - renameMethodsInThing(renames, argumentEntry.getBehaviorEntry()), - argumentEntry.getIndex(), - argumentEntry.getName() - ); - } else if (thing instanceof EntryReference) { - EntryReference reference = (EntryReference) thing; - reference.entry = renameMethodsInThing(renames, reference.entry); - reference.context = renameMethodsInThing(renames, reference.context); - return thing; - } - return thing; - } - @SuppressWarnings("unchecked") public static T renameClassesInThing(final Map renames, T thing) { if (thing instanceof String) { @@ -97,31 +68,16 @@ public class EntryRenamer { return (T) new ClassEntry(renameClassesInThing(renames, classEntry.getClassName())); } else if (thing instanceof FieldEntry) { FieldEntry fieldEntry = (FieldEntry) thing; - return (T) new FieldEntry( - renameClassesInThing(renames, fieldEntry.getClassEntry()), - fieldEntry.getName(), - renameClassesInThing(renames, fieldEntry.getType()) - ); + return (T) new FieldEntry(renameClassesInThing(renames, fieldEntry.getClassEntry()), fieldEntry.getName(), renameClassesInThing(renames, fieldEntry.getType())); } else if (thing instanceof ConstructorEntry) { ConstructorEntry constructorEntry = (ConstructorEntry) thing; - return (T) new ConstructorEntry( - renameClassesInThing(renames, constructorEntry.getClassEntry()), - renameClassesInThing(renames, constructorEntry.getSignature()) - ); + return (T) new ConstructorEntry(renameClassesInThing(renames, constructorEntry.getClassEntry()), renameClassesInThing(renames, constructorEntry.getSignature())); } else if (thing instanceof MethodEntry) { MethodEntry methodEntry = (MethodEntry) thing; - return (T) new MethodEntry( - renameClassesInThing(renames, methodEntry.getClassEntry()), - methodEntry.getName(), - renameClassesInThing(renames, methodEntry.getSignature()) - ); + return (T) new MethodEntry(renameClassesInThing(renames, methodEntry.getClassEntry()), methodEntry.getName(), renameClassesInThing(renames, methodEntry.getSignature())); } else if (thing instanceof ArgumentEntry) { ArgumentEntry argumentEntry = (ArgumentEntry) thing; - return (T) new ArgumentEntry( - renameClassesInThing(renames, argumentEntry.getBehaviorEntry()), - argumentEntry.getIndex(), - argumentEntry.getName() - ); + return (T) new ArgumentEntry(renameClassesInThing(renames, argumentEntry.getBehaviorEntry()), argumentEntry.getIndex(), argumentEntry.getName()); } else if (thing instanceof EntryReference) { EntryReference reference = (EntryReference) thing; reference.entry = renameClassesInThing(renames, reference.entry); diff --git a/src/main/java/cuchaz/enigma/analysis/FieldReferenceTreeNode.java b/src/main/java/cuchaz/enigma/analysis/FieldReferenceTreeNode.java index 05d9c13..70cd059 100644 --- a/src/main/java/cuchaz/enigma/analysis/FieldReferenceTreeNode.java +++ b/src/main/java/cuchaz/enigma/analysis/FieldReferenceTreeNode.java @@ -18,8 +18,6 @@ import cuchaz.enigma.mapping.Translator; public class FieldReferenceTreeNode extends DefaultMutableTreeNode implements ReferenceTreeNode { - private static final long serialVersionUID = -7934108091928699835L; - private Translator deobfuscatingTranslator; private FieldEntry entry; private EntryReference reference; diff --git a/src/main/java/cuchaz/enigma/analysis/JarClassIterator.java b/src/main/java/cuchaz/enigma/analysis/JarClassIterator.java index 0400427..0d18105 100644 --- a/src/main/java/cuchaz/enigma/analysis/JarClassIterator.java +++ b/src/main/java/cuchaz/enigma/analysis/JarClassIterator.java @@ -89,14 +89,6 @@ public class JarClassIterator implements Iterator { return () -> new JarClassIterator(jar); } - public static CtClass getClass(JarFile jar, ClassEntry classEntry) { - try { - return getClass(jar, new JarEntry(classEntry.getName() + ".class")); - } catch (IOException | NotFoundException ex) { - throw new Error("Unable to load class: " + classEntry.getName()); - } - } - private static CtClass getClass(JarFile jar, JarEntry entry) throws IOException, NotFoundException { // read the class into a buffer ByteArrayOutputStream bos = new ByteArrayOutputStream(); diff --git a/src/main/java/cuchaz/enigma/analysis/JarIndex.java b/src/main/java/cuchaz/enigma/analysis/JarIndex.java index bd67090..9acf0b1 100644 --- a/src/main/java/cuchaz/enigma/analysis/JarIndex.java +++ b/src/main/java/cuchaz/enigma/analysis/JarIndex.java @@ -503,14 +503,6 @@ public class JarIndex { return this.obfClassEntries; } - public Collection getObfFieldEntries() { - return this.fields.values(); - } - - public Collection getObfBehaviorEntries() { - return this.behaviors.values(); - } - public TranslationIndex getTranslationIndex() { return this.translationIndex; } diff --git a/src/main/java/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java b/src/main/java/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java index 7919b5d..9bd6219 100644 --- a/src/main/java/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java +++ b/src/main/java/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java @@ -22,8 +22,6 @@ import cuchaz.enigma.mapping.Translator; public class MethodImplementationsTreeNode extends DefaultMutableTreeNode { - private static final long serialVersionUID = 3781080657461899915L; - private Translator deobfuscatingTranslator; private MethodEntry entry; diff --git a/src/main/java/cuchaz/enigma/analysis/MethodInheritanceTreeNode.java b/src/main/java/cuchaz/enigma/analysis/MethodInheritanceTreeNode.java index 6383783..b65b8c1 100644 --- a/src/main/java/cuchaz/enigma/analysis/MethodInheritanceTreeNode.java +++ b/src/main/java/cuchaz/enigma/analysis/MethodInheritanceTreeNode.java @@ -22,8 +22,6 @@ import cuchaz.enigma.mapping.Translator; public class MethodInheritanceTreeNode extends DefaultMutableTreeNode { - private static final long serialVersionUID = 1096677030991810007L; - private Translator deobfuscatingTranslator; private MethodEntry entry; private boolean isImplemented; diff --git a/src/main/java/cuchaz/enigma/analysis/SourceIndex.java b/src/main/java/cuchaz/enigma/analysis/SourceIndex.java index 3fa1309..73e0431 100644 --- a/src/main/java/cuchaz/enigma/analysis/SourceIndex.java +++ b/src/main/java/cuchaz/enigma/analysis/SourceIndex.java @@ -145,10 +145,6 @@ public class SourceIndex { return this.tokenToReference.keySet(); } - public Iterable declarations() { - return this.declarationToToken.keySet(); - } - public Token getDeclarationToken(Entry deobfEntry) { return this.declarationToToken.get(deobfEntry); } diff --git a/src/main/java/cuchaz/enigma/analysis/Token.java b/src/main/java/cuchaz/enigma/analysis/Token.java index 575c373..419842a 100644 --- a/src/main/java/cuchaz/enigma/analysis/Token.java +++ b/src/main/java/cuchaz/enigma/analysis/Token.java @@ -16,10 +16,6 @@ public class Token implements Comparable { public int end; public String text; - public Token(int start, int end) { - this(start, end, null); - } - public Token(int start, int end, String source) { this.start = start; this.end = end; diff --git a/src/main/java/cuchaz/enigma/analysis/TranslationIndex.java b/src/main/java/cuchaz/enigma/analysis/TranslationIndex.java index 3d8f556..275f56c 100644 --- a/src/main/java/cuchaz/enigma/analysis/TranslationIndex.java +++ b/src/main/java/cuchaz/enigma/analysis/TranslationIndex.java @@ -15,10 +15,10 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; -import java.io.*; -import java.util.*; -import java.util.zip.GZIPInputStream; -import java.util.zip.GZIPOutputStream; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; import cuchaz.enigma.mapping.*; import javassist.CtBehavior; @@ -26,9 +26,7 @@ import javassist.CtClass; import javassist.CtField; import javassist.bytecode.Descriptor; -public class TranslationIndex implements Serializable { - - private static final long serialVersionUID = 738687982126844179L; +public class TranslationIndex { private Map superclasses; private Multimap fieldEntries; @@ -43,7 +41,6 @@ public class TranslationIndex implements Serializable { } public TranslationIndex(TranslationIndex other, Translator translator) { - // translate the superclasses this.superclasses = Maps.newHashMap(); for (Map.Entry mapEntry : other.superclasses.entrySet()) { @@ -82,7 +79,6 @@ public class TranslationIndex implements Serializable { } public void indexClass(CtClass c, boolean indexMembers) { - ClassEntry classEntry = EntryFactory.getClassEntry(c); if (isJre(classEntry)) { return; @@ -139,7 +135,6 @@ public class TranslationIndex implements Serializable { } public List getSubclass(ClassEntry classEntry) { - // linear search is fast enough for now List subclasses = Lists.newArrayList(); for (Map.Entry entry : this.superclasses.entrySet()) { @@ -191,7 +186,6 @@ public class TranslationIndex implements Serializable { } public ClassEntry resolveEntryClass(Entry entry) { - if (entry instanceof ClassEntry) { return (ClassEntry) entry; } @@ -210,7 +204,6 @@ public class TranslationIndex implements Serializable { } public ClassEntry resolveSuperclass(Entry entry) { - // this entry could refer to a method on a class where the method is not actually implemented // travel up the inheritance tree to find the closest implementation while (!entryExists(entry)) { @@ -230,7 +223,6 @@ public class TranslationIndex implements Serializable { } public ClassEntry resolveInterface(Entry entry) { - // the interfaces for any class is a forest // so let's look at all the trees for (ClassEntry interfaceEntry : this.interfaces.get(entry.getClassEntry())) { @@ -246,27 +238,4 @@ public class TranslationIndex implements Serializable { String packageName = classEntry.getPackageName(); return packageName != null && (packageName.startsWith("java") || packageName.startsWith("javax")); } - - public void write(OutputStream out) - throws IOException { - GZIPOutputStream gzipout = new GZIPOutputStream(out); - ObjectOutputStream oout = new ObjectOutputStream(gzipout); - oout.writeObject(this.superclasses); - oout.writeObject(this.fieldEntries); - oout.writeObject(this.behaviorEntries); - gzipout.finish(); - } - - @SuppressWarnings("unchecked") - public void read(InputStream in) - throws IOException { - try { - ObjectInputStream oin = new ObjectInputStream(new GZIPInputStream(in)); - this.superclasses = (HashMap) oin.readObject(); - this.fieldEntries = (HashMultimap) oin.readObject(); - this.behaviorEntries = (HashMultimap) oin.readObject(); - } catch (ClassNotFoundException ex) { - throw new Error(ex); - } - } } -- cgit v1.2.3