From d1a041362a164e4469a4b725608c631bd0961c2e Mon Sep 17 00:00:00 2001 From: jeff Date: Sat, 7 Mar 2015 20:54:44 -0500 Subject: ui improvements --- src/cuchaz/enigma/convert/MappingsConverter.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/cuchaz/enigma/convert/MappingsConverter.java') diff --git a/src/cuchaz/enigma/convert/MappingsConverter.java b/src/cuchaz/enigma/convert/MappingsConverter.java index aa067d4..f38723f 100644 --- a/src/cuchaz/enigma/convert/MappingsConverter.java +++ b/src/cuchaz/enigma/convert/MappingsConverter.java @@ -45,11 +45,11 @@ public class MappingsConverter { destIndex.indexJar(destJar, false); // compute the matching - ClassMatching matching = computeMatching(sourceJar, sourceIndex, destJar, destIndex); + ClassMatching matching = computeMatching(sourceJar, sourceIndex, destJar, destIndex, null); return new Matches(matching.matches()); } - public static ClassMatching computeMatching(JarFile sourceJar, JarIndex sourceIndex, JarFile destJar, JarIndex destIndex) { + public static ClassMatching computeMatching(JarFile sourceJar, JarIndex sourceIndex, JarFile destJar, JarIndex destIndex, BiMap knownMatches) { System.out.println("Iteratively matching classes"); @@ -74,11 +74,15 @@ public class MappingsConverter { new ClassIdentifier(destJar, destIndex, destNamer, useReferences) ); + if (knownMatches != null) { + matching.addKnownMatches(knownMatches); + } + if (lastMatching == null) { // search all classes matching.match(sourceIndex.getObfClassEntries(), destIndex.getObfClassEntries()); } else { - // we already know about these matches + // we already know about these matches from last time matching.addKnownMatches(lastMatching.uniqueMatches()); // search unmatched and ambiguously-matched classes -- cgit v1.2.3