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
---
 .../cuchaz/enigma/analysis/EntryReference.java     | 34 ++++++++++++----------
 1 file changed, 18 insertions(+), 16 deletions(-)

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

diff --git a/src/main/java/cuchaz/enigma/analysis/EntryReference.java b/src/main/java/cuchaz/enigma/analysis/EntryReference.java
index df36c23..e122210 100644
--- a/src/main/java/cuchaz/enigma/analysis/EntryReference.java
+++ b/src/main/java/cuchaz/enigma/analysis/EntryReference.java
@@ -11,15 +11,20 @@
 
 package cuchaz.enigma.analysis;
 
-import cuchaz.enigma.mapping.entry.ClassEntry;
-import cuchaz.enigma.mapping.entry.Entry;
-import cuchaz.enigma.mapping.entry.MethodEntry;
+import cuchaz.enigma.translation.Translatable;
+import cuchaz.enigma.translation.Translator;
+import cuchaz.enigma.translation.mapping.EntryMapping;
+import cuchaz.enigma.translation.mapping.EntryResolver;
+import cuchaz.enigma.translation.mapping.EntryMap;
+import cuchaz.enigma.translation.representation.entry.ClassEntry;
+import cuchaz.enigma.translation.representation.entry.Entry;
+import cuchaz.enigma.translation.representation.entry.MethodEntry;
 import cuchaz.enigma.utils.Utils;
 
 import java.util.Arrays;
 import java.util.List;
 
-public class EntryReference<E extends Entry, C extends Entry> {
+public class EntryReference<E extends Entry<?>, C extends Entry<?>> implements Translatable {
 
 	private static final List<String> CONSTRUCTOR_NON_NAMES = Arrays.asList("this", "super", "static");
 	public E entry;
@@ -53,32 +58,24 @@ public class EntryReference<E extends Entry, C extends Entry> {
 
 	public ClassEntry getLocationClassEntry() {
 		if (context != null) {
-			return context.getOwnerClassEntry();
+			return context.getContainingClass();
 		}
-		return entry.getOwnerClassEntry();
+		return entry.getContainingClass();
 	}
 
 	public boolean isNamed() {
 		return this.sourceName;
 	}
 
-	public Entry getNameableEntry() {
+	public Entry<?> getNameableEntry() {
 		if (entry instanceof MethodEntry && ((MethodEntry) entry).isConstructor()) {
 			// renaming a constructor really means renaming the class
-			return entry.getOwnerClassEntry();
+			return entry.getContainingClass();
 		}
 		return entry;
 	}
 
 	public String getNameableName() {
-		if (getNameableEntry() instanceof ClassEntry) {
-			ClassEntry classEntry = (ClassEntry) getNameableEntry();
-			if (classEntry.isInnerClass()) {
-				// make sure we only rename the inner class name
-				return classEntry.getInnermostClassName();
-			}
-		}
-
 		return getNameableEntry().getName();
 	}
 
@@ -121,4 +118,9 @@ public class EntryReference<E extends Entry, C extends Entry> {
 		}
 		return buf.toString();
 	}
+
+	@Override
+	public Translatable translate(Translator translator, EntryResolver resolver, EntryMap<EntryMapping> mappings) {
+		return new EntryReference<>(translator.translate(entry), translator.translate(context), this);
+	}
 }
-- 
cgit v1.2.3