From 7ec433f1ecc5b44f8b690c7443d5e38ac0e6422d Mon Sep 17 00:00:00 2001
From: gegy1000
Date: Fri, 22 Jun 2018 22:29:41 +0200
Subject: Resolve all failed tests

---
 src/main/java/cuchaz/enigma/analysis/JarIndex.java         | 3 +--
 src/main/java/cuchaz/enigma/analysis/TranslationIndex.java | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/main/java/cuchaz/enigma/analysis')

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 {
 
 	public void indexInnerClass(ClassEntry innerEntry, ClassEntry outerEntry) {
 		this.innerClassesByOuter.put(outerEntry, innerEntry);
-		boolean innerWasAdded = this.outerClassesByInner.put(innerEntry, outerEntry) == null;
-		assert (innerWasAdded);
+		this.outerClassesByInner.putIfAbsent(innerEntry, outerEntry);
 	}
 
 	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 {
 
 		// add the superclass
 		ClassEntry superclassEntry = entryPool.getClass(superName);
-		if (!isJre(superclassEntry)) {
+		if (superclassEntry != null) {
 			this.superclasses.put(classEntry, superclassEntry);
 		}
 
-- 
cgit v1.2.3