From 237b2ed2a6b6f537cdbdf9fc9c6d0c7743f34375 Mon Sep 17 00:00:00 2001
From: jeff
Date: Thu, 21 Aug 2014 01:10:37 -0400
Subject: fixed call graph searching added system to navigate multiple tokens
 for the same entry in a behavior

---
 src/cuchaz/enigma/mapping/Translator.java | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

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

diff --git a/src/cuchaz/enigma/mapping/Translator.java b/src/cuchaz/enigma/mapping/Translator.java
index e34c31b..a671c27 100644
--- a/src/cuchaz/enigma/mapping/Translator.java
+++ b/src/cuchaz/enigma/mapping/Translator.java
@@ -30,27 +30,28 @@ public class Translator
 		m_ancestries = ancestries;
 	}
 	
-	public Entry translateEntry( Entry entry )
+	@SuppressWarnings( "unchecked" )
+	public <T extends Entry> T translateEntry( T entry )
 	{
 		if( entry instanceof ClassEntry )
 		{
-			return translateEntry( (ClassEntry)entry );
+			return (T)translateEntry( (ClassEntry)entry );
 		}
 		else if( entry instanceof FieldEntry )
 		{
-			return translateEntry( (FieldEntry)entry );
+			return (T)translateEntry( (FieldEntry)entry );
 		}
 		else if( entry instanceof MethodEntry )
 		{
-			return translateEntry( (MethodEntry)entry );
+			return (T)translateEntry( (MethodEntry)entry );
 		}
 		else if( entry instanceof ConstructorEntry )
 		{
-			return translateEntry( (ConstructorEntry)entry );
+			return (T)translateEntry( (ConstructorEntry)entry );
 		}
 		else if( entry instanceof ArgumentEntry )
 		{
-			return translateEntry( (ArgumentEntry)entry );
+			return (T)translateEntry( (ArgumentEntry)entry );
 		}
 		else
 		{
@@ -194,10 +195,17 @@ public class Translator
 	
 	public ConstructorEntry translateEntry( ConstructorEntry in )
 	{
-		return new ConstructorEntry(
-			translateEntry( in.getClassEntry() ),
-			translateSignature( in.getSignature() )
-		);
+		if( in.isStatic() )
+		{
+			return new ConstructorEntry( translateEntry( in.getClassEntry() ) );
+		}
+		else
+		{
+			return new ConstructorEntry(
+				translateEntry( in.getClassEntry() ),
+				translateSignature( in.getSignature() )
+			);
+		}
 	}
 	
 	public BehaviorEntry translateEntry( BehaviorEntry in )
-- 
cgit v1.2.3