System.IComparable is java's Comparable

improve english

.gitignore

@@ -1,6 +1,7 @@
 bin/
 obj/
 #build/
+.settings/
 test-results/
 *.csproj.user
 *.suo

COPYING

@@ -0,0 +1,24 @@
+CS2J has two components:
+
+- CSharpTranslator:
+     This builds the cs2j.exe executable.  This executable runs
+     directly under Windows and under Mono on other platforms
+     (http://www.mono-project.com/Main_Page).
+
+     This work is licensed under the MIT / X Window System License
+     (http://opensource.org/licenses/mit-license.php). 
+
+     With this licensing then the produced Java code should be
+     completely unencumbered and you can do what you want with it.
+
+- CS2JLibrary: 
+
+     This contains the XML translation files that direct CS2J to
+     translate .Net framework calls into appropriate Java code, and
+     the CS2JLibrary Java support library that translated applications
+     include.
+
+     This work is licensed under the Apache License, Version 2.0
+     (http://www.apache.org/licenses/LICENSE-2.0).
+
+     

CS2JLibrary/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <runtime name="JVM 1.6.0 (MacOS X Default)"/>
-</faceted-project>

CS2JLibrary/NOTICE

@@ -1,6 +1,7 @@
 CS2J Library
-Copyright 2007,2008,2009,2010 Rustici Software, LLC
+Copyright 2007-2013 Rustici Software, LLC
-Copyright 2010,2011 Kevin Glynn (kevin.glynn@twigletsoftware.com)
+Copyright 2010-2013 Kevin Glynn (kevin.glynn@twigletsoftware.com)
 
 This product includes software developed by
-Rustici Software, LLC (http://www.scorm.com/).
+Rustici Software, LLC (http://www.scorm.com/) 
+and Kevin Glynn (http://www.twigletsoftware.com).

CS2JLibrary/NetFramework/CS2J/CS2JNet/JavaSupport/Collections/Generic/IteratorSupport.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    This file is
+
+    Copyright 2010,2011 Kevin Glynn (kevin.glynn@twigletsoftware.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>CS2JNet.JavaSupport.Collections.Generic.IteratorSupport</Import>
+  </Imports>
+  <Java>IteratorSupport</Java>
+  <Name>CS2J.CS2JNet.JavaSupport.Collections.Generic.IteratorSupport</Name>
+  <Methods>
+    <Method>
+      <Imports>
+        <Import>CS2JNet.JavaSupport.Collections.Generic.IteratorSupport</Import>
+      </Imports>
+      <Params>
+        <Param>
+          <Type>System.Object</Type>
+          <Name>enum</Name>
+        </Param>
+      </Params>
+      <Java>IteratorSupport.mk(${enum})</Java>
+      <Name>mk</Name>
+    </Method>
+  </Methods>
+</Class>

CS2JLibrary/NetFramework/CS2J/java/util/Iterator'1.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    This file is
+
+    Copyright 2010,2011 Kevin Glynn (kevin.glynn@twigletsoftware.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.Iterator</Import>
+  </Imports>
+  <Java>Iterator*[${E}]*</Java>
+  <Name>CS2J.java.util.Iterator</Name>
+  <TypeParams>
+    <Name>E</Name>
+  </TypeParams>
+</Interface>

CS2JLibrary/NetFramework/ICSharpCode/SharpZipLib/Zip/ZipEntry.xml

@@ -43,4 +43,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>pGPM09fTQoml/g9H+67m0NSehzc=</DigestValue></Reference></SignedInfo><SignatureValue>bXOgNeli5u9NXkMj3xgnkcudKVxosUjwXv4TvQfOd3iOacagMAY4/dRFPkbZM6RT7lBE6Uzo2OCsqhXYDAhqyYqHdHJ12rJOhMeLKo4czbZCwSHi6NUwKjasKKc2Byres56f7HTRdvfi7kxAUr/M4DfClSALI2ziQCbXj3MAR88=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/ICSharpCode/SharpZipLib/Zip/ZipInputStream.xml

@@ -49,4 +49,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>4b/KSDK568s56twipOj0YRfWUjI=</DigestValue></Reference></SignedInfo><SignatureValue>cfgLeHXgmq/PrTVDzC9ZfAnbAFvLBFDOvSW4qJ9PaCsUu2MolqkmEVUMVdUVAW1aqNyavG1MYM3SAtTV14xFmajy/uXw25GjKUwHRfZZHr44fQT71xx7FGMxboR8Rz7BkDCVz7APA7kPf835QPDSfNSFyPsdyGMnDSI7YoSWqFE=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/Action'1.xml

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    This file is
+
+    Copyright 2010,2011 Kevin Glynn (kevin.glynn@twigletsoftware.com)
+
+-->
+<Delegate 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.System.Action</Import>
+  </Imports>
+  <Java>Action*[${T}]*</Java>
+  <Name>System.Action</Name>
+  <TypeParams>
+    <Name>T</Name>
+  </TypeParams>
+  <Uses />
+  <Inherits>
+    <Type>System.Object</Type>
+  </Inherits>
+  <Methods>
+    <Method static="true">
+      <Imports>
+        <Import>CS2JNet.System.__MultiAction</Import>
+      </Imports>
+      <Java>__MultiAction.Combine(${a},${b})</Java>
+      <Params>
+        <Param>
+          <Type>System.Action*[T]*</Type>
+          <Name>a</Name>
+        </Param>
+        <Param>
+          <Type>System.Action*[T]*</Type>
+          <Name>b</Name>
+        </Param>
+      </Params>
+      <Name>Combine</Name>
+      <TypeParams>
+        <Name>T</Name>
+      </TypeParams>
+      <Return>System.Action*[T]*</Return>
+    </Method>
+    <Method static="true">
+      <Imports>
+        <Import>CS2JNet.System.__MultiAction</Import>
+      </Imports>
+      <Java>__MultiAction.Remove(${a},${b})</Java>
+      <Params>
+        <Param>
+          <Type>System.Action*[T]*</Type>
+          <Name>a</Name>
+        </Param>
+        <Param>
+          <Type>System.Action*[T]*</Type>
+          <Name>b</Name>
+        </Param>
+      </Params>
+      <Name>Remove</Name>
+      <TypeParams>
+        <Name>T</Name>
+      </TypeParams>
+      <Return>System.Action*[T]*</Return>
+    </Method>
+  </Methods>
+  <Invoke>
+    <Java>${this:16}.Invoke(${a})</Java>
+    <Params>
+      <Param>
+        <Type>T</Type>
+        <Name>a</Name>
+      </Param>
+    </Params>
+    <Name>Invoke</Name>
+    <TypeParams />
+    <Return>System.Boolean</Return>
+  </Invoke>
+
+</Delegate>

CS2JLibrary/NetFramework/System/Activator.xml

@@ -35,4 +35,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>csHM+322NGEkjhtUaqVqhEdDaf4=</DigestValue></Reference></SignedInfo><SignatureValue>bAZ8HiaaiLU21DKydvOquzxScfvhC9jk67KQ/yRI67oIZFK3CAfo04enMplJ2k84YoFIMrkZtvRidMJJrSahWHDl9qUWcYFfyRUuw3y1razVYcUYdS9OLVP9Gbhs8itCoKmPQ/bzY1mtMMKE3GQbgOgzG7Tjim+AO0yl6tpGYlU=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/ApplicationException.xml

@@ -68,4 +68,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>wKAlXgsoeaS+aLO3amFA5RiwWFM=</DigestValue></Reference></SignedInfo><SignatureValue>CtV6aD06QgWuXtNCzpHUNUZdWeRrhJT3NvfRluNdz79nJkiFtkjETCKGSi33XiRdxveKFBtJF+KMo+R8YVbnfEiubVeaeFJQ1eRg8irv3GhfVNNcrv9zFyMq7cCRPgGwyykUdHhXxvtfZITOvZdfBneoalWZ/aJH1ja2tucL3BQ=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/ArgumentException.xml

@@ -8,7 +8,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 />
+  <Imports>
+     <Import>CS2JNet.System.ArgumentException</Import>
+  </Imports>
   <Java>ArgumentException</Java>
   <Name>System.ArgumentException</Name>
   <Uses />
@@ -108,4 +110,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>Y4yxDrGpA33OvePneLd+HYMTp6k=</DigestValue></Reference></SignedInfo><SignatureValue>Lncr7yNaFrSKNLGZicNP+svC65lLZ2oKBZpxETz5u1/qO7SRq4ifSF5QS1MPM/54VjbPowMvQxoKntDn5keH4Kkq9YNcheIMT9/gI6PPnRPERtFe2npzbmMKWvju6Vxvqdw4hKL3VWyF/fYtfF2raZsJ93GsbJkk/igOG9Ba2nw=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/ArithmeticException.xml

@@ -68,4 +68,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>Ucq1oaY1HGZ/ornt2qli1mMdQ+w=</DigestValue></Reference></SignedInfo><SignatureValue>RQo6mIRH/DojiBvIE85pk00RJazTMWP1b60Ca78gtwuqjwfL6plDspuu4/2vAloZImwJq9zCalpS5VIkumU2OvmgVgZjnB8o8WDQS3XX6K/dc8Cgx6QXGsjNFqBnaGSaPj82uOFf7KuLMn59jK3FMKZsN1aTJ8Gl6HUJp1nb8SM=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/Array'1.xml

@@ -81,4 +81,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>4tVOJbuP1pVke4TtnQZVaouGbx0=</DigestValue></Reference></SignedInfo><SignatureValue>IoUhzxP/j0CrwueOE6tQAtfxoKXoyCBkos7axq4itnvWX4jZr6VzlO37NIPoDcbzIkOXClg/nfS6q8TuIFGw/gYwHafjI/OBYSpCZwlfXLMmc+HCzxMnWWue0a7IOXNzTbeWrbd7gy4Qp0zv8Wr45NlgdWJpGVTQaXWbAiO5jmw=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/Attribute.xml

@@ -22,4 +22,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>CWUAumRJSDwnzFCd2RPMCJjDw5c=</DigestValue></Reference></SignedInfo><SignatureValue>JRkTEp9fkPdmp++UvTi5AksnJ0IaXMu/LRDy2Voy8cGQW3IyATaYxLAuYDcbJfKPmnZydar/0QTPKgySdRRQVKk/WZavhj58+eVjwisp/g2TqbytkbUg4QlEnboYEK6k60zuiEElmLPi/dRcnWq8EAkgZcsV84rcE+g2c95D2CY=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/Boolean.xml

@@ -7,9 +7,10 @@
     Copyright 2010,2011 Kevin Glynn (kevin.glynn@twigletsoftware.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">
+<Class has_boxed_rep="true" 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>boolean</Java>
+  <BoxedJava>Boolean</BoxedJava>
   <Name>System.Boolean</Name>
   <Uses />
   <Inherits>
@@ -79,4 +80,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>zyHDBzrvR1koU/5yQGaf2y5NbnY=</DigestValue></Reference></SignedInfo><SignatureValue>Ji+9fR23CsKRU0LvxhnX7GoVh1NfZqdXRvaeWdNsbwDJBy0Xt5a3k6S3YvMc816QjOu06ZFkubPh0oPZB8pZIpQ3EkYCzojzq4EZcS4lJFSs0bgRstVScK2+yBk2/pB+1349VS57aFl/fWnS5z0zYbemLMIUaooCbYJlHA9sWZ0=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/Byte.xml

@@ -7,9 +7,10 @@
     Copyright 2010,2011 Kevin Glynn (kevin.glynn@twigletsoftware.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">
+<Class has_boxed_rep="true" 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>byte</Java>
+  <BoxedJava>Byte</BoxedJava>
   <Name>System.Byte</Name>
   <Uses />
   <Inherits>
@@ -56,6 +57,14 @@
       <Get>Byte.MAX_VALUE</Get>
       <Set>${this:16}.setMaxValue(${value})</Set>
     </Property>
+    <Property>
+      <Imports />
+      <Java>${this}</Java>
+      <Type>System.Byte</Type>
+      <Name>Value</Name>
+      <Get>${this}</Get>
+      <Set>${this:16}.setValue(${value})</Set>
+    </Property>
   </Properties>
   <Events />
   <Indexers />
@@ -73,4 +82,4 @@
   </Casts>
   <UnaryOps />
   <BinaryOps />
-<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>9UV0KDy27dm2PgLpXQYexqZHgrI=</DigestValue></Reference></SignedInfo><SignatureValue>hK2py13asxC+KdyfudqYmjri02cTXjfeJE0dZPGWELurbR2AdYFni3yJapmhPErkXLGfmjVBr9nr/mWl+Xq1NbmYhfV20A5+AnKwcA9V6qhQb/qLg10+J0HpCQItZOgUmGXjkZ3uqMEGxHuyUilxYoYz6HPOl0OdU3UlZl8kxvg=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/Char.xml

@@ -7,9 +7,10 @@
     Copyright 2010,2011 Kevin Glynn (kevin.glynn@twigletsoftware.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">
+<Class has_boxed_rep="true" 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>char</Java>
+  <BoxedJava>Character</BoxedJava>
   <Name>System.Char</Name>
   <Uses />
   <Inherits>
@@ -163,6 +164,14 @@
       <Get>Character.MAX_VALUE</Get>
       <Set>${this:16}.setMaxValue(${value})</Set>
     </Property>
+    <Property>
+      <Imports />
+      <Java>${this}</Java>
+      <Type>System.Char</Type>
+      <Name>Value</Name>
+      <Get>${this}</Get>
+      <Set>${this:16}.setValue(${value})</Set>
+    </Property>
   </Properties>
   <Events />
   <Indexers />
@@ -171,4 +180,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>dDnJLXOZbRXXVncWmSeoyg6O27M=</DigestValue></Reference></SignedInfo><SignatureValue>KOZlaLyTTRo7tgFEFAoGyqHymiV0GRST5e5OeaGyKEwJob1vvRRzwJvwdVQiMJuHWMM5LQ+RYI4GZnPU2AjIM4L6eyNwCep8dDckdoIeC3UZ+PPslxeUvUuRLLZON1ARTt1lNxb2BuEa+jeVC2bxGco+iBpqQb2uyCEShV/HHPY=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/Collections/ArrayList.xml

@@ -117,6 +117,16 @@
       <Name>RemoveAt</Name>
       <Return>System.Void</Return>
     </Method>
+    <Method>
+      <Imports>
+        <Import>java.util.Collections</Import>
+      </Imports>
+      <Java>Collections.reverse(${this:16})</Java>
+      <Params>
+      </Params>
+      <Name>Reverse</Name>
+      <Return>System.Void</Return>
+    </Method>
     <Method>
       <Imports>
         <Import>CS2JNet.System.Collections.ArrayListSupport</Import>
@@ -163,7 +173,7 @@
       </Params>
       <Type>System.Object</Type>
       <Get>${this:16}.get(${i})</Get>
-      <Set>${this:16}.add(${i}, ${value})</Set>
+      <Set>${this:16}.set(${i}, ${value})</Set>
     </Indexer>
   </Indexers>
   <Constructors>
@@ -209,4 +219,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>gLYig4mGyArp7WBZouxhkR9f3mQ=</DigestValue></Reference></SignedInfo><SignatureValue>Kgts+e+7OzUNDdVVwbvPCS8LPoM7YNuWOWvt2+SvG988lDMfC7NDzkMzmaRzy8/lC5CRnxPP969do+GJOtFIE3EpaiWB3YD/mfYSwa89adKt2nNtHoNN5pkQ3nTYapEYtV2rZ80pUpKJPcjvTf3yqp5jA0txNEWAzQ9y/xFNZAw=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/Collections/DictionaryEntry.xml

@@ -41,4 +41,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>eTYKwE5MiNpvE4vXplBizURvVNg=</DigestValue></Reference></SignedInfo><SignatureValue>Fb5jiXxPu9S70KLfSCKliYyaL90Sk8SZumqB9Idc3qwVcMlRPFQAKuol+zsk/TENiDp7Nw48WJ/mQ5LxCO9a/0NV22c7/q9PYdIYlLZu3sApcS82/MtJ8AAeG/o8OvpjgaP71CS2xhZCE4DOnkrWBYJmQCF02jogJVpGWbDjARw=</SignatureValue></Signature></Class>
+</Class>

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

@@ -132,4 +132,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>qbxkvItrQBq06TjO7qOtFI8C/q0=</DigestValue></Reference></SignedInfo><SignatureValue>RcwnIhyoghrIJVGfVld2S5OkoSKruLMH/elhtAB+HTovqtoa+1Sdb1cVkFbu8Vb4YpAubmZh6Kv87UYSjKb50c15xCsx3naC7Je/qZ68rac206rokoqKiLXAV5M5C+Pr0q8gFyQK60WohWma7DrsO+B5ByXYR1UORm6Tk4WO04Q=</SignatureValue></Signature></Class>
+</Class>

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

@@ -8,18 +8,28 @@
 -->
 <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>CS2JNet.System.Collections.Generic.ICollectionSupport</Import>
+    <Import>CS2JNet.System.Collections.ICollection</Import>
   </Imports>
-  <Java>ICollectionSupport*[${T}]*</Java>
+  <Java>ICollection*[${T}]*</Java>
   <Name>System.Collections.Generic.ICollection</Name>
   <TypeParams>
     <Name>T</Name>
   </TypeParams>
+  <Inherits>
+    <Type>&gt;System.Collections.Generic.IEnumerable*[T]*</Type>
+  </Inherits>
   <Iterable>
     <ElementType>T</ElementType>
     <Java>${expr}</Java>
   </Iterable>
   <Properties>
+    <Property>
+      <Imports />
+      <Java>${this:16}.size()</Java>
+      <Type>System.Int32</Type>
+      <Name>Count</Name>
+      <Get>${this:16}.size()</Get>
+    </Property>
   </Properties>
   <Methods>
     <Method>
@@ -35,4 +45,4 @@
       <Return>System.Int32</Return>
     </Method>
   </Methods>
-<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>E8HIpKiRknOratBbxt4a71EId0E=</DigestValue></Reference></SignedInfo><SignatureValue>bqvpolcous2/NZYPel/paViJS5fRwPaIvj75jVeZg70SnvhIFVNstqctcVLe2mw52NihU5aIVD3Pl1E5ZCeZbXs15yeg9B2CG//EbCpSXGO/a9iLa0aZhv4O63vLJAqBqT1tqKj+Z8FXIJxbwo4rtwnNHH7rqUAMsg3GfojAmS8=</SignatureValue></Signature></Interface>
+</Interface>

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

@@ -33,4 +33,4 @@
   </Methods>
   <Properties>
   </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>/PjF1YTT9YA7Mx/RRyWYrceaKa0=</DigestValue></Reference></SignedInfo><SignatureValue>axDWxokriznrp2wjipORfzl9sGm+cQ8TDNWUXEU1IdY1uVCkjb9eSKpItf/HOEftNpt3HVmaXN9jQGXSGid0LPNeKSgRa1MvjvgW3ook98V1IH9jgZGRRMsgzJZ+1C+1wpHd9XRqmiOVD2eFgmsynaGyJwwsAL1hX7DP6rY/ps8=</SignatureValue></Signature></Interface>
+</Interface>

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

@@ -99,5 +99,12 @@
       <Name>Values</Name>
       <Get>${this:16}.values()</Get>
     </Property>
+    <Property>
+      <Imports />
+      <Java>${this:16}.size()</Java>
+      <Type>System.Int32</Type>
+      <Name>Count</Name>
+      <Get>${this:16}.size()</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>BBHaGzWIzkVajkMtIotxcu6p5VY=</DigestValue></Reference></SignedInfo><SignatureValue>WOOzmkxA0yBm1tFVetTcQxQc7SztNyQygCPbn5vaHLtHI/MoQMuTuytu5BrGb4UJ7KG68galgfmWUlUD99Txs44X+XdHA7wY0XcAUwXHV+/uti6FicyhHw7mDr9Bj4+Rjq4RIA2I0gS5P25V9nMEIEQCD3/jjc+wc4Lt5AHw/b4=</SignatureValue></Signature></Interface>
+</Interface>

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

@@ -8,9 +8,9 @@
 -->
 <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.lang.Iterable</Import>
+    <Import>CS2JNet.System.Collections.IEnumerable</Import>
   </Imports>
-  <Java>Iterable*[${E}]*</Java>
+  <Java>IEnumerable*[${E}]*</Java>
   <Name>System.Collections.Generic.IEnumerable</Name>
   <TypeParams>
     <Name>E</Name>
@@ -21,4 +21,12 @@
   </Iterable>
   <Properties>
   </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>FzD0ISaWZKb/GDgZSI4werJrHHs=</DigestValue></Reference></SignedInfo><SignatureValue>NeU9k5KOXySVLGMadMEZfh5bsC928iltYWSnpm/5N0sN3NSyfZYUPZ3mL8DG8bZPzJbTIla2fkkZH0FbsDbtU1AeTYpFg9C8NSGDeYqR1mNEaCqYUZQmmP5MP9TtyT9dZOItpb4TXSWjKdkahUaw6CbFRn38Az9Wfh+8DdHIzjg=</SignatureValue></Signature></Interface>
+  <Methods>
+    <Method>
+      <Java>${this:16}.GetEnumerator()</Java>
+      <Params />
+      <Name>GetEnumerator</Name>
+      <Return>System.Collections.Generic.IEnumerator*[E]*</Return>
+    </Method>
+  </Methods>
+</Interface>

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

@@ -8,9 +8,9 @@
 -->
 <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>CS2JNet.System.Collections.Generic.IEnumeratorSupport</Import>
+    <Import>CS2JNet.System.Collections.IEnumerator</Import>
   </Imports>
-  <Java>IEnumeratorSupport*[${E}]*</Java>
+  <Java>IEnumerator*[${E}]*</Java>
   <Name>System.Collections.Generic.IEnumerator</Name>
   <TypeParams>
     <Name>E</Name>
@@ -26,4 +26,18 @@
       <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>Z9FptX0U42LEe5NyR07kbqmjngA=</DigestValue></Reference></SignedInfo><SignatureValue>AMNZC0531V5Q+gQld+kJ3wysXE0U2xV2g0dMdYeCAdgwPdcJ7LlZLgfDUDVJHv7XvlfwuXIIlAxXkrzojSVtfQIc7S/uku8p3hLiY5WUAriqkwK+AgUA+WrtWdng0Sda89V7HOODNZCbBNoPKQLRNKoWJc17EWxw+dyqymRLjAQ=</SignatureValue></Signature></Interface>
+  <Methods>
+    <Method>
+      <Java>${this:16}.MoveNext()</Java>
+      <Params />
+      <Name>MoveNext</Name>
+      <Return>System.Boolean</Return>
+    </Method>
+    <Method>
+      <Java>${this:16}.Reset()</Java>
+      <Params />
+      <Name>Reset</Name>
+      <Return>System.Void</Return>
+    </Method>
+  </Methods>
+</Interface>

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

@@ -125,7 +125,7 @@
       <Return>System.Void</Return>
     </Method>
     <Method>
-      <Java>${this:16}.toArray(new ${T}[${this}.size()])</Java>
+      <Java>((${T}[]) ${this:16}.toArray())</Java>
       <Params>
       </Params>
       <Name>ToArray</Name>
@@ -206,4 +206,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>0DKs0/92WkOLSBA4QYJH96/8vCo=</DigestValue></Reference></SignedInfo><SignatureValue>A7cSO9FRjdm598vxpPAP3HZ/6sb96PaHzb8FRNI/oZQMs6mlAsfeEcc0CnRC+qCLjiu49IPoTflUcsJ4vfwh+OyefsG23XcYdTFCrFNFjSiiOwxSknjrshyP+splrrhvgRAtZButRgy5XuyKhj7wGUNR3OoYujEgyMBxwko8qjs=</SignatureValue></Signature></Interface>
+</Interface>

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

@@ -72,4 +72,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>cUmprobnXdg5Nhlk8vAMJ2coyAo=</DigestValue></Reference></SignedInfo><SignatureValue>XKTAn+4HQ4/anCQ8npTwr1Yrf3AxZc69HuV6muqqws96mCfCvaUhIqmlc2rZsw4CaXd+0bkFunIbLLgqHBaOePb1eKyp29uHhXODO/68lb8kfcPHB4aGO5LKWNPGw3mQoKK4RjuuRdOWZpx1wg7P5BGr+bGdX/gVk8pUUhHzDHs=</SignatureValue></Signature></Class>
+</Class>

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

@@ -30,4 +30,4 @@
       <Get>${this:16}.getValue()</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>+iuvT/0P8kTGm4mUQp1qNOHcnuM=</DigestValue></Reference></SignedInfo><SignatureValue>V3dGjywn9LJWjroZCUMyPMtl/nuKbtonNsi+QEB7aLalgu0Brz6zmiV86bz6d6C9IZGQR+567JbbrIGR1ZJ1gv69CS8O44sD+FOeyrMsFZ1DBQDHB2QctU9dFlF9tDfyOC5uA4FuYGMAWwk98pEhvV3gaGv5RtGqZkxAGlT2v8M=</SignatureValue></Signature></Struct>
+</Struct>

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

@@ -0,0 +1,135 @@
+<?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@twigletsoftware.com)
+
+-->
+<Class variant="LCC" 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.HashMap</Import>
+  </Imports>
+  <Java>HashMap*[${K},${V}]*</Java>
+  <Name>System.Collections.Generic.Dictionary</Name>
+  <TypeParams>
+    <Name>K</Name>
+    <Name>V</Name>
+  </TypeParams>
+  <Uses />
+  <Inherits>
+    <Type>System.Collections.Generic.IDictionary*[K,V]*</Type>
+<!--    <Type>IList<T>, ICollection<T>, 
+	IEnumerable<T>, IList, ICollection, IEnumerable</Type> -->
+  </Inherits>
+  <Iterable>
+    <ElementType>KeyValuePair*[K,V]*</ElementType>
+    <Java>${expr}.entrySet()</Java>
+  </Iterable>
+  <Methods>
+    <Method>
+      <Imports />
+      <Java>${this:16}.put(${key}, ${value})</Java>
+      <Params>
+        <Param>
+          <Type>K</Type>
+          <Name>key</Name>
+        </Param>
+        <Param>
+          <Type>V</Type>
+          <Name>value</Name>
+        </Param>
+      </Params>
+      <Name>Add</Name>
+      <Return>System.Void</Return>
+    </Method>
+    <Method>
+      <Imports />
+      <Java>${this:16}.clear()</Java>
+      <Params />
+      <Name>Clear</Name>
+      <Return>System.Void</Return>
+    </Method>
+    <Method>
+      <Imports />
+      <Java>${this:16}.containsKey(${key})</Java>
+      <Params>
+        <Param>
+          <Type>K</Type>
+          <Name>key</Name>
+        </Param>
+      </Params>
+      <Name>ContainsKey</Name>
+      <Return>System.Boolean</Return>
+    </Method>
+    <Method>
+      <Imports />
+      <Java>${this:16}.containsValue(${value})</Java>
+      <Params>
+        <Param>
+          <Type>V</Type>
+          <Name>value</Name>
+        </Param>
+      </Params>
+      <Name>ContainsValue</Name>
+      <Return>System.Boolean</Return>
+    </Method>
+    <Method>
+      <Imports />
+      <Java>${this:16}.remove(${key})</Java>
+      <Params>
+        <Param>
+          <Type>System.Object</Type>
+          <Name>key</Name>
+        </Param>
+      </Params>
+      <Name>Remove</Name>
+      <!-- in java actually returns the value removed -->
+      <Return>System.Boolean</Return>
+    </Method>
+  </Methods>
+  <Properties>
+    <Property>
+      <Imports />
+      <Java>${this:16}.size()</Java>
+      <Type>System.Int32</Type>
+      <Name>Count</Name>
+      <Get>${this:16}.size()</Get>
+    </Property>
+    <Property>
+      <Imports>
+        <Import>CS2JNet.JavaSupport.Collections.Generic.LCC.CollectionSupport</Import>
+      </Imports>
+      <Type>System.Collections.Generic.KeyCollection*[K]*</Type>
+      <Name>Keys</Name>
+      <Get>CollectionSupport.mk(${this:16}.keySet())</Get>
+    </Property>
+  </Properties>
+  <Events />
+  <Indexers>
+    <Indexer>
+      <Imports />
+      <Params>
+        <Param>
+          <Type>System.Object</Type>
+          <Name>key</Name>
+        </Param>
+      </Params>
+      <Type>V</Type>
+      <Get>${this:16}.get(${key})</Get>
+      <Set>${this:16}.put(${key}, ${value})</Set>
+    </Indexer>
+  </Indexers>
+  <Constructors>
+    <Constructor>
+      <Imports />
+      <Java>new HashMap*[${K},${V}]*()</Java>
+      <Params />
+    </Constructor>
+  </Constructors>
+  <Fields />
+  <Casts />
+  <UnaryOps />
+  <BinaryOps />
+</Class>

CS2JLibrary/NetFramework/System/Collections/Generic/LCC/ICollection'1.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    This file is
+
+    Copyright 2010,2011 Kevin Glynn (kevin.glynn@twigletsoftware.com)
+
+-->
+<Interface variant="LCC" 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.System.Collections.LCC.ICollection</Import>
+  </Imports>
+  <Java>ICollection*[${T}]*</Java>
+  <Name>System.Collections.Generic.ICollection</Name>
+  <TypeParams>
+    <Name>T</Name>
+  </TypeParams>
+  <Inherits>
+    <Type>System.Collections.Generic.IEnumerable*[T]*</Type>
+  </Inherits>
+  <Iterable>
+    <ElementType>T</ElementType>
+    <Java>${expr}</Java>
+  </Iterable>
+  <Properties>
+  </Properties>
+  <Methods>
+    <Method>
+      <Imports />
+      <Java>${this:16}.add(${arg})</Java>
+      <Params>
+        <Param>
+          <Type>T</Type>
+          <Name>arg</Name>
+        </Param>
+      </Params>
+      <Name>Add</Name>
+      <Return>System.Int32</Return>
+    </Method>
+  </Methods>
+</Interface>

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

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    This file is
+
+    Copyright 2010,2011 Kevin Glynn (kevin.glynn@twigletsoftware.com)
+
+-->
+<Interface variant="LCC" 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>
+  <Methods>
+    <Method>
+      <Imports />
+      <Java>${this:16}.put(${key}, ${value})</Java>
+      <Params>
+        <Param>
+          <Type>K</Type>
+          <Name>key</Name>
+        </Param>
+        <Param>
+          <Type>V</Type>
+          <Name>value</Name>
+        </Param>
+      </Params>
+      <Name>Add</Name>
+      <Return>System.Void</Return>
+    </Method>
+    <Method>
+      <Imports />
+      <Java>${this:16}.clear()</Java>
+      <Params />
+      <Name>Clear</Name>
+      <Return>System.Void</Return>
+    </Method>
+    <Method>
+      <Imports />
+      <Java>${this:16}.containsKey(${key})</Java>
+      <Params>
+        <Param>
+          <Type>K</Type>
+          <Name>key</Name>
+        </Param>
+      </Params>
+      <Name>ContainsKey</Name>
+      <Return>System.Boolean</Return>
+    </Method>
+    <Method>
+      <Imports />
+      <Java>${this:16}.remove(${key})</Java>
+      <Params>
+        <Param>
+          <Type>K</Type>
+          <Name>key</Name>
+        </Param>
+      </Params>
+      <Name>Remove</Name>
+      <!-- in java actually returns the value removed -->
+      <Return>System.Boolean</Return>
+    </Method>
+  </Methods>
+  <Indexers>
+    <Indexer>
+      <Imports />
+      <Params>
+        <Param>
+          <Type>K</Type>
+          <Name>key</Name>
+        </Param>
+      </Params>
+      <Type>V</Type>
+      <Get>${this:16}.get(${key})</Get>
+      <Set>${this:16}.put(${key}, ${value})</Set>
+    </Indexer>
+  </Indexers>
+  <Properties>
+    <Property>
+      <Imports>
+        <Import>CS2JNet.JavaSupport.Collections.Generic.LCC.CollectionSupport</Import>
+      </Imports>
+      <Type>System.Collections.Generic.ICollection*[K]*</Type>
+      <Name>Keys</Name>
+      <Get>CollectionSupport.mk(${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>

CS2JLibrary/NetFramework/System/Collections/Generic/LCC/IEnumerable'1.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    This file is
+
+    Copyright 2010,2011 Kevin Glynn (kevin.glynn@twigletsoftware.com)
+
+-->
+<Interface variant="LCC" 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.System.Collections.LCC.IEnumerable</Import>
+  </Imports>
+  <Java>IEnumerable*[${E}]*</Java>
+  <Name>System.Collections.Generic.IEnumerable</Name>
+  <TypeParams>
+    <Name>E</Name>
+  </TypeParams>
+  <Iterable>
+    <ElementType>E</ElementType>
+    <Java>${expr}</Java>
+  </Iterable>
+  <Properties>
+  </Properties>
+  <Methods>
+    <Method>
+      <Java>${this:16}.getEnumerator()</Java>
+      <Params />
+      <Name>GetEnumerator</Name>
+      <Return>System.Collections.Generic.IEnumerator*[E]*</Return>
+    </Method>
+  </Methods>
+</Interface>

CS2JLibrary/NetFramework/System/Collections/Generic/LCC/IEnumerator'1.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    This file is
+
+    Copyright 2010,2011 Kevin Glynn (kevin.glynn@twigletsoftware.com)
+
+-->
+<Interface variant="LCC" 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.System.Collections.LCC.IEnumerator</Import>
+  </Imports>
+  <Java>IEnumerator*[${E}]*</Java>
+  <Name>System.Collections.Generic.IEnumerator</Name>
+  <TypeParams>
+    <Name>E</Name>
+  </TypeParams>
+  <Iterable>
+    <ElementType>E</ElementType>
+    <Java>${expr}</Java>
+  </Iterable>
+  <Properties>
+    <Property>
+      <Type>E</Type>
+      <Name>Current</Name>
+      <Get>${this:16}.getCurrent()</Get>
+    </Property>
+  </Properties>
+  <Methods>
+    <Method>
+      <Java>${this:16}.moveNext()</Java>
+      <Params />
+      <Name>MoveNext</Name>
+      <Return>System.Boolean</Return>
+    </Method>
+    <Method>
+      <Java>${this:16}.reset()</Java>
+      <Params />
+      <Name>Reset</Name>
+      <Return>System.Void</Return>
+    </Method>
+  </Methods>
+</Interface>

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

@@ -0,0 +1,75 @@
+<?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@twigletsoftware.com)
+
+-->
+<Class variant="LCC" 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>CollectionSupport*[${T}]*</Java>
+  <!-- Actually: System.Collections.Generic.Dictionary<TKey, TValue>.KeyCollection -->
+  <Name>System.Collections.Generic.KeyCollection</Name>
+  <TypeParams>
+    <Name>T</Name>
+  </TypeParams>
+  <Uses />
+  <Inherits>
+  </Inherits>
+  <Iterable>
+    <ElementType>T</ElementType>
+    <Java>${expr}</Java>
+  </Iterable>
+  <Methods>
+    <Method>
+      <Imports>
+        <Import>CS2JNet.System.Collections.Generic.KeyCollectionSupport</Import>
+      </Imports>
+      <Java>${this:16}.copyTo(${array}, ${index})</Java>
+      <Params>
+        <Param>
+          <Type>T[]</Type>
+          <Name>array</Name>
+        </Param>
+        <Param>
+          <Type>System.Int32</Type>
+          <Name>index</Name>
+        </Param>
+      </Params>
+      <Name>CopyTo</Name>
+      <Return>System.Void</Return>
+    </Method>
+    <Method>
+      <Imports>
+        <Import>CS2JNet.JavaSupport.Collections.Generic.LCC.EnumeratorSupport</Import>
+      </Imports>
+      <Java>new EnumeratorSupport*[T]*(${this:16}.iterator())</Java>
+      <Params>
+      </Params>
+      <Name>GetEnumerator</Name>
+      <Return>System.Collections.Generic.IEnumerator*[T]*</Return>
+    </Method>
+  </Methods>
+  <Properties>
+    <Property>
+      <Imports />
+      <Java>${this:16}.size()</Java>
+      <Type>System.Int32</Type>
+      <Name>Count</Name>
+      <Get>${this:16}.size()</Get>
+    </Property>
+  </Properties>
+  <Events />
+  <Indexers>
+  </Indexers>
+  <Constructors>
+  </Constructors>
+  <Fields />
+  <Casts />
+  <UnaryOps />
+  <BinaryOps />
+</Class>

CS2JLibrary/NetFramework/System/Collections/Generic/LCC/List'1.xml

@@ -0,0 +1,205 @@
+<?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@twigletsoftware.com)
+
+-->
+<Class variant="LCC" 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.System.Collections.LCC.CSList</Import>
+  </Imports>
+  <Java>CSList*[${T}]*</Java>
+  <Name>System.Collections.Generic.List</Name>
+  <TypeParams>
+    <Name>T</Name>
+  </TypeParams>
+  <Uses />
+  <Inherits>
+    <Type>IList*[T]*</Type>
+    <Type>ICollection*[T]*</Type> 
+    <Type>IEnumerable*[T]*</Type> 
+  </Inherits>
+  <Iterable>
+    <ElementType>T</ElementType>
+    <Java>${expr}</Java>
+  </Iterable>
+  <Methods>
+    <Method>
+      <Imports />
+      <Java>${this:16}.add(${arg})</Java>
+      <Params>
+        <Param>
+          <Type>T</Type>
+          <Name>arg</Name>
+        </Param>
+      </Params>
+      <Name>Add</Name>
+      <Return>System.Void</Return>
+    </Method>
+    <Method>
+      <Java>${this:16}.addRange(${arg})</Java>
+      <Params>
+        <Param>
+          <Type>T[]</Type>
+          <Name>arg</Name>
+        </Param>
+      </Params>
+      <Name>AddRange</Name>
+      <Return>System.Void</Return>
+    </Method>
+    <Method>
+      <Imports />
+      <Java>${this:16}.addRange(${arg})</Java>
+      <Params>
+        <Param>
+          <Type>System.Collections.Generic.IEnumerable*[T]*</Type>
+          <Name>arg</Name>
+        </Param>
+      </Params>
+      <Name>AddRange</Name>
+      <Return>System.Void</Return>
+    </Method>
+    <Method>
+      <Imports />
+      <Java>${this:16}.clear()</Java>
+      <Params />
+      <Name>Clear</Name>
+      <Return>System.Void</Return>
+    </Method>
+    <Method>
+      <Imports />
+      <Java>${this:16}.contains(${key})</Java>
+      <Params>
+        <Param>
+          <Type>T</Type>
+          <Name>key</Name>
+        </Param>
+      </Params>
+      <Name>Contains</Name>
+      <Return>System.Boolean</Return>
+    </Method>
+    <Method>
+      <Imports />
+      <Java>${this:16}.add(${index}, ${value})</Java>
+      <Params>
+        <Param>
+          <Type>System.Int32</Type>
+          <Name>index</Name>
+        </Param>
+        <Param>
+          <Type>T</Type>
+          <Name>value</Name>
+        </Param>
+      </Params>
+      <Name>Insert</Name>
+      <Return>System.Void</Return>
+    </Method>
+    <Method>
+      <Imports />
+      <Java>${this:16}.remove(${value})</Java>
+      <Params>
+        <Param>
+          <Type>T</Type>
+          <Name>value</Name>
+        </Param>
+      </Params>
+      <Name>Remove</Name>
+      <Return>System.Boolean</Return>
+    </Method>
+    <Method>
+      <Imports />
+      <Java>${this:16}.remove((int)${value})</Java>
+      <Params>
+        <Param>
+          <Type>System.Int32</Type>
+          <Name>index</Name>
+        </Param>
+      </Params>
+      <Name>RemoveAt</Name>
+      <Return>System.Void</Return>
+    </Method>
+    <Method>
+      <Java>((${T}[]) ${this:16}.toArray())</Java>
+      <Params>
+      </Params>
+      <Name>ToArray</Name>
+      <Return>T[]</Return>
+    </Method>
+    <Method>
+      <Imports>
+        <Import>java.util.Collections</Import>
+      </Imports>
+      <Java>Collections.sort(${this})</Java>
+      <Params />
+      <Name>Sort</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>
+  </Properties>
+  <Events />
+  <Indexers>
+    <Indexer>
+      <Imports />
+      <Params>
+        <Param>
+          <Type>System.Int32</Type>
+          <Name>i</Name>
+        </Param>
+      </Params>
+      <Type>T</Type>
+      <Get>${this:16}.get(${i})</Get>
+      <Set>${this:16}.add(${i}, ${value})</Set>
+    </Indexer>
+  </Indexers>
+  <Constructors>
+    <Constructor>
+      <Imports />
+      <Java>new CSList*[${T}]*()</Java>
+      <Params />
+    </Constructor>
+    <Constructor>
+      <Imports />
+      <Java>new CSList*[${T}]*(${length})</Java>
+      <Params>
+        <Param>
+          <Type>System.Int32</Type>
+          <Name>length</Name>
+        </Param>
+      </Params>
+    </Constructor>
+    <Constructor>
+      <Java>new CSList*[${T}]*(${collection})</Java>
+      <Params>
+        <Param>
+          <Type>T[]</Type>
+          <Name>collection</Name>
+        </Param>
+      </Params>
+    </Constructor>
+    <Constructor>
+      <Java>new CSList*[${T}]*(${collection})</Java>
+      <Params>
+        <Param>
+          <Type>System.Collections.Generic.IEnumerable*[T]*</Type>
+          <Name>collection</Name>
+        </Param>
+      </Params>
+    </Constructor>
+  </Constructors>
+  <Fields />
+  <Casts />
+  <UnaryOps />
+  <BinaryOps />
+</Class>

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

@@ -9,17 +9,18 @@
 -->
 <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.ArrayList</Import>
+    <Import>CS2JNet.System.Collections.CSList</Import>
   </Imports>
-  <Java>ArrayList*[${T}]*</Java>
+  <Java>CSList*[${T}]*</Java>
   <Name>System.Collections.Generic.List</Name>
   <TypeParams>
     <Name>T</Name>
   </TypeParams>
   <Uses />
   <Inherits>
-<!--    <Type>IList<T>, ICollection<T>, 
+    <Type>IList*[T]*</Type>
-	IEnumerable<T>, IList, ICollection, IEnumerable</Type> -->
+    <Type>ICollection*[T]*</Type> 
+    <Type>IEnumerable*[T]*</Type> 
   </Inherits>
   <Iterable>
     <ElementType>T</ElementType>
@@ -36,14 +37,10 @@
         </Param>
       </Params>
       <Name>Add</Name>
-      <!-- TODO: this.add(e) actually always returns true -->
+      <Return>System.Void</Return>
-      <Return>System.Int32</Return>
     </Method>
     <Method>
-      <Imports>
+      <Java>${this:16}.addRange(${arg})</Java>
-        <Import>java.util.Arrays</Import>
-      </Imports>
-      <Java>${this:16}.addAll(Arrays.asList(${arg}))</Java>
       <Params>
         <Param>
           <Type>T[]</Type>
@@ -55,7 +52,7 @@
     </Method>
     <Method>
       <Imports />
-      <Java>${this:16}.addAll(${arg})</Java>
+      <Java>${this:16}.addRange(${arg})</Java>
       <Params>
         <Param>
           <Type>System.Collections.Generic.IEnumerable*[T]*</Type>
@@ -125,7 +122,7 @@
       <Return>System.Void</Return>
     </Method>
     <Method>
-      <Java>${this:16}.toArray(new ${T}[${this}.size()])</Java>
+      <Java>((${T}[]) ${this:16}.toArray())</Java>
       <Params>
       </Params>
       <Name>ToArray</Name>
@@ -169,12 +166,12 @@
   <Constructors>
     <Constructor>
       <Imports />
-      <Java>new ArrayList*[${T}]*()</Java>
+      <Java>new CSList*[${T}]*()</Java>
       <Params />
     </Constructor>
     <Constructor>
       <Imports />
-      <Java>new ArrayList*[${T}]*(${length})</Java>
+      <Java>new CSList*[${T}]*(${length})</Java>
       <Params>
         <Param>
           <Type>System.Int32</Type>
@@ -183,7 +180,7 @@
       </Params>
     </Constructor>
     <Constructor>
-      <Java>new ArrayList*[${T}]*(Arrays.asList(${collection}))</Java>
+      <Java>new CSList*[${T}]*(${collection})</Java>
       <Params>
         <Param>
           <Type>T[]</Type>
@@ -192,10 +189,7 @@
       </Params>
     </Constructor>
     <Constructor>
-      <Imports>
+      <Java>new CSList*[${T}]*(${collection})</Java>
-        <Import>CS2JNet.System.Collections.Generic.GenArrayListSupport</Import>
-      </Imports>
-      <Java>GenArrayListSupport.*[${T}]*toList(${collection})</Java>
       <Params>
         <Param>
           <Type>System.Collections.Generic.IEnumerable*[T]*</Type>
@@ -208,4 +202,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>dMxWahle6+JWazXF5rdEoxNFqHQ=</DigestValue></Reference></SignedInfo><SignatureValue>QHAtm2BA/7k2dSASQHMw6aKKJEGk6P2x5HAGuae81wbbLDkrnihhH2PFU+6WFudzrinE4JSp9WOHKzOxJ659kj6Wg8qx5asDxOhkhG06He0TE4jcq64/U0tM2GZxViqhaFHAExXAZoT9rxjqP5prxerSnSvfy16hhPAixY5XEEA=</SignatureValue></Signature></Class>
+</Class>

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

@@ -49,4 +49,4 @@
       <Get>${this}.size()</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>Uvp+vMhERPFYV8x/KYKxjZRz2gE=</DigestValue></Reference></SignedInfo><SignatureValue>PWmTTNJTr/Y3eTi/Pmf/UZJwPA44r9XFMLnj7v5rf9PZuhUZvOt6WQw5p+gmCcmuDQv/Sw0Z/zMTzuMhhgZwfFgXHuTrdVcy5bQASNnfdApB9EJtGryJuhUERcEXxAtm/5gRrIUYWSPlglDlOuNGbsVq+huVI3fjLQFEmlOPktY=</SignatureValue></Signature></Interface>
+</Interface>

CS2JLibrary/NetFramework/System/Collections/Hashtable.xml

@@ -142,4 +142,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>CyFYJRPJJJC+BdPe7KI/hR0PeK0=</DigestValue></Reference></SignedInfo><SignatureValue>AZ0nzp3rrggsT6CxfIFTSUcr4RAH6yv8sF0m4OyMKEbB5O3fQOW/deSIwBbOVykX520B7mewcEVGxCAa5z3QgAdADC59gYCcudG+pkifY7ltivIClVuT105fBvAxGkRO0Mh+EWqRgFJnxt/x7/ujMj/Q0kiOBYWHQlK7I+Uvugk=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/Collections/ICollection.xml

@@ -38,4 +38,4 @@
   </Properties>
   <Events />
   <Indexers />
-<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>6gV7You6WIQBvjaQbSXW1A6CzNc=</DigestValue></Reference></SignedInfo><SignatureValue>Mt45VxyPfNFtMOXmD5RZkBNxjt1w/+wBCsgs/BnTzTPJSL/SKSJAQt7a7WbzDHTiBVaDmneuvPwX9eFpTIxvGNAYHQxepPMmuLemSQMWOCHsZYhvY4NrxprBLrLGgJ6rnGLVIds+edIhYumnkih3wmQlwx4enBXXlsUo/6BtmqM=</SignatureValue></Signature></Interface>
+</Interface>

CS2JLibrary/NetFramework/System/Collections/IDictionary.xml

@@ -110,4 +110,4 @@
       <Set>${this:16}.put(${key}, ${value})</Set>
     </Indexer>
   </Indexers>
-<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>EWxwABnf9ST7gUYb9kpBDRkVPlw=</DigestValue></Reference></SignedInfo><SignatureValue>Ot9PdGRVKbd+jpJ2FjasH+hnjpEv/GtZNxWvqA+ylC5N3MAZzMJ0KV43VI+EJ3rYnkqYJlk4qlS7WiPOw49xYe8EBntC9jcn+QCP9SnTSnKIc4GJjSL3C4/zm9HRwluevAwpAMVJRKki0eEODGVTI8gDgEOqiz0lMF+G40poxJk=</SignatureValue></Signature></Interface>
+</Interface>

CS2JLibrary/NetFramework/System/Collections/IEnumerable.xml

@@ -9,24 +9,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>
-    <Import>CS2JNet.System.Collections.Generic.IEnumeratorSupport</Import>
+    <Import>java.lang.Iterable</Import>
   </Imports>
-  <Java>IEnumeratorSupport</Java>
+  <Java>Iterable</Java>
-  <Name>System.Collections.IEnumerator</Name>
+  <Name>System.Collections.IEnumerable</Name>
   <Uses />
   <Inherits> <Type>System.Object</Type> </Inherits>
   <Methods>
-    <Method>
-      <Imports>
-        <Import>CS2JNet.JavaSupport.Collections.Generic.EnumeratorSupport</Import>
-      </Imports>
-      <Java>EnumeratorSupport.mk(${this:16}.iterator())</Java>
-      <Params />
-      <Name>GetEnumerator</Name>
-      <Return>System.Collections.IEnumerator</Return>
-    </Method>
   </Methods>
+  <Iterable>
+    <ElementType>System.Object</ElementType>
+    <Java>${expr}</Java>
+  </Iterable>
   <Properties />
   <Events />
   <Indexers />
-<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>sixfgqz4xuUkbenJmdZoedGBFN0=</DigestValue></Reference></SignedInfo><SignatureValue>U/2TvtQN5sFEJOtHG4hMrB+MWlOP5mk7UctdvITS80+/66yidqE06LHUL5PpYDwrPhCFCpG4b7YqLuaDZ2SB97IcLmJRBntCkhRyRULRe4bguyZtSCAgD+tPH4Xz0FT81XBs+W/h/J9R+fOn6/J243sdwf5eiaA60kph87hlU5M=</SignatureValue></Signature></Interface>
+</Interface>

CS2JLibrary/NetFramework/System/Collections/IEnumerator.xml

@@ -8,9 +8,9 @@
 -->
 <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>CS2JNet.System.Collections.Generic.IEnumeratorSupport</Import>
+    <Import>CS2JNet.System.Collections.IEnumerator</Import>
   </Imports>
-  <Java>IEnumeratorSupport</Java>
+  <Java>IEnumerator</Java>
   <Name>System.Collections.IEnumerator</Name>
   <Methods>
     <Method>
@@ -27,4 +27,4 @@
       <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>EexqLMXmbAIe9ZNbxrJYBZDcwsM=</DigestValue></Reference></SignedInfo><SignatureValue>CeXfheOhf+sCsrhVCbuhH0sRuOabcn851HR4E/wNIQ8/YmVRZfdOlzRJVadHXX+bfmA4WEyWH+zzwBTjapaMLVyvtIfWImjbyQJx+WEmAiEv2b0k/r0RfzIRt8xF4/E95wwWD2bKLwB2YEEYchp87Mu6DnSuneJxlncMjH+xxWo=</SignatureValue></Signature></Interface>
+</Interface>

CS2JLibrary/NetFramework/System/Collections/IList.xml

@@ -71,4 +71,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>jKtaIt9Mb8orQ5XjTN0rBD6NALM=</DigestValue></Reference></SignedInfo><SignatureValue>A4PZi9hfTW0DTyaISV0oegjg1hWfMLYrMdwd5iXP2XebpFCh15oiJefuYvsTSv2VG6QY0aQ/cifoMbqTu0+Mi/3iEpvPzsnmC/FQHDA6YWFJKnVp+/tV2tU6E7QnZaeyCK+i6ZDKhXFHMlpu1BstQv1aKzZwDMXv7vDqW92incc=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/Collections/LCC/IEnumerable.xml

@@ -0,0 +1,27 @@
+<?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@twigletsoftware.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>CS2JNet.System.Collections.IEnumerable</Import>
+  </Imports>
+  <Java>IEnumerable</Java>
+  <Name>System.Collections.IEnumerable</Name>
+  <Uses />
+  <Inherits> <Type>System.Object</Type> </Inherits>
+  <Methods>
+  </Methods>
+  <Iterable>
+    <ElementType>System.Object</ElementType>
+    <Java>${expr}</Java>
+  </Iterable>
+  <Properties />
+  <Events />
+  <Indexers />
+</Interface>

CS2JLibrary/NetFramework/System/Collections/LCC/IEnumerator.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    This file is
+
+    Copyright 2010,2011 Kevin Glynn (kevin.glynn@twigletsoftware.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>CS2JNet.System.Collections.LCC.IEnumerator</Import>
+  </Imports>
+  <Java>IEnumerator</Java>
+  <Name>System.Collections.IEnumerator</Name>
+  <Methods>
+    <Method>
+      <Java>${this:16}.moveNext()</Java>
+      <Params />
+      <Name>MoveNext</Name>
+      <Return>System.Boolean</Return>
+    </Method>
+  </Methods>
+  <Properties>
+    <Property>
+      <Type>System.Object</Type>
+      <Name>Current</Name>
+      <Get>${this:16}.getCurrent()</Get>
+    </Property>
+  </Properties>
+</Interface>

CS2JLibrary/NetFramework/System/Collections/ObjectModel/Collection'1.xml

@@ -30,4 +30,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>ixzk6Kx8bCs/4AGyB4h8FtWPMh8=</DigestValue></Reference></SignedInfo><SignatureValue>XOgNcGWlOpdm/TuEse9Fo82YDJ8pv7JYSk8tBr2Cdz3Mk3y4/b8alDaMT9bisEcep550jY4nW4HMGS6IxEsHPI4M4q91TZiLpSQhRiUT6yJQg7VxhSaszfROkCCd3OGWBJrgJgZYDIFT7ArrGtkj+eDkv62+qztH7cGhMRrSptU=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/Collections/SortedList.xml

@@ -140,4 +140,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>Rnf8GowFFF9JUEkVxHIh7NNruxc=</DigestValue></Reference></SignedInfo><SignatureValue>D1rqx0ui7x+8pqBSgXVXYfSapffmCkR++UqTYmP36i443cLV2H02XPVocQDM/jW87GCPUkMmdioGxrCIWJbmcnrOepuw77qAFtzQuywTukaQLMk954f5apHzWQlzqzkcNLmWMjd5dviYDD7vGyEVBO2P6cg6m6/PoHqNppFKTZc=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/Collections/Specialized/NameValueCollection.xml

@@ -39,4 +39,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>hlfCVl94jm1nJtIrWXI+KPTFOec=</DigestValue></Reference></SignedInfo><SignatureValue>TFJ3r07y0tmBsWBlostNh2LlZU/Lj2EvpAIbrnHQ/NxtrRMiOeoOTmBqtVllKKZc+2EGI4aqOQuBIFxT+MIasUKiOrSDImqhDYonn+QQnPwH42ruJTcAadWlmOfuqPFqF7hh06JSgrsbfPi4BG2O+5hm94/wOyDYw66BWwNbnRU=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/Configuration/ConfigurationManager.xml

@@ -33,4 +33,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>kP5gPp11Yyi1fTz0I9QwDiAUwiU=</DigestValue></Reference></SignedInfo><SignatureValue>PAUMX9tgmmmnEgxeDxrvqMgg0s5ahxzveQyYU2852h/+et01u8jqckjK5jH6DN2Bxi57r8otX8il8qJI8rwlW6hnxzZM0fzKvKBTe0HkXYbux4nXMgSpLLLu6zqmVEqVNLhTKrp2itVO1au67ZKo72WaxSPEIy5Lx6vLfUHNpYw=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/Configuration/ConfigurationSettings.xml

@@ -33,4 +33,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>zRdrCE7++fwidkg6cMbjEIYPsoA=</DigestValue></Reference></SignedInfo><SignatureValue>AYWHRbEjQls/eMGYmy1ZuIptui8f/43q/ELndb7y25p/IXUvWrVqqGMkubBQIn4wvu1UUPZ4m4GWoFK9N9refHbLrz2v96z6OQqKHNoTHICgPxoejwbmHTyJpQBxea3+IWp9LyVLEfvRsGB1UQ3hkp4hn5aQsLsluEnPQvlBChU=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/Console.xml

@@ -84,12 +84,10 @@
   </Methods>
   <Properties>
     <Property>
-      <Imports />
       <Java>System.out</Java>
       <Type>System.IO.TextWriter</Type>
       <Name>Out</Name>
       <Get>System.out</Get>
-      <Set>${this:16}.setOut(${value})</Set>
     </Property>
   </Properties>
   <Events />
@@ -99,4 +97,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>+r7jICzyZNJZ2rNpw5KYF0bNSOU=</DigestValue></Reference></SignedInfo><SignatureValue>Yx6az2BHF+417wwADv1kADZFzirZlCf3hO/HkE+uBAOqBVS7BdoU6AJKJZ8jsPwW1sSMz3WeaZ8nxjhUTOa4ZE4g8oPiW0MQD8oD7owwFXXZRBQZ9aTx2lZxJ4UjLU2immH2skNDoVyO3HUDmPAMLJpFpTJYlnf2BKdBu0ryXaM=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/Convert.xml

@@ -158,4 +158,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>GNgoFJf+qvGzcrBX99c+hyOOn6s=</DigestValue></Reference></SignedInfo><SignatureValue>RN+idg6uO8WuY17V8IBHtMb4KHoIWaWZwjyuYY+fMzqt3tgaE8umxzEj2bA0g92ZkFPYpXCbrMeyBfo00EYG2hQ4gU3PFP+qeAF9wTetxr2Bq6JUngC169bLpXVT1O6TVQGYxu8jeM+RlHDC6T8sXIcaZuHgBMNp8kA4d2QVQjk=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/DBNull.xml

@@ -33,4 +33,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>H2u7T/0n1uzmhUP9xs7s3vpwUio=</DigestValue></Reference></SignedInfo><SignatureValue>Hkshe178tcOCf0FmiHg3TFRNsTBTbYZygQHl0iYtofdp+IM3h6YvlbyYT4cGJcGUVEcqijLqYR8WG1up0lh4ohI2k+/uGP7ogyx73sV+d4DnGPKdSyxdN+dnQvqb6BBfxE/basxO1jZdZfu7hTacTqbewAN3UtjS66qQvkv8fhU=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/DateTime.xml

@@ -244,6 +244,12 @@
     </Method>
   </Methods>
   <Properties>
+    <Property>
+      <Java>Calendar.getInstance().getTime()</Java>
+      <Type>System.DateTime</Type>
+      <Name>MinDate</Name>
+      <Get>new Date(Long.MIN_VALUE)</Get>
+    </Property>
     <Property>
       <Imports>
         <Import>java.util.Calendar</Import>
@@ -254,6 +260,15 @@
       <Get>Calendar.getInstance().getTime()</Get>
       <Set>${this:16}.setNow(${value})</Set>
     </Property>
+    <Property>
+      <Imports>
+        <Import>java.util.Calendar</Import>
+        <Import>java.util.TimeZone</Import>
+      </Imports>
+      <Type>System.DateTime</Type>
+      <Name>UtcNow</Name>
+      <Get>Calendar.getInstance(TimeZone.getTimeZone("UTC")).getTime()</Get>
+    </Property>
     <Property>
       <Imports>
         <Import>java.util.Date</Import>
@@ -293,4 +308,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>7uAb8+T1igmvalwNMoG5G2tP7Uo=</DigestValue></Reference></SignedInfo><SignatureValue>d0iRrcSiNCFXAsUf28KhcXJ19Vn3nvVuRmDx74BGmmJuwYaGoc8gfHBhgK/AgDHQnL8lQM9XjgroWyKfbvMBZsX3ZmmgniW9ME8Js++H/s0ZqF/PqfouDC+UC6wI5ZeFYf8aAeghT/ElMDck6OLfUdkZtsF2Ptx+NkteWOwS0kc=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/Decimal.xml

@@ -7,9 +7,10 @@
     Copyright 2010,2011 Kevin Glynn (kevin.glynn@twigletsoftware.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">
+<Class has_boxed_rep="true" 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>double</Java>
+  <BoxedJava>Double</BoxedJava>
   <Name>System.Decimal</Name>
   <Uses />
   <Inherits>
@@ -97,4 +98,4 @@
   </Casts>
   <UnaryOps />
   <BinaryOps />
-<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>7Ot5ixWiT3Qc7uTzVliJoQz9ryQ=</DigestValue></Reference></SignedInfo><SignatureValue>LbqwFKTyvHQi9S5c/PDTHJn1brBajsz5eYZOg+okiqdYCAxM5plon5NQ1u0FNjpNas4nXOxOCmo+J7VQ6fYJ+NYYE7JchwyHuSaMfsfdS7Jv1uXeXlraHkBE0STcwYRy306ObyEu76tKSht9FwWbxz13Ng03P3OdkJpKMExiFis=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/Double.xml

@@ -7,9 +7,10 @@
     Copyright 2010,2011 Kevin Glynn (kevin.glynn@twigletsoftware.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">
+<Class has_boxed_rep="true" 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>double</Java>
+  <BoxedJava>Double</BoxedJava>
   <Name>System.Double</Name>
   <Uses />
   <Inherits>
@@ -204,6 +205,14 @@
       <Get>Double.POSITIVE_INFINITY</Get>
       <Set>${this:16}.setPositiveInfinity(${value})</Set>
     </Property>
+    <Property>
+      <Imports />
+      <Java>${this}</Java>
+      <Type>System.Double</Type>
+      <Name>Value</Name>
+      <Get>${this}</Get>
+      <Set>${this:16}.setValue(${value})</Set>
+    </Property>
   </Properties>
   <Events />
   <Indexers />
@@ -227,4 +236,4 @@
   </Casts>
   <UnaryOps />
   <BinaryOps />
-<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>LIAx4dAFrghcUimx0SObO607yuI=</DigestValue></Reference></SignedInfo><SignatureValue>OowvpOnEX2C75lGtSBxebVFykZ5LSclrdUiufOG3ifUCxcoXOKeqisC5joUIyqoB3F0yabOuGHQv8BFf2MIUptwmOOP2QzUwSh6BJbd+tvnAYQmRZnsaPl4gBAGqXQacpE1rgEWCOqs+mWAfoW3zClDa0lKdIsLnhgZOTvcPT9U=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/Enum.xml

@@ -49,8 +49,10 @@
       <Return>System.String</Return>
     </Method>
     <Method>
-      <Imports />
+      <Imports>
-      <Java>Enum.valueOf((Class*[? extends Enum]*)${enumType:15}, ${value})</Java>
+        <Import>CS2JNet.System.EnumSupport</Import>
+      </Imports>
+      <Java>EnumSupport.Parse((Class*[? extends Enum]*)${enumType:15}, ${value})</Java>
       <Params>
         <Param>
           <Type>System.Type</Type>
@@ -64,6 +66,28 @@
       <Name>Parse</Name>
       <Return>System.Object</Return>
     </Method>
+    <Method>
+      <Imports>
+        <Import>CS2JNet.System.EnumSupport</Import>
+      </Imports>
+      <Java>EnumSupport.Parse((Class*[? extends Enum]*)${enumType:15}, ${value}, ${ignoreCase})</Java>
+      <Params>
+        <Param>
+          <Type>System.Type</Type>
+          <Name>enumType</Name>
+        </Param>
+        <Param>
+          <Type>System.String</Type>
+          <Name>value</Name>
+        </Param>
+        <Param>
+          <Type>System.Boolean</Type>
+          <Name>ignoreCase</Name>
+        </Param>
+      </Params>
+      <Name>Parse</Name>
+      <Return>System.Object</Return>
+    </Method>
   </Methods>
   <Properties />
   <Events />
@@ -96,4 +120,4 @@
   </Casts>
   <UnaryOps />
   <BinaryOps />
-<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>421taeYQfl8V0tcircAA5cgNF0k=</DigestValue></Reference></SignedInfo><SignatureValue>PyqeBNqGPZ4PQJx5QA+x2S2m8q7O1RZHsx2u2rJUhyoZbLrF+NBIfomV7dbIgIJ9Q5tjQTEyOKPRVve5SmgJ97w3bKOkyUgZbGk69vSMsBbtUk8IgtsYCfcBG9UmvjCBh9pV5bReRf8iJAvnLQpC9n9GRomXGV+K7DMzPrFwz0E=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/EnumAsNumber.xml

@@ -95,4 +95,4 @@
   </Casts>
   <UnaryOps />
   <BinaryOps />
-<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>4k0U7tevFUQGN33Tfaobpi/xr64=</DigestValue></Reference></SignedInfo><SignatureValue>DPkWTs8CFtDAbj2n+7s8QOnQyELUqZGzUoo/MPJ/VJozmcYviAip5P2q1FIzeZiNgLmvihJlz2MM+frdFAXuoUYvTqhbOq5jgPSsCkZymbvNyVR260JixNfSEIxunzyREvMPS0N0Lvmi7znH2IXxfUgXJpOw1El5qzfng49LTp8=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/Environment.xml

@@ -43,4 +43,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>ptKNWkfazFtlOdOMKPsKSvD096c=</DigestValue></Reference></SignedInfo><SignatureValue>ROp3Fp6wLw1rNYGt34gt3gvDzWW0XKLPMB9/vcEJL4Psd5erNgP2m1dNBPVYZ5/Sq7hReNwFGygxVoNDbJuC9gJ0LAS/mukUnTObx0qvfsSQzD/+RZc6iiN8Jlq3XNaV7yv2NwrQ07JnTBUT3RTeOXLLdPgVCUSRpVc87PJVifg=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/EventArgs.xml

@@ -26,4 +26,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>10gQjwZURfUiWRQQZHHLhjzvyao=</DigestValue></Reference></SignedInfo><SignatureValue>LqaNkGhL5G8I7kNkIqKGWaU1y3aQS1NNeLnUK0bAhiQDk2aatsldV3RvSyA+sUyHJ/La+jYz5chPUmZusenax1EoM9CvvOoP9Uzpz4V4VtpWWBJr65Hc9rLhyfkgxoGgSnuvFOxxLVd/t1LqzE+SHlfgaxYTttwwIoSqHksEsAc=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/EventHandler'1.xml

@@ -37,7 +37,7 @@
       </Params>
       <Name>Combine</Name>
       <TypeParams>
-        <Name>T</Name>
+        <Name>TEventArgs</Name>
       </TypeParams>
       <Return>System.EventHandler*[TEventArgs]*</Return>
     </Method>
@@ -58,7 +58,7 @@
       </Params>
       <Name>Remove</Name>
       <TypeParams>
-        <Name>T</Name>
+        <Name>TEventArgs</Name>
       </TypeParams>
       <Return>System.EventHandler*[TEventArgs]*</Return>
     </Method>
@@ -80,4 +80,4 @@
     <Return>void</Return>
   </Invoke>
 
-<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>yz+yOlqpwafASqBPdP2mB/lVgZk=</DigestValue></Reference></SignedInfo><SignatureValue>Nv+agoqBJd5WaI7/+c3HuvQ/dt5/5j3fHCKxNm4v8TZITAC8J+AbF8DN3l3ZZC1+zmhBzRTyrMMD7EWi7zumiRrhC2r/+rUpYbfOeiHANORPmwqP5NvSBeUbWvEp3VRBtQZHYNTDNG1gbOApoTGZi0z3dSv1ySftgALkYlxmbrc=</SignatureValue></Signature></Delegate>
+</Delegate>

CS2JLibrary/NetFramework/System/Exception.xml

@@ -103,4 +103,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>yu2wOTyUyadVCuq3eoz/y2QNoGs=</DigestValue></Reference></SignedInfo><SignatureValue>ZdPXY6PcJn6yuDYvUzlFwxVDdR1r5a+dX1bLKQnRZKq7e8TV/K5ObmfbOkAvmqd+eIBWUlUSHbCPMoRlhYW8BQFIYcOf2YvItZLn9QWO1PWlvkNYPVmmofT9OCupVfRAB+ZIL10fi1NvAE65S24UqVpSAuk6qXrOqFvRyvhBQ00=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/GC.xml

@@ -41,4 +41,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>YzA16cWwMe/tL/4GAcwMR4/czcg=</DigestValue></Reference></SignedInfo><SignatureValue>Q3ilO3ARI/H4ek1HnJ0VF5xXzVgex2V1AmSfeMX0GTuDC9rH2OnQPQv+sowzDT+CHHQ7wFqbRqCGRu76z6sYrueZi+infu8SoMUo77UYLgKzDaoOz0nC+J0mJlL35ExKHs7KlaG2eHW3CQr2ogagY5VUktWwIWW8XLkaLMqOZ90=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/Globalization/CultureInfo.xml

@@ -8,8 +8,10 @@
 
 -->
 <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 />
+  <Imports>
-  <Java>TODO</Java>
+    <Import>java.util.Locale</Import>
+  </Imports>
+  <Java>Locale</Java>
   <Name>System.Globalization.CultureInfo</Name>
   <Uses />
   <Inherits>
@@ -36,4 +38,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>Vsg8TZxeGQwn7AAjmcVy7PWrVmk=</DigestValue></Reference></SignedInfo><SignatureValue>YovJ4GmShMK+vdZ/Mvx9ww510jYu76KRQTptuUoxZbxfQ3u/ePrOuIQvluX2NXT6zvK3L5Cs+jnAehQ9AZGY8SZJdUJl6ElB9Nl879MYB7LwnXsgfJGyyLzdSQ37yOQKBY72NfmiNdY0m7XildocSaWUFFeGKVPaNdU/w6l+L6Y=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/Globalization/NumberFormatInfo.xml

@@ -46,4 +46,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>hNTYNBbpVjGNDduq5f1DR52cmBQ=</DigestValue></Reference></SignedInfo><SignatureValue>S7kMe5TlEJRRqsmDhi4DBf+PXnSN1+IXuEBsf5e7oNJYTkSW0p5mNLSh9WXsEofeQF+pFllqk5br7fzynm4AgU5+BEpdphi5DbpTardAEe/s1jWIuy7NPgGW8iEX7kn+9igBfODOo+FQVG9z0hVXRHF0E3nQIvGwqEJrOzAwhZY=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/Globalization/NumberStyles.xml

@@ -53,4 +53,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>YcWFOxs0ChrrveGzSpzTQsOlvyk=</DigestValue></Reference></SignedInfo><SignatureValue>bKa1RcaZuRQ2MRIrwsEVE5WJ/5vkgrXH3/jzan7SJiAWW+a9/f+YbTTrJ9+qjKgNhZPA0KXtBqwSWOltD2nL+Z8uIVOzn9BL6NNac1jq+JG1z7LA6usH8eZ+riBtBsWIx8LbKsgqpzSsN0o/JFIf9PCgUMdAa+FRarL1jCElvis=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/Guid.xml

@@ -65,4 +65,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>Tp6afT/OOq5ZjPtIh+5sx/AznjE=</DigestValue></Reference></SignedInfo><SignatureValue>SBAuNXFb2mDvbwarVc1cEamAfpEcSFiCdg7vRdFqHdPZkX0l52vLAHkQue0//Lrhi0hS+H/cKH7yL/+nmb8riN0bCBNlvGv4WKd0cR3+xzMyM64uD1qK8cHaSbezuBnrg3Op57fY+8C7g7ZrKP+/NSBbTihZupD86KgHYt/UdFA=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/ICloneable.xml

@@ -26,4 +26,4 @@
   <Properties />
   <Events />
   <Indexers />
-<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>u2nG8Uyuf+PYnlOdhaRxQ6HoTWE=</DigestValue></Reference></SignedInfo><SignatureValue>B65UQHeWayb2ALjl2pf8KJZBZ+azKV1CUD3y6H1CiX4V4Uy75BNemElxGZqb9vioYgjiXb67JROyng4ydVcizK0O1VY3M2O2TcERZSSHnzyezQOuPhyHmKM1ps0PclEHufl7h9zCBZ4gEY0dcSWL/eLb2YwNeMGYehu+QBMsAso=</SignatureValue></Signature></Interface>
+</Interface>

CS2JLibrary/NetFramework/System/IComparable'1.xml

@@ -0,0 +1,36 @@
+<?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@twigletsoftware.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 />
+  <Java>Comparable*[${T}]*</Java>
+  <Name>System.IComparable</Name>
+  <TypeParams>
+    <Name>T</Name>
+  </TypeParams>
+  <Uses />
+  <Inherits> <Type>System.Object</Type> </Inherits>
+  <Methods>
+    <Method>
+      <Imports />
+      <Java>${this:16}.compareTo(${arg})</Java>
+      <Params>
+        <Param>
+          <Type>*[T]*</Type>
+          <Name>arg</Name>
+        </Param>
+      </Params>
+      <Name>CompareTo</Name>
+      <Return>System.Int32</Return>
+    </Method>
+  </Methods>
+  <Properties />
+  <Events />
+  <Indexers />
+</Interface>

CS2JLibrary/NetFramework/System/IComparable.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -9,14 +9,14 @@
 -->
 <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>IComparable</Java>
+  <Java>Comparable</Java>
   <Name>System.IComparable</Name>
   <Uses />
   <Inherits> <Type>System.Object</Type> </Inherits>
   <Methods>
     <Method>
       <Imports />
-      <Java>${this:16}.Compare(${arg})</Java>
+      <Java>${this:16}.compareTo(${arg})</Java>
       <Params>
         <Param>
           <Type>System.Object</Type>
@@ -30,4 +30,4 @@
   <Properties />
   <Events />
   <Indexers />
-<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>QW7zplxnu6rYgpu0uqJgggP3fSo=</DigestValue></Reference></SignedInfo><SignatureValue>GeWHzaqovCST5IYkoACbZgKIpSm6bx4FprDZMyTVZKddmTlLTp3cbhXJso2GxzEhz8cfbRac8axPMLLPtnZa3qEv+7zAsSJKcHglIpQMbfoP5jNUiEFo6LIodpU7BTxzFS+PEC8hLFSxUwKpWqGnnL+sx1Ie34EYgOcRNCDwQU8=</SignatureValue></Signature></Interface>
+</Interface>

CS2JLibrary/NetFramework/System/IDisposable.xml

@@ -27,4 +27,4 @@
   <Properties />
   <Events />
   <Indexers />
-<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>+vVUUFftRdH5Pr1U9UgceoocL/c=</DigestValue></Reference></SignedInfo><SignatureValue>iSpArQXUl74iZlhpxXJA0uxKNQP58ZhDGoiQafnENk6Sr2WkJrv1+FbrcL/VoqEvgT6EZ0lzvv1jbKJY0h6grUsn4CcN2J4MCttnAOCnemuxaVb00aASlLUwmN7InqdhebdjH4uFR7UUKm7qYq5EvAR095fu0A/zGWSJ7L/tXO4=</SignatureValue></Signature></Interface>
+</Interface>

CS2JLibrary/NetFramework/System/IO/Directory.xml

@@ -163,4 +163,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>VhV6lARiqMUmCrlSRS70iH9eVC8=</DigestValue></Reference></SignedInfo><SignatureValue>cNsBhGGskh7xMpVV2aLEVMnceR42o1BOIBda++MO9mRYOwIESDqsoL98YzSIkF/KM2l97EB7OaaTryRHmOF9b6uhxQvIwmNsgpMSdIh9IF/ya8A3uMggoimoppl0+JsmxYCRlOSWrEsqG9mstpV6aP7LRY4a+z8ej8yg2KMLEac=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/IO/DirectoryInfo.xml

@@ -65,4 +65,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>NJanqVIRU5Jqt79bLB9tjLbelKA=</DigestValue></Reference></SignedInfo><SignatureValue>FML+/nkG9wri0yTifdQTpb7dBBBLbtkxzTujiWJQFMc3ieQnQbT4juBevjnXZLmuZNEGl/fW4GI5coSaSchtcHUhkhG9a37jezuUAztdNi20+cYaNRiJGaQH0OqROgV/RX6sLtZ5zcQCaawUgp3rSTD3R3s7Jf1mYvLl7R4+ZaE=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/IO/File.xml

@@ -18,12 +18,12 @@
   <Methods>
     <Method>
       <Imports>
-        <Import>java.io.BufferedWriter</Import>
+        <Import>java.io.PrintWriter</Import>
         <Import>java.io.OutputStreamWriter</Import>
         <Import>java.io.FileOutputStream</Import>
         <Import>java.nio.charset.Charset</Import>
       </Imports>
-      <Java>new BufferedWriter(new OutputStreamWriter(new FileOutputStream(${path}), Charset.forName("UTF-8")))</Java>
+      <Java>new PrintWriter(new OutputStreamWriter(new FileOutputStream(${path}), Charset.forName("UTF-8")))</Java>
       <Params>
         <Param>
           <Type>System.String</Type>
@@ -185,4 +185,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>TBZHwEiP93PrWtoJNDg2/1ZYwjE=</DigestValue></Reference></SignedInfo><SignatureValue>Q93a6W87/seu/9tF/jihtZcoTi8JnA23TNcC4xyJ/fmfmYAjr00PW9twMaqS982FFtfUn6A5aiBZX2pNbWJWYBsN08RddL5QoUjtM+eIiu3mUOIn3fNpKsLUJRADPYV8nFI/9fhY0GfPHoAM8y0RRSTho+Fjg8vZznigEEg6miE=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/IO/FileAccess.xml

@@ -30,4 +30,4 @@
       <Name>ReadWrite</Name>
     </Member>
   </Members>
-<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>efTWa4oLEWHXEL6YOzaqcIomFVo=</DigestValue></Reference></SignedInfo><SignatureValue>gg/i649hSZt7bAPM9ZB0QueDX8++7p7/Yzteb7h4p2YkRI22vMM2Lc+jI4lgxIB/Hf5Jd3XI0rGDRcDip2t4bV0ErQbPGTajuJncLj7RJ/BDpCA3nUBWZDYRmypxK/u3r1kf5aCAWQDZm0Bj6XlVK6+++Y+OG2PAkIpbngWlQQc=</SignatureValue></Signature></Enum>
+</Enum>

CS2JLibrary/NetFramework/System/IO/FileAttributes.xml

@@ -31,4 +31,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>1y1//jRrmn1IDiw5DPAEY3JLwos=</DigestValue></Reference></SignedInfo><SignatureValue>D1Soj4dqI/8ewFGU+ajHQKV1zGZ4tq/Epk0HGxNRLj7UY8MvOf+x9Sc5HIhhtnxfCLsSJ4vnLOHCgSvHu6lyAqtEcF6PnQn6qwe0nLmWY3PehDU9DcXJ6WqbYMLIBAeVYcJbCKIvByAlnnr8KeukrgtwqYnr5fg2pQOrENKZrr8=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/IO/FileInfo.xml

@@ -48,4 +48,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>zT7MZf/MtNsbtsieJgt1tkb8G18=</DigestValue></Reference></SignedInfo><SignatureValue>Dz4GmEgPd46EzWfr1FGFh+NdonIxqUFMo2PNIVqvWpOQZHV2QA/juzjeo6F0rURli/KIW9Mx1TGnVIVGrD32hzgerC62ladoAwS90ipITEf//X+mEfu1yEElV7ro7WEDF7Nixih1AhWMuS6bezc2Tm9B9dQpmtH4lOxHJFgis5g=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/IO/FileMode.xml

@@ -42,4 +42,4 @@
       <Name>Append</Name>
     </Member>
   </Members>
-<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>mo6ChmPjcAlAo0NBWLLZbsocykw=</DigestValue></Reference></SignedInfo><SignatureValue>RlUioSuamZxr9dmH+n+zDAoS31RAR3VRqGwbq0J8Ew28sRdZoXTjz2yJwWvSZIzMRNeMc0v8VZbLRMEM39bSKH51gWKuQ8TFyzTBwMzQDeDsNO5kzdxcE1DYGnZKKplPDKPM8n9mlpuDYginKU8dk3dA/CtPgAmc7X90AuPIhew=</SignatureValue></Signature></Enum>
+</Enum>

CS2JLibrary/NetFramework/System/IO/FileNotFoundException.xml

@@ -55,4 +55,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>Ffp0ZAAL6/cvcEd3wzAGKfvph6E=</DigestValue></Reference></SignedInfo><SignatureValue>h00T7/kqU7OxN/phB3We3PtyjMkPPm7Kex8evt2CMV2PY61buT3cgoVGmz1VVKeqBr5iAblKeqtEnAsxId21UNEQQG8dZ9XLXd5R1IJcID5gZw4aXBX4ymZcCXqTdgfkAY3f6+Y+0Dcoo1lw9dl3AJ2AorQ3OEDAWx3JnJwo+qA=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/IO/FileStream.xml

@@ -48,4 +48,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>Nqv13S/xI9uBrmcuLe+drNaB6b8=</DigestValue></Reference></SignedInfo><SignatureValue>iQUcu2k9+e5NyIoodH+eDiOcEbrHWBSsi9WKdfqbnOuGnJ9Z+L0gfuCOAi/48FKQPvQ6JYNA+CaxfshTfL/rwIfDS5mrFBUaQjZug33WYuKUxuR7ggb9jQpG0ODKRQ36O6lern2HVpSG3QBK6+DWvPMSmUsuNDQPJBTjhubTmqY=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/IO/FileSystemInfo.xml

@@ -46,4 +46,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>8CBcOoazDwSkjtE5RVdjt2IlXeI=</DigestValue></Reference></SignedInfo><SignatureValue>AkgW2mQtiG8DxId2b8TVsc1mSA2aLvYznEEDWLKI37Ds1HZ0ZI7x4IEu9usRxiwDujVchjZbAxe32W1Fr4tuuHLcQpnY5Xty66Ktn1v6a4tKIdfwUmoShP6r/V83NTvTtDpPXvsJGVeqacyV62TKzvrLJOhibmLQRJ6I8dqYIb4=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/IO/IOException.xml

@@ -8,8 +8,10 @@
 
 -->
 <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 />
+  <Imports>
-  <Java>Throwable</Java>
+    <Import>java.io.IOException</Import>
+  </Imports>
+  <Java>IOException</Java>
   <Name>System.IO.IOException</Name>
   <Uses />
   <Inherits>
@@ -21,13 +23,17 @@
   <Indexers />
   <Constructors>
     <Constructor>
-      <Imports />
+      <Imports>
-      <Java>new Throwable()</Java>
+        <Import>java.io.IOException</Import>
+      </Imports>
+      <Java>new IOException()</Java>
       <Params />
     </Constructor>
     <Constructor>
-      <Imports />
+      <Imports>
-      <Java>new Throwable(${message})</Java>
+        <Import>java.io.IOException</Import>
+      </Imports>
+      <Java>new IOException(${message})</Java>
       <Params>
         <Param>
           <Type>System.String</Type>
@@ -36,7 +42,9 @@
       </Params>
     </Constructor>
     <Constructor>
-      <Imports />
+      <Imports>
+        <Import>java.io.IOException</Import>
+      </Imports>
       <Java>new IOException(${info},${ctxt})</Java>
       <Params>
         <Param>
@@ -50,8 +58,10 @@
       </Params>
     </Constructor>
     <Constructor>
-      <Imports />
+      <Imports>
-      <Java>new Throwable(${message}, ${inner})</Java>
+        <Import>java.io.IOException</Import>
+      </Imports>
+      <Java>new IOException(${message}, ${inner})</Java>
       <Params>
         <Param>
           <Type>System.String</Type>
@@ -68,4 +78,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>Rh5b9fqcmJ3Mc6y4rcny3+nHpPo=</DigestValue></Reference></SignedInfo><SignatureValue>dKXPtM0THwShuICT119ryLha/pA86yoODUzSi+a0s/02gAyNr4538k8TSBsUQkwSKfHymKuskaYV8ecnYBUlWh7QNTp1QXqiaKlOGbpuAgP8utT3eHWgCzZwwURcGM7gHppwrtUuuFeCtS2QSN4YksGBii1mgjZ4/JnrzMJR2vY=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/IO/Path.xml

@@ -115,4 +115,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>3hXB/CetRaRsxGX4tnYLHV3H7y4=</DigestValue></Reference></SignedInfo><SignatureValue>gXU6SIQJodDJtjbem3/rYDKiGU+cyvqX2JTrFyKuzUuT6T7+7ZYgiQudeJhd8NDZnTQZTmsCG82G9UI2ubW/2XOdBpm5nTALzFyXwC4ZJnFouylTslTmXuWrhofL4F15lSLiQfVgnuwxt5VOoedSNWHxhDTjNZxkpagxcGpbUGo=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/IO/Stream.xml

@@ -98,4 +98,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>4cELY16KAUL//3IJkilcJj4RauA=</DigestValue></Reference></SignedInfo><SignatureValue>YTK2P4LPePeVb9tsK6LktpGh8LjpHRVBHfJnZLcIfTG5K2B8fLpg1fKfYus0en63Yj5jlmsCmwWpaGZCbZfZ7ZPE0hnzJ1sBORVAKvWKmdYF+r/0Z8daoxK2G2FON5RwUwvwLhLkpSk58pO/W50aR0buQYmI5+efhRIkuGcPLYg=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/IO/StreamReader.xml

@@ -94,4 +94,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>dRH/vaByIBY+aiG1yjT0gmAaqSI=</DigestValue></Reference></SignedInfo><SignatureValue>JLqwf19a6+rPQWKTI0DoGuI/bm5Nh8G2wSVstYcZo6atAIzQK34ek3owvj09/1XXnIce2DUduqDXeqUDzzYRTS0rGVnLM4ykyaV4SUAlUuynPPPkgFrmKE75Pz9VCENMxK+n+FNDvMrUeIVk584d2jIsbQWSHQYYwpn31ihIS78=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/IO/StreamWriter.xml

@@ -9,9 +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>java.io.BufferedWriter</Import>
+    <Import>java.io.PrintWriter</Import>
   </Imports>
-  <Java>BufferedWriter</Java>
+  <Java>PrintWriter</Java>
   <Name>System.IO.StreamWriter</Name>
   <Uses />
   <Inherits>
@@ -24,10 +24,10 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <Import>java.io.BufferedWriter</Import>
+        <Import>java.io.PrintWriter</Import>
         <Import>java.io.FileWriter</Import>
       </Imports>
-      <Java>new BufferedWriter(new FileWriter(${path}))</Java>
+      <Java>new PrintWriter(new FileWriter(${path}), true)</Java>
       <Params>
         <Param>
           <Type>System.String</Type>
@@ -37,10 +37,10 @@
     </Constructor>
     <Constructor>
       <Imports>
-        <Import>java.io.BufferedWriter</Import>
+        <Import>java.io.PrintWriter</Import>
         <Import>java.io.FileWriter</Import>
       </Imports>
-      <Java>new BufferedWriter(new FileWriter(${path},${append}))</Java>
+      <Java>new PrintWriter(new FileWriter(${path},${append}),true)</Java>
       <Params>
         <Param>
           <Type>System.String</Type>
@@ -54,9 +54,9 @@
     </Constructor>
     <Constructor>
       <Imports>
-        <Import>java.io.OutputStreamWriter</Import>
+        <Import>java.io.PrintStream</Import>
       </Imports>
-      <Java>new OutputStreamWriter(${stream}.getOutputStream())</Java>
+      <Java>new PrintStream(${stream}.getOutputStream())</Java>
       <Params>
         <Param>
           <Type>System.IO.FileStream</Type>
@@ -69,4 +69,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>t76KgMrSLQSVHQjriHUPB2vcC8E=</DigestValue></Reference></SignedInfo><SignatureValue>JebOk+Gye7UgS4w6ik3W+1JyI65G/eFCX3gDNU5yf0XxTEwwnWt4Xoh/0baxo0AQr9UcG/pZKnbhtH9CLMV9AA9Yaoh11uZnJnkii91Q5ENtxCVFFtPKOgR0BiExYH37scOiN+7SC8iSp67LZet2giGE6NB6KWoPw1OGKxHJUDk=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/IO/StringReader.xml

@@ -39,4 +39,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>Hdd4PmMJ7tDg/ZezSRw2teEPm/A=</DigestValue></Reference></SignedInfo><SignatureValue>F2gNwFY5/0VXhnHL2StnuMeah9i4GURjxpCbGReRbO2gS1L690wJCIBzeSAP4JQTljpMuOpeCfk2Gj2PVVaD/lkb5GwsP9vWqCtYcwOnfHlt7AW1G0kIz3mR+ZKdODpyMP8Taba3ZfErFxc6yLxUL1d4hCnryAie/vDSDAMTtno=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/IO/StringWriter.xml

@@ -39,4 +39,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>eZ5XfRFQS57NI3ywcx0Yl6wLnf4=</DigestValue></Reference></SignedInfo><SignatureValue>eN4ab8eG2r8sJNn/5lUWcMomeRA+SJirGSGBjvlNmpI9/xMNhXhSVyV1R+qMZ/ONp5y4qr8qMlqCN+TSfFpWFD9OHRXebDp6taqwYe4K3q0XCI4fJPmuU5vWuXGnN4Y/ilEpTNUem1OWH/EhNy8dzeD/4qHQP4lPbxfbm2xrVWc=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/IO/TextReader.xml

@@ -50,4 +50,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>yeJxK1ztg1+4n1PWYmukuTH3MOI=</DigestValue></Reference></SignedInfo><SignatureValue>RU+NSDIyRxonWeQSW4qK3NUXkmc0TB/v+KS8WLdvNouWKllfWAZwNJkEeEDJ/EA/GU/nwBCnCSUXAQf8pPLW77XVPFWH+TQFqeLBjzXZJeWImQ2C8LW4492nQGzt5oPhFl5hK80Eeurux29CW9fOJnVtVa54Xv/LRR6YegL9Eag=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/IO/TextWriter.xml

@@ -9,9 +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>java.io.Writer</Import>
+    <Import>java.io.PrintStream</Import>
   </Imports>
-  <Java>Writer</Java>
+  <Java>PrintStream</Java>
   <Name>System.IO.TextWriter</Name>
   <Uses />
   <Inherits>
@@ -27,7 +27,7 @@
     </Method>
     <Method>
       <Imports />
-      <Java>${this:16}.write(${arg} + System.getProperty("line.separator"))</Java>
+      <Java>${this:16}.println(${arg})</Java>
       <Params>
         <Param>
           <Type>System.Object</Type>
@@ -39,7 +39,7 @@
     </Method>
     <Method>
       <Imports />
-      <Java>${this:16}.write(${arg})</Java>
+      <Java>${this:16}.print(${arg})</Java>
       <Params>
         <Param>
           <Type>System.Object</Type>
@@ -113,4 +113,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>fHpl4A2XFSJlv/tomMrof1jeCz4=</DigestValue></Reference></SignedInfo><SignatureValue>SHiLgQTTYxeOYcqrtm91Mrj3CeT4crWhq/gtehchWFRLdDXwB8zNkCEImFdFh4AZ6qlGo8X0nehYbQ3zhdPelvKN97nm/BJ0euWmnnguB6/53ZPYm0PJ/KvReA45KE2xvdB2JUHqnrunN0SJtG8Cbceb8kbvNvv7hvEC5eNfd1I=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/Int16.xml

@@ -7,9 +7,10 @@
     Copyright 2010,2011 Kevin Glynn (kevin.glynn@twigletsoftware.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">
+<Class has_boxed_rep="true" 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>int</Java>
+  <Java>short</Java>
+  <BoxedJava>Short</BoxedJava>
   <Name>System.Int16</Name>
   <Uses />
   <Inherits>
@@ -56,6 +57,14 @@
       <Get>Short.MAX_VALUE</Get>
       <Set>${this:16}.setMaxValue(${value})</Set>
     </Property>
+    <Property>
+      <Imports />
+      <Java>${this}</Java>
+      <Type>System.Int16</Type>
+      <Name>Value</Name>
+      <Get>${this}</Get>
+      <Set>${this:16}.setValue(${value})</Set>
+    </Property>
   </Properties>
   <Events />
   <Indexers />
@@ -71,4 +80,4 @@
   </Casts>
   <UnaryOps />
   <BinaryOps />
-<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>RpEteKGIPrPawPr4xVjPHqjFTyI=</DigestValue></Reference></SignedInfo><SignatureValue>Xr3BSO4oUAZ6b2X5yNPrmnni5YHGkJk2WIb45bbZm/BbC9ftzY9RK82oKp/0Sbf/RLKOXL5nv0MkGzrtvJMdtVHewNc2S6eqK1VGL0exap+WmDn/2KAZ3jX7uOUS/RCXeEarQ+nimCvlw3nyug1FbjC9Af1jW1D73+3/j/oxyS8=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/Int32.xml

@@ -7,9 +7,10 @@
     Copyright 2010,2011 Kevin Glynn (kevin.glynn@twigletsoftware.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">
+<Class has_boxed_rep="true" 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>int</Java>
+  <BoxedJava>Integer</BoxedJava>
   <Name>System.Int32</Name>
   <Uses />
   <Inherits>
@@ -92,6 +93,14 @@
       <Get>Integer.MAX_VALUE</Get>
       <Set>${this:16}.setMaxValue(${value})</Set>
     </Property>
+    <Property>
+      <Imports />
+      <Java>${this}</Java>
+      <Type>System.Int32</Type>
+      <Name>Value</Name>
+      <Get>${this}</Get>
+      <Set>${this:16}.setValue(${value})</Set>
+    </Property>
   </Properties>
   <Events />
   <Indexers />
@@ -109,4 +118,4 @@
   </Casts>
   <UnaryOps />
   <BinaryOps />
-<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>lOIJEJHw4pTV7n/If1Uf8EVvIt0=</DigestValue></Reference></SignedInfo><SignatureValue>HXjJhVmsRSzPeRQ3RPecWhg66s+6TeWPsWO5GPhgOGIGPCbxTfq89aeVyFUvOPxxPW+xeadwT78nGTf6YCCiHnS2nuH4xDbs3DBkkq8v6e1gJ1oF482vdPKurTTavczimfir4Qc2me1kPDFmlYQPNf3+94OZ54zxfVbYkCQAUA4=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/Int64.xml

@@ -7,9 +7,10 @@
     Copyright 2010,2011 Kevin Glynn (kevin.glynn@twigletsoftware.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">
+<Class has_boxed_rep="true" 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>long</Java>
+  <BoxedJava>Long</BoxedJava>
   <Name>System.Int64</Name>
   <Uses />
   <Inherits>
@@ -63,6 +64,14 @@
       <Get>Long.MAX_VALUE</Get>
       <Set>${this:16}.setMaxValue(${value})</Set>
     </Property>
+    <Property>
+      <Imports />
+      <Java>${this}</Java>
+      <Type>System.Int64</Type>
+      <Name>Value</Name>
+      <Get>${this}</Get>
+      <Set>${this:16}.setValue(${value})</Set>
+    </Property>
   </Properties>
   <Events />
   <Indexers />
@@ -80,4 +89,4 @@
   </Casts>
   <UnaryOps />
   <BinaryOps />
-<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>R1mAmy6v+GTCZW1KEYBAeW9Qdz8=</DigestValue></Reference></SignedInfo><SignatureValue>JjDOrDolQbC95bLUtPd//bq8OA+Q+ni2d7IFATgiklkeg1nL3a6Uipp5TrqZt8K8ED0iW886an6QuhLqJVy+G8FxYULBC9OlaDvJNjk4pMJJ1pnJhyPPmYPONbTi0xwpAZ/cz6vAZaQBRwz4IBNsR/I0uvVODDwfbWlb50GWsMM=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/InvalidCastException.xml

@@ -46,4 +46,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>Leq87l4mvDIXCO9GBoVObjKAjHE=</DigestValue></Reference></SignedInfo><SignatureValue>P4VblXRWnzh7rnJBACZ+qnTDIrnENVqpKCeGdyOHrEnzKBKQwlPU4h6brxyoEAZrlE9PCex9TtGdxcdBQrKWtnyCq7HXo1iJ9jbWKSEweWM/U8rKdQ2b9501Tz6hvXwSKzTu2kt+jwBjfKvyBmA2SBUMdqVFxijWQnL8AquzPb8=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/InvalidOperationException.xml

@@ -77,4 +77,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>1eHYF4d6Kna8vr1gxf+yy5FFQns=</DigestValue></Reference></SignedInfo><SignatureValue>MfkaqWomg11FZaQJLaWTxUGjUQzTPcDnBPuF2q4PCyjlnigDr4B2+VT7qyRz+8jt4GDVihUil6WFh8XJkqbGITNgIEtmclayJvQIp+r0Tlmz2UQhfXRVAPpsvBf5S75NQmyT/+ZuPs1UyRuT9ts5GOhlhNNAHy/S0DVRWzqalOc=</SignatureValue></Signature></Class>
+</Class>

CS2JLibrary/NetFramework/System/LCC/EventHandler'1.xml

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    This file is
+
+    Copyright 2010,2011 Kevin Glynn (kevin.glynn@twigletsoftware.com)
+
+-->
+<Delegate 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.System.LCC.EventHandler</Import>
+  </Imports>
+  <Java>EventHandler*[${TEventArgs}]*</Java>
+  <Name>System.EventHandler</Name>
+  <TypeParams>
+    <Name>TEventArgs</Name>
+  </TypeParams>
+  <Uses />
+  <Inherits>
+    <Type>System.Object</Type>
+  </Inherits>
+  <Methods>
+    <Method static="true">
+      <Imports>
+        <Import>CS2JNet.System.LCC.__MultiEventHandler</Import>
+      </Imports>
+      <Java>__MultiEventHandler.combine(${a},${b})</Java>
+      <Params>
+        <Param>
+          <Type>System.EventHandler*[TEventArgs]*</Type>
+          <Name>a</Name>
+        </Param>
+        <Param>
+          <Type>System.EventHandler*[TEventArgs]*</Type>
+          <Name>b</Name>
+        </Param>
+      </Params>
+      <Name>Combine</Name>
+      <TypeParams>
+        <Name>TEventArgs</Name>
+      </TypeParams>
+      <Return>System.EventHandler*[TEventArgs]*</Return>
+    </Method>
+    <Method static="true">
+      <Imports>
+        <Import>CS2JNet.System.LCC.__MultiEventHandler</Import>
+      </Imports>
+      <Java>__MultiEventHandler.remove(${a},${b})</Java>
+      <Params>
+        <Param>
+          <Type>System.EventHandler*[TEventArgs]*</Type>
+          <Name>a</Name>
+        </Param>
+        <Param>
+          <Type>System.EventHandler*[TEventArgs]*</Type>
+          <Name>b</Name>
+        </Param>
+      </Params>
+      <Name>Remove</Name>
+      <TypeParams>
+        <Name>TEventArgs</Name>
+      </TypeParams>
+      <Return>System.EventHandler*[TEventArgs]*</Return>
+    </Method>
+  </Methods>
+  <Invoke>
+    <Java>${this:16}.invoke(${sender}, ${e})</Java>
+    <Params>
+      <Param>
+        <Type>System.Object</Type>
+        <Name>sender</Name>
+      </Param>
+      <Param>
+        <Type>TEventArgs</Type>
+        <Name>e</Name>
+      </Param>
+    </Params>
+    <Name>Invoke</Name>
+    <TypeParams />
+    <Return>System.Void</Return>
+  </Invoke>
+
+</Delegate>

CS2JLibrary/NetFramework/System/LCC/IDisposable.xml

@@ -27,4 +27,4 @@
   <Properties />
   <Events />
   <Indexers />
-<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>LYuGsVKWZHsnTw+gkph0FYZ2iYs=</DigestValue></Reference></SignedInfo><SignatureValue>DgWvsumXrVwXuaLSfMGKGFr9PkcXaCGpnMTIL/mmFsuMwtkyrGnZHlcV6HMmq2vc9izXrceKx5QsnnuQ1cMig4IXkNrPA5psthnZ5bwHnDElQOOiJrrhaLj9u1+z5rMldexiCV+MH2p/kxVaXtF4jwa4Lpgrv5/q+ZIDmJ3QMRA=</SignatureValue></Signature></Interface>
+</Interface>

CS2JLibrary/NetFramework/System/LCC/Predicate'1.xml

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    This file is
+
+    Copyright 2010,2011 Kevin Glynn (kevin.glynn@twigletsoftware.com)
+
+-->
+<Delegate variant="LCC" 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.System.LCC.Predicate</Import>
+  </Imports>
+  <Java>Predicate*[${T}]*</Java>
+  <Name>System.Predicate</Name>
+  <TypeParams>
+    <Name>T</Name>
+  </TypeParams>
+  <Uses />
+  <Inherits>
+    <Type>System.Object</Type>
+  </Inherits>
+  <Methods>
+    <Method static="true">
+      <Imports>
+        <Import>CS2JNet.System.LCC.__MultiPredicate</Import>
+      </Imports>
+      <Java>__MultiPredicate.combine(${a},${b})</Java>
+      <Params>
+        <Param>
+          <Type>System.Predicate*[T]*</Type>
+          <Name>a</Name>
+        </Param>
+        <Param>
+          <Type>System.Predicate*[T]*</Type>
+          <Name>b</Name>
+        </Param>
+      </Params>
+      <Name>Combine</Name>
+      <TypeParams>
+        <Name>T</Name>
+      </TypeParams>
+      <Return>System.Predicate*[T]*</Return>
+    </Method>
+    <Method static="true">
+      <Imports>
+        <Import>CS2JNet.System.LCC.__MultiPredicate</Import>
+      </Imports>
+      <Java>__MultiPredicate.remove(${a},${b})</Java>
+      <Params>
+        <Param>
+          <Type>System.Predicate*[T]*</Type>
+          <Name>a</Name>
+        </Param>
+        <Param>
+          <Type>System.Predicate*[T]*</Type>
+          <Name>b</Name>
+        </Param>
+      </Params>
+      <Name>Remove</Name>
+      <TypeParams>
+        <Name>T</Name>
+      </TypeParams>
+      <Return>System.Predicate*[T]*</Return>
+    </Method>
+  </Methods>
+  <Invoke>
+    <Java>${this:16}.invoke(${a})</Java>
+    <Params>
+      <Param>
+        <Type>T</Type>
+        <Name>a</Name>
+      </Param>
+    </Params>
+    <Name>Invoke</Name>
+    <TypeParams />
+    <Return>System.Boolean</Return>
+  </Invoke>
+</Delegate>

CS2JLibrary/NetFramework/System/Math.xml

@@ -142,6 +142,22 @@
       <Name>Max</Name>
       <Return>System.Number</Return>
     </Method>
+    <Method>
+      <Imports />
+      <Java>Math.pow(${a},${b})</Java>
+      <Params>
+        <Param>
+          <Type>System.Double</Type>
+          <Name>a</Name>
+        </Param>
+        <Param>
+          <Type>System.Double</Type>
+          <Name>b</Name>
+        </Param>
+      </Params>
+      <Name>Pow</Name>
+      <Return>System.Double</Return>
+    </Method>
     <Method>
       <Imports />
       <Java>Math.round(${d})</Java>
@@ -179,8 +195,10 @@
       <Return>System.Single</Return>
     </Method>
     <Method>
-      <Imports />
+      <Imports>
-      <Java>(Math.round(${d}*Math.pow(10,${decimals})) / Math.pow(10,${decimals}))</Java>
+	<Import>CS2JNet.System.MathSupport</Import>
+      </Imports>
+      <Java>MathSupport.round(${d},${decimals})</Java>
       <Params>
         <Param>
           <Type>System.Decimal</Type>
@@ -195,8 +213,10 @@
       <Return>System.Decimal</Return>
     </Method>
     <Method>
-      <Imports />
+      <Imports>
-      <Java>(Math.round(${d}*Math.pow(10,${decimals})) / Math.pow(10,${decimals}))</Java>
+	<Import>CS2JNet.System.MathSupport</Import>
+      </Imports>
+      <Java>MathSupport.round(${d},${decimals})</Java>
       <Params>
         <Param>
           <Type>System.Double</Type>
@@ -219,4 +239,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<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>gTetkrvTe1YbqV/4LDgOCCGHB2Q=</DigestValue></Reference></SignedInfo><SignatureValue>LlG+sl3PcrJut3uf2Qmnyi4d77gxtJWUTqWASMA8XzlNulo+7ht3/KFL6QmO6PnQAVobEky9xqMQ1V3TxNXFMDYcOlQYKUAEDzV+4ABNJoR8jGdo+NdRH4ybGMxWDC+RRYuQ2ML6DpQBUsKuqiMYUi876xBtYwsa3LV9nBhEKSQ=</SignatureValue></Signature></Class>
+</Class>