diff options
| author | 2017-03-24 01:30:24 +0100 | |
|---|---|---|
| committer | 2017-03-24 01:30:24 +0100 | |
| commit | a67541419d105d859253f312cb18043e6d13f1ea (patch) | |
| tree | 47245a346a703ca579af87c82d6a3fec7ad35344 | |
| parent | Implement experimental Tiny mappings loader (diff) | |
| download | enigma-a67541419d105d859253f312cb18043e6d13f1ea.tar.gz enigma-a67541419d105d859253f312cb18043e6d13f1ea.tar.xz enigma-a67541419d105d859253f312cb18043e6d13f1ea.zip | |
Reformat code
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 { | |||
| 47 | private final MappingsRenamer renamer; | 47 | private final MappingsRenamer renamer; |
| 48 | private final Map<TranslationDirection, Translator> translatorCache; | 48 | private final Map<TranslationDirection, Translator> translatorCache; |
| 49 | private Mappings mappings; | 49 | private Mappings mappings; |
| 50 | |||
| 50 | public Deobfuscator(JarFile jar) { | 51 | public Deobfuscator(JarFile jar) { |
| 51 | this.jar = jar; | 52 | this.jar = jar; |
| 52 | 53 | ||
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 { | |||
| 114 | // DEBUG | 114 | // DEBUG |
| 115 | //System.out.println("ANONYMOUS: " + outerClassEntry.getName() + "$" + innerClassEntry.getSimpleName()); | 115 | //System.out.println("ANONYMOUS: " + outerClassEntry.getName() + "$" + innerClassEntry.getSimpleName()); |
| 116 | }/* else { | 116 | }/* else { |
| 117 | // DEBUG | 117 | // DEBUG |
| 118 | //System.out.println("INNER: " + outerClassEntry.getName() + "$" + innerClassEntry.getSimpleName()); | 118 | //System.out.println("INNER: " + outerClassEntry.getName() + "$" + innerClassEntry.getSimpleName()); |
| 119 | }*/ | 119 | }*/ |
| 120 | } | 120 | } |
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 { | |||
| 143 | } | 143 | } |
| 144 | 144 | ||
| 145 | /* DEBUG | 145 | /* DEBUG |
| 146 | System.out.println(String.format("\tDEOBF: %s-> ATTR: %s,%s,%s", classEntry, attr.outerClass(i), attr.innerClass(i), attr.innerName(i))); | 146 | System.out.println(String.format("\tDEOBF: %s-> ATTR: %s,%s,%s", classEntry, attr.outerClass(i), attr.innerClass(i), attr.innerName(i))); |
| 147 | */ | 147 | */ |
| 148 | } | 148 | } |
| 149 | } | 149 | } |
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 { | |||
| 138 | attr.append(innerClassIndex, parentClassIndex, innerClassNameIndex, accessFlags); | 138 | attr.append(innerClassIndex, parentClassIndex, innerClassNameIndex, accessFlags); |
| 139 | 139 | ||
| 140 | /* DEBUG | 140 | /* DEBUG |
| 141 | System.out.println(String.format("\tOBF: %s -> ATTR: %s,%s,%s (replace %s with %s)", | 141 | System.out.println(String.format("\tOBF: %s -> ATTR: %s,%s,%s (replace %s with %s)", |
| 142 | obfClassEntry, | 142 | obfClassEntry, |
| 143 | attr.innerClass(attr.tableLength() - 1), | 143 | attr.innerClass(attr.tableLength() - 1), |
| 144 | attr.outerClass(attr.tableLength() - 1), | 144 | 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 { | |||
| 21 | 21 | ||
| 22 | private Map<String, String> sourceNames; | 22 | private Map<String, String> sourceNames; |
| 23 | private Map<String, String> destNames; | 23 | private Map<String, String> destNames; |
| 24 | |||
| 24 | public ClassNamer(BiMap<ClassEntry, ClassEntry> mappings) { | 25 | public ClassNamer(BiMap<ClassEntry, ClassEntry> mappings) { |
| 25 | // convert the identity mappings to name maps | 26 | // convert the identity mappings to name maps |
| 26 | this.sourceNames = Maps.newHashMap(); | 27 | 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 { | |||
| 53 | private ClassEntry destClass; | 53 | private ClassEntry destClass; |
| 54 | private SourceType sourceType; | 54 | private SourceType sourceType; |
| 55 | private SaveListener saveListener; | 55 | private SaveListener saveListener; |
| 56 | |||
| 56 | public ClassMatchingGui(ClassMatches matches, Deobfuscator sourceDeobfuscator, Deobfuscator destDeobfuscator) { | 57 | public ClassMatchingGui(ClassMatches matches, Deobfuscator sourceDeobfuscator, Deobfuscator destDeobfuscator) { |
| 57 | 58 | ||
| 58 | classMatches = matches; | 59 | 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 { | |||
| 35 | private ClassSelectionListener selectionListener; | 35 | private ClassSelectionListener selectionListener; |
| 36 | private RenameSelectionListener renameSelectionListener; | 36 | private RenameSelectionListener renameSelectionListener; |
| 37 | private Comparator<ClassEntry> comparator; | 37 | private Comparator<ClassEntry> comparator; |
| 38 | |||
| 38 | public ClassSelector(Gui gui, Comparator<ClassEntry> comparator, boolean isRenamable) { | 39 | public ClassSelector(Gui gui, Comparator<ClassEntry> comparator, boolean isRenamable) { |
| 39 | this.comparator = comparator; | 40 | this.comparator = comparator; |
| 40 | 41 | ||
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 { | |||
| 36 | private SelectionHighlightPainter selectionHighlightPainter; | 36 | private SelectionHighlightPainter selectionHighlightPainter; |
| 37 | private SourceIndex sourceIndex; | 37 | private SourceIndex sourceIndex; |
| 38 | private SelectionListener selectionListener; | 38 | private SelectionListener selectionListener; |
| 39 | |||
| 39 | public CodeReader() { | 40 | public CodeReader() { |
| 40 | 41 | ||
| 41 | setEditable(false); | 42 | 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<T extends Entry> { | |||
| 59 | private ClassEntry obfDestClass; | 59 | private ClassEntry obfDestClass; |
| 60 | private T obfSourceEntry; | 60 | private T obfSourceEntry; |
| 61 | private T obfDestEntry; | 61 | private T obfDestEntry; |
| 62 | |||
| 62 | public MemberMatchingGui(ClassMatches classMatches, MemberMatches<T> fieldMatches, Deobfuscator sourceDeobfuscator, Deobfuscator destDeobfuscator) { | 63 | public MemberMatchingGui(ClassMatches classMatches, MemberMatches<T> fieldMatches, Deobfuscator sourceDeobfuscator, Deobfuscator destDeobfuscator) { |
| 63 | 64 | ||
| 64 | this.classMatches = classMatches; | 65 | 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<ClassMapping> { | |||
| 542 | } | 542 | } |
| 543 | 543 | ||
| 544 | // Used for tiny parsing to keep track of deobfuscate inner classes | 544 | // Used for tiny parsing to keep track of deobfuscate inner classes |
| 545 | public ClassMapping setDeobInner(String deobName) | 545 | public ClassMapping setDeobInner(String deobName) { |
| 546 | { | ||
| 547 | this.deobfFullName = deobName; | 546 | this.deobfFullName = deobName; |
| 548 | return this; | 547 | return this; |
| 549 | } | 548 | } |