From 61eb14f65e73a9b3d0ea6eca6b04da804a4ff61b Mon Sep 17 00:00:00 2001
From: jeff
Date: Sun, 8 Mar 2015 13:49:44 -0400
Subject: lots of small tweaks and improvements

---
 src/cuchaz/enigma/convert/ClassIdentity.java | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'src/cuchaz/enigma/convert')

diff --git a/src/cuchaz/enigma/convert/ClassIdentity.java b/src/cuchaz/enigma/convert/ClassIdentity.java
index 3736a53..d07e0a4 100644
--- a/src/cuchaz/enigma/convert/ClassIdentity.java
+++ b/src/cuchaz/enigma/convert/ClassIdentity.java
@@ -69,6 +69,7 @@ public class ClassIdentity {
 	private Multiset<String> m_implements;
 	private Multiset<String> m_implementations;
 	private Multiset<String> m_references;
+	private String m_outer;
 
 	private final ClassNameReplacer m_classNameReplacer = new ClassNameReplacer() {
 		
@@ -167,6 +168,8 @@ public class ClassIdentity {
 				}
 			}
 		}
+		
+		m_outer = EntryFactory.getClassEntry(c).getOuterClassName();
 	}
 	
 	private void addReference(EntryReference<? extends Entry,BehaviorEntry> reference) {
@@ -234,6 +237,9 @@ public class ClassIdentity {
 			buf.append(reference);
 			buf.append("\n");
 		}
+		buf.append("\touter ");
+		buf.append(m_outer);
+		buf.append("\n");
 		return buf.toString();
 	}
 	
@@ -402,13 +408,15 @@ public class ClassIdentity {
 	}
 	
 	public int getMatchScore(ClassIdentity other) {
-		return getNumMatches(m_fields, other.m_fields) 
+		return 2*getNumMatches(m_extends, other.m_extends)
+			+ 2*getNumMatches(m_outer, other.m_outer)
+			+ getNumMatches(m_fields, other.m_fields)
 			+ getNumMatches(m_methods, other.m_methods)
 			+ getNumMatches(m_constructors, other.m_constructors);
 	}
 	
 	public int getMaxMatchScore() {
-		return m_fields.size() + m_methods.size() + m_constructors.size();
+		return 2 + 2 + m_fields.size() + m_methods.size() + m_constructors.size();
 	}
 	
 	public boolean matches(CtClass c) {
@@ -427,4 +435,11 @@ public class ClassIdentity {
 		}
 		return numMatches;
 	}
+	
+	private int getNumMatches(String a, String b) {
+		if (a.equals(b)) {
+			return 1;
+		}
+		return 0;
+	}
 }
-- 
cgit v1.2.3