2004-11-30 Atsushi Enomoto <atsushi@ximian.com>

	* DTMXPathDocumentWriter.cs,
	  DTMXPathDocumentBuilder.cs,
	  DTMXPathNode.cs : SchemaType on attribute is not used.

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

diff --git a/mcs/class/System.XML/Mono.Xml.XPath/ChangeLog b/mcs/class/System.XML/Mono.Xml.XPath/ChangeLog
index c3ec6f8c8aa3011b42736fcd852083910bee7742..ee22e538f254553c046bc7e09308774b09f26534 100644 (file)
--- a/mcs/class/System.XML/Mono.Xml.XPath/ChangeLog
+++ b/mcs/class/System.XML/Mono.Xml.XPath/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-30  Atsushi Enomoto <atsushi@ximian.com>
+
+       * DTMXPathDocumentWriter.cs,
+         DTMXPathDocumentBuilder.cs,
+         DTMXPathNode.cs : SchemaType on attribute is not used.
+
 2004-11-26  Atsushi Enomoto <atsushi@ximian.com>
 
        * XPathNavigatorReader.cs,

diff --git a/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocumentBuilder.cs b/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocumentBuilder.cs
index 953bd58ac042a49ca7e167fd04845a5f294d14f8..65bb3c35aae5b0b0bce37976d662b7deee36a84c 100644 (file)
--- a/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocumentBuilder.cs
+++ b/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocumentBuilder.cs
@@ -153,7 +153,7 @@ namespace Mono.Xml.XPath
                        // (Difference between jnz or jbe in 80x86.)
                        AddNode (0, 0, 0, 0, XPathNodeType.All, "", false, "", "", "", "", "", 0, 0, 0);
                        nodeIndex++;
-                       AddAttribute (0, null, null, null, null, null, 0, 0);
+                       AddAttribute (0, null, null, null, null, 0, 0);
                        AddNsNode (0, null, null, 0);
                        nsIndex++;
                        AddNsNode (1, "xml", XmlNamespaces.XML, 0);
@@ -359,7 +359,6 @@ namespace Mono.Xml.XPath
                                ns, 
                                prefix != null ? prefix : String.Empty, 
                                value,
-                               null, 
                                lineInfo != null ? lineInfo.LineNumber : 0,
                                lineInfo != null ? lineInfo.LinePosition : 0);
                        if (firstAttributeIndex == 0)
@@ -434,7 +433,7 @@ namespace Mono.Xml.XPath
                }
 
                // Followings are skipped: nextAttribute,
-               public void AddAttribute (int ownerElement, string localName, string ns, string prefix, string value, object schemaType, int lineNumber, int linePosition)
+               public void AddAttribute (int ownerElement, string localName, string ns, string prefix, string value, int lineNumber, int linePosition)
                {
                        if (attributes.Length < attributeIndex + 1) {
                                attributeCapacity *= 4;
@@ -449,7 +448,6 @@ namespace Mono.Xml.XPath
                        attributes [attributeIndex].NamespaceURI = ns;
                        attributes [attributeIndex].Prefix = prefix;
                        attributes [attributeIndex].Value = value;
-                       attributes [attributeIndex].SchemaType = schemaType;
                        attributes [attributeIndex].LineNumber = lineNumber;
                        attributes [attributeIndex].LinePosition = linePosition;
                }

diff --git a/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocumentWriter.cs b/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocumentWriter.cs
index 0dd7c7849ad0f2684f4f65c88c55705a639419a8..177b335778de9a31801bbacfef6f471ff4ccdbd9 100755 (executable)
--- a/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocumentWriter.cs
+++ b/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocumentWriter.cs
@@ -110,7 +110,7 @@ namespace Mono.Xml.XPath
                        // (Difference between jnz or jbe in 80x86.)
                        AddNode (0, 0, 0, 0, XPathNodeType.All, "", false, "", "", "", "", "", 0, 0, 0);
                        nodeIndex++;
-                       AddAttribute (0, null, null, null, null, null, 0, 0);
+                       AddAttribute (0, null, null, null, null, 0, 0);
                        AddNsNode (0, null, null, 0);
                        nsIndex++;
                        AddNsNode (1, "xml", XmlNamespaces.XML, 0);
@@ -236,7 +236,7 @@ namespace Mono.Xml.XPath
                }
 
                // Followings are skipped: nextAttribute,
-               public void AddAttribute (int ownerElement, string localName, string ns, string prefix, string value, object schemaType, int lineNumber, int linePosition)
+               public void AddAttribute (int ownerElement, string localName, string ns, string prefix, string value, int lineNumber, int linePosition)
                {
                        if (attributes.Length < attributeIndex + 1) {
                                attributeCapacity *= 4;
@@ -251,7 +251,6 @@ namespace Mono.Xml.XPath
                        attributes [attributeIndex].NamespaceURI = ns;
                        attributes [attributeIndex].Prefix = prefix;
                        attributes [attributeIndex].Value = value;
-                       attributes [attributeIndex].SchemaType = schemaType;
                        attributes [attributeIndex].LineNumber = lineNumber;
                        attributes [attributeIndex].LinePosition = linePosition;
                }
@@ -577,7 +576,6 @@ namespace Mono.Xml.XPath
                                ns, 
                                prefix != null ? prefix : String.Empty, 
                                value,
-                               null,
                                0,
                                0);
                        if (firstAttributeIndex == 0)

diff --git a/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathNode.cs b/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathNode.cs
index 11d22e294773b13682b44bbcdf8141843c217daa..9fdcf9e95a6820f9c4df9f07761ac8efa68e8515 100644 (file)
--- a/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathNode.cs
+++ b/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathNode.cs
@@ -83,7 +83,6 @@ namespace Mono.Xml.XPath
                public string NamespaceURI;
                public string Prefix;
                public string Value;
-               public object SchemaType;
                public int LineNumber;
                public int LinePosition;
        }