2005-01-31 Zoltan Varga <vargaz@freemail.hu>

[mono.git] / mcs / class / System.XML / System.Xml.Schema / XmlSchemaSimpleContentExtension.cs

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleContentExtension.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleContentExtension.cs
index 959b5f6ab00875be661ecb487c6154b2a14ec048..ac304ca1949b4df08c814937c326c1a79eeb90a7 100755 (executable)
--- a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleContentExtension.cs
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleContentExtension.cs
@@ -5,6 +5,27 @@
 //     Dwivedi, Ajay kumar  Adwiv@Yahoo.com\r
 //     Atsushi Enomoto  ginga@kit.hi-ho.ne.jp\r
 //\r
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
 using System;\r
 using System.Xml;\r
 using System.Xml.Serialization;\r
@@ -20,7 +41,7 @@ namespace System.Xml.Schema
                private XmlSchemaAnyAttribute any;\r
                private XmlSchemaObjectCollection attributes;\r
                private XmlQualifiedName baseTypeName;\r
-               private static string xmlname = "extension";\r
+               const string xmlname = "extension";\r
 \r
                public XmlSchemaSimpleContentExtension()\r
                {\r
@@ -63,6 +84,13 @@ namespace System.Xml.Schema
                        if (this.IsComplied (schema.CompilationId))\r
                                return 0;\r
 \r
+#if NET_2_0\r
+                       if (AnyAttribute != null)\r
+                               AnyAttribute.Parent = this;\r
+                       foreach (XmlSchemaObject obj in Attributes)\r
+                               obj.Parent = this;\r
+#endif\r
+\r
                        if (this.isRedefinedComponent) {\r
                                if (Annotation != null)\r
                                        Annotation.isRedefinedComponent = true;\r
@@ -130,7 +158,7 @@ namespace System.Xml.Schema
                                actualBaseSchemaType = st;\r
                        } else if (baseTypeName == XmlSchemaComplexType.AnyTypeName) {\r
                                actualBaseSchemaType = XmlSchemaComplexType.AnyType;
-                       } else if (baseTypeName.Namespace == XmlSchema.Namespace) {\r
+                       } else if (XmlSchemaUtil.IsBuiltInDatatypeName (baseTypeName)) {\r
                                actualBaseSchemaType = XmlSchemaDatatype.FromName (baseTypeName);\r
                                if (actualBaseSchemaType == null)\r
                                        error (h, "Invalid schema datatype name is specified.");\r