From e16f81dba9edadb3fc02492bfeff06266890e754 Mon Sep 17 00:00:00 2001 From: Yanis48 Date: Mon, 14 Dec 2020 21:15:53 +0100 Subject: Structure panel! --- .../cuchaz/enigma/analysis/StructureTreeNode.java | 109 +++++++++++++++++++++ .../cuchaz/enigma/analysis/index/JarIndex.java | 24 ++++- .../translation/representation/TypeDescriptor.java | 27 +++-- .../representation/entry/ClassEntry.java | 3 + .../translation/representation/entry/Entry.java | 7 ++ enigma/src/main/resources/lang/en_us.json | 2 + enigma/src/main/resources/lang/fr_fr.json | 2 + 7 files changed, 161 insertions(+), 13 deletions(-) create mode 100644 enigma/src/main/java/cuchaz/enigma/analysis/StructureTreeNode.java (limited to 'enigma') diff --git a/enigma/src/main/java/cuchaz/enigma/analysis/StructureTreeNode.java b/enigma/src/main/java/cuchaz/enigma/analysis/StructureTreeNode.java new file mode 100644 index 0000000..13f277c --- /dev/null +++ b/enigma/src/main/java/cuchaz/enigma/analysis/StructureTreeNode.java @@ -0,0 +1,109 @@ +package cuchaz.enigma.analysis; + +import cuchaz.enigma.analysis.index.JarIndex; +import cuchaz.enigma.translation.Translator; +import cuchaz.enigma.translation.representation.TypeDescriptor; +import cuchaz.enigma.translation.representation.entry.*; + +import javax.swing.tree.DefaultMutableTreeNode; +import java.util.List; + +public class StructureTreeNode extends DefaultMutableTreeNode { + private final Translator translator; + private final ClassEntry parentEntry; + private final ParentedEntry entry; + + public StructureTreeNode(Translator translator, ClassEntry parentEntry, ParentedEntry entry) { + this.translator = translator; + this.parentEntry = parentEntry; + this.entry = entry; + } + + /** + * Returns the parented entry corresponding to this tree node. + */ + public ParentedEntry getEntry() { + return this.entry; + } + + public void load(JarIndex jarIndex, boolean hideDeobfuscated) { + List children = jarIndex.getChildrenByClass().get(this.parentEntry); + + for (ParentedEntry child : children) { + StructureTreeNode childNode = new StructureTreeNode(this.translator, this.parentEntry, child); + + if (child instanceof ClassEntry) { + childNode = new StructureTreeNode(this.translator, (ClassEntry) child, child); + childNode.load(jarIndex, hideDeobfuscated); + } + + // don't add deobfuscated members if hideDeobfuscated is true, unless it's an inner class + if (hideDeobfuscated && this.translator.extendedTranslate(child).isDeobfuscated() && !(child instanceof ClassEntry)) { + continue; + } + + // don't add constructor methods if hideDeobfuscated is true + if (hideDeobfuscated && (child instanceof MethodEntry) && ((MethodEntry) child).isConstructor()) { + continue; + } + + this.add(childNode); + } + } + + @Override + public String toString() { + ParentedEntry translatedEntry = this.translator.extendedTranslate(this.entry).getValue(); + String result = translatedEntry.getName(); + + if (this.entry instanceof FieldDefEntry) { + FieldDefEntry field = (FieldDefEntry) translatedEntry; + String returnType = this.parseDesc(field.getDesc()); + + result = result + ": " + returnType; + } else if (this.entry instanceof MethodDefEntry) { + MethodDefEntry method = (MethodDefEntry) translatedEntry; + String args = this.parseArgs(method.getDesc().getArgumentDescs()); + String returnType = this.parseDesc(method.getDesc().getReturnDesc()); + + if (method.isConstructor()) { + result = method.getParent().getSimpleName() + args; + } else { + result = result + args + ": " + returnType; + } + } + + return result; + } + + private String parseArgs(List args) { + if (args.size() > 0) { + String result = "("; + + for (int i = 0; i < args.size(); i++) { + if (i > 0) { + result += ", "; + } + + result += this.parseDesc(args.get(i)); + } + + return result + ")"; + } + + return "()"; + } + + private String parseDesc(TypeDescriptor desc) { + if (desc.isVoid()) return "void"; + if (desc.isPrimitive()) return desc.getPrimitive().getKeyword(); + if (desc.isType()) return desc.getTypeEntry().getSimpleName(); + + if (desc.isArray()) { + if (desc.getArrayType().isPrimitive()) return desc.getArrayType().getPrimitive().getKeyword() + "[]"; + if (desc.getArrayType().isType()) return desc.getArrayType().getTypeEntry().getSimpleName() + "[]"; + } + + return null; + } +} diff --git a/enigma/src/main/java/cuchaz/enigma/analysis/index/JarIndex.java b/enigma/src/main/java/cuchaz/enigma/analysis/index/JarIndex.java index b5ad91a..d41731f 100644 --- a/enigma/src/main/java/cuchaz/enigma/analysis/index/JarIndex.java +++ b/enigma/src/main/java/cuchaz/enigma/analysis/index/JarIndex.java @@ -23,10 +23,7 @@ import cuchaz.enigma.translation.representation.Lambda; import cuchaz.enigma.translation.representation.entry.*; import cuchaz.enigma.utils.I18n; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashSet; -import java.util.Set; +import java.util.*; public class JarIndex implements JarIndexer { private final Set indexedClasses = new HashSet<>(); @@ -40,6 +37,7 @@ public class JarIndex implements JarIndexer { private final Collection indexers; private final Multimap methodImplementations = HashMultimap.create(); + private final Map> childrenByClass; public JarIndex(EntryIndex entryIndex, InheritanceIndex inheritanceIndex, ReferenceIndex referenceIndex, BridgeMethodIndex bridgeMethodIndex, PackageVisibilityIndex packageVisibilityIndex) { this.entryIndex = entryIndex; @@ -49,6 +47,7 @@ public class JarIndex implements JarIndexer { this.packageVisibilityIndex = packageVisibilityIndex; this.indexers = Arrays.asList(entryIndex, inheritanceIndex, referenceIndex, bridgeMethodIndex, packageVisibilityIndex); this.entryResolver = new IndexEntryResolver(this); + this.childrenByClass = new HashMap<>(); } public static JarIndex empty() { @@ -101,6 +100,11 @@ public class JarIndex implements JarIndexer { } indexers.forEach(indexer -> indexer.indexClass(classEntry)); + childrenByClass.putIfAbsent(classEntry, new ArrayList<>()); + if (classEntry.isInnerClass() && !classEntry.getAccess().isSynthetic()) { + childrenByClass.putIfAbsent(classEntry.getParent(), new ArrayList<>()); + childrenByClass.get(classEntry.getParent()).add(classEntry); + } } @Override @@ -110,6 +114,10 @@ public class JarIndex implements JarIndexer { } indexers.forEach(indexer -> indexer.indexField(fieldEntry)); + if (!fieldEntry.getAccess().isSynthetic()) { + childrenByClass.putIfAbsent(fieldEntry.getParent(), new ArrayList<>()); + childrenByClass.get(fieldEntry.getParent()).add(fieldEntry); + } } @Override @@ -119,6 +127,10 @@ public class JarIndex implements JarIndexer { } indexers.forEach(indexer -> indexer.indexMethod(methodEntry)); + if (!methodEntry.getAccess().isSynthetic() && !methodEntry.getName().equals("")) { + childrenByClass.putIfAbsent(methodEntry.getParent(), new ArrayList<>()); + childrenByClass.get(methodEntry.getParent()).add(methodEntry); + } if (!methodEntry.isConstructor()) { methodImplementations.put(methodEntry.getParent().getFullName(), methodEntry); @@ -176,6 +188,10 @@ public class JarIndex implements JarIndexer { return entryResolver; } + public Map> getChildrenByClass() { + return this.childrenByClass; + } + public boolean isIndexed(String internalName) { return indexedClasses.contains(internalName); } diff --git a/enigma/src/main/java/cuchaz/enigma/translation/representation/TypeDescriptor.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/TypeDescriptor.java index a7dccfc..6a1b82f 100644 --- a/enigma/src/main/java/cuchaz/enigma/translation/representation/TypeDescriptor.java +++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/TypeDescriptor.java @@ -235,14 +235,14 @@ public class TypeDescriptor implements Translatable { } public enum Primitive { - BYTE('B'), - CHARACTER('C'), - SHORT('S'), - INTEGER('I'), - LONG('J'), - FLOAT('F'), - DOUBLE('D'), - BOOLEAN('Z'); + BYTE('B', "byte"), + CHARACTER('C', "char"), + SHORT('S', "short"), + INTEGER('I', "int"), + LONG('J', "long"), + FLOAT('F', "float"), + DOUBLE('D', "double"), + BOOLEAN('Z', "boolean"); private static final Map lookup; @@ -254,9 +254,11 @@ public class TypeDescriptor implements Translatable { } private char code; + private String keyword; - Primitive(char code) { + Primitive(char code, String keyword) { this.code = code; + this.keyword = keyword; } public static Primitive get(char code) { @@ -266,5 +268,12 @@ public class TypeDescriptor implements Translatable { public char getCode() { return this.code; } + + /** + * Returns the Java keyword corresponding to this primitive. + */ + public String getKeyword() { + return this.keyword; + } } } diff --git a/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/ClassEntry.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/ClassEntry.java index 4a50021..b4a22f1 100644 --- a/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/ClassEntry.java +++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/ClassEntry.java @@ -134,6 +134,9 @@ public class ClassEntry extends ParentedEntry implements Comparable< return name; } + /** + * Returns whether this class entry has a parent, and therefore is an inner class. + */ public boolean isInnerClass() { return parent != null; } diff --git a/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/Entry.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/Entry.java index ff392fe..6fd412a 100644 --- a/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/Entry.java +++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/Entry.java @@ -29,6 +29,13 @@ public interface Entry

> extends Translatable { return getName(); } + /** + * Returns the parent entry of this entry. + * + *

The parent entry should be a {@linkplain MethodEntry method} for local variables, + * a {@linkplain ClassEntry class} for methods, fields and inner classes, and {@code null} + * for other classes.

+ */ @Nullable P getParent(); diff --git a/enigma/src/main/resources/lang/en_us.json b/enigma/src/main/resources/lang/en_us.json index 9db4e1f..8195bb1 100644 --- a/enigma/src/main/resources/lang/en_us.json +++ b/enigma/src/main/resources/lang/en_us.json @@ -101,6 +101,8 @@ "info_panel.identifier.index": "Index", "info_panel.editor.class.decompiling": "(decompiling...)", "info_panel.editor.class.not_found": "Unable to find class:", + "info_panel.tree.structure": "Structure", + "info_panel.tree.structure.hide_deobfuscated": "Hide deobfuscated members", "info_panel.tree.inheritance": "Inheritance", "info_panel.tree.implementations": "Implementations", "info_panel.tree.calls": "Call Graph", diff --git a/enigma/src/main/resources/lang/fr_fr.json b/enigma/src/main/resources/lang/fr_fr.json index 127b9c8..43bea4d 100644 --- a/enigma/src/main/resources/lang/fr_fr.json +++ b/enigma/src/main/resources/lang/fr_fr.json @@ -101,6 +101,8 @@ "info_panel.identifier.index": "Index", "info_panel.editor.class.decompiling": "(décompilation...)", "info_panel.editor.class.not_found": "Impossible de trouver la classe :", + "info_panel.tree.structure": "Structure", + "info_panel.tree.structure.hide_deobfuscated": "Masquer les membres déobfusqués", "info_panel.tree.inheritance": "Héritage", "info_panel.tree.implementations": "Implémentations", "info_panel.tree.calls": "Graphique des appels", -- cgit v1.2.3 From 68dd12b0efd2632e292e32827f1870310a003634 Mon Sep 17 00:00:00 2001 From: Yanis48 Date: Tue, 15 Dec 2020 09:17:08 +0100 Subject: Fix automapped entries Automatically deobfuscated names (like in enums) were displayed with their obfuscated name, and were not considered as deobf when selecting "hide deobf members" --- .../cuchaz/enigma/analysis/StructureTreeNode.java | 63 +++++++++++++++++----- 1 file changed, 51 insertions(+), 12 deletions(-) (limited to 'enigma') diff --git a/enigma/src/main/java/cuchaz/enigma/analysis/StructureTreeNode.java b/enigma/src/main/java/cuchaz/enigma/analysis/StructureTreeNode.java index 13f277c..312c2fe 100644 --- a/enigma/src/main/java/cuchaz/enigma/analysis/StructureTreeNode.java +++ b/enigma/src/main/java/cuchaz/enigma/analysis/StructureTreeNode.java @@ -1,7 +1,9 @@ package cuchaz.enigma.analysis; -import cuchaz.enigma.analysis.index.JarIndex; -import cuchaz.enigma.translation.Translator; +import cuchaz.enigma.EnigmaProject; +import cuchaz.enigma.api.service.NameProposalService; +import cuchaz.enigma.api.service.ObfuscationTestService; +import cuchaz.enigma.translation.mapping.EntryRemapper; import cuchaz.enigma.translation.representation.TypeDescriptor; import cuchaz.enigma.translation.representation.entry.*; @@ -9,12 +11,14 @@ import javax.swing.tree.DefaultMutableTreeNode; import java.util.List; public class StructureTreeNode extends DefaultMutableTreeNode { - private final Translator translator; + private final List nameProposalServices; + private final EntryRemapper mapper; private final ClassEntry parentEntry; private final ParentedEntry entry; - public StructureTreeNode(Translator translator, ClassEntry parentEntry, ParentedEntry entry) { - this.translator = translator; + public StructureTreeNode(EnigmaProject project, ClassEntry parentEntry, ParentedEntry entry) { + this.nameProposalServices = project.getEnigma().getServices().get(NameProposalService.TYPE); + this.mapper = project.getMapper(); this.parentEntry = parentEntry; this.entry = entry; } @@ -26,19 +30,19 @@ public class StructureTreeNode extends DefaultMutableTreeNode { return this.entry; } - public void load(JarIndex jarIndex, boolean hideDeobfuscated) { - List children = jarIndex.getChildrenByClass().get(this.parentEntry); + public void load(EnigmaProject project, boolean hideDeobfuscated) { + List children = project.getJarIndex().getChildrenByClass().get(this.parentEntry); for (ParentedEntry child : children) { - StructureTreeNode childNode = new StructureTreeNode(this.translator, this.parentEntry, child); + StructureTreeNode childNode = new StructureTreeNode(project, this.parentEntry, child); if (child instanceof ClassEntry) { - childNode = new StructureTreeNode(this.translator, (ClassEntry) child, child); - childNode.load(jarIndex, hideDeobfuscated); + childNode = new StructureTreeNode(project, (ClassEntry) child, child); + childNode.load(project, hideDeobfuscated); } // don't add deobfuscated members if hideDeobfuscated is true, unless it's an inner class - if (hideDeobfuscated && this.translator.extendedTranslate(child).isDeobfuscated() && !(child instanceof ClassEntry)) { + if (hideDeobfuscated && this.isDeobfuscated(project, child) && !(child instanceof ClassEntry)) { continue; } @@ -51,11 +55,46 @@ public class StructureTreeNode extends DefaultMutableTreeNode { } } + private boolean isDeobfuscated(EnigmaProject project, ParentedEntry child) { + List obfuscationTestServices = project.getEnigma().getServices().get(ObfuscationTestService.TYPE); + + if (!obfuscationTestServices.isEmpty()) { + for (ObfuscationTestService service : obfuscationTestServices) { + if (service.testDeobfuscated(child)) { + return true; + } + } + } + + if (!this.nameProposalServices.isEmpty()) { + for (NameProposalService service : this.nameProposalServices) { + if (service.proposeName(child, this.mapper).isPresent()) { + return true; + } + } + } + + String mappedName = project.getMapper().deobfuscate(child).getName(); + if (mappedName != null && !mappedName.isEmpty() && !mappedName.equals(child.getName())) { + return true; + } + + return false; + } + @Override public String toString() { - ParentedEntry translatedEntry = this.translator.extendedTranslate(this.entry).getValue(); + ParentedEntry translatedEntry = this.mapper.deobfuscate(this.entry); String result = translatedEntry.getName(); + if (!this.nameProposalServices.isEmpty()) { + for (NameProposalService service : this.nameProposalServices) { + if (service.proposeName(this.entry, this.mapper).isPresent()) { + result = service.proposeName(this.entry, this.mapper).get(); + } + } + } + if (this.entry instanceof FieldDefEntry) { FieldDefEntry field = (FieldDefEntry) translatedEntry; String returnType = this.parseDesc(field.getDesc()); -- cgit v1.2.3 From 559bac70027bd5161697a3c8dd0907cf89111d31 Mon Sep 17 00:00:00 2001 From: Yanis48 Date: Tue, 15 Dec 2020 19:37:13 +0100 Subject: Fix automapped again --- .../cuchaz/enigma/analysis/StructureTreeNode.java | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'enigma') diff --git a/enigma/src/main/java/cuchaz/enigma/analysis/StructureTreeNode.java b/enigma/src/main/java/cuchaz/enigma/analysis/StructureTreeNode.java index 312c2fe..876b5ca 100644 --- a/enigma/src/main/java/cuchaz/enigma/analysis/StructureTreeNode.java +++ b/enigma/src/main/java/cuchaz/enigma/analysis/StructureTreeNode.java @@ -3,6 +3,7 @@ package cuchaz.enigma.analysis; import cuchaz.enigma.EnigmaProject; import cuchaz.enigma.api.service.NameProposalService; import cuchaz.enigma.api.service.ObfuscationTestService; +import cuchaz.enigma.translation.TranslateResult; import cuchaz.enigma.translation.mapping.EntryRemapper; import cuchaz.enigma.translation.representation.TypeDescriptor; import cuchaz.enigma.translation.representation.entry.*; @@ -84,24 +85,26 @@ public class StructureTreeNode extends DefaultMutableTreeNode { @Override public String toString() { - ParentedEntry translatedEntry = this.mapper.deobfuscate(this.entry); - String result = translatedEntry.getName(); - - if (!this.nameProposalServices.isEmpty()) { - for (NameProposalService service : this.nameProposalServices) { - if (service.proposeName(this.entry, this.mapper).isPresent()) { - result = service.proposeName(this.entry, this.mapper).get(); + TranslateResult translateResult = this.mapper.extendedDeobfuscate(this.entry); + String result = translateResult.getValue().getName(); + + if (translateResult.isObfuscated()) { + if (!this.nameProposalServices.isEmpty()) { + for (NameProposalService service : this.nameProposalServices) { + if (service.proposeName(this.entry, this.mapper).isPresent()) { + result = service.proposeName(this.entry, this.mapper).get(); + } } } } if (this.entry instanceof FieldDefEntry) { - FieldDefEntry field = (FieldDefEntry) translatedEntry; + FieldDefEntry field = (FieldDefEntry) translateResult.getValue(); String returnType = this.parseDesc(field.getDesc()); result = result + ": " + returnType; } else if (this.entry instanceof MethodDefEntry) { - MethodDefEntry method = (MethodDefEntry) translatedEntry; + MethodDefEntry method = (MethodDefEntry) translateResult.getValue(); String args = this.parseArgs(method.getDesc().getArgumentDescs()); String returnType = this.parseDesc(method.getDesc().getReturnDesc()); -- cgit v1.2.3 From 12f270c80570b136add40dc259c25383ac36bf81 Mon Sep 17 00:00:00 2001 From: Yanis48 Date: Tue, 15 Dec 2020 21:22:55 +0100 Subject: avoid duplicate logic --- .../src/main/java/cuchaz/enigma/EnigmaProject.java | 30 ++++++++++++++++++++++ .../cuchaz/enigma/analysis/StructureTreeNode.java | 30 +--------------------- 2 files changed, 31 insertions(+), 29 deletions(-) (limited to 'enigma') diff --git a/enigma/src/main/java/cuchaz/enigma/EnigmaProject.java b/enigma/src/main/java/cuchaz/enigma/EnigmaProject.java index fcd2c96..a01eca1 100644 --- a/enigma/src/main/java/cuchaz/enigma/EnigmaProject.java +++ b/enigma/src/main/java/cuchaz/enigma/EnigmaProject.java @@ -18,6 +18,7 @@ import java.util.stream.Stream; import com.google.common.base.Functions; import com.google.common.base.Preconditions; +import cuchaz.enigma.api.service.ObfuscationTestService; import cuchaz.enigma.classprovider.ObfuscationFixClassProvider; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.tree.ClassNode; @@ -158,6 +159,35 @@ public class EnigmaProject { return obfReference.isNamed() && isRenamable(obfReference.getNameableEntry()); } + public boolean isObfuscated(Entry entry) { + String name = entry.getName(); + + List obfuscationTestServices = this.getEnigma().getServices().get(ObfuscationTestService.TYPE); + if (!obfuscationTestServices.isEmpty()) { + for (ObfuscationTestService service : obfuscationTestServices) { + if (service.testDeobfuscated(entry)) { + return false; + } + } + } + + List nameProposalServices = this.getEnigma().getServices().get(NameProposalService.TYPE); + if (!nameProposalServices.isEmpty()) { + for (NameProposalService service : nameProposalServices) { + if (service.proposeName(entry, mapper).isPresent()) { + return false; + } + } + } + + String mappedName = mapper.deobfuscate(entry).getName(); + if (mappedName != null && !mappedName.isEmpty() && !mappedName.equals(name)) { + return false; + } + + return true; + } + public JarExport exportRemappedJar(ProgressListener progress) { Collection classEntries = jarIndex.getEntryIndex().getClasses(); ClassProvider fixingClassProvider = new ObfuscationFixClassProvider(classProvider, jarIndex); diff --git a/enigma/src/main/java/cuchaz/enigma/analysis/StructureTreeNode.java b/enigma/src/main/java/cuchaz/enigma/analysis/StructureTreeNode.java index 876b5ca..f310aa7 100644 --- a/enigma/src/main/java/cuchaz/enigma/analysis/StructureTreeNode.java +++ b/enigma/src/main/java/cuchaz/enigma/analysis/StructureTreeNode.java @@ -2,7 +2,6 @@ package cuchaz.enigma.analysis; import cuchaz.enigma.EnigmaProject; import cuchaz.enigma.api.service.NameProposalService; -import cuchaz.enigma.api.service.ObfuscationTestService; import cuchaz.enigma.translation.TranslateResult; import cuchaz.enigma.translation.mapping.EntryRemapper; import cuchaz.enigma.translation.representation.TypeDescriptor; @@ -43,7 +42,7 @@ public class StructureTreeNode extends DefaultMutableTreeNode { } // don't add deobfuscated members if hideDeobfuscated is true, unless it's an inner class - if (hideDeobfuscated && this.isDeobfuscated(project, child) && !(child instanceof ClassEntry)) { + if (hideDeobfuscated && !project.isObfuscated(child) && !(child instanceof ClassEntry)) { continue; } @@ -56,33 +55,6 @@ public class StructureTreeNode extends DefaultMutableTreeNode { } } - private boolean isDeobfuscated(EnigmaProject project, ParentedEntry child) { - List obfuscationTestServices = project.getEnigma().getServices().get(ObfuscationTestService.TYPE); - - if (!obfuscationTestServices.isEmpty()) { - for (ObfuscationTestService service : obfuscationTestServices) { - if (service.testDeobfuscated(child)) { - return true; - } - } - } - - if (!this.nameProposalServices.isEmpty()) { - for (NameProposalService service : this.nameProposalServices) { - if (service.proposeName(child, this.mapper).isPresent()) { - return true; - } - } - } - - String mappedName = project.getMapper().deobfuscate(child).getName(); - if (mappedName != null && !mappedName.isEmpty() && !mappedName.equals(child.getName())) { - return true; - } - - return false; - } - @Override public String toString() { TranslateResult translateResult = this.mapper.extendedDeobfuscate(this.entry); -- cgit v1.2.3 From a30735c3069fdfa66bc24b1f9186272f9a9b1a0d Mon Sep 17 00:00:00 2001 From: Yanis48 Date: Sat, 19 Dec 2020 14:47:22 +0100 Subject: use ListMultimap when indexing jar --- .../java/cuchaz/enigma/analysis/index/JarIndex.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'enigma') diff --git a/enigma/src/main/java/cuchaz/enigma/analysis/index/JarIndex.java b/enigma/src/main/java/cuchaz/enigma/analysis/index/JarIndex.java index d41731f..aa360cf 100644 --- a/enigma/src/main/java/cuchaz/enigma/analysis/index/JarIndex.java +++ b/enigma/src/main/java/cuchaz/enigma/analysis/index/JarIndex.java @@ -11,8 +11,7 @@ package cuchaz.enigma.analysis.index; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; +import com.google.common.collect.*; import cuchaz.enigma.Enigma; import cuchaz.enigma.ProgressListener; import cuchaz.enigma.analysis.ReferenceTargetType; @@ -37,7 +36,7 @@ public class JarIndex implements JarIndexer { private final Collection indexers; private final Multimap methodImplementations = HashMultimap.create(); - private final Map> childrenByClass; + private final ListMultimap childrenByClass; public JarIndex(EntryIndex entryIndex, InheritanceIndex inheritanceIndex, ReferenceIndex referenceIndex, BridgeMethodIndex bridgeMethodIndex, PackageVisibilityIndex packageVisibilityIndex) { this.entryIndex = entryIndex; @@ -47,7 +46,7 @@ public class JarIndex implements JarIndexer { this.packageVisibilityIndex = packageVisibilityIndex; this.indexers = Arrays.asList(entryIndex, inheritanceIndex, referenceIndex, bridgeMethodIndex, packageVisibilityIndex); this.entryResolver = new IndexEntryResolver(this); - this.childrenByClass = new HashMap<>(); + this.childrenByClass = ArrayListMultimap.create(); } public static JarIndex empty() { @@ -100,10 +99,8 @@ public class JarIndex implements JarIndexer { } indexers.forEach(indexer -> indexer.indexClass(classEntry)); - childrenByClass.putIfAbsent(classEntry, new ArrayList<>()); if (classEntry.isInnerClass() && !classEntry.getAccess().isSynthetic()) { - childrenByClass.putIfAbsent(classEntry.getParent(), new ArrayList<>()); - childrenByClass.get(classEntry.getParent()).add(classEntry); + childrenByClass.put(classEntry.getParent(), classEntry); } } @@ -115,8 +112,7 @@ public class JarIndex implements JarIndexer { indexers.forEach(indexer -> indexer.indexField(fieldEntry)); if (!fieldEntry.getAccess().isSynthetic()) { - childrenByClass.putIfAbsent(fieldEntry.getParent(), new ArrayList<>()); - childrenByClass.get(fieldEntry.getParent()).add(fieldEntry); + childrenByClass.put(fieldEntry.getParent(), fieldEntry); } } @@ -128,8 +124,7 @@ public class JarIndex implements JarIndexer { indexers.forEach(indexer -> indexer.indexMethod(methodEntry)); if (!methodEntry.getAccess().isSynthetic() && !methodEntry.getName().equals("")) { - childrenByClass.putIfAbsent(methodEntry.getParent(), new ArrayList<>()); - childrenByClass.get(methodEntry.getParent()).add(methodEntry); + childrenByClass.put(methodEntry.getParent(), methodEntry); } if (!methodEntry.isConstructor()) { @@ -188,7 +183,7 @@ public class JarIndex implements JarIndexer { return entryResolver; } - public Map> getChildrenByClass() { + public ListMultimap getChildrenByClass() { return this.childrenByClass; } -- cgit v1.2.3