From 1faf3bee250f75d8c13708ab875a881a5b9cb6ed Mon Sep 17 00:00:00 2001
From: jeff
Date: Wed, 3 Sep 2014 23:56:11 -0400
Subject: removed deobfuscated method signatures from mappings

They're too much work to maintain, and they're totally unnecessary!
---
 src/cuchaz/enigma/mapping/MethodMapping.java | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

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

diff --git a/src/cuchaz/enigma/mapping/MethodMapping.java b/src/cuchaz/enigma/mapping/MethodMapping.java
index e59cb2e..6210fd0 100644
--- a/src/cuchaz/enigma/mapping/MethodMapping.java
+++ b/src/cuchaz/enigma/mapping/MethodMapping.java
@@ -23,20 +23,26 @@ public class MethodMapping implements Serializable, Comparable<MethodMapping>
 	private String m_obfName;
 	private String m_deobfName;
 	private String m_obfSignature;
-	private String m_deobfSignature;
 	private Map<Integer,ArgumentMapping> m_arguments;
 	
 	public MethodMapping( String obfName, String obfSignature )
 	{
-		this( obfName, obfSignature, null, null );
+		this( obfName, obfSignature, null );
 	}
 	
-	public MethodMapping( String obfName, String obfSignature, String deobfName, String deobfSignature )
+	public MethodMapping( String obfName, String obfSignature, String deobfName )
 	{
+		if( obfName == null )
+		{
+			throw new IllegalArgumentException( "obf name cannot be null!" );
+		}
+		if( obfSignature == null )
+		{
+			throw new IllegalArgumentException( "obf signature cannot be null!" );
+		}
 		m_obfName = obfName;
 		m_deobfName = NameValidator.validateMethodName( deobfName );
 		m_obfSignature = obfSignature;
-		m_deobfSignature = deobfSignature;
 		m_arguments = new TreeMap<Integer,ArgumentMapping>();
 	}
 
@@ -59,15 +65,6 @@ public class MethodMapping implements Serializable, Comparable<MethodMapping>
 		return m_obfSignature;
 	}
 	
-	public String getDeobfSignature( )
-	{
-		return m_deobfSignature;
-	}
-	public void setDeobfSignature( String val )
-	{
-		m_deobfSignature = val;
-	}
-	
 	public Iterable<ArgumentMapping> arguments( )
 	{
 		return m_arguments.values();
@@ -127,8 +124,6 @@ public class MethodMapping implements Serializable, Comparable<MethodMapping>
 		buf.append( "\n" );
 		buf.append( "\t" );
 		buf.append( m_obfSignature );
-		buf.append( " <-> " );
-		buf.append( m_deobfSignature );
 		buf.append( "\n" );
 		buf.append( "\tArguments:\n" );
 		for( ArgumentMapping argumentMapping : m_arguments.values() )
@@ -145,7 +140,7 @@ public class MethodMapping implements Serializable, Comparable<MethodMapping>
 	@Override
 	public int compareTo( MethodMapping other )
 	{
-		return ( m_obfName + m_obfSignature ).compareTo( ( other.m_obfName + other.m_obfSignature ) );
+		return ( m_obfName + m_obfSignature ).compareTo( other.m_obfName + other.m_obfSignature );
 	}
 
 	public boolean renameObfClass( final String oldObfClassName, final String newObfClassName )
-- 
cgit v1.2.3