Add CollectionSupport class to turn a java collection into a c# collection

CS2JLibrary/NetFramework/System/Collections/Generic/Dictionary'2.xml

@@ -98,10 +98,12 @@
       <Get>${this:16}.size()</Get>
     </Property>
     <Property>
-      <Imports />
+      <Imports>
+        <Import>CS2JNet.JavaSupport.Collections.Generic.CollectionSupport</Import>
+      </Imports>
       <Type>System.Collections.Generic.KeyCollection*[K]*</Type>
       <Name>Keys</Name>
-      <Get>${this:16}.keySet()</Get>
+      <Get>CollectionSupport.mk(${this:16}.keySet())</Get>
     </Property>
   </Properties>
   <Events />

CS2JLibrary/NetFramework/System/Collections/Generic/IDictionary'2.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -86,10 +86,12 @@
   </Indexers>
   <Properties>
     <Property>
-      <Imports />
+      <Imports>
+        <Import>CS2JNet.JavaSupport.Collections.Generic.CollectionSupport</Import>
+      </Imports>
       <Type>System.Collections.Generic.ICollection*[K]*</Type>
       <Name>Keys</Name>
-      <Get>${this:16}.keySet()</Get>
+      <Get>CollectionSupport.mk(${this:16}.keySet())</Get>
     </Property>
     <Property>
       <Imports />

CS2JLibrary/NetFramework/System/Collections/Generic/KeyCollection'1.xml

@@ -9,8 +9,9 @@
 -->
 <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>
+     <Import>CS2JNet.JavaSupport.Collections.Generic.CollectionSupport</Import>
   </Imports>
-  <Java>Set*[${T}]*</Java>
+  <Java>CollectionSupport*[${T}]*</Java>
   <!-- Actually: System.Collections.Generic.Dictionary<TKey, TValue>.KeyCollection -->
   <Name>System.Collections.Generic.KeyCollection</Name>
   <TypeParams>
@@ -28,7 +29,7 @@
       <Imports>
         <Import>CS2JNet.System.Collections.Generic.KeyCollectionSupport</Import>
       </Imports>
-      <Java>KeyCollectionSupport.CopyTo(${this}, ${array}, ${index})</Java>
+      <Java>${this:16}.CopyTo(${array}, ${index})</Java>
       <Params>
         <Param>
           <Type>T[]</Type>

CS2JLibrary/src/CS2JNet/JavaSupport/Collections/Generic/CollectionSupport.java

@@ -0,0 +1,176 @@
+/*
+   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.JavaSupport.Collections.Generic;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.apache.commons.lang.NullArgumentException;
+
+import CS2JNet.JavaSupport.CS2JRunTimeException;
+import CS2JNet.System.ArgumentException;
+import CS2JNet.System.Collections.Generic.ICollectionSupport;
+import CS2JNet.System.Collections.Generic.IEnumeratorSupport;
+
+/**
+ * A concrete implementation of .Net's ICollection that wraps a Collection
+ * 
+ * @author keving
+ *
+ * @param <T>
+ */
+public class CollectionSupport<T> implements ICollectionSupport<T> {
+
+	private Collection<T> myCollection = null;
+	
+	public CollectionSupport(Collection<T> inColl) {
+		myCollection = inColl;
+	}
+
+	public static <S> CollectionSupport<S> mk(Collection<S> inColl) {
+		return new CollectionSupport<S>(inColl);
+	}
+
+	
+	public Iterator<T> iterator() {
+		return myCollection.iterator();
+	}
+
+
+	@Override
+	public boolean add(T arg0) {
+		return myCollection.add(arg0);
+	}
+
+
+	@Override
+	public boolean addAll(Collection<? extends T> arg0) {
+		return myCollection.addAll(arg0);
+	}
+
+
+	@Override
+	public void clear() {
+		myCollection.clear();
+	}
+
+
+	@Override
+	public boolean contains(Object arg0) {
+		return myCollection.contains(arg0);
+	}
+
+
+	@Override
+	public boolean containsAll(Collection<?> arg0) {
+		return myCollection.containsAll(arg0);
+	}
+
+
+	@Override
+	public boolean isEmpty() {
+		return myCollection.isEmpty();
+	}
+
+
+	@Override
+	public boolean remove(Object arg0) {
+		return myCollection.remove(arg0);
+	}
+
+
+	@Override
+	public boolean removeAll(Collection<?> arg0) {
+		return myCollection.removeAll(arg0);
+	}
+
+
+	@Override
+	public boolean retainAll(Collection<?> arg0) {
+		return myCollection.retainAll(arg0);
+	}
+
+
+	@Override
+	public int size() {
+		return myCollection.size();
+	}
+
+
+	@Override
+	public Object[] toArray() {
+		return myCollection.toArray();
+	}
+
+
+	@Override
+	public <S> S[] toArray(S[] arg0) {
+		return myCollection.toArray(arg0);
+	}
+
+
+	@Override
+	public boolean Contains(T x) throws Exception {
+		return myCollection.contains(x);
+	}
+
+
+	@Override
+	public void Add(T x) throws Exception {
+		myCollection.add(x);
+		
+	}
+
+
+	@Override
+	public boolean Remove(T x) throws Exception {
+		return myCollection.remove(x);
+	}
+
+
+	@Override
+	public void Clear() throws Exception {
+		myCollection.clear();
+		
+	}
+
+
+	@Override
+	public IEnumeratorSupport<T> GetEnumerator() throws Exception {
+		return new EnumeratorSupport<T>(myCollection.iterator());
+	}
+
+
+	@Override
+	public void CopyTo(T[] arr, int i) throws Exception {
+		if (arr == null) {
+			throw new NullArgumentException("arr");
+		}
+		if (i < 0 || i + myCollection.size() > arr.length) {
+			throw new ArgumentException("i");
+		}
+		int idx = 0;
+		for (T e : this) {
+			arr[i+idx] = e;
+		}
+		
+	}
+	
+}