2004-10-29 Atsushi Enomoto <atsushi@ximian.com>

	* XmlSchemaAttribute.cs : AttributeSchemaType could be determined on
	  compilation time. AttributeType is obsolete.
	* XmlSchemaElement.cs : ditto for ElementSchemaType and ElementType.

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

diff --git a/mcs/class/System.XML/System.Xml.Schema/ChangeLog b/mcs/class/System.XML/System.Xml.Schema/ChangeLog
index 982b990629ab4b78318fe02b1a77d522e8acbf52..68da55f67186b6ba9de4628e50dba3add232745f 100755 (executable)
--- a/mcs/class/System.XML/System.Xml.Schema/ChangeLog
+++ b/mcs/class/System.XML/System.Xml.Schema/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-29  Atsushi Enomoto <atsushi@ximian.com>
+
+       * XmlSchemaAttribute.cs : AttributeSchemaType could be determined on
+         compilation time. AttributeType is obsolete.
+       * XmlSchemaElement.cs : ditto for ElementSchemaType and ElementType.
+
 2004-10-29  Atsushi Enomoto <atsushi@ximian.com>
 
        * XmlSchemaComplexType.cs : added LocalElements, with the description

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAttribute.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAttribute.cs
index 798ca177239526e41bd6354a27a64a7a0bd12f7b..50588b9731465f6c4b5d95f7864a070cc8dc62a8 100755 (executable)
--- a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAttribute.cs
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAttribute.cs
@@ -39,6 +39,9 @@ namespace System.Xml.Schema
        public class XmlSchemaAttribute : XmlSchemaAnnotated\r
        {\r
                private object attributeType;\r
+#if NET_2_0\r
+               private XmlSchemaSimpleType attributeSchemaType;\r
+#endif\r
                private string defaultValue;\r
                private string fixedValue;\r
                private string validatedDefaultValue;\r
@@ -152,6 +155,9 @@ namespace System.Xml.Schema
                }\r
 \r
                [XmlIgnore]\r
+#if NET_2_0\r
+               [Obsolete]\r
+#endif\r
                public object AttributeType \r
                {\r
                        get{\r
@@ -169,11 +175,8 @@ namespace System.Xml.Schema
                        get {\r
                                if (referencedAttribute != null)\r
                                        return referencedAttribute.AttributeSchemaType;\r
-                               XmlSchemaDatatype dt = attributeType as XmlSchemaDatatype;\r
-                               if (dt != null)\r
-                                       return XmlSchemaType.GetBuiltInSimpleType (dt);\r
                                else\r
-                                       return attributeType as XmlSchemaSimpleType;\r
+                                       return attributeSchemaType;\r
                        }\r
                }\r
 #endif\r
@@ -432,6 +435,12 @@ namespace System.Xml.Schema
                        else\r
                                validatedUse = Use;\r
 \r
+#if NET_2_0\r
+                       attributeSchemaType = attributeType as XmlSchemaSimpleType;\r
+                       if (attributeSchemaType == null)\r
+                               attributeSchemaType = XmlSchemaType.GetBuiltInSimpleType (((XmlSchemaDatatype) attributeType).TypeCode);\r
+#endif\r
+\r
                        ValidationId = schema.ValidationId;\r
                        return errorCount;\r
                }\r

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaElement.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaElement.cs
index dd05396e4fbb62064a1300903da2255db9718500..9ccb00f4a0d65383513c47985897194b9cdb8751 100755 (executable)
--- a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaElement.cs
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaElement.cs
@@ -43,6 +43,9 @@ namespace System.Xml.Schema
                private XmlSchemaObjectCollection constraints;\r
                private string defaultValue;\r
                private object elementType;\r
+#if NET_2_0\r
+               private XmlSchemaType elementSchemaType;\r
+#endif\r
                private XmlSchemaDerivationMethod final;\r
                private string fixedValue;\r
                private XmlSchemaForm form;\r
@@ -213,6 +216,9 @@ namespace System.Xml.Schema
                }\r
 \r
                [XmlIgnore]\r
+#if NET_2_0\r
+               [Obsolete]\r
+#endif\r
                public object ElementType \r
                {\r
                        get {\r
@@ -230,11 +236,8 @@ namespace System.Xml.Schema
                        get {\r
                                if (referencedElement != null)\r
                                        return referencedElement.ElementSchemaType;\r
-                               XmlSchemaDatatype dt = elementType as XmlSchemaDatatype;\r
-                               if (dt != null)\r
-                                       return XmlSchemaType.GetBuiltInSimpleType (dt);\r
                                else\r
-                                       return elementType as XmlSchemaType;\r
+                                       return elementSchemaType;\r
                        }\r
                }\r
 #endif\r
@@ -733,6 +736,12 @@ namespace System.Xml.Schema
                        foreach (XmlSchemaIdentityConstraint ident in Constraints)\r
                                ident.Validate (h, schema);\r
 \r
+#if NET_2_0\r
+                       elementSchemaType = elementType as XmlSchemaType;\r
+                       if (elementSchemaType == null && elementType != null)\r
+                               elementSchemaType = XmlSchemaType.GetBuiltInType (((XmlSchemaDatatype) elementType).TypeCode);\r
+#endif\r
+\r
                        ValidationId = schema.ValidationId;\r
                        return errorCount;\r
                }\r