From caaf13f4d3323f1c78a407bf1ec5c004f37e65ec Mon Sep 17 00:00:00 2001
From: Kevin Glynn <kevin.glynn@twigletsoftware.com>
Date: Fri, 4 Mar 2011 18:10:28 +0100
Subject: [PATCH] Add Generic classes

---
 .../System/Collections/Generic/Dictionary.xml | 161 ------------------
 .../Collections/Generic/ICollection'1.xml     |  24 +++
 .../Collections/Generic/IDictionary'2.xml     |  37 ++++
 .../Collections/Generic/KeyValuePair'2.xml    |  19 +++
 4 files changed, 80 insertions(+), 161 deletions(-)
 delete mode 100644 CS2JLibrary/NetFramework/System/Collections/Generic/Dictionary.xml
 create mode 100644 CS2JLibrary/NetFramework/System/Collections/Generic/ICollection'1.xml
 create mode 100644 CS2JLibrary/NetFramework/System/Collections/Generic/IDictionary'2.xml
 create mode 100644 CS2JLibrary/NetFramework/System/Collections/Generic/KeyValuePair'2.xml

diff --git a/CS2JLibrary/NetFramework/System/Collections/Generic/Dictionary.xml b/CS2JLibrary/NetFramework/System/Collections/Generic/Dictionary.xml
deleted file mode 100644
index 796b358..0000000
--- a/CS2JLibrary/NetFramework/System/Collections/Generic/Dictionary.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-    This file is
-
-    Copyright 2007,2008,2009,2010 Rustici Software, LLC
-    Copyright 2010,2011 Kevin Glynn (kevin.glynn.com)
-
--->
-<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>java.util.Hashtable</Import>
-  </Imports>
-  <Java>Hashtable</Java>
-  <Name>System.Collections.Generic.Dictionary</Name>
-  <Uses />
-  <Inherits>
-    <Type>System.Collections.ICollection</Type>
-    <Type>System.Collections.IDictionary</Type>
-  </Inherits>
-  <Methods>
-    <Method>
-      <Imports />
-      <Java>${this:16}.put(${key}, ${value})</Java>
-      <Params>
-        <Param>
-          <Type>System.Object</Type>
-          <Name>key</Name>
-        </Param>
-        <Param>
-          <Type>System.Object</Type>
-          <Name>value</Name>
-        </Param>
-      </Params>
-      <Name>Add</Name>
-      <Return>System.Int32</Return>
-    </Method>
-    <Method>
-      <Imports />
-      <Java>${this:16}.containsKey(${key})</Java>
-      <Params>
-        <Param>
-          <Type>System.Object</Type>
-          <Name>key</Name>
-        </Param>
-      </Params>
-      <Name>Contains</Name>
-      <Return>System.Boolean</Return>
-    </Method>
-    <Method>
-      <Imports />
-      <Java>${this:16}.containsKey(${key})</Java>
-      <Params>
-        <Param>
-          <Type>System.Object</Type>
-          <Name>key</Name>
-        </Param>
-      </Params>
-      <Name>ContainsKey</Name>
-      <Return>System.Boolean</Return>
-    </Method>
-    <Method>
-      <Imports />
-      <Java>${this:16}.get(${key})</Java>
-      <Params>
-        <Param>
-          <Type>System.Object</Type>
-          <Name>key</Name>
-        </Param>
-      </Params>
-      <Name>get___idx</Name>
-      <Return>System.Object</Return>
-    </Method>
-    <Method>
-      <Imports />
-      <Java>${this:16}.put(${key}, ${value})</Java>
-      <Params>
-        <Param>
-          <Type>System.Object</Type>
-          <Name>key</Name>
-        </Param>
-        <Param>
-          <Type>System.Object</Type>
-          <Name>value</Name>
-        </Param>
-      </Params>
-      <Name>set___idx</Name>
-      <Return>System.Void</Return>
-    </Method>
-  </Methods>
-  <Properties>
-    <Property>
-      <Imports />
-      <Java>${this:16}.size()</Java>
-      <Type>System.Int32</Type>
-      <Name>Count</Name>
-      <Get>${this:16}.size()</Get>
-      <Set>${this:16}.setCount(${value})</Set>
-    </Property>
-    <Property>
-      <Imports />
-      <Java>${this:16}.keySet()</Java>
-      <Type>System.Collections.ICollection</Type>
-      <Name>Keys</Name>
-      <Get>${this:16}.keySet()</Get>
-      <Set>${this:16}.setKeys(${value})</Set>
-    </Property>
-  </Properties>
-  <Events />
-  <Indexers>
-    <Indexer>
-      <Imports />
-      <Params>
-        <Param>
-          <Type>System.Object</Type>
-          <Name>key</Name>
-        </Param>
-      </Params>
-      <Type>System.Object</Type>
-      <Get>${this:16}.get(${key})</Get>
-      <Set>${this:16}.put(${key}, ${value})</Set>
-    </Indexer>
-  </Indexers>
-  <Constructors>
-    <Constructor>
-      <Imports>
-        <Import>java.util.Hashtable</Import>
-      </Imports>
-      <Java>new Hashtable()</Java>
-      <Params />
-    </Constructor>
-    <Constructor>
-      <Imports>
-        <Import>java.util.Hashtable</Import>
-      </Imports>
-      <Java>new Hashtable(${length})</Java>
-      <Params>
-        <Param>
-          <Type>System.Int32</Type>
-          <Name>length</Name>
-        </Param>
-      </Params>
-    </Constructor>
-    <Constructor>
-      <Imports>
-        <Import>java.util.Hashtable</Import>
-      </Imports>
-      <Java>new Hashtable(${collection})</Java>
-      <Params>
-        <Param>
-          <Type>System.ICollection</Type>
-          <Name>collection</Name>
-        </Param>
-      </Params>
-    </Constructor>
-  </Constructors>
-  <Fields />
-  <Casts />
-  <UnaryOps />
-  <BinaryOps />
-</Class>
diff --git a/CS2JLibrary/NetFramework/System/Collections/Generic/ICollection'1.xml b/CS2JLibrary/NetFramework/System/Collections/Generic/ICollection'1.xml
new file mode 100644
index 0000000..c8ad879
--- /dev/null
+++ b/CS2JLibrary/NetFramework/System/Collections/Generic/ICollection'1.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    This file is
+
+    Copyright 2010,2011 Kevin Glynn (kevin.glynn.com)
+
+-->
+<Interface 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>java.util.Collection</Import>
+  </Imports>
+  <Java>Collection*[${T}]*</Java>
+  <Name>System.Collections.Generic.ICollection</Name>
+  <TypeParams>
+    <Name>T</Name>
+  </TypeParams>
+  <Iterable>
+    <ElementType>T</ElementType>
+    <Java>${expr}</Java>
+  </Iterable>
+  <Properties>
+  </Properties>
+</Interface>
diff --git a/CS2JLibrary/NetFramework/System/Collections/Generic/IDictionary'2.xml b/CS2JLibrary/NetFramework/System/Collections/Generic/IDictionary'2.xml
new file mode 100644
index 0000000..0dff17b
--- /dev/null
+++ b/CS2JLibrary/NetFramework/System/Collections/Generic/IDictionary'2.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    This file is
+
+    Copyright 2010,2011 Kevin Glynn (kevin.glynn.com)
+
+-->
+<Interface 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>java.util.Map</Import>
+  </Imports>
+  <Java>Map*[${K},${V}]*</Java>
+  <Name>System.Collections.Generic.IDictionary</Name>
+  <TypeParams>
+    <Name>K</Name>
+    <Name>V</Name>
+  </TypeParams>
+  <Iterable>
+    <ElementType>System.Collections.Generic.KeyValuePair*[K,V]*</ElementType>
+    <Java>${expr}.entrySet()</Java>
+  </Iterable>
+  <Properties>
+    <Property>
+      <Imports />
+      <Type>System.Collections.Generic.ICollection*[K]*</Type>
+      <Name>Keys</Name>
+      <Get>${this:16}.keySet()</Get>
+    </Property>
+    <Property>
+      <Imports />
+      <Type>System.Collections.Generic.ICollection*[V]*</Type>
+      <Name>Values</Name>
+      <Get>${this:16}.values()</Get>
+    </Property>
+  </Properties>
+</Interface>
diff --git a/CS2JLibrary/NetFramework/System/Collections/Generic/KeyValuePair'2.xml b/CS2JLibrary/NetFramework/System/Collections/Generic/KeyValuePair'2.xml
new file mode 100644
index 0000000..13c1aa5
--- /dev/null
+++ b/CS2JLibrary/NetFramework/System/Collections/Generic/KeyValuePair'2.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    This file is
+
+    Copyright 2010,2011 Kevin Glynn (kevin.glynn.com)
+
+-->
+<Struct 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>java.util.Map.Entry</Import>
+  </Imports>
+  <Java>Entry*[${K},${V}]*</Java>
+  <Name>System.Collections.Generic.KeyValuePair</Name>
+  <TypeParams>
+    <Name>K</Name>
+    <Name>V</Name>
+  </TypeParams>
+</Struct>