From e0e3141619cecd54c087d964654e6c35511c48f9 Mon Sep 17 00:00:00 2001 From: Thog Date: Tue, 6 Sep 2016 12:11:50 +0200 Subject: A little bit of clean up --- .../java/cuchaz/enigma/convert/ClassIdentifier.java | 1 - .../java/cuchaz/enigma/convert/ClassIdentity.java | 4 ++-- src/main/java/cuchaz/enigma/convert/ClassMatch.java | 5 ++--- .../java/cuchaz/enigma/convert/ClassMatching.java | 13 ++++++------- .../java/cuchaz/enigma/convert/MappingsConverter.java | 19 ++++++++----------- .../java/cuchaz/enigma/convert/MatchesReader.java | 4 ++-- 6 files changed, 20 insertions(+), 26 deletions(-) (limited to 'src/main/java/cuchaz/enigma/convert') diff --git a/src/main/java/cuchaz/enigma/convert/ClassIdentifier.java b/src/main/java/cuchaz/enigma/convert/ClassIdentifier.java index f545437..557e608 100644 --- a/src/main/java/cuchaz/enigma/convert/ClassIdentifier.java +++ b/src/main/java/cuchaz/enigma/convert/ClassIdentifier.java @@ -19,7 +19,6 @@ import cuchaz.enigma.TranslatingTypeLoader; import cuchaz.enigma.analysis.JarIndex; import cuchaz.enigma.convert.ClassNamer.SidedClassNamer; import cuchaz.enigma.mapping.ClassEntry; -import cuchaz.enigma.mapping.TranslationDirection; import cuchaz.enigma.mapping.Translator; import javassist.CtClass; diff --git a/src/main/java/cuchaz/enigma/convert/ClassIdentity.java b/src/main/java/cuchaz/enigma/convert/ClassIdentity.java index 606c1df..57cbc06 100644 --- a/src/main/java/cuchaz/enigma/convert/ClassIdentity.java +++ b/src/main/java/cuchaz/enigma/convert/ClassIdentity.java @@ -21,7 +21,6 @@ import java.util.Map; import java.util.Set; import cuchaz.enigma.Constants; -import cuchaz.enigma.Util; import cuchaz.enigma.analysis.ClassImplementationsTreeNode; import cuchaz.enigma.analysis.EntryReference; import cuchaz.enigma.analysis.JarIndex; @@ -30,6 +29,7 @@ import cuchaz.enigma.bytecode.InfoType; import cuchaz.enigma.bytecode.accessors.ConstInfoAccessor; import cuchaz.enigma.convert.ClassNamer.SidedClassNamer; import cuchaz.enigma.mapping.*; +import cuchaz.enigma.utils.Utils; import javassist.*; import javassist.bytecode.*; import javassist.expr.*; @@ -386,7 +386,7 @@ public class ClassIdentity { objs.addAll(this.implementz); objs.addAll(this.implementations); objs.addAll(this.references); - return Util.combineHashesOrdered(objs); + return Utils.combineHashesOrdered(objs); } public int getMatchScore(ClassIdentity other) { diff --git a/src/main/java/cuchaz/enigma/convert/ClassMatch.java b/src/main/java/cuchaz/enigma/convert/ClassMatch.java index 422529e..9fa35f0 100644 --- a/src/main/java/cuchaz/enigma/convert/ClassMatch.java +++ b/src/main/java/cuchaz/enigma/convert/ClassMatch.java @@ -15,9 +15,8 @@ import com.google.common.collect.Sets; import java.util.Collection; import java.util.Set; -import cuchaz.enigma.Util; import cuchaz.enigma.mapping.ClassEntry; - +import cuchaz.enigma.utils.Utils; public class ClassMatch { @@ -70,7 +69,7 @@ public class ClassMatch { @Override public int hashCode() { - return Util.combineHashesOrdered(sourceClasses, destClasses); + return Utils.combineHashesOrdered(sourceClasses, destClasses); } @Override diff --git a/src/main/java/cuchaz/enigma/convert/ClassMatching.java b/src/main/java/cuchaz/enigma/convert/ClassMatching.java index 9350ea7..af9ae01 100644 --- a/src/main/java/cuchaz/enigma/convert/ClassMatching.java +++ b/src/main/java/cuchaz/enigma/convert/ClassMatching.java @@ -144,12 +144,11 @@ public class ClassMatching { numAmbiguousDest += match.destClasses.size(); } - StringBuilder buf = new StringBuilder(); - buf.append(String.format("%20s%8s%8s\n", "", "Source", "Dest")); - buf.append(String.format("%20s%8d%8d\n", "Classes", sourceClasses().size(), destClasses().size())); - buf.append(String.format("%20s%8d%8d\n", "Uniquely matched", uniqueMatches().size(), uniqueMatches().size())); - buf.append(String.format("%20s%8d%8d\n", "Ambiguously matched", numAmbiguousSource, numAmbiguousDest)); - buf.append(String.format("%20s%8d%8d\n", "Unmatched", unmatchedSourceClasses().size(), unmatchedDestClasses().size())); - return buf.toString(); + String buf = String.format("%20s%8s%8s\n", "", "Source", "Dest") + String + .format("%20s%8d%8d\n", "Classes", sourceClasses().size(), destClasses().size()) + String + .format("%20s%8d%8d\n", "Uniquely matched", uniqueMatches().size(), uniqueMatches().size()) + String + .format("%20s%8d%8d\n", "Ambiguously matched", numAmbiguousSource, numAmbiguousDest) + String + .format("%20s%8d%8d\n", "Unmatched", unmatchedSourceClasses().size(), unmatchedDestClasses().size()); + return buf; } } diff --git a/src/main/java/cuchaz/enigma/convert/MappingsConverter.java b/src/main/java/cuchaz/enigma/convert/MappingsConverter.java index abb1bea..a80d9ce 100644 --- a/src/main/java/cuchaz/enigma/convert/MappingsConverter.java +++ b/src/main/java/cuchaz/enigma/convert/MappingsConverter.java @@ -11,10 +11,6 @@ package cuchaz.enigma.convert; import com.google.common.collect.*; - -import java.util.*; -import java.util.jar.JarFile; - import cuchaz.enigma.Constants; import cuchaz.enigma.Deobfuscator; import cuchaz.enigma.analysis.JarIndex; @@ -22,6 +18,9 @@ import cuchaz.enigma.convert.ClassNamer.SidedClassNamer; import cuchaz.enigma.mapping.*; import cuchaz.enigma.throwables.MappingConflict; +import java.util.*; +import java.util.jar.JarFile; + public class MappingsConverter { public static ClassMatches computeClassMatches(JarFile sourceJar, JarFile destJar, Mappings mappings) { @@ -365,14 +364,12 @@ public class MappingsConverter { public Set filterEntries(Collection obfDestFields, BehaviorEntry obfSourceField, ClassMatches classMatches) { Set out = Sets.newHashSet(); for (BehaviorEntry obfDestField : obfDestFields) { - Signature translatedDestSignature = translate(obfDestField.getSignature(), classMatches.getUniqueMatches().inverse()); - if (translatedDestSignature == null && obfSourceField.getSignature() == null) { + Signature translatedDestSignature = translate(obfDestField.getSignature(), + classMatches.getUniqueMatches().inverse()); + if ((translatedDestSignature == null && obfSourceField.getSignature() == null) + || translatedDestSignature != null && obfSourceField.getSignature() != null + && translatedDestSignature.equals(obfSourceField.getSignature())) out.add(obfDestField); - } else if (translatedDestSignature == null || obfSourceField.getSignature() == null) { - // skip it - } else if (translatedDestSignature.equals(obfSourceField.getSignature())) { - out.add(obfDestField); - } } return out; } diff --git a/src/main/java/cuchaz/enigma/convert/MatchesReader.java b/src/main/java/cuchaz/enigma/convert/MatchesReader.java index 773566d..ee5e482 100644 --- a/src/main/java/cuchaz/enigma/convert/MatchesReader.java +++ b/src/main/java/cuchaz/enigma/convert/MatchesReader.java @@ -28,7 +28,7 @@ public class MatchesReader { throws IOException { try (BufferedReader in = new BufferedReader(new FileReader(file))) { ClassMatches matches = new ClassMatches(); - String line = null; + String line; while ((line = in.readLine()) != null) { matches.add(readClassMatch(line)); } @@ -57,7 +57,7 @@ public class MatchesReader { throws IOException { try (BufferedReader in = new BufferedReader(new FileReader(file))) { MemberMatches matches = new MemberMatches(); - String line = null; + String line; while ((line = in.readLine()) != null) { readMemberMatch(matches, line); } -- cgit v1.2.3