* NewMonoXSD.cs: Import elements in the order they are declared in the schema.

svn path=/trunk/mcs/; revision=26405

diff --git a/mcs/tools/mono-xsd/ChangeLog b/mcs/tools/mono-xsd/ChangeLog
index 605aef5998bd55968ef071768b64d8161b5ca47c..e2eb8d10b6b9b7db7db548b12c21a5851f6d925d 100644 (file)
--- a/mcs/tools/mono-xsd/ChangeLog
+++ b/mcs/tools/mono-xsd/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-29  Lluis Sanchez Gual  <lluis@ximian.com>
+
+       * NewMonoXSD.cs: Import elements in the order they are declared in the schema.
+
 2004-04-26  Atsushi Enomoto <atsushi@ximian.com>
 
        * NewMonoXSD.cs : Enabled /d option (typed dataset generation support

diff --git a/mcs/tools/mono-xsd/NewMonoXSD.cs b/mcs/tools/mono-xsd/NewMonoXSD.cs
index 384a82d2fbb065ef6d7bc5a045378648b27ee7b7..a884b6763db1918de61a58001370266f8ff46f99 100755 (executable)
--- a/mcs/tools/mono-xsd/NewMonoXSD.cs
+++ b/mcs/tools/mono-xsd/NewMonoXSD.cs
@@ -325,8 +325,9 @@ namespace Mono.Util {
                        {\r
                                foreach (XmlSchema schema in schemas) {\r
                                        if (!schema.IsCompiled) schema.Compile (null);\r
-                                       foreach (XmlSchemaElement elem in schema.Elements.Values)\r
-                                               qnames.Add (elem.QualifiedName);\r
+                                       foreach (XmlSchemaObject ob in schema.Items)\r
+                                               if (ob is XmlSchemaElement)\r
+                                                       qnames.Add (((XmlSchemaElement)ob).QualifiedName);\r
                                }\r
                        }\r
 \r