From 4923fdfe8a01f361b76bd4c7d045184272d41ad5 Mon Sep 17 00:00:00 2001
From: Cuchaz
Date: Sun, 2 Aug 2015 15:47:27 -0400
Subject: fix up class matcher a bit

---
 src/cuchaz/enigma/convert/ClassIdentity.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/cuchaz/enigma/convert/ClassIdentity.java')

diff --git a/src/cuchaz/enigma/convert/ClassIdentity.java b/src/cuchaz/enigma/convert/ClassIdentity.java
index 2e164ae..d9ed08e 100644
--- a/src/cuchaz/enigma/convert/ClassIdentity.java
+++ b/src/cuchaz/enigma/convert/ClassIdentity.java
@@ -117,7 +117,7 @@ public class ClassIdentity {
 		
 		// stuff from the bytecode
 		
-		m_classEntry = new ClassEntry(Descriptor.toJvmName(c.getName()));
+		m_classEntry = EntryFactory.getClassEntry(c);
 		m_fields = HashMultiset.create();
 		for (CtField field : c.getDeclaredFields()) {
 			m_fields.add(scrubType(field.getSignature()));
@@ -180,7 +180,10 @@ public class ClassIdentity {
 			}
 		}
 		
-		m_outer = EntryFactory.getClassEntry(c).getOuterClassName();
+		m_outer = null;
+		if (m_classEntry.isInnerClass()) {
+			m_outer = m_classEntry.getOuterClassName();
+		}
 	}
 	
 	private void addReference(EntryReference<? extends Entry,BehaviorEntry> reference) {
@@ -460,7 +463,9 @@ public class ClassIdentity {
 	}
 	
 	private int getNumMatches(String a, String b) {
-		if (a.equals(b)) {
+		if (a == null && b == null) {
+			return 1;
+		} else if (a != null && b != null && a.equals(b)) {
 			return 1;
 		}
 		return 0;
-- 
cgit v1.2.3