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/TestTranslator.java | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

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

diff --git a/src/test/java/cuchaz/enigma/TestTranslator.java b/src/test/java/cuchaz/enigma/TestTranslator.java
index 9b6eb91..b978129 100644
--- a/src/test/java/cuchaz/enigma/TestTranslator.java
+++ b/src/test/java/cuchaz/enigma/TestTranslator.java
@@ -11,23 +11,14 @@
 
 package cuchaz.enigma;
 
-import cuchaz.enigma.mapping.entry.Entry;
-import cuchaz.enigma.mapping.Mappings;
-import cuchaz.enigma.mapping.Translator;
+import cuchaz.enigma.translation.representation.entry.Entry;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import static cuchaz.enigma.TestEntryFactory.newClass;
-import static cuchaz.enigma.TestEntryFactory.newField;
-import static cuchaz.enigma.TestEntryFactory.newMethod;
+import static cuchaz.enigma.TestEntryFactory.*;
 
 public class TestTranslator {
 
-	private static Deobfuscator deobfuscator;
-	private static Mappings mappings;
-	private static Translator deobfTranslator;
-	private static Translator obfTranslator;
-
 	@BeforeClass
 	public static void beforeClass()
 		throws Exception {
@@ -147,7 +138,7 @@ public class TestTranslator {
 		assertMapping(newMethod("i$b", "a", "()Ljava/lang/Object;"), newMethod("deobf/I_Generics$B_Generic", "m1", "()Ljava/lang/Object;"));
 	}
 
-	private void assertMapping(Entry obf, Entry deobf) {
+	private void assertMapping(Entry<?> obf, Entry<?> deobf) {
 		//assertThat(deobfTranslator.translateEntry(obf), is(deobf));
 		//assertThat(obfTranslator.translateEntry(deobf), is(obf));
 
-- 
cgit v1.2.3