From a67541419d105d859253f312cb18043e6d13f1ea Mon Sep 17 00:00:00 2001 From: Thog Date: Fri, 24 Mar 2017 01:30:24 +0100 Subject: Reformat code --- src/main/java/cuchaz/enigma/Deobfuscator.java | 1 + src/main/java/cuchaz/enigma/analysis/JarIndex.java | 2 +- src/main/java/cuchaz/enigma/bytecode/ClassRenamer.java | 2 +- src/main/java/cuchaz/enigma/bytecode/InnerClassWriter.java | 2 +- src/main/java/cuchaz/enigma/convert/ClassNamer.java | 1 + src/main/java/cuchaz/enigma/gui/ClassMatchingGui.java | 1 + src/main/java/cuchaz/enigma/gui/ClassSelector.java | 1 + src/main/java/cuchaz/enigma/gui/CodeReader.java | 1 + src/main/java/cuchaz/enigma/gui/MemberMatchingGui.java | 1 + src/main/java/cuchaz/enigma/mapping/ClassMapping.java | 3 +-- 10 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/cuchaz/enigma/Deobfuscator.java b/src/main/java/cuchaz/enigma/Deobfuscator.java index 934d02a5..d72dfdd2 100644 --- a/src/main/java/cuchaz/enigma/Deobfuscator.java +++ b/src/main/java/cuchaz/enigma/Deobfuscator.java @@ -47,6 +47,7 @@ public class Deobfuscator { private final MappingsRenamer renamer; private final Map translatorCache; private Mappings mappings; + public Deobfuscator(JarFile jar) { this.jar = jar; diff --git a/src/main/java/cuchaz/enigma/analysis/JarIndex.java b/src/main/java/cuchaz/enigma/analysis/JarIndex.java index ea87dda5..d0d0f2c5 100644 --- a/src/main/java/cuchaz/enigma/analysis/JarIndex.java +++ b/src/main/java/cuchaz/enigma/analysis/JarIndex.java @@ -114,7 +114,7 @@ public class JarIndex { // DEBUG //System.out.println("ANONYMOUS: " + outerClassEntry.getName() + "$" + innerClassEntry.getSimpleName()); }/* else { - // DEBUG + // DEBUG //System.out.println("INNER: " + outerClassEntry.getName() + "$" + innerClassEntry.getSimpleName()); }*/ } diff --git a/src/main/java/cuchaz/enigma/bytecode/ClassRenamer.java b/src/main/java/cuchaz/enigma/bytecode/ClassRenamer.java index a52cab6d..62a838d1 100644 --- a/src/main/java/cuchaz/enigma/bytecode/ClassRenamer.java +++ b/src/main/java/cuchaz/enigma/bytecode/ClassRenamer.java @@ -143,7 +143,7 @@ public class ClassRenamer { } /* DEBUG - System.out.println(String.format("\tDEOBF: %s-> ATTR: %s,%s,%s", classEntry, attr.outerClass(i), attr.innerClass(i), attr.innerName(i))); + System.out.println(String.format("\tDEOBF: %s-> ATTR: %s,%s,%s", classEntry, attr.outerClass(i), attr.innerClass(i), attr.innerName(i))); */ } } diff --git a/src/main/java/cuchaz/enigma/bytecode/InnerClassWriter.java b/src/main/java/cuchaz/enigma/bytecode/InnerClassWriter.java index 5f8be908..1fb95935 100644 --- a/src/main/java/cuchaz/enigma/bytecode/InnerClassWriter.java +++ b/src/main/java/cuchaz/enigma/bytecode/InnerClassWriter.java @@ -138,7 +138,7 @@ public class InnerClassWriter { attr.append(innerClassIndex, parentClassIndex, innerClassNameIndex, accessFlags); /* DEBUG - System.out.println(String.format("\tOBF: %s -> ATTR: %s,%s,%s (replace %s with %s)", + System.out.println(String.format("\tOBF: %s -> ATTR: %s,%s,%s (replace %s with %s)", obfClassEntry, attr.innerClass(attr.tableLength() - 1), attr.outerClass(attr.tableLength() - 1), diff --git a/src/main/java/cuchaz/enigma/convert/ClassNamer.java b/src/main/java/cuchaz/enigma/convert/ClassNamer.java index 39699101..e5902c43 100644 --- a/src/main/java/cuchaz/enigma/convert/ClassNamer.java +++ b/src/main/java/cuchaz/enigma/convert/ClassNamer.java @@ -21,6 +21,7 @@ public class ClassNamer { private Map sourceNames; private Map destNames; + public ClassNamer(BiMap mappings) { // convert the identity mappings to name maps this.sourceNames = Maps.newHashMap(); diff --git a/src/main/java/cuchaz/enigma/gui/ClassMatchingGui.java b/src/main/java/cuchaz/enigma/gui/ClassMatchingGui.java index 05501f40..ce1c1ceb 100644 --- a/src/main/java/cuchaz/enigma/gui/ClassMatchingGui.java +++ b/src/main/java/cuchaz/enigma/gui/ClassMatchingGui.java @@ -53,6 +53,7 @@ public class ClassMatchingGui { private ClassEntry destClass; private SourceType sourceType; private SaveListener saveListener; + public ClassMatchingGui(ClassMatches matches, Deobfuscator sourceDeobfuscator, Deobfuscator destDeobfuscator) { classMatches = matches; diff --git a/src/main/java/cuchaz/enigma/gui/ClassSelector.java b/src/main/java/cuchaz/enigma/gui/ClassSelector.java index f7d7703f..8df21947 100644 --- a/src/main/java/cuchaz/enigma/gui/ClassSelector.java +++ b/src/main/java/cuchaz/enigma/gui/ClassSelector.java @@ -35,6 +35,7 @@ public class ClassSelector extends JTree { private ClassSelectionListener selectionListener; private RenameSelectionListener renameSelectionListener; private Comparator comparator; + public ClassSelector(Gui gui, Comparator comparator, boolean isRenamable) { this.comparator = comparator; diff --git a/src/main/java/cuchaz/enigma/gui/CodeReader.java b/src/main/java/cuchaz/enigma/gui/CodeReader.java index 2e235dc6..f76dc897 100644 --- a/src/main/java/cuchaz/enigma/gui/CodeReader.java +++ b/src/main/java/cuchaz/enigma/gui/CodeReader.java @@ -36,6 +36,7 @@ public class CodeReader extends JEditorPane { private SelectionHighlightPainter selectionHighlightPainter; private SourceIndex sourceIndex; private SelectionListener selectionListener; + public CodeReader() { setEditable(false); diff --git a/src/main/java/cuchaz/enigma/gui/MemberMatchingGui.java b/src/main/java/cuchaz/enigma/gui/MemberMatchingGui.java index 4f5231f1..fe6a3b0e 100644 --- a/src/main/java/cuchaz/enigma/gui/MemberMatchingGui.java +++ b/src/main/java/cuchaz/enigma/gui/MemberMatchingGui.java @@ -59,6 +59,7 @@ public class MemberMatchingGui { private ClassEntry obfDestClass; private T obfSourceEntry; private T obfDestEntry; + public MemberMatchingGui(ClassMatches classMatches, MemberMatches fieldMatches, Deobfuscator sourceDeobfuscator, Deobfuscator destDeobfuscator) { this.classMatches = classMatches; diff --git a/src/main/java/cuchaz/enigma/mapping/ClassMapping.java b/src/main/java/cuchaz/enigma/mapping/ClassMapping.java index 1d1f558c..51751ca9 100644 --- a/src/main/java/cuchaz/enigma/mapping/ClassMapping.java +++ b/src/main/java/cuchaz/enigma/mapping/ClassMapping.java @@ -542,8 +542,7 @@ public class ClassMapping implements Comparable { } // Used for tiny parsing to keep track of deobfuscate inner classes - public ClassMapping setDeobInner(String deobName) - { + public ClassMapping setDeobInner(String deobName) { this.deobfFullName = deobName; return this; } -- cgit v1.2.3