From 2b2b82b2ff6a7907fc5209f4ea6e1c072eb9c28e Mon Sep 17 00:00:00 2001
From: jeff
Date: Wed, 24 Sep 2014 23:02:07 -0400
Subject: changed warnings for mappings migration

---
 src/cuchaz/enigma/mapping/MappingsRenamer.java | 28 ++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/cuchaz/enigma/mapping/MappingsRenamer.java b/src/cuchaz/enigma/mapping/MappingsRenamer.java
index dcceefbd..182bbd19 100644
--- a/src/cuchaz/enigma/mapping/MappingsRenamer.java
+++ b/src/cuchaz/enigma/mapping/MappingsRenamer.java
@@ -123,11 +123,17 @@ public class MappingsRenamer
 	{
 		classMapping.removeFieldMapping( fieldMapping );
 		ClassMapping targetClassMapping = getOrCreateClassMapping( obfClass );
-		if( !targetClassMapping.containsObfField( fieldMapping.getObfName() )
-			&& !targetClassMapping.containsDeobfField( fieldMapping.getDeobfName() ) )
+		if( !targetClassMapping.containsObfField( fieldMapping.getObfName() ) )
 		{
-			targetClassMapping.addFieldMapping( fieldMapping );
-			return true;
+			if( !targetClassMapping.containsDeobfField( fieldMapping.getDeobfName() ) )
+			{
+				targetClassMapping.addFieldMapping( fieldMapping );
+				return true;
+			}
+			else
+			{
+				System.err.println( "WARNING: deobf field was already there: " + obfClass + "." + fieldMapping.getDeobfName() );
+			}
 		}
 		return false;
 	}
@@ -136,11 +142,17 @@ public class MappingsRenamer
 	{
 		classMapping.removeMethodMapping( methodMapping );
 		ClassMapping targetClassMapping = getOrCreateClassMapping( obfClass );
-		if( !targetClassMapping.containsObfMethod( methodMapping.getObfName(), methodMapping.getObfSignature() )
-			&& !targetClassMapping.containsDeobfMethod( methodMapping.getDeobfName(), methodMapping.getObfSignature() ) )
+		if( !targetClassMapping.containsObfMethod( methodMapping.getObfName(), methodMapping.getObfSignature() ) )
 		{
-			targetClassMapping.addMethodMapping( methodMapping );
-			return true;
+			if( !targetClassMapping.containsDeobfMethod( methodMapping.getDeobfName(), methodMapping.getObfSignature() ) )
+			{
+				targetClassMapping.addMethodMapping( methodMapping );
+				return true;
+			}
+			else
+			{
+				System.err.println( "WARNING: deobf method was already there: " + obfClass + "." + methodMapping.getDeobfName() + methodMapping.getObfSignature() );
+			}
 		}
 		return false;
 	}
-- 
cgit v1.2.3