From 31a1a418b04cd3e7b06cb50cb8674a2c25079f6c Mon Sep 17 00:00:00 2001
From: jeff
Date: Sun, 8 Feb 2015 23:10:26 -0500
Subject: added types to fields

---
 src/cuchaz/enigma/mapping/FieldMapping.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/cuchaz/enigma/mapping/FieldMapping.java')

diff --git a/src/cuchaz/enigma/mapping/FieldMapping.java b/src/cuchaz/enigma/mapping/FieldMapping.java
index 5f5c270..14b20dd 100644
--- a/src/cuchaz/enigma/mapping/FieldMapping.java
+++ b/src/cuchaz/enigma/mapping/FieldMapping.java
@@ -18,10 +18,12 @@ public class FieldMapping implements Serializable, Comparable<FieldMapping> {
 	
 	private String m_obfName;
 	private String m_deobfName;
+	private Type m_obfType;
 	
-	public FieldMapping(String obfName, String deobfName) {
+	public FieldMapping(String obfName, Type obfType, String deobfName) {
 		m_obfName = obfName;
 		m_deobfName = NameValidator.validateFieldName(deobfName);
+		m_obfType = obfType;
 	}
 	
 	public String getObfName() {
@@ -36,8 +38,12 @@ public class FieldMapping implements Serializable, Comparable<FieldMapping> {
 		m_deobfName = NameValidator.validateFieldName(val);
 	}
 	
+	public Type getObfType() {
+		return m_obfType;
+	}
+	
 	@Override
 	public int compareTo(FieldMapping other) {
-		return m_obfName.compareTo(other.m_obfName);
+		return (m_obfName + m_obfType).compareTo(other.m_obfName + other.m_obfType);
 	}
 }
-- 
cgit v1.2.3