From 2c5e4afa3b6b063b225f521e6a205c106a46938c Mon Sep 17 00:00:00 2001
From: Kevin Glynn <kevin.glynn@twigletsoftware.com>
Date: Tue, 10 Apr 2012 14:45:01 +0200
Subject: [PATCH] sync from RS: Add better enum parsing

---
 CS2JLibrary/NetFramework/System/Enum.xml      | 28 +++++++++++++++++--
 .../src/CS2JNet/System/EnumSupport.java       | 18 ++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/CS2JLibrary/NetFramework/System/Enum.xml b/CS2JLibrary/NetFramework/System/Enum.xml
index 14d3680..84cb439 100644
--- a/CS2JLibrary/NetFramework/System/Enum.xml
+++ b/CS2JLibrary/NetFramework/System/Enum.xml
@@ -49,8 +49,10 @@
       <Return>System.String</Return>
     </Method>
     <Method>
-      <Imports />
-      <Java>Enum.valueOf((Class*[? extends Enum]*)${enumType:15}, ${value})</Java>
+      <Imports>
+        <Import>CS2JNet.System.EnumSupport</Import>
+      </Imports>
+      <Java>EnumSupport.Parse((Class*[? extends Enum]*)${enumType:15}, ${value})</Java>
       <Params>
         <Param>
           <Type>System.Type</Type>
@@ -64,6 +66,28 @@
       <Name>Parse</Name>
       <Return>System.Object</Return>
     </Method>
+    <Method>
+      <Imports>
+        <Import>CS2JNet.System.EnumSupport</Import>
+      </Imports>
+      <Java>EnumSupport.Parse((Class*[? extends Enum]*)${enumType:15}, ${value}, ${ignoreCase})</Java>
+      <Params>
+        <Param>
+          <Type>System.Type</Type>
+          <Name>enumType</Name>
+        </Param>
+        <Param>
+          <Type>System.String</Type>
+          <Name>value</Name>
+        </Param>
+        <Param>
+          <Type>System.Boolean</Type>
+          <Name>ignoreCase</Name>
+        </Param>
+      </Params>
+      <Name>Parse</Name>
+      <Return>System.Object</Return>
+    </Method>
   </Methods>
   <Properties />
   <Events />
diff --git a/CS2JLibrary/src/CS2JNet/System/EnumSupport.java b/CS2JLibrary/src/CS2JNet/System/EnumSupport.java
index 15698a4..5f9949f 100755
--- a/CS2JLibrary/src/CS2JNet/System/EnumSupport.java
+++ b/CS2JLibrary/src/CS2JNet/System/EnumSupport.java
@@ -40,5 +40,23 @@ public class EnumSupport {
 			return e.name();
 		}
 		
+	}
+	
+	public static Object Parse(Class<? extends Enum> enumClass, String name) throws IllegalArgumentException {
+		return Parse(enumClass, name, false);
+	}
+	
+	public static Object Parse(Class<? extends Enum> enumClass, String name, boolean ignoreCase) throws IllegalArgumentException {
+		if(!ignoreCase){
+			return Enum.valueOf(enumClass, name);
+		}
+		
+		Enum[] vals = enumClass.getEnumConstants();
+		for(Enum val : vals){
+			if(val.toString().equalsIgnoreCase(name)){
+				return val;
+			}
+		}
+		throw new IllegalArgumentException(name + " is not a valid " + enumClass.getName());
 	}
 }