From 882da155cab9f01348ae06a4e31cabaa43887acd Mon Sep 17 00:00:00 2001
From: Kevin Glynn <kevin.glynn@twigletsoftware.com>
Date: Tue, 19 Jul 2011 11:04:08 +0200
Subject: [PATCH] Closes #20; Build lists from IEnumerables

---
 .../System/Collections/ArrayList.xml          |  2 +-
 .../System/Collections/Generic/List'1.xml     | 10 +++--
 .../Generic/GenArrayListSupport.java          | 37 +++++++++++++++++++
 CSharpTranslator/tests/Tester/Main.cs         |  4 +-
 CSharpTranslator/tests/Tester/Misc/Misc.cs    |  8 ++++
 .../tests/Tester/Misc/RenameTest.cs           | 25 +++++++++++++
 .../tests/Tester/Misc/newmodifier.cs          | 30 +++++++++++++++
 CSharpTranslator/tests/Tester/Tester.csproj   |  2 +
 8 files changed, 112 insertions(+), 6 deletions(-)
 create mode 100755 CS2JLibrary/src/CS2JNet/System/Collections/Generic/GenArrayListSupport.java
 create mode 100644 CSharpTranslator/tests/Tester/Misc/RenameTest.cs
 create mode 100644 CSharpTranslator/tests/Tester/Misc/newmodifier.cs

diff --git a/CS2JLibrary/NetFramework/System/Collections/ArrayList.xml b/CS2JLibrary/NetFramework/System/Collections/ArrayList.xml
index 63575d7..26a70ab 100644
--- a/CS2JLibrary/NetFramework/System/Collections/ArrayList.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/ArrayList.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
diff --git a/CS2JLibrary/NetFramework/System/Collections/Generic/List'1.xml b/CS2JLibrary/NetFramework/System/Collections/Generic/List'1.xml
index 32fd845..950ac6b 100644
--- a/CS2JLibrary/NetFramework/System/Collections/Generic/List'1.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/Generic/List'1.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -192,11 +192,13 @@
       </Params>
     </Constructor>
     <Constructor>
-      <Imports />
-      <Java>new ArrayList*[${T}]*(${collection})</Java>
+      <Imports>
+        <Import>CS2JNet.System.Collections.Generic.GenArrayListSupport</Import>
+      </Imports>
+      <Java>GenArrayListSupport.*[${T}]*toList(${collection})</Java>
       <Params>
         <Param>
-          <Type>System.IEnumerable[T]</Type>
+          <Type>System.Collections.Generic.IEnumerable*[T]*</Type>
           <Name>collection</Name>
         </Param>
       </Params>
diff --git a/CS2JLibrary/src/CS2JNet/System/Collections/Generic/GenArrayListSupport.java b/CS2JLibrary/src/CS2JNet/System/Collections/Generic/GenArrayListSupport.java
new file mode 100755
index 0000000..377cccf
--- /dev/null
+++ b/CS2JLibrary/src/CS2JNet/System/Collections/Generic/GenArrayListSupport.java
@@ -0,0 +1,37 @@
+/*
+   Copyright 2007,2008,2009,2010 Rustici Software, LLC
+   Copyright 2010,2011 Kevin Glynn (kevin.glynn@twigletsoftware.com)
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+   Author(s):
+
+   Kevin Glynn (kevin.glynn@twigletsoftware.com)
+*/
+
+package CS2JNet.System.Collections.Generic;
+
+import java.util.*;
+
+public class GenArrayListSupport<T> {
+
+	
+	public static <T> ArrayList<T> toList(Iterable<T> iter)
+	{
+		ArrayList<T> ret = new ArrayList<T>();
+		for (T o : iter) {
+			ret.add(o);
+		}
+		return ret;
+	}
+}
\ No newline at end of file
diff --git a/CSharpTranslator/tests/Tester/Main.cs b/CSharpTranslator/tests/Tester/Main.cs
index f52d620..bffa301 100644
--- a/CSharpTranslator/tests/Tester/Main.cs
+++ b/CSharpTranslator/tests/Tester/Main.cs
@@ -6,7 +6,7 @@ namespace Tester
 		public static void Main (string[] args)
 		{
 			
-			Tester.DelegateUser.DelegateTest<int>.DelMain(args);
+			//Tester.DelegateUser.DelegateTest<int>.DelMain(args);
 			
 			//Tester.RefOut.RefOutTest.RefOutMain(args);
 
@@ -14,6 +14,8 @@ namespace Tester
 			
 			//Tester.Delegates.EventHandler.Sample.EHMain();
 			
+			Tester.Misc.RenameTest.RNMain("hello world");
+			
 		}
 	}
 }
diff --git a/CSharpTranslator/tests/Tester/Misc/Misc.cs b/CSharpTranslator/tests/Tester/Misc/Misc.cs
index 0a3030c..99b3981 100644
--- a/CSharpTranslator/tests/Tester/Misc/Misc.cs
+++ b/CSharpTranslator/tests/Tester/Misc/Misc.cs
@@ -1,12 +1,20 @@
 using System;
+using System.Collections.Generic;
 namespace Tester.Misc
 {
+	
    public class Misc
    {
       public Misc ()
       {
       }
 		
+				
+	  public void GroupConfiguration(IEnumerable<Misc> groups)
+	  {
+		 IList<Misc> Groups = new List<Misc>(groups);
+	  }
+		
       private int TestProperty
       {
          get;set;
diff --git a/CSharpTranslator/tests/Tester/Misc/RenameTest.cs b/CSharpTranslator/tests/Tester/Misc/RenameTest.cs
new file mode 100644
index 0000000..dc702b1
--- /dev/null
+++ b/CSharpTranslator/tests/Tester/Misc/RenameTest.cs
@@ -0,0 +1,25 @@
+using System;
+namespace Tester.Misc
+{
+	public class RenameTest
+	{
+		public RenameTest ()
+		{
+		}
+		
+		public string AMethod(object x) {
+			return "AMethod has arg " + x.ToString();
+		}
+
+		public string aMethod(string s) {
+			return "aMethod has string arg \"" + s + "\"";
+		}
+
+		public static void RNMain(string arg) {
+			RenameTest rnObj = new RenameTest();
+			Console.Out.WriteLine(rnObj.AMethod(arg));
+		}	
+	}
+	
+}
+
diff --git a/CSharpTranslator/tests/Tester/Misc/newmodifier.cs b/CSharpTranslator/tests/Tester/Misc/newmodifier.cs
new file mode 100644
index 0000000..b9a8c62
--- /dev/null
+++ b/CSharpTranslator/tests/Tester/Misc/newmodifier.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace Tester.NewModifier
+{
+class B {
+       public virtual void foo() {
+               Console.WriteLine("B:foo");
+       }
+}
+class D : B {
+       public new void foo() {
+               Console.WriteLine("D:foo");
+       }
+}
+
+public class Test5 {
+       public static void T5Main(){
+               B b = new D();
+               b.foo();
+               Console.WriteLine("Done");
+       }
+}
+/*
+Output:
+B:foo
+*/
+}
diff --git a/CSharpTranslator/tests/Tester/Tester.csproj b/CSharpTranslator/tests/Tester/Tester.csproj
index 22c8322..83474a2 100644
--- a/CSharpTranslator/tests/Tester/Tester.csproj
+++ b/CSharpTranslator/tests/Tester/Tester.csproj
@@ -56,6 +56,8 @@
     <Compile Include="Misc\Misc.cs" />
     <Compile Include="Delegates\DelegateUser.cs" />
     <Compile Include="Delegates\EventHandler.cs" />
+    <Compile Include="Misc\RenameTest.cs" />
+    <Compile Include="Misc\newmodifier.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>