From 00fcd0550fcdda621c2e4662f6ddd55ce673b931 Mon Sep 17 00:00:00 2001
From: Gegy
Date: Thu, 24 Jan 2019 14:48:32 +0200
Subject: [WIP] Mapping rework (#91)

* Move packages

* Mapping & entry refactor: first pass

* Fix deobf -> obf tree remapping

* Resolve various issues

* Give all entries the potential for parents and treat inner classes as children

* Deobf UI tree elements

* Tests pass

* Sort mapping output

* Fix delta tracking

* Index separation and first pass for #97

* Keep track of remapped jar index

* Fix child entries not being remapped

* Drop non-root entries

* Track dropped mappings

* Fix enigma mapping ordering

* EntryTreeNode interface

* Small tweaks

* Naive full index remap on rename

* Entries can resolve to more than one root entry

* Support alternative resolution strategies

* Bridge method resolution

* Tests pass

* Fix mappings being used where there are none

* Fix methods with different descriptors being considered unique. closes #89
---
 src/test/java/cuchaz/enigma/TestDeobfed.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/test/java/cuchaz/enigma/TestDeobfed.java')

diff --git a/src/test/java/cuchaz/enigma/TestDeobfed.java b/src/test/java/cuchaz/enigma/TestDeobfed.java
index 9babf1e..25cb60c 100644
--- a/src/test/java/cuchaz/enigma/TestDeobfed.java
+++ b/src/test/java/cuchaz/enigma/TestDeobfed.java
@@ -11,9 +11,8 @@
 
 package cuchaz.enigma;
 
-import cuchaz.enigma.analysis.JarIndex;
 import cuchaz.enigma.analysis.ParsedJar;
-import cuchaz.enigma.mapping.entry.ReferencedEntryPool;
+import cuchaz.enigma.analysis.index.JarIndex;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -32,13 +31,13 @@ public class TestDeobfed {
 	public static void beforeClass()
 		throws Exception {
 		jar = new ParsedJar(new JarFile("build/test-deobf/translation.jar"));
-		index = new JarIndex(new ReferencedEntryPool());
-		index.indexJar(jar, true);
+		index = JarIndex.empty();
+		index.indexJar(jar, s -> {});
 	}
 
 	@Test
 	public void obfEntries() {
-		assertThat(index.getObfClassEntries(), containsInAnyOrder(
+		assertThat(index.getEntryIndex().getClasses(), containsInAnyOrder(
 			newClass("cuchaz/enigma/inputs/Keep"),
 			newClass("a"),
 			newClass("b"),
-- 
cgit v1.2.3