summaryrefslogtreecommitdiff
path: root/src/main/java/cuchaz/enigma/analysis
diff options
context:
space:
mode:
authorGravatar gegy10002018-06-22 22:29:41 +0200
committerGravatar gegy10002018-06-22 22:29:41 +0200
commit7ec433f1ecc5b44f8b690c7443d5e38ac0e6422d (patch)
tree346ba1771ce56d46cab67ee4b80c86214856db54 /src/main/java/cuchaz/enigma/analysis
parentFix compile issues (diff)
downloadenigma-fork-7ec433f1ecc5b44f8b690c7443d5e38ac0e6422d.tar.gz
enigma-fork-7ec433f1ecc5b44f8b690c7443d5e38ac0e6422d.tar.xz
enigma-fork-7ec433f1ecc5b44f8b690c7443d5e38ac0e6422d.zip
Resolve all failed tests
Diffstat (limited to 'src/main/java/cuchaz/enigma/analysis')
-rw-r--r--src/main/java/cuchaz/enigma/analysis/JarIndex.java3
-rw-r--r--src/main/java/cuchaz/enigma/analysis/TranslationIndex.java2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/cuchaz/enigma/analysis/JarIndex.java b/src/main/java/cuchaz/enigma/analysis/JarIndex.java
index 87e6e88..8172dea 100644
--- a/src/main/java/cuchaz/enigma/analysis/JarIndex.java
+++ b/src/main/java/cuchaz/enigma/analysis/JarIndex.java
@@ -148,8 +148,7 @@ public class JarIndex {
148 148
149 public void indexInnerClass(ClassEntry innerEntry, ClassEntry outerEntry) { 149 public void indexInnerClass(ClassEntry innerEntry, ClassEntry outerEntry) {
150 this.innerClassesByOuter.put(outerEntry, innerEntry); 150 this.innerClassesByOuter.put(outerEntry, innerEntry);
151 boolean innerWasAdded = this.outerClassesByInner.put(innerEntry, outerEntry) == null; 151 this.outerClassesByInner.putIfAbsent(innerEntry, outerEntry);
152 assert (innerWasAdded);
153 } 152 }
154 153
155 private MethodEntry findBridgedMethod(MethodDefEntry method) { 154 private MethodEntry findBridgedMethod(MethodDefEntry method) {
diff --git a/src/main/java/cuchaz/enigma/analysis/TranslationIndex.java b/src/main/java/cuchaz/enigma/analysis/TranslationIndex.java
index 644a3f2..b2ddc5f 100644
--- a/src/main/java/cuchaz/enigma/analysis/TranslationIndex.java
+++ b/src/main/java/cuchaz/enigma/analysis/TranslationIndex.java
@@ -84,7 +84,7 @@ public class TranslationIndex {
84 84
85 // add the superclass 85 // add the superclass
86 ClassEntry superclassEntry = entryPool.getClass(superName); 86 ClassEntry superclassEntry = entryPool.getClass(superName);
87 if (!isJre(superclassEntry)) { 87 if (superclassEntry != null) {
88 this.superclasses.put(classEntry, superclassEntry); 88 this.superclasses.put(classEntry, superclassEntry);
89 } 89 }
90 90