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 4b7394afd8f8c0ab6605a04aa38a82bcd83a8e92..bd573ec94ab93af33545c43b1d9b5a2cc85e53ba 100755 (executable)
--- a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaRedefine.cs
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaRedefine.cs
@@ -24,31 +24,35 @@ namespace System.Xml.Schema
                        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
@@ -81,13 +85,13 @@ namespace System.Xml.Schema
                                {\r
                                        redefine.SchemaLocation = reader.Value;\r
                                }\r
-                               else if(reader.NamespaceURI == "" || reader.NamespaceURI == XmlSchema.Namespace)\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
-                                       //TODO: Add to Unhandled attributes\r
+                                       XmlSchemaUtil.ReadUnhandledAttribute(reader,redefine);\r
                                }\r
                        }\r
 \r