diff options
Diffstat (limited to 'src/main/java/cuchaz/enigma/mapping/MappingsChecker.java')
| -rw-r--r-- | src/main/java/cuchaz/enigma/mapping/MappingsChecker.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java b/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java index 172641b..a42f255 100644 --- a/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java +++ b/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java | |||
| @@ -14,6 +14,10 @@ package cuchaz.enigma.mapping; | |||
| 14 | import com.google.common.collect.Lists; | 14 | import com.google.common.collect.Lists; |
| 15 | import com.google.common.collect.Maps; | 15 | import com.google.common.collect.Maps; |
| 16 | import cuchaz.enigma.analysis.JarIndex; | 16 | import cuchaz.enigma.analysis.JarIndex; |
| 17 | import cuchaz.enigma.mapping.entry.ClassEntry; | ||
| 18 | import cuchaz.enigma.mapping.entry.EntryFactory; | ||
| 19 | import cuchaz.enigma.mapping.entry.FieldEntry; | ||
| 20 | import cuchaz.enigma.mapping.entry.MethodEntry; | ||
| 17 | 21 | ||
| 18 | import java.util.Map; | 22 | import java.util.Map; |
| 19 | 23 | ||
| @@ -23,7 +27,7 @@ public class MappingsChecker { | |||
| 23 | private Map<ClassEntry, ClassMapping> droppedClassMappings; | 27 | private Map<ClassEntry, ClassMapping> droppedClassMappings; |
| 24 | private Map<ClassEntry, ClassMapping> droppedInnerClassMappings; | 28 | private Map<ClassEntry, ClassMapping> droppedInnerClassMappings; |
| 25 | private Map<FieldEntry, FieldMapping> droppedFieldMappings; | 29 | private Map<FieldEntry, FieldMapping> droppedFieldMappings; |
| 26 | private Map<BehaviorEntry, MethodMapping> droppedMethodMappings; | 30 | private Map<MethodEntry, MethodMapping> droppedMethodMappings; |
| 27 | 31 | ||
| 28 | public MappingsChecker(JarIndex index) { | 32 | public MappingsChecker(JarIndex index) { |
| 29 | this.index = index; | 33 | this.index = index; |
| @@ -45,7 +49,7 @@ public class MappingsChecker { | |||
| 45 | return this.droppedFieldMappings; | 49 | return this.droppedFieldMappings; |
| 46 | } | 50 | } |
| 47 | 51 | ||
| 48 | public Map<BehaviorEntry, MethodMapping> getDroppedMethodMappings() { | 52 | public Map<MethodEntry, MethodMapping> getDroppedMethodMappings() { |
| 49 | return this.droppedMethodMappings; | 53 | return this.droppedMethodMappings; |
| 50 | } | 54 | } |
| 51 | 55 | ||
| @@ -77,10 +81,10 @@ public class MappingsChecker { | |||
| 77 | 81 | ||
| 78 | // check methods | 82 | // check methods |
| 79 | for (MethodMapping methodMapping : Lists.newArrayList(classMapping.methods())) { | 83 | for (MethodMapping methodMapping : Lists.newArrayList(classMapping.methods())) { |
| 80 | BehaviorEntry obfBehaviorEntry = EntryFactory.getObfBehaviorEntry(classEntry, methodMapping); | 84 | MethodEntry obfMethodEntry = EntryFactory.getObfMethodEntry(classEntry, methodMapping); |
| 81 | if (!this.index.containsObfBehavior(obfBehaviorEntry)) { | 85 | if (!this.index.containsObfMethod(obfMethodEntry)) { |
| 82 | classMapping.removeMethodMapping(methodMapping); | 86 | classMapping.removeMethodMapping(methodMapping); |
| 83 | this.droppedMethodMappings.put(obfBehaviorEntry, methodMapping); | 87 | this.droppedMethodMappings.put(obfMethodEntry, methodMapping); |
| 84 | } | 88 | } |
| 85 | } | 89 | } |
| 86 | 90 | ||