summaryrefslogtreecommitdiff
path: root/src/cuchaz/enigma/convert/MappingsConverter.java
diff options
context:
space:
mode:
authorGravatar jeff2015-03-09 12:53:11 -0400
committerGravatar jeff2015-03-09 12:53:11 -0400
commitd6b2a223a7973941e5e4fb45c8ceec4885891496 (patch)
tree5728ab513d0b4ed85a720da7eb48c6591dd3f8b0 /src/cuchaz/enigma/convert/MappingsConverter.java
parentadd tracking for mismatched fields/methods (diff)
downloadenigma-fork-d6b2a223a7973941e5e4fb45c8ceec4885891496.tar.gz
enigma-fork-d6b2a223a7973941e5e4fb45c8ceec4885891496.tar.xz
enigma-fork-d6b2a223a7973941e5e4fb45c8ceec4885891496.zip
starting on field matching gui
Diffstat (limited to 'src/cuchaz/enigma/convert/MappingsConverter.java')
-rw-r--r--src/cuchaz/enigma/convert/MappingsConverter.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cuchaz/enigma/convert/MappingsConverter.java b/src/cuchaz/enigma/convert/MappingsConverter.java
index 5883878..667ee9d 100644
--- a/src/cuchaz/enigma/convert/MappingsConverter.java
+++ b/src/cuchaz/enigma/convert/MappingsConverter.java
@@ -37,7 +37,7 @@ import cuchaz.enigma.mapping.MethodMapping;
37 37
38public class MappingsConverter { 38public class MappingsConverter {
39 39
40 public static Matches computeMatches(JarFile sourceJar, JarFile destJar, Mappings mappings) { 40 public static ClassMatches computeMatches(JarFile sourceJar, JarFile destJar, Mappings mappings) {
41 41
42 // index jars 42 // index jars
43 System.out.println("Indexing source jar..."); 43 System.out.println("Indexing source jar...");
@@ -49,7 +49,7 @@ public class MappingsConverter {
49 49
50 // compute the matching 50 // compute the matching
51 ClassMatching matching = computeMatching(sourceJar, sourceIndex, destJar, destIndex, null); 51 ClassMatching matching = computeMatching(sourceJar, sourceIndex, destJar, destIndex, null);
52 return new Matches(matching.matches()); 52 return new ClassMatches(matching.matches());
53 } 53 }
54 54
55 public static ClassMatching computeMatching(JarFile sourceJar, JarIndex sourceIndex, JarFile destJar, JarIndex destIndex, BiMap<ClassEntry,ClassEntry> knownMatches) { 55 public static ClassMatching computeMatching(JarFile sourceJar, JarIndex sourceIndex, JarFile destJar, JarIndex destIndex, BiMap<ClassEntry,ClassEntry> knownMatches) {
@@ -115,7 +115,7 @@ public class MappingsConverter {
115 return lastMatching; 115 return lastMatching;
116 } 116 }
117 117
118 public static Mappings newMappings(Matches matches, Mappings oldMappings, Deobfuscator sourceDeobfuscator, Deobfuscator destDeobfuscator) { 118 public static Mappings newMappings(ClassMatches matches, Mappings oldMappings, Deobfuscator sourceDeobfuscator, Deobfuscator destDeobfuscator) {
119 119
120 // sort the unique matches by size of inner class chain 120 // sort the unique matches by size of inner class chain
121 Multimap<Integer,Entry<ClassEntry,ClassEntry>> matchesByDestChainSize = HashMultimap.create(); 121 Multimap<Integer,Entry<ClassEntry,ClassEntry>> matchesByDestChainSize = HashMultimap.create();
@@ -172,7 +172,7 @@ public class MappingsConverter {
172 return newMappings; 172 return newMappings;
173 } 173 }
174 174
175 private static ClassMapping migrateClassMapping(ClassEntry newObfClass, ClassMapping mapping, final Matches matches, boolean useSimpleName) { 175 private static ClassMapping migrateClassMapping(ClassEntry newObfClass, ClassMapping mapping, final ClassMatches matches, boolean useSimpleName) {
176 176
177 ClassNameReplacer replacer = new ClassNameReplacer() { 177 ClassNameReplacer replacer = new ClassNameReplacer() {
178 @Override 178 @Override