From 19550129d842f05c869d58aba0f7e199760c4572 Mon Sep 17 00:00:00 2001
From: Kevin Glynn <kevin.glynn@twigletsoftware.com>
Date: Mon, 17 Jan 2011 16:43:40 +0100
Subject: [PATCH] inherit from System.Object. Not sure what the real answer is
 here

---
 CS2JLibrary/NetFramework/System/Collections/ArrayList.xml | 6 +++---
 CS2JLibrary/NetFramework/System/String.xml                | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CS2JLibrary/NetFramework/System/Collections/ArrayList.xml b/CS2JLibrary/NetFramework/System/Collections/ArrayList.xml
index b2dea7c..dced0de 100644
--- a/CS2JLibrary/NetFramework/System/Collections/ArrayList.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/ArrayList.xml
@@ -169,12 +169,12 @@
   <Constructors>
     <Constructor>
       <Imports />
-      <Java>new ArrayListSupport()</Java>
+      <Java>new ArrayList()</Java>
       <Params />
     </Constructor>
     <Constructor>
       <Imports />
-      <Java>new ArrayListSupport(${length})</Java>
+      <Java>new ArrayList(${length})</Java>
       <Params>
         <Param>
           <Type>System.Int32</Type>
@@ -184,7 +184,7 @@
     </Constructor>
     <Constructor>
       <Imports />
-      <Java>new ArrayListSupport(${collection})</Java>
+      <Java>new ArrayList(${collection})</Java>
       <Params>
         <Param>
           <Type>System.ICollection</Type>
diff --git a/CS2JLibrary/NetFramework/System/String.xml b/CS2JLibrary/NetFramework/System/String.xml
index 506469e..a249dc3 100644
--- a/CS2JLibrary/NetFramework/System/String.xml
+++ b/CS2JLibrary/NetFramework/System/String.xml
@@ -4,7 +4,9 @@
   <Java>String</Java>
   <Name>System.String</Name>
   <Uses />
-  <Inherits />
+  <Inherits>
+    <Type>System.Object</Type>
+  </Inherits>
   <Methods>
     <Method>
       <Imports>