From 74edc74c2c7b3236f00bf92499bb884837673b7d Mon Sep 17 00:00:00 2001 From: lclc98 Date: Sat, 2 Jul 2016 20:13:13 +1000 Subject: Reformatting code --- .../java/cuchaz/enigma/convert/ClassIdentity.java | 2 +- .../java/cuchaz/enigma/convert/ClassMatches.java | 4 +- .../java/cuchaz/enigma/convert/ClassMatching.java | 15 +- .../java/cuchaz/enigma/convert/FieldMatches.java | 151 --------------------- .../cuchaz/enigma/convert/MappingsConverter.java | 47 +++---- .../java/cuchaz/enigma/convert/MatchesReader.java | 13 +- 6 files changed, 29 insertions(+), 203 deletions(-) delete mode 100644 src/main/java/cuchaz/enigma/convert/FieldMatches.java (limited to 'src/main/java/cuchaz/enigma/convert') diff --git a/src/main/java/cuchaz/enigma/convert/ClassIdentity.java b/src/main/java/cuchaz/enigma/convert/ClassIdentity.java index 2317a3d..606c1df 100644 --- a/src/main/java/cuchaz/enigma/convert/ClassIdentity.java +++ b/src/main/java/cuchaz/enigma/convert/ClassIdentity.java @@ -58,7 +58,7 @@ public class ClassIdentity { // classes not in the none package can be passed through ClassEntry classEntry = new ClassEntry(className); - if (!classEntry.getPackageName().equals(Constants.NonePackage)) { + if (!classEntry.getPackageName().equals(Constants.NONE_PACKAGE)) { return className; } diff --git a/src/main/java/cuchaz/enigma/convert/ClassMatches.java b/src/main/java/cuchaz/enigma/convert/ClassMatches.java index 3a25435..0b7e803 100644 --- a/src/main/java/cuchaz/enigma/convert/ClassMatches.java +++ b/src/main/java/cuchaz/enigma/convert/ClassMatches.java @@ -45,9 +45,7 @@ public class ClassMatches implements Iterable { m_unmatchedSourceClasses = Sets.newHashSet(); m_unmatchedDestClasses = Sets.newHashSet(); - for (ClassMatch match : matches) { - indexMatch(match); - } + matches.forEach(this::indexMatch); } public void add(ClassMatch match) { diff --git a/src/main/java/cuchaz/enigma/convert/ClassMatching.java b/src/main/java/cuchaz/enigma/convert/ClassMatching.java index 9350ea7..194b6c4 100644 --- a/src/main/java/cuchaz/enigma/convert/ClassMatching.java +++ b/src/main/java/cuchaz/enigma/convert/ClassMatching.java @@ -55,23 +55,14 @@ public class ClassMatching { public Collection matches() { List matches = Lists.newArrayList(); for (Entry entry : m_knownMatches.entrySet()) { - matches.add(new ClassMatch( - entry.getKey(), - entry.getValue() - )); + matches.add(new ClassMatch(entry.getKey(), entry.getValue())); } for (ClassIdentity identity : m_sourceClasses.identities()) { - matches.add(new ClassMatch( - m_sourceClasses.getClasses(identity), - m_destClasses.getClasses(identity) - )); + matches.add(new ClassMatch(m_sourceClasses.getClasses(identity), m_destClasses.getClasses(identity))); } for (ClassIdentity identity : m_destClasses.identities()) { if (!m_sourceClasses.containsIdentity(identity)) { - matches.add(new ClassMatch( - new ArrayList<>(), - m_destClasses.getClasses(identity) - )); + matches.add(new ClassMatch(new ArrayList<>(), m_destClasses.getClasses(identity))); } } return matches; diff --git a/src/main/java/cuchaz/enigma/convert/FieldMatches.java b/src/main/java/cuchaz/enigma/convert/FieldMatches.java deleted file mode 100644 index 0899cd2..0000000 --- a/src/main/java/cuchaz/enigma/convert/FieldMatches.java +++ /dev/null @@ -1,151 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Jeff Martin. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser General Public - * License v3.0 which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl.html - *

- * Contributors: - * Jeff Martin - initial API and implementation - ******************************************************************************/ -package cuchaz.enigma.convert; - -import com.google.common.collect.*; - -import java.util.Collection; -import java.util.Set; - -import cuchaz.enigma.mapping.ClassEntry; -import cuchaz.enigma.mapping.FieldEntry; - - -public class FieldMatches { - - private BiMap m_matches; - private Multimap m_matchedSourceFields; - private Multimap m_unmatchedSourceFields; - private Multimap m_unmatchedDestFields; - private Multimap m_unmatchableSourceFields; - - public FieldMatches() { - m_matches = HashBiMap.create(); - m_matchedSourceFields = HashMultimap.create(); - m_unmatchedSourceFields = HashMultimap.create(); - m_unmatchedDestFields = HashMultimap.create(); - m_unmatchableSourceFields = HashMultimap.create(); - } - - public void addMatch(FieldEntry srcField, FieldEntry destField) { - boolean wasAdded = m_matches.put(srcField, destField) == null; - assert (wasAdded); - wasAdded = m_matchedSourceFields.put(srcField.getClassEntry(), srcField); - assert (wasAdded); - } - - public void addUnmatchedSourceField(FieldEntry fieldEntry) { - boolean wasAdded = m_unmatchedSourceFields.put(fieldEntry.getClassEntry(), fieldEntry); - assert (wasAdded); - } - - public void addUnmatchedSourceFields(Iterable fieldEntries) { - for (FieldEntry fieldEntry : fieldEntries) { - addUnmatchedSourceField(fieldEntry); - } - } - - public void addUnmatchedDestField(FieldEntry fieldEntry) { - boolean wasAdded = m_unmatchedDestFields.put(fieldEntry.getClassEntry(), fieldEntry); - assert (wasAdded); - } - - public void addUnmatchedDestFields(Iterable fieldEntries) { - for (FieldEntry fieldEntry : fieldEntries) { - addUnmatchedDestField(fieldEntry); - } - } - - public void addUnmatchableSourceField(FieldEntry sourceField) { - boolean wasAdded = m_unmatchableSourceFields.put(sourceField.getClassEntry(), sourceField); - assert (wasAdded); - } - - public Set getSourceClassesWithUnmatchedFields() { - return m_unmatchedSourceFields.keySet(); - } - - public Collection getSourceClassesWithoutUnmatchedFields() { - Set out = Sets.newHashSet(); - out.addAll(m_matchedSourceFields.keySet()); - out.removeAll(m_unmatchedSourceFields.keySet()); - return out; - } - - public Collection getUnmatchedSourceFields() { - return m_unmatchedSourceFields.values(); - } - - public Collection getUnmatchedSourceFields(ClassEntry sourceClass) { - return m_unmatchedSourceFields.get(sourceClass); - } - - public Collection getUnmatchedDestFields() { - return m_unmatchedDestFields.values(); - } - - public Collection getUnmatchedDestFields(ClassEntry destClass) { - return m_unmatchedDestFields.get(destClass); - } - - public Collection getUnmatchableSourceFields() { - return m_unmatchableSourceFields.values(); - } - - public boolean hasSource(FieldEntry fieldEntry) { - return m_matches.containsKey(fieldEntry) || m_unmatchedSourceFields.containsValue(fieldEntry); - } - - public boolean hasDest(FieldEntry fieldEntry) { - return m_matches.containsValue(fieldEntry) || m_unmatchedDestFields.containsValue(fieldEntry); - } - - public BiMap matches() { - return m_matches; - } - - public boolean isMatchedSourceField(FieldEntry sourceField) { - return m_matches.containsKey(sourceField); - } - - public boolean isMatchedDestField(FieldEntry destField) { - return m_matches.containsValue(destField); - } - - public void makeMatch(FieldEntry sourceField, FieldEntry destField) { - boolean wasRemoved = m_unmatchedSourceFields.remove(sourceField.getClassEntry(), sourceField); - assert (wasRemoved); - wasRemoved = m_unmatchedDestFields.remove(destField.getClassEntry(), destField); - assert (wasRemoved); - addMatch(sourceField, destField); - } - - public boolean isMatched(FieldEntry sourceField, FieldEntry destField) { - FieldEntry match = m_matches.get(sourceField); - return match != null && match.equals(destField); - } - - public void unmakeMatch(FieldEntry sourceField, FieldEntry destField) { - boolean wasRemoved = m_matches.remove(sourceField) != null; - assert (wasRemoved); - wasRemoved = m_matchedSourceFields.remove(sourceField.getClassEntry(), sourceField); - assert (wasRemoved); - addUnmatchedSourceField(sourceField); - addUnmatchedDestField(destField); - } - - public void makeSourceUnmatchable(FieldEntry sourceField) { - assert (!isMatchedSourceField(sourceField)); - boolean wasRemoved = m_unmatchedSourceFields.remove(sourceField.getClassEntry(), sourceField); - assert (wasRemoved); - addUnmatchableSourceField(sourceField); - } -} diff --git a/src/main/java/cuchaz/enigma/convert/MappingsConverter.java b/src/main/java/cuchaz/enigma/convert/MappingsConverter.java index 394b8c8..d1daadb 100644 --- a/src/main/java/cuchaz/enigma/convert/MappingsConverter.java +++ b/src/main/java/cuchaz/enigma/convert/MappingsConverter.java @@ -151,7 +151,9 @@ public class MappingsConverter { } } } - destMapping.addInnerClassMapping(migrateClassMapping(obfDestClassEntry, sourceMapping, matches, true)); + if (destMapping != null) { + destMapping.addInnerClassMapping(migrateClassMapping(obfDestClassEntry, sourceMapping, matches, true)); + } } } } @@ -160,15 +162,12 @@ public class MappingsConverter { private static ClassMapping migrateClassMapping(ClassEntry newObfClass, ClassMapping oldClassMapping, final ClassMatches matches, boolean useSimpleName) { - ClassNameReplacer replacer = new ClassNameReplacer() { - @Override - public String replace(String className) { - ClassEntry newClassEntry = matches.getUniqueMatches().get(new ClassEntry(className)); - if (newClassEntry != null) { - return newClassEntry.getName(); - } - return null; + ClassNameReplacer replacer = className -> { + ClassEntry newClassEntry = matches.getUniqueMatches().get(new ClassEntry(className)); + if (newClassEntry != null) { + return newClassEntry.getName(); } + return null; }; ClassMapping newClassMapping; @@ -229,7 +228,7 @@ public class MappingsConverter { // non obfuscated classes can be migrated ClassEntry classEntry = oldObfType.getClassEntry(); - if (!classEntry.getPackageName().equals(Constants.NonePackage)) { + if (!classEntry.getPackageName().equals(Constants.NONE_PACKAGE)) { return true; } @@ -390,7 +389,7 @@ public class MappingsConverter { public static MemberMatches computeMemberMatches(Deobfuscator destDeobfuscator, Mappings destMappings, ClassMatches classMatches, Doer doer) { - MemberMatches memberMatches = new MemberMatches(); + MemberMatches memberMatches = new MemberMatches<>(); // unmatched source fields are easy MappingsChecker checker = new MappingsChecker(destDeobfuscator.getJarIndex()); @@ -481,15 +480,12 @@ public class MappingsConverter { } private static Type translate(Type type, final BiMap map) { - return new Type(type, new ClassNameReplacer() { - @Override - public String replace(String inClassName) { - ClassEntry outClassEntry = map.get(new ClassEntry(inClassName)); - if (outClassEntry == null) { - return null; - } - return outClassEntry.getName(); + return new Type(type, inClassName -> { + ClassEntry outClassEntry = map.get(new ClassEntry(inClassName)); + if (outClassEntry == null) { + return null; } + return outClassEntry.getName(); }); } @@ -497,15 +493,12 @@ public class MappingsConverter { if (signature == null) { return null; } - return new Signature(signature, new ClassNameReplacer() { - @Override - public String replace(String inClassName) { - ClassEntry outClassEntry = map.get(new ClassEntry(inClassName)); - if (outClassEntry == null) { - return null; - } - return outClassEntry.getName(); + return new Signature(signature, inClassName -> { + ClassEntry outClassEntry = map.get(new ClassEntry(inClassName)); + if (outClassEntry == null) { + return null; } + return outClassEntry.getName(); }); } diff --git a/src/main/java/cuchaz/enigma/convert/MatchesReader.java b/src/main/java/cuchaz/enigma/convert/MatchesReader.java index 773566d..f7853ac 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)); } @@ -56,8 +56,8 @@ public class MatchesReader { public static MemberMatches readMembers(File file) throws IOException { try (BufferedReader in = new BufferedReader(new FileReader(file))) { - MemberMatches matches = new MemberMatches(); - String line = null; + MemberMatches matches = new MemberMatches<>(); + String line; while ((line = in.readLine()) != null) { readMemberMatch(matches, line); } @@ -90,13 +90,8 @@ public class MatchesReader { } String[] parts = in.split(" "); if (parts.length == 3 && parts[2].indexOf('(') < 0) { - return (T) new FieldEntry( - new ClassEntry(parts[0]), - parts[1], - new Type(parts[2]) - ); + return (T) new FieldEntry(new ClassEntry(parts[0]), parts[1], new Type(parts[2])); } else { - assert (parts.length == 2 || parts.length == 3); if (parts.length == 2) { return (T) EntryFactory.getBehaviorEntry(parts[0], parts[1]); } else if (parts.length == 3) { -- cgit v1.2.3