From d7298e12b5aae9ad7c5796d7b54f52f5a280b353 Mon Sep 17 00:00:00 2001
From: Kevin Glynn <kevin.glynn@twigletsoftware.com>
Date: Mon, 31 Jan 2011 16:29:14 +0100
Subject: [PATCH] create arraylists from arrays, fix java type corresponding to
 NumberFormatInfo and NumberStyles

---
 .../System/Collections/ArrayList.xml          | 22 +++++++++++++++----
 .../System/Globalization/NumberFormatInfo.xml |  6 +++--
 .../System/Globalization/NumberStyles.xml     |  2 +-
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/CS2JLibrary/NetFramework/System/Collections/ArrayList.xml b/CS2JLibrary/NetFramework/System/Collections/ArrayList.xml
index 3432e69..28a6ae4 100644
--- a/CS2JLibrary/NetFramework/System/Collections/ArrayList.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/ArrayList.xml
@@ -24,11 +24,13 @@
       <Return>System.Int32</Return>
     </Method>
     <Method>
-      <Imports />
-      <Java>${this}.addAll(${arg})</Java>
+      <Imports>
+        <Import>java.util.Arrays</Import>
+      </Imports>
+      <Java>${this}.addAll(Arrays.asList(${arg}))</Java>
       <Params>
         <Param>
-          <Type>System.Collections.ICollection</Type>
+          <Type>System.Object[]</Type>
           <Name>arg</Name>
         </Param>
       </Params>
@@ -40,7 +42,7 @@
       <Java>${this}.addAll(${arg})</Java>
       <Params>
         <Param>
-          <Type>System.Array</Type>
+          <Type>System.Collections.ICollection</Type>
           <Name>arg</Name>
         </Param>
       </Params>
@@ -169,6 +171,18 @@
         </Param>
       </Params>
     </Constructor>
+    <Constructor>
+      <Imports>
+        <Import>java.util.Arrays</Import>
+      </Imports>
+      <Java>new ArrayList(Arrays.asList(${collection}))</Java>
+      <Params>
+        <Param>
+          <Type>System.Object[]</Type>
+          <Name>collection</Name>
+        </Param>
+      </Params>
+    </Constructor>
     <Constructor>
       <Imports />
       <Java>new ArrayList(${collection})</Java>
diff --git a/CS2JLibrary/NetFramework/System/Globalization/NumberFormatInfo.xml b/CS2JLibrary/NetFramework/System/Globalization/NumberFormatInfo.xml
index b1378d7..750bbc9 100644
--- a/CS2JLibrary/NetFramework/System/Globalization/NumberFormatInfo.xml
+++ b/CS2JLibrary/NetFramework/System/Globalization/NumberFormatInfo.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
-  <Imports />
-  <Java>NumberFormatInfo</Java>
+  <Imports>
+    <Import>java.util.Locale</Import>
+  </Imports>
+  <Java>Locale</Java>
   <Name>System.Globalization.NumberFormatInfo</Name>
   <Uses />
   <Inherits>
diff --git a/CS2JLibrary/NetFramework/System/Globalization/NumberStyles.xml b/CS2JLibrary/NetFramework/System/Globalization/NumberStyles.xml
index 8e3894d..536954c 100644
--- a/CS2JLibrary/NetFramework/System/Globalization/NumberStyles.xml
+++ b/CS2JLibrary/NetFramework/System/Globalization/NumberStyles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
   <Imports />
-  <Java>NumberStyles</Java>
+  <Java>int</Java>
   <Name>System.Globalization.NumberStyles</Name>
   <Uses />
   <Inherits> <Type>System.Object</Type> </Inherits>