From 064fe6a628f23f21eb2c8f584215f439e54cfaec Mon Sep 17 00:00:00 2001
From: jeff
Date: Wed, 24 Sep 2014 20:32:19 -0400
Subject: fixed in-jar detection for bridge-related methods

---
 src/cuchaz/enigma/mapping/BehaviorEntry.java       | 12 +++-
 .../enigma/mapping/BehaviorEntryFactory.java       | 76 ++++++++++++++++++++++
 src/cuchaz/enigma/mapping/MethodEntry.java         |  4 ++
 src/cuchaz/enigma/mapping/MethodMapping.java       |  5 ++
 4 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 src/cuchaz/enigma/mapping/BehaviorEntryFactory.java

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

diff --git a/src/cuchaz/enigma/mapping/BehaviorEntry.java b/src/cuchaz/enigma/mapping/BehaviorEntry.java
index 99fdd28..8fc4eaf 100644
--- a/src/cuchaz/enigma/mapping/BehaviorEntry.java
+++ b/src/cuchaz/enigma/mapping/BehaviorEntry.java
@@ -1,6 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Jeff Martin.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ * 
+ * Contributors:
+ *     Jeff Martin - initial API and implementation
+ ******************************************************************************/
 package cuchaz.enigma.mapping;
 
 public interface BehaviorEntry extends Entry
 {
-	public String getSignature();
+	String getSignature();
 }
diff --git a/src/cuchaz/enigma/mapping/BehaviorEntryFactory.java b/src/cuchaz/enigma/mapping/BehaviorEntryFactory.java
new file mode 100644
index 0000000..d3cfb93
--- /dev/null
+++ b/src/cuchaz/enigma/mapping/BehaviorEntryFactory.java
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Jeff Martin.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ * 
+ * Contributors:
+ *     Jeff Martin - initial API and implementation
+ ******************************************************************************/
+package cuchaz.enigma.mapping;
+
+import javassist.CtBehavior;
+import javassist.CtConstructor;
+import javassist.CtMethod;
+import javassist.bytecode.Descriptor;
+
+
+public class BehaviorEntryFactory
+{
+	public static BehaviorEntry create( String className, String name, String signature )
+	{
+		return create( new ClassEntry( className ), name, signature );
+	}
+	
+	public static BehaviorEntry create( ClassEntry classEntry, String name, String signature )
+	{
+		if( name.equals( "<init>" ) )
+		{
+			return new ConstructorEntry( classEntry, signature );
+		}
+		else if( name.equals( "<clinit>" ) )
+		{
+			return new ConstructorEntry( classEntry );
+		}
+		else
+		{
+			return new MethodEntry( classEntry, name, signature );
+		}
+	}
+	
+	public static BehaviorEntry create( CtBehavior behavior )
+	{
+		String className = Descriptor.toJvmName( behavior.getDeclaringClass().getName() );
+		if( behavior instanceof CtMethod )
+		{
+			return create( className, behavior.getName(), behavior.getSignature() );
+		}
+		else if( behavior instanceof CtConstructor )
+		{
+			CtConstructor constructor = (CtConstructor)behavior;
+			if( constructor.isClassInitializer() )
+			{
+				return create( className, "<clinit>", null );
+			}
+			else
+			{
+				return create( className, "<init>", constructor.getSignature() );
+			}
+		}
+		else
+		{
+			throw new IllegalArgumentException( "Unable to create BehaviorEntry from " + behavior );
+		}
+	}
+	
+	public static BehaviorEntry createObf( ClassEntry classEntry, MethodMapping methodMapping )
+	{
+		return create( classEntry, methodMapping.getObfName(), methodMapping.getObfSignature() );
+	}
+	
+	public static BehaviorEntry createDeobf( ClassEntry classEntry, MethodMapping methodMapping )
+	{
+		return create( classEntry, methodMapping.getDeobfName(), methodMapping.getObfSignature() );
+	}
+}
diff --git a/src/cuchaz/enigma/mapping/MethodEntry.java b/src/cuchaz/enigma/mapping/MethodEntry.java
index 8adbfe9..dbc1885 100644
--- a/src/cuchaz/enigma/mapping/MethodEntry.java
+++ b/src/cuchaz/enigma/mapping/MethodEntry.java
@@ -36,6 +36,10 @@ public class MethodEntry implements BehaviorEntry, Serializable
 		{
 			throw new IllegalArgumentException( "Method signature cannot be null!" );
 		}
+		if( name.startsWith( "<" ) )
+		{
+			throw new IllegalArgumentException( "Don't use MethodEntry for a constructor!" );
+		}
 		
 		m_classEntry = classEntry;
 		m_name = name;
diff --git a/src/cuchaz/enigma/mapping/MethodMapping.java b/src/cuchaz/enigma/mapping/MethodMapping.java
index 6210fd0..b076fa3 100644
--- a/src/cuchaz/enigma/mapping/MethodMapping.java
+++ b/src/cuchaz/enigma/mapping/MethodMapping.java
@@ -70,6 +70,11 @@ public class MethodMapping implements Serializable, Comparable<MethodMapping>
 		return m_arguments.values();
 	}
 	
+	public boolean isConstructor( )
+	{
+		return m_obfName.startsWith( "<" );
+	}
+	
 	public void addArgumentMapping( ArgumentMapping argumentMapping )
 	{
 		boolean wasAdded = m_arguments.put( argumentMapping.getIndex(), argumentMapping ) == null;
-- 
cgit v1.2.3