From 830987e80a58222568f29551ee62efa82c64bf35 Mon Sep 17 00:00:00 2001
From: Kevin Glynn <kevin.glynn@twigletsoftware.com>
Date: Mon, 18 Apr 2011 19:27:23 +0200
Subject: [PATCH] firtle with enumerators and collection templates

---
 .../Collections/Generic/IEnumerator'1.xml      |  8 +++++---
 .../Collections/Generic/KeyCollection'1.xml    |  2 +-
 .../System/Collections/ICollection.xml         | 14 +++++++++-----
 .../System/Collections/IEnumerable.xml         | 18 +++++++++++-------
 .../System/Collections/IEnumerator.xml         | 16 +++++++++++++---
 .../Collections/Generic/EnumeratorSupport.java |  5 +++++
 6 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/CS2JLibrary/NetFramework/System/Collections/Generic/IEnumerator'1.xml b/CS2JLibrary/NetFramework/System/Collections/Generic/IEnumerator'1.xml
index c8926fd..a7e1b6c 100644
--- a/CS2JLibrary/NetFramework/System/Collections/Generic/IEnumerator'1.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/Generic/IEnumerator'1.xml
@@ -20,8 +20,10 @@
     <Java>${expr}</Java>
   </Iterable>
   <Properties>
-    <Type>E</Type>
-    <Name>Current></Name>
-    <Get>${this:16}.getcurrent()</Get>
+    <Property>
+      <Type>E</Type>
+      <Name>Current</Name>
+      <Get>${this:16}.getCurrent()</Get>
+    </Property>
   </Properties>
 <Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>jEYi0rdl/kMLr7uBNG0M9LMlbCQ=</DigestValue></Reference></SignedInfo><SignatureValue>C/hbBQnMGlWnPvwE61XrMusMlyKT+K792pEYR7D7CnpO7Td1gFgCCfkSdFVZ1axk+sLzebWIQKH8+NFRC6+hlNpViODt46v/300e+fi2Yx8BWhpq5e51zfNAhHIdaUemMqHMHNG5BMOngpFx1yrO/zxHvj7HPJqGBwJV7w8yPtU=</SignatureValue></Signature></Interface>
diff --git a/CS2JLibrary/NetFramework/System/Collections/Generic/KeyCollection'1.xml b/CS2JLibrary/NetFramework/System/Collections/Generic/KeyCollection'1.xml
index 8165edd..fc67239 100644
--- a/CS2JLibrary/NetFramework/System/Collections/Generic/KeyCollection'1.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/Generic/KeyCollection'1.xml
@@ -47,7 +47,7 @@
       <Imports>
         <Import>CS2JNet.JavaSupport.Collections.Generic.EnumeratorSupport</Import>
       </Imports>
-      <Java>new EnumeratorSupport*[T]*(${this}.iterator())</Java>
+      <Java>new EnumeratorSupport*[T]*(${this:16}.iterator())</Java>
       <Params>
       </Params>
       <Name>GetEnumerator</Name>
diff --git a/CS2JLibrary/NetFramework/System/Collections/ICollection.xml b/CS2JLibrary/NetFramework/System/Collections/ICollection.xml
index 4966293..f83a1f0 100644
--- a/CS2JLibrary/NetFramework/System/Collections/ICollection.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/ICollection.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -8,15 +8,19 @@
 
 -->
 <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 />
-  <Java>Iterable</Java>
+  <Imports>
+    <Import>CS2JNet.System.Collections.Generic.ICollectionSupport</Import>
+  </Imports>
+  <Java>ICollectionSupport</Java>
   <Name>System.Collections.ICollection</Name>
   <Uses />
   <Inherits> <Type>System.Object</Type> </Inherits>
   <Methods>
     <Method>
-      <Imports />
-      <Java>${this:16}.iterator()</Java>
+      <Imports>
+        <Import>CS2JNet.JavaSupport.Collections.Generic.EnumeratorSupport</Import>
+      </Imports>
+      <Java>EnumeratorSupport.mk(${this:16}.iterator())</Java>
       <Params />
       <Name>GetEnumerator</Name>
       <Return>System.IEnumerator</Return>
diff --git a/CS2JLibrary/NetFramework/System/Collections/IEnumerable.xml b/CS2JLibrary/NetFramework/System/Collections/IEnumerable.xml
index 581c222..fbc5989 100644
--- a/CS2JLibrary/NetFramework/System/Collections/IEnumerable.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/IEnumerable.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -8,18 +8,22 @@
 
 -->
 <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 />
-  <Java>Iterable</Java>
-  <Name>System.Collections.IEnumerable</Name>
+  <Imports>
+    <Import>CS2JNet.System.Collections.Generic.IEnumeratorSupport</Import>
+  </Imports>
+  <Java>IEnumeratorSupport</Java>
+  <Name>System.Collections.IEnumerator</Name>
   <Uses />
   <Inherits> <Type>System.Object</Type> </Inherits>
   <Methods>
     <Method>
-      <Imports />
-      <Java>${this:16}.iterator()</Java>
+      <Imports>
+        <Import>CS2JNet.JavaSupport.Collections.Generic.EnumeratorSupport</Import>
+      </Imports>
+      <Java>EnumeratorSupport.mk(${this:16}.iterator())</Java>
       <Params />
       <Name>GetEnumerator</Name>
-      <Return>System.IEnumerator</Return>
+      <Return>System.Collections.IEnumerator</Return>
     </Method>
   </Methods>
   <Properties />
diff --git a/CS2JLibrary/NetFramework/System/Collections/IEnumerator.xml b/CS2JLibrary/NetFramework/System/Collections/IEnumerator.xml
index fab0041..30ab6bb 100644
--- a/CS2JLibrary/NetFramework/System/Collections/IEnumerator.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/IEnumerator.xml
@@ -12,9 +12,19 @@
   </Imports>
   <Java>IEnumeratorSupport</Java>
   <Name>System.Collections.IEnumerator</Name>
+  <Methods>
+    <Method>
+      <Java>${this:16}.MoveNext()</Java>
+      <Params />
+      <Name>MoveNext</Name>
+      <Return>System.Boolean</Return>
+    </Method>
+  </Methods>
   <Properties>
-    <Type>System.Object</Type>
-    <Name>Current></Name>
-    <Get>${this:16}.getcurrent()</Get>
+    <Property>
+      <Type>System.Object</Type>
+      <Name>Current</Name>
+      <Get>${this:16}.getCurrent()</Get>
+    </Property>
   </Properties>
 <Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>jEYi0rdl/kMLr7uBNG0M9LMlbCQ=</DigestValue></Reference></SignedInfo><SignatureValue>C/hbBQnMGlWnPvwE61XrMusMlyKT+K792pEYR7D7CnpO7Td1gFgCCfkSdFVZ1axk+sLzebWIQKH8+NFRC6+hlNpViODt46v/300e+fi2Yx8BWhpq5e51zfNAhHIdaUemMqHMHNG5BMOngpFx1yrO/zxHvj7HPJqGBwJV7w8yPtU=</SignatureValue></Signature></Interface>
diff --git a/CS2JLibrary/src/CS2JNet/JavaSupport/Collections/Generic/EnumeratorSupport.java b/CS2JLibrary/src/CS2JNet/JavaSupport/Collections/Generic/EnumeratorSupport.java
index 3c1f56d..ccb564f 100644
--- a/CS2JLibrary/src/CS2JNet/JavaSupport/Collections/Generic/EnumeratorSupport.java
+++ b/CS2JLibrary/src/CS2JNet/JavaSupport/Collections/Generic/EnumeratorSupport.java
@@ -20,6 +20,7 @@
 */
 package CS2JNet.JavaSupport.Collections.Generic;
 
+import java.util.Collection;
 import java.util.Iterator;
 
 import CS2JNet.JavaSupport.CS2JRunTimeException;
@@ -37,6 +38,10 @@ public class EnumeratorSupport<T> implements IEnumeratorSupport<T> {
 	private Iterator<T> myIterator = null;
 	private T myCurrent = null;
 	
+	public static <S> EnumeratorSupport<S> mk(Iterator<S> inIt) {
+		return new EnumeratorSupport<S>(inIt);
+	}
+
 	public EnumeratorSupport(Iterator<T> it) {
 		myIterator = it;
 	}