Merge pull request #1624 from esdrubal/getprocesstimes

[mono.git] / mcs / class / System.Design / System.Data.Design / TypedDataSetGenerator.cs

diff --git a/mcs/class/System.Design/System.Data.Design/TypedDataSetGenerator.cs b/mcs/class/System.Design/System.Data.Design/TypedDataSetGenerator.cs
index 0a51a2825d9f609d277e55e609166f0720db46ce..92a113de719ead7236118c8dc9da427b5ce34f90 100644 (file)
--- a/mcs/class/System.Design/System.Data.Design/TypedDataSetGenerator.cs
+++ b/mcs/class/System.Design/System.Data.Design/TypedDataSetGenerator.cs
@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System.CodeDom;
 using System.CodeDom.Compiler;
@@ -40,6 +39,8 @@ using System.Data.Common;
 using System.Reflection;
 using System.IO;
 
+using T = System.Data.TypedDataSetGenerator;
+
 namespace System.Data.Design
 {
        // It is likely replaced by System.Data.TypedDataSetGenerator-based
@@ -66,26 +67,15 @@ namespace System.Data.Design
 
                public static string Generate (DataSet dataSet, CodeNamespace codeNamespace, CodeDomProvider codeProvider)
                {
-                       // See CustomDataclassGenerator.cs
-                       CustomDataClassGenerator.CreateDataSetClasses (
-                               dataSet, codeNamespace, codeProvider, null);
-
+                       T.Generate (dataSet, codeNamespace, codeProvider.CreateGenerator ());
                        return null;
                }
 
                public static string Generate (string inputFileContent, CodeCompileUnit compileUnit, CodeNamespace mainNamespace, CodeDomProvider codeProvider)
                {
-                       if (inputFileContent == null || inputFileContent.Length < 5)
-                               return null;
-                       
-                       DataSet ds = new DataSet ();
-                       StringReader sr = new StringReader (inputFileContent);
-                       ds.ReadXmlSchema (sr as TextReader);
-                       
-                       // See CustomDataclassGenerator.cs
-                       CustomDataClassGenerator.CreateDataSetClasses (
-                               ds, compileUnit, mainNamespace, codeProvider, null);
-                               
+                       var dataSet = new DataSet ();
+                       dataSet.ReadXmlSchema (inputFileContent);
+                       T.Generate (dataSet, mainNamespace, codeProvider.CreateGenerator ());
                        return null;
                }
 
@@ -127,4 +117,3 @@ namespace System.Data.Design
        }
 }
 
-#endif