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/analysis/EntryRenamer.java | 20 +--- src/main/java/cuchaz/enigma/analysis/JarIndex.java | 20 ++-- .../analysis/MethodImplementationsTreeNode.java | 4 +- .../enigma/analysis/MethodInheritanceTreeNode.java | 4 +- .../enigma/analysis/RelatedMethodChecker.java | 104 --------------------- .../java/cuchaz/enigma/analysis/SourceIndex.java | 4 +- .../cuchaz/enigma/analysis/TranslationIndex.java | 2 +- 7 files changed, 19 insertions(+), 139 deletions(-) delete mode 100644 src/main/java/cuchaz/enigma/analysis/RelatedMethodChecker.java (limited to 'src/main/java/cuchaz/enigma/analysis') diff --git a/src/main/java/cuchaz/enigma/analysis/EntryRenamer.java b/src/main/java/cuchaz/enigma/analysis/EntryRenamer.java index 9c3d051..a885c6a 100644 --- a/src/main/java/cuchaz/enigma/analysis/EntryRenamer.java +++ b/src/main/java/cuchaz/enigma/analysis/EntryRenamer.java @@ -36,10 +36,7 @@ public class EntryRenamer { // for each key/value pair... Set> entriesToAdd = Sets.newHashSet(); for (Map.Entry entry : map.entrySet()) { - entriesToAdd.add(new AbstractMap.SimpleEntry<>( - renameClassesInThing(renames, entry.getKey()), - renameClassesInThing(renames, entry.getValue()) - )); + entriesToAdd.add(new AbstractMap.SimpleEntry<>(renameClassesInThing(renames, entry.getKey()), renameClassesInThing(renames, entry.getValue()))); } map.clear(); for (Map.Entry entry : entriesToAdd) { @@ -51,10 +48,7 @@ public class EntryRenamer { // for each key/value pair... Set> entriesToAdd = Sets.newHashSet(); for (Map.Entry entry : map.entries()) { - entriesToAdd.add(new AbstractMap.SimpleEntry<>( - renameClassesInThing(renames, entry.getKey()), - renameClassesInThing(renames, entry.getValue()) - )); + entriesToAdd.add(new AbstractMap.SimpleEntry<>(renameClassesInThing(renames, entry.getKey()), renameClassesInThing(renames, entry.getValue()))); } map.clear(); for (Map.Entry entry : entriesToAdd) { @@ -66,10 +60,7 @@ public class EntryRenamer { // for each key/value pair... Set> entriesToAdd = Sets.newHashSet(); for (Map.Entry entry : map.entries()) { - entriesToAdd.add(new AbstractMap.SimpleEntry<>( - renameMethodsInThing(renames, entry.getKey()), - renameMethodsInThing(renames, entry.getValue()) - )); + entriesToAdd.add(new AbstractMap.SimpleEntry<>(renameMethodsInThing(renames, entry.getKey()), renameMethodsInThing(renames, entry.getValue()))); } map.clear(); for (Map.Entry entry : entriesToAdd) { @@ -81,10 +72,7 @@ public class EntryRenamer { // for each key/value pair... Set> entriesToAdd = Sets.newHashSet(); for (Map.Entry entry : map.entrySet()) { - entriesToAdd.add(new AbstractMap.SimpleEntry<>( - renameMethodsInThing(renames, entry.getKey()), - renameMethodsInThing(renames, entry.getValue()) - )); + entriesToAdd.add(new AbstractMap.SimpleEntry<>(renameMethodsInThing(renames, entry.getKey()), renameMethodsInThing(renames, entry.getValue()))); } map.clear(); for (Map.Entry entry : entriesToAdd) { diff --git a/src/main/java/cuchaz/enigma/analysis/JarIndex.java b/src/main/java/cuchaz/enigma/analysis/JarIndex.java index 8b30f9e..377a8cb 100644 --- a/src/main/java/cuchaz/enigma/analysis/JarIndex.java +++ b/src/main/java/cuchaz/enigma/analysis/JarIndex.java @@ -60,14 +60,14 @@ public class JarIndex { for (ClassEntry classEntry : JarClassIterator.getClassEntries(jar)) { if (classEntry.isInDefaultPackage()) { // move out of default package - classEntry = new ClassEntry(Constants.NonePackage + "/" + classEntry.getName()); + classEntry = new ClassEntry(Constants.NONE_PACKAGE + "/" + classEntry.getName()); } this.obfClassEntries.add(classEntry); } // step 2: index field/method/constructor access for (CtClass c : JarClassIterator.classes(jar)) { - ClassRenamer.moveAllClassesOutOfDefaultPackage(c, Constants.NonePackage); + ClassRenamer.moveAllClassesOutOfDefaultPackage(c, Constants.NONE_PACKAGE); for (CtField field : c.getDeclaredFields()) { FieldEntry fieldEntry = EntryFactory.getFieldEntry(field); this.access.put(fieldEntry, Access.get(field)); @@ -82,7 +82,7 @@ public class JarIndex { // step 3: index extends, implements, fields, and methods for (CtClass c : JarClassIterator.classes(jar)) { - ClassRenamer.moveAllClassesOutOfDefaultPackage(c, Constants.NonePackage); + ClassRenamer.moveAllClassesOutOfDefaultPackage(c, Constants.NONE_PACKAGE); this.translationIndex.indexClass(c); String className = Descriptor.toJvmName(c.getName()); for (String interfaceName : c.getClassFile().getInterfaces()) { @@ -99,7 +99,7 @@ public class JarIndex { // step 4: index field, method, constructor references for (CtClass c : JarClassIterator.classes(jar)) { - ClassRenamer.moveAllClassesOutOfDefaultPackage(c, Constants.NonePackage); + ClassRenamer.moveAllClassesOutOfDefaultPackage(c, Constants.NONE_PACKAGE); for (CtBehavior behavior : c.getDeclaredBehaviors()) { indexBehaviorReferences(behavior); } @@ -109,7 +109,7 @@ public class JarIndex { // step 5: index inner classes and anonymous classes for (CtClass c : JarClassIterator.classes(jar)) { - ClassRenamer.moveAllClassesOutOfDefaultPackage(c, Constants.NonePackage); + ClassRenamer.moveAllClassesOutOfDefaultPackage(c, Constants.NONE_PACKAGE); ClassEntry innerClassEntry = EntryFactory.getClassEntry(c); ClassEntry outerClassEntry = findOuterClass(c); if (outerClassEntry != null) { @@ -183,7 +183,7 @@ public class JarIndex { calledMethodEntry.getSignature() ); } - EntryReference reference = new EntryReference( + EntryReference reference = new EntryReference<>( calledMethodEntry, call.getMethodName(), behaviorEntry @@ -198,7 +198,7 @@ public class JarIndex { if (resolvedClassEntry != null && !resolvedClassEntry.equals(calledFieldEntry.getClassEntry())) { calledFieldEntry = new FieldEntry(calledFieldEntry, resolvedClassEntry); } - EntryReference reference = new EntryReference( + EntryReference reference = new EntryReference<>( calledFieldEntry, call.getFieldName(), behaviorEntry @@ -209,7 +209,7 @@ public class JarIndex { @Override public void edit(ConstructorCall call) { ConstructorEntry calledConstructorEntry = EntryFactory.getConstructorEntry(call); - EntryReference reference = new EntryReference( + EntryReference reference = new EntryReference<>( calledConstructorEntry, call.getMethodName(), behaviorEntry @@ -220,7 +220,7 @@ public class JarIndex { @Override public void edit(NewExpr call) { ConstructorEntry calledConstructorEntry = EntryFactory.getConstructorEntry(call); - EntryReference reference = new EntryReference( + EntryReference reference = new EntryReference<>( calledConstructorEntry, call.getClassName(), behaviorEntry @@ -711,7 +711,7 @@ public class JarIndex { public Set getInterfaces(String className) { ClassEntry classEntry = new ClassEntry(className); - Set interfaces = new HashSet(); + Set interfaces = new HashSet<>(); interfaces.addAll(this.translationIndex.getInterfaces(classEntry)); for (ClassEntry ancestor : this.translationIndex.getAncestry(classEntry)) { interfaces.addAll(this.translationIndex.getInterfaces(ancestor)); diff --git a/src/main/java/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java b/src/main/java/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java index 1cf80d9..7919b5d 100644 --- a/src/main/java/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java +++ b/src/main/java/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java @@ -75,9 +75,7 @@ public class MethodImplementationsTreeNode extends DefaultMutableTreeNode { } // add them to this node - for (MethodImplementationsTreeNode node : nodes) { - this.add(node); - } + nodes.forEach(this::add); } public static MethodImplementationsTreeNode findNode(MethodImplementationsTreeNode node, MethodEntry entry) { diff --git a/src/main/java/cuchaz/enigma/analysis/MethodInheritanceTreeNode.java b/src/main/java/cuchaz/enigma/analysis/MethodInheritanceTreeNode.java index a3bed6e..6383783 100644 --- a/src/main/java/cuchaz/enigma/analysis/MethodInheritanceTreeNode.java +++ b/src/main/java/cuchaz/enigma/analysis/MethodInheritanceTreeNode.java @@ -79,9 +79,7 @@ public class MethodInheritanceTreeNode extends DefaultMutableTreeNode { } // add them to this node - for (MethodInheritanceTreeNode node : nodes) { - this.add(node); - } + nodes.forEach(this::add); if (recurse) { for (MethodInheritanceTreeNode node : nodes) { diff --git a/src/main/java/cuchaz/enigma/analysis/RelatedMethodChecker.java b/src/main/java/cuchaz/enigma/analysis/RelatedMethodChecker.java deleted file mode 100644 index 08e2dbf..0000000 --- a/src/main/java/cuchaz/enigma/analysis/RelatedMethodChecker.java +++ /dev/null @@ -1,104 +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.analysis; - -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; - -import java.util.Map; -import java.util.Set; - -import cuchaz.enigma.mapping.*; - -public class RelatedMethodChecker { - - private JarIndex m_jarIndex; - private Map, String> m_deobfNamesByGroup; - private Map m_deobfNamesByObfMethod; - private Map> m_groupsByObfMethod; - private Set> m_inconsistentGroups; - - public RelatedMethodChecker(JarIndex jarIndex) { - m_jarIndex = jarIndex; - m_deobfNamesByGroup = Maps.newHashMap(); - m_deobfNamesByObfMethod = Maps.newHashMap(); - m_groupsByObfMethod = Maps.newHashMap(); - m_inconsistentGroups = Sets.newHashSet(); - } - - public void checkMethod(ClassEntry classEntry, MethodMapping methodMapping) { - - // TEMP: disable the expensive check for now, maybe we can optimize it later, or just use it for debugging - if (true) { - return; - } - - BehaviorEntry obfBehaviorEntry = EntryFactory.getObfBehaviorEntry(classEntry, methodMapping); - if (!(obfBehaviorEntry instanceof MethodEntry)) { - // only methods have related implementations - return; - } - MethodEntry obfMethodEntry = (MethodEntry) obfBehaviorEntry; - String deobfName = methodMapping.getDeobfName(); - m_deobfNamesByObfMethod.put(obfMethodEntry, deobfName); - - // have we seen this method's group before? - Set group = m_groupsByObfMethod.get(obfMethodEntry); - if (group == null) { - - // no, compute the group and save the name - group = m_jarIndex.getRelatedMethodImplementations(obfMethodEntry); - m_deobfNamesByGroup.put(group, deobfName); - - assert (group.contains(obfMethodEntry)); - for (MethodEntry relatedMethodEntry : group) { - m_groupsByObfMethod.put(relatedMethodEntry, group); - } - } - - // check the name - if (!sameName(m_deobfNamesByGroup.get(group), deobfName)) { - m_inconsistentGroups.add(group); - } - } - - private boolean sameName(String a, String b) { - if (a == null && b == null) { - return true; - } else if (a != null && b != null) { - return a.equals(b); - } - return false; - } - - public boolean hasProblems() { - return m_inconsistentGroups.size() > 0; - } - - public String getReport() { - StringBuilder buf = new StringBuilder(); - buf.append(m_inconsistentGroups.size()); - buf.append(" groups of methods related by inheritance and/or interfaces have different deobf names!\n"); - for (Set group : m_inconsistentGroups) { - buf.append("\tGroup with "); - buf.append(group.size()); - buf.append(" methods:\n"); - for (MethodEntry methodEntry : group) { - buf.append("\t\t"); - buf.append(methodEntry.toString()); - buf.append(" => "); - buf.append(m_deobfNamesByObfMethod.get(methodEntry)); - buf.append("\n"); - } - } - return buf.toString(); - } -} diff --git a/src/main/java/cuchaz/enigma/analysis/SourceIndex.java b/src/main/java/cuchaz/enigma/analysis/SourceIndex.java index cbc2945..719930e 100644 --- a/src/main/java/cuchaz/enigma/analysis/SourceIndex.java +++ b/src/main/java/cuchaz/enigma/analysis/SourceIndex.java @@ -98,7 +98,7 @@ public class SourceIndex { public void addReference(AstNode node, Entry deobfEntry, Entry deobfContext) { Token token = getToken(node); if (token != null) { - EntryReference deobfReference = new EntryReference(deobfEntry, token.text, deobfContext); + EntryReference deobfReference = new EntryReference<>(deobfEntry, token.text, deobfContext); this.tokenToReference.put(token, deobfReference); this.referenceToTokens.put(deobfReference, token); } @@ -107,7 +107,7 @@ public class SourceIndex { public void addDeclaration(AstNode node, Entry deobfEntry) { Token token = getToken(node); if (token != null) { - EntryReference reference = new EntryReference(deobfEntry, token.text); + EntryReference reference = new EntryReference<>(deobfEntry, token.text); this.tokenToReference.put(token, reference); this.referenceToTokens.put(reference, token); this.declarationToToken.put(deobfEntry, token); diff --git a/src/main/java/cuchaz/enigma/analysis/TranslationIndex.java b/src/main/java/cuchaz/enigma/analysis/TranslationIndex.java index f020ae2..adb87b6 100644 --- a/src/main/java/cuchaz/enigma/analysis/TranslationIndex.java +++ b/src/main/java/cuchaz/enigma/analysis/TranslationIndex.java @@ -119,7 +119,7 @@ public class TranslationIndex implements Serializable { public void renameClasses(Map renames) { EntryRenamer.renameClassesInMap(renames, this.superclasses); - EntryRenamer.renameClassesInMultimap(renames,this.fieldEntries); + EntryRenamer.renameClassesInMultimap(renames, this.fieldEntries); EntryRenamer.renameClassesInMultimap(renames, this.behaviorEntries); } -- cgit v1.2.3