From 2b2249e873c4adfd2dd6e8f1f2489ccd9f6aa021 Mon Sep 17 00:00:00 2001
From: gegy1000
Date: Sat, 19 May 2018 17:02:46 +0200
Subject: Initial port to ASM

---
 src/main/java/cuchaz/enigma/analysis/EntryReference.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 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 3761fca..b972585 100644
--- a/src/main/java/cuchaz/enigma/analysis/EntryReference.java
+++ b/src/main/java/cuchaz/enigma/analysis/EntryReference.java
@@ -12,8 +12,8 @@
 package cuchaz.enigma.analysis;
 
 import cuchaz.enigma.mapping.ClassEntry;
-import cuchaz.enigma.mapping.ConstructorEntry;
 import cuchaz.enigma.mapping.Entry;
+import cuchaz.enigma.mapping.MethodEntry;
 import cuchaz.enigma.utils.Utils;
 
 import java.util.Arrays;
@@ -21,7 +21,7 @@ import java.util.List;
 
 public class EntryReference<E extends Entry, C extends Entry> {
 
-	private static final List<String> ConstructorNonNames = Arrays.asList("this", "super", "static");
+	private static final List<String> CONSTRUCTOR_NON_NAMES = Arrays.asList("this", "super", "static");
 	public E entry;
 	public C context;
 
@@ -40,7 +40,7 @@ public class EntryReference<E extends Entry, C extends Entry> {
 		this.context = context;
 
 		this.sourceName = sourceName != null && !sourceName.isEmpty();
-		if (entry instanceof ConstructorEntry && ConstructorNonNames.contains(sourceName)) {
+		if (entry instanceof MethodEntry && ((MethodEntry) entry).isConstructor() && CONSTRUCTOR_NON_NAMES.contains(sourceName)) {
 			this.sourceName = false;
 		}
 	}
@@ -53,9 +53,9 @@ public class EntryReference<E extends Entry, C extends Entry> {
 
 	public ClassEntry getLocationClassEntry() {
 		if (context != null) {
-			return context.getClassEntry();
+			return context.getOwnerClassEntry();
 		}
-		return entry.getClassEntry();
+		return entry.getOwnerClassEntry();
 	}
 
 	public boolean isNamed() {
@@ -63,9 +63,9 @@ public class EntryReference<E extends Entry, C extends Entry> {
 	}
 
 	public Entry getNameableEntry() {
-		if (entry instanceof ConstructorEntry) {
+		if (entry instanceof MethodEntry && ((MethodEntry) entry).isConstructor()) {
 			// renaming a constructor really means renaming the class
-			return entry.getClassEntry();
+			return entry.getOwnerClassEntry();
 		}
 		return entry;
 	}
-- 
cgit v1.2.3


From 406b9a89318473571d27de60b8aa1b51f84af245 Mon Sep 17 00:00:00 2001
From: gegy1000
Date: Sat, 19 May 2018 17:06:26 +0200
Subject: Package updates

---
 src/main/java/cuchaz/enigma/analysis/EntryReference.java | 6 +++---
 1 file changed, 3 insertions(+), 3 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 b972585..101729d 100644
--- a/src/main/java/cuchaz/enigma/analysis/EntryReference.java
+++ b/src/main/java/cuchaz/enigma/analysis/EntryReference.java
@@ -11,9 +11,9 @@
 
 package cuchaz.enigma.analysis;
 
-import cuchaz.enigma.mapping.ClassEntry;
-import cuchaz.enigma.mapping.Entry;
-import cuchaz.enigma.mapping.MethodEntry;
+import cuchaz.enigma.mapping.entry.ClassEntry;
+import cuchaz.enigma.mapping.entry.Entry;
+import cuchaz.enigma.mapping.entry.MethodEntry;
 import cuchaz.enigma.utils.Utils;
 
 import java.util.Arrays;
-- 
cgit v1.2.3