Reformat changes, and add some small debugging information to catch errors

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

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaRedefine.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaRedefine.cs
index 29c358207a0ad68d15005d90daa51e40f728d81f..bd573ec94ab93af33545c43b1d9b5a2cc85e53ba 100755 (executable)
--- a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaRedefine.cs
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaRedefine.cs
@@ -1,6 +1,7 @@
 // Author: Dwivedi, Ajay kumar\r
 //            Adwiv@Yahoo.com\r
 using System;\r
+using System.Xml;\r
 using System.Xml.Serialization;\r
 \r
 namespace System.Xml.Schema\r
@@ -14,34 +15,137 @@ namespace System.Xml.Schema
                private XmlSchemaObjectTable groups;\r
                private XmlSchemaObjectCollection items;\r
                private XmlSchemaObjectTable schemaTypes;\r
+               private static string xmlname = "redefine";\r
 \r
                public XmlSchemaRedefine()\r
                {\r
+                       attributeGroups = new XmlSchemaObjectTable();\r
+                       groups = new XmlSchemaObjectTable();\r
+                       items = new XmlSchemaObjectCollection(this);\r
+                       schemaTypes = new XmlSchemaObjectTable();\r
                }\r
-               [XmlIgnore]\r
-               public XmlSchemaObjectTable AttributeGroups \r
-               {\r
-                       get{ return attributeGroups; }\r
-               }\r
-               [XmlIgnore]\r
-               public XmlSchemaObjectTable Groups \r
-               {\r
-                       get{ return groups; }\r
-               }\r
+               \r
                [XmlElement("annotation",typeof(XmlSchemaAnnotation),Namespace="http://www.w3.org/2001/XMLSchema")]\r
                [XmlElement("simpleType",typeof(XmlSchemaSimpleType),Namespace="http://www.w3.org/2001/XMLSchema")]\r
                [XmlElement("complexType",typeof(XmlSchemaComplexType),Namespace="http://www.w3.org/2001/XMLSchema")]\r
                [XmlElement("group",typeof(XmlSchemaGroup),Namespace="http://www.w3.org/2001/XMLSchema")]\r
-               //NOTE: AttributeGroup and not AttributeGroupRef\r
+                       //NOTE: AttributeGroup and not AttributeGroupRef\r
                [XmlElement("attributeGroup",typeof(XmlSchemaAttributeGroup),Namespace="http://www.w3.org/2001/XMLSchema")]\r
                public XmlSchemaObjectCollection Items \r
                {\r
                        get{ return items; }\r
                }\r
+\r
+               [XmlIgnore]\r
+               public XmlSchemaObjectTable AttributeGroups \r
+               {\r
+                       get{ return attributeGroups; }\r
+               }\r
+               \r
                [XmlIgnore]\r
                public XmlSchemaObjectTable SchemaTypes \r
                {\r
                        get{ return schemaTypes; }\r
                }\r
+\r
+               [XmlIgnore]\r
+               public XmlSchemaObjectTable Groups \r
+               {\r
+                       get{ return groups; }\r
+               }\r
+//<redefine \r
+//  id = ID \r
+//  schemaLocation = anyURI \r
+//  {any attributes with non-schema namespace . . .}>\r
+//  Content: (annotation | (simpleType | complexType | group | attributeGroup))*\r
+//</redefine>\r
+               internal static XmlSchemaRedefine Read(XmlSchemaReader reader, ValidationEventHandler h)\r
+               {\r
+                       XmlSchemaRedefine redefine = new XmlSchemaRedefine();\r
+                       reader.MoveToElement();\r
+\r
+                       if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)\r
+                       {\r
+                               error(h,"Should not happen :1: XmlSchemaRedefine.Read, name="+reader.Name,null);\r
+                               reader.Skip();\r
+                               return null;\r
+                       }\r
+\r
+                       redefine.LineNumber = reader.LineNumber;\r
+                       redefine.LinePosition = reader.LinePosition;\r
+                       redefine.SourceUri = reader.BaseURI;\r
+\r
+                       while(reader.MoveToNextAttribute())\r
+                       {\r
+                               if(reader.Name == "id")\r
+                               {\r
+                                       redefine.Id = reader.Value;\r
+                               }\r
+                               else if(reader.Name == "schemaLocation")\r
+                               {\r
+                                       redefine.SchemaLocation = reader.Value;\r
+                               }\r
+                               else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)\r
+                               {\r
+                                       error(h,reader.Name + " is not a valid attribute for redefine",null);\r
+                               }\r
+                               else\r
+                               {\r
+                                       XmlSchemaUtil.ReadUnhandledAttribute(reader,redefine);\r
+                               }\r
+                       }\r
+\r
+                       reader.MoveToElement();\r
+                       if(reader.IsEmptyElement)\r
+                               return redefine;\r
+\r
+                       //(annotation | (simpleType | complexType | group | attributeGroup))*\r
+                       while(reader.ReadNextElement())\r
+                       {\r
+                               if(reader.NodeType == XmlNodeType.EndElement)\r
+                               {\r
+                                       if(reader.LocalName != xmlname)\r
+                                               error(h,"Should not happen :2: XmlSchemaRedefine.Read, name="+reader.Name,null);\r
+                                       break;\r
+                               }\r
+                               if(reader.LocalName == "annotation")\r
+                               {\r
+                                       XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);\r
+                                       if(annotation != null)\r
+                                               redefine.items.Add(annotation);\r
+                                       continue;\r
+                               }\r
+                               if(reader.LocalName == "simpleType")\r
+                               {\r
+                                       XmlSchemaSimpleType simpleType = XmlSchemaSimpleType.Read(reader,h);\r
+                                       if(simpleType != null)\r
+                                               redefine.items.Add(simpleType);\r
+                                       continue;\r
+                               }\r
+                               if(reader.LocalName == "complexType")\r
+                               {\r
+                                       XmlSchemaComplexType complexType = XmlSchemaComplexType.Read(reader,h);\r
+                                       if(complexType != null)\r
+                                               redefine.items.Add(complexType);\r
+                                       continue;\r
+                               }\r
+                               if(reader.LocalName == "group")\r
+                               {\r
+                                       XmlSchemaGroup group = XmlSchemaGroup.Read(reader,h);\r
+                                       if(group != null)\r
+                                               redefine.items.Add(group);\r
+                                       continue;\r
+                               }\r
+                               if(reader.LocalName == "attributeGroup")\r
+                               {\r
+                                       XmlSchemaAttributeGroup attributeGroup = XmlSchemaAttributeGroup.Read(reader,h);\r
+                                       if(attributeGroup != null)\r
+                                               redefine.items.Add(attributeGroup);\r
+                                       continue;\r
+                               }\r
+                               reader.RaiseInvalidElementError();\r
+                       }\r
+                       return redefine;\r
+               }\r
        }\r
 }\r