2002-10-26 Piers Haken <piersh@friskit.com>

	* XmlNode.cs: add virtual property XPathNodeType
	* XmlAttribute.cs:
	* XmlComment.cs:
	* XmlDocument.cs:
	* XmlElement.cs::
	* XmlProcessingInstruction.cs:
	* XmlSignificantWhitespace.cs:
	* XmlText.cs:
	* XmlWhitespace.cs: implement XPathNodeType property
	* XmlDocumentNavigator.cs: use XPathNodeType property instead of switch

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

diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog
index aa03b419084577b9d045d93e0b720146adc237db..67541434ff05a634f73f19ad58a5e4fda227ef5d 100644 (file)
--- a/mcs/class/System.XML/System.Xml/ChangeLog
+++ b/mcs/class/System.XML/System.Xml/ChangeLog
@@ -1,3 +1,216 @@
+2002-10-26  Piers Haken <piersh@friskit.com>
+
+       * XmlNode.cs: add virtual property XPathNodeType
+       * XmlAttribute.cs:
+       * XmlComment.cs:
+       * XmlDocument.cs:
+       * XmlElement.cs::
+       * XmlProcessingInstruction.cs:
+       * XmlSignificantWhitespace.cs:
+       * XmlText.cs:
+       * XmlWhitespace.cs: implement XPathNodeType property
+       * XmlDocumentNavigator.cs: use XPathNodeType property instead of switch
+
+2002-10-26  Piers Haken <piersh@friskit.com>
+
+       * XmlDocumentNavigator.cs: return invalid XPathNodeType (-1) for unknown node types.
+
+2002-10-23  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * XmlTextReader.cs: don't increment depth for entity references.
+
+2002-10-22  Tim Haynes <thaynes@openlinksw.com>
+
+       * - Fixed the duplication of xmlns:xx = yy when serializing the
+       XML for serialization
+       
+       Fixed the unnecessary parsing/serializing when adding assemblies
+       for serialization 
+
+       Avoided setting the XmlNode.InnerXml property
+       (as it's not implemented) 
+
+       Fixed the usage/implementation of
+       XmlElement.GetElementsByTagName()
+       
+2002-10-21  Duncan Mak  <duncan@ximian.com>
+
+       * XmlDocument.cs:
+       * XmlElement.cs:
+       * XmlNode.cs:
+       * XmlTextReader.cs: Implementation for XmlNode.InnerXml from
+       Atsushi Enomoto <ginga@kit.hi-ho.ne.jp>.
+
+2002-10-18  Duncan Mak  <duncan@ximian.com>
+
+       * XmlDocument.cs: Applied a patch by Atsushi Enomoto
+       <ginga@kit.hi-ho.ne.jp>.
+
+2002-10-12  A.Enomoto <ginga@kit.hi-ho.ne.jp>
+
+       * XmlDocument.cs (ImportNode): Implemented
+
+2002-10-06  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * XmlDocument.cs: one more Load method implemented.
+       * XmlTextReader.cs: Depth now works.
+
+2002-09-22  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * XmlConvert.cs: IsInvalid is now internal.
+       * XmlNamespaceManager.cs: implemented RemoveNamespace
+       * XmlTextReader.cs: return BaseURI and Encoding from the parser.
+       * XmlTextWriter.cs: implemented WriteName and WriteNmToken.
+
+2002-09-19  Matt Hunter <mahunter@tconl.com>
+
+       * XmlElement.cs: Implementing SetAttributeNode(localName,namespaceURI)
+       * XmlAttributeCollection.cs: Implemented Append (XmlAttribute) 
+         
+2002-09-19  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * XmlConvert.cs: finished implementation.
+       * XmlTextReader.cs: fixed #30239.
+       * XmlTextWriter.cs: fixed #30240.
+
+2002-09-15  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * XmlTextReader.cs: line and position begin with 1.
+
+2002-09-13  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * XmlException.cs: added a new internal constructor for IXmlLineInfo
+       and output line and position info in Message.
+
+       * XmlReader.cs: implemented missing bits.
+
+2002-09-12     Piers Haken <piersh@friksit.com>
+
+       * XmlDocumentNavigator.cs: implement MoveToId()
+
+2002-09-05  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * XmlTextWriter.cs: fixed bug #29886.
+
+2002-08-26  Ravi Pratap  <ravi@ximian.com>
+
+
+       * XmlAttribute.cs (InnerText): Implement getting this property.
+
+       * XmlNode.cs (InnerText): Ensure that we append only values of
+       text nodes.
+
+2002-08-26  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * XmlWriter.cs: made ws and namespaceManager protected. mcs has a bug
+       that allowed compiling this.
+       [ FIXME: filed bug #29435. mcs should have failed on this ]
+
+2002-08-25  Tim Coleman <tim@timcoleman.com>
+        * XmlNode.cs:
+                Change CreateNavigator to not be virtual.
+        * XmlElement.cs:
+                Add set_Prefix and InnerText accessors.
+        * XmlEntityReference.cs:
+                Add set_Value accessor.
+        * XmlTextWriter.cs:
+                Make objects which should be private private.
+        * XmlWriter.cs:
+                Remove WriteStartElementInternal abstract definition.
+        * XmlValidatingReader.cs:
+                New stubs added.
+
+2002-08-22  Jason Diamond <jason@injektilo.org>
+
+       * XmlAttributeCollection.cs, XmlElement.cs: Implementation of RemoveAll
+       and RemoveAllAttributes courtesy of Matt Hunter <xrkune@tconl.com>.
+
+2002-08-22  Jason Diamond <jason@injektilo.org>
+
+       * XmlElement.cs: Correction to previous GetElementsByTagName patch
+       courtesy of Matt Hunter <xrkune@tconl.com>.
+
+2002-08-22  Jason Diamond <jason@injektilo.org>
+
+       * XmlDocument.cs, XmlElement.cs: Added implementation of namepsace
+       qualified GetElementsByTagName courtesy of Matt Hunter 
+       <xrkune@tconl.com>.
+
+2002-08-19  Jason Diamond <jason@injektilo.org>
+
+       * XmlDocument.cs, XmlElement.cs: Added implementation of 
+       GetElementsByTagName courtesy of Matt Hunter <xrkune@tconl.com>.
+
+2002-08-16  Jason Diamond <jason@injektilo.org>
+
+       * XmlElement.cs: Fixed writing out qualified elements courtesy of
+       Marcus Bürgel <marcus.buergel@gmx.de>.
+
+2002-08-13  Tim Coleman <tim@timcoleman.com>
+       * XmlTextWriter.cs:
+               Partial implementation of WriteQualifiedName ().
+
+2002-08-07  Kral Ferch <kral_ferch@hotmail.com>
+       * XmlCharacterData.cs:  Implemented AppendData(), DeleteData(),
+               InsertData(), and ReplaceData().  These methods fire the
+               NodeChanging and NodeChanged events.
+               
+       * XmlDocument.cs:  Fixed bugs in onNodeChanged() and onNodeChanging().
+       
+       * XmlNode.cs:  AppendChild() fires NodeInserting and NodeInserted events.
+               RemoveAll() and RemoveChild() fire NodeRemoving and NodeRemoved events.
+       
+2002-08-03  Tim Coleman <tim@timcoleman.com>
+       * XmlNamespaceManager.cs:
+               .Net allows the empty namespace to be redefined
+               at a later point, but the current implementation
+               did not.  This fixes a hashtable conflict.
+
+2002-07-26  Tim Coleman <tim@timcoleman.com>
+       * XmlTextWriter.cs:
+               When given a textwriter, check to see if it has a
+               null encoding. This was being done for other inputs
+               than a textwriter.
+
+Wed Jul 24 13:16:19 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+       * XmlTextReader.cs: rough line/column support.
+
+2002-07-23  Duncan Mak  <duncan@ximian.com>
+
+       * XmlConvert.cs: Implement the ToDateTime method. ToDateTime
+       (string, string []) is particularly strange.
+
+       * XmlException.cs: Remember to call the base serialization
+       constructor.
+
+       * XmlNodeReader.cs: Keep a new variable to store the Depth. 
+
+2002-07-14  Jason Diamond  <jason@injektilo.org>
+
+       * XmlAttribute.cs: Removed ownerElement field since we can reuse 
+       parentNode field.
+
+       * XmlDocumentNavigator.cs: MoveToParent now moves to the OwnerElement
+       if the current node is an attribute.
+
+       * XmlElement.cs: SetAttributeNode now sets the new attribute's
+       owner element.
+
+2002-07-12  Jason Diamond  <jason@injektilo.org>
+
+       * XmlDocument.cs: If null was passed in for prefix or namespaceURI when
+       creating an element, use String.Empty instead.
+
+2002-07-12     Piers Haken <piersh@friksit.com>
+
+       * XmlAttributeCollection.cs: implement some ItemOf indexers
+       * XmlNamedNodeMap.cs: add internal 'Nodes' accessor for the nodeList field
+       * XmlNode.cs: SelectNodes: return empty XmlNodeList, not null
+
+2002-07-06  Ajay kumar Dwivedi <adwiv@yahoo.com>
+
+
 2002-10-26  Piers Haken <piersh@friskit.com>
 
        * XmlDocumentNavigator.cs: return invalid XPathNodeType (-1) for unknown node types.

diff --git a/mcs/class/System.XML/System.Xml/XmlAttribute.cs b/mcs/class/System.XML/System.Xml/XmlAttribute.cs
index 56e8658f4d5f13187d0c6929b9e87d3a117254d9..efd3f928c82f03b00045674e38a9508bfeb78ec2 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlAttribute.cs
+++ b/mcs/class/System.XML/System.Xml/XmlAttribute.cs
@@ -9,6 +9,7 @@
 
 using System;
 using System.Text;
+using System.Xml.XPath;
 
 namespace System.Xml
 {
@@ -107,6 +108,12 @@ namespace System.Xml
                        }
                }
 
+               internal override XPathNodeType XPathNodeType {
+                       get {
+                               return XPathNodeType.Attribute;
+                       }
+               }
+
                public override XmlDocument OwnerDocument {
                        get {
                                return base.OwnerDocument;

diff --git a/mcs/class/System.XML/System.Xml/XmlComment.cs b/mcs/class/System.XML/System.Xml/XmlComment.cs
index 4c83ebab0e6f350a25e9548b6c98eadbf344ba11..a515a1a95f9cdd18a7d4970a347e127bb3612869 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlComment.cs
+++ b/mcs/class/System.XML/System.Xml/XmlComment.cs
@@ -8,6 +8,7 @@
 //
 
 using System;
+using System.Xml.XPath;
 
 namespace System.Xml
 {
@@ -36,6 +37,12 @@ namespace System.Xml
                        get { return XmlNodeType.Comment; }
                }
                
+               internal override XPathNodeType XPathNodeType {
+                       get {
+                               return XPathNodeType.Comment;
+                       }
+               }
+
                #endregion
 
                #region Methods

diff --git a/mcs/class/System.XML/System.Xml/XmlDocument.cs b/mcs/class/System.XML/System.Xml/XmlDocument.cs
index 1ba2d42e2d11d39f160a675cbb3dacc67a26e3cb..e8c9a670688afee099507e5c6b6c5bc2eba101f3 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlDocument.cs
+++ b/mcs/class/System.XML/System.Xml/XmlDocument.cs
@@ -153,6 +153,12 @@ namespace System.Xml
                        get { return XmlNodeType.Document; }
                }
 
+               internal override XPathNodeType XPathNodeType {
+                       get {
+                               return XPathNodeType.Root;
+                       }
+               }
+
                public override XmlDocument OwnerDocument {
                        get { return null; }
                }

diff --git a/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs b/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs
index ebb5ef3affdad3d72791b13a6336798fee118958..4df3fa7f169c187d0fffd0d434020710a8b04ad7 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs
+++ b/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs
@@ -105,25 +105,7 @@ namespace System.Xml
 
                public override XPathNodeType NodeType {
                        get {
-                               switch (node.NodeType) {
-                               case XmlNodeType.Document:
-                                       return XPathNodeType.Root;
-                               case XmlNodeType.Element:
-                                       return XPathNodeType.Element;
-                               case XmlNodeType.Attribute:
-                                       return XPathNodeType.Attribute;
-                               case XmlNodeType.Text:
-                                       return XPathNodeType.Text;
-                               case XmlNodeType.Whitespace:
-                                       return XPathNodeType.Whitespace;
-                               case XmlNodeType.SignificantWhitespace:
-                                       return XPathNodeType.SignificantWhitespace;
-                               case XmlNodeType.Comment:
-                                       return XPathNodeType.Comment;
-                               case XmlNodeType.ProcessingInstruction:
-                                       return XPathNodeType.ProcessingInstruction;
-                               }
-                               return (XPathNodeType) (-1);
+                               return node.XPathNodeType;
                        }
                }
 
@@ -137,19 +119,13 @@ namespace System.Xml
                        get {
                                switch (NodeType) {
                                case XPathNodeType.Attribute:
-                                       return node.Value;
-                               case XPathNodeType.Element:
-                                       return node.InnerText;
                                case XPathNodeType.Comment:
-                                       return node.Value;
                                case XPathNodeType.ProcessingInstruction:
-                                       return node.Value;
                                case XPathNodeType.Text:
-                                       return node.Value;
                                case XPathNodeType.Whitespace:
-                                       return node.Value;
                                case XPathNodeType.SignificantWhitespace:
                                        return node.Value;
+                               case XPathNodeType.Element:
                                case XPathNodeType.Root:
                                        return node.InnerText;
                                }

diff --git a/mcs/class/System.XML/System.Xml/XmlElement.cs b/mcs/class/System.XML/System.Xml/XmlElement.cs
index 531088c26df75c8e3444e0526733e205ce9b145a..c79010411e065730f6d961aba10111b2e4d6d8d5 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlElement.cs
+++ b/mcs/class/System.XML/System.Xml/XmlElement.cs
@@ -9,6 +9,7 @@
 
 using System;
 using System.Collections;
+using System.Xml.XPath;
 
 namespace System.Xml
 {
@@ -124,6 +125,12 @@ namespace System.Xml
                        }
                }
 
+               internal override XPathNodeType XPathNodeType {
+                       get {
+                               return XPathNodeType.Element;
+                       }
+               }
+
                [MonoTODO]
                public override XmlDocument OwnerDocument {
                        get { 

diff --git a/mcs/class/System.XML/System.Xml/XmlNode.cs b/mcs/class/System.XML/System.Xml/XmlNode.cs
index 58196116b21cca1b3c5696d759822268b3a30e71..9a3fba51f571dc2932fb2f7eef2bab7ec1535127 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlNode.cs
+++ b/mcs/class/System.XML/System.Xml/XmlNode.cs
@@ -159,6 +159,12 @@ namespace System.Xml
 
                public abstract XmlNodeType NodeType { get;     }
 
+               internal virtual XPathNodeType XPathNodeType {
+                       get {
+                               return (XPathNodeType) (-1);
+                       }
+               }
+
                public virtual string OuterXml {
                        get {
                                StringWriter sw = new StringWriter ();

diff --git a/mcs/class/System.XML/System.Xml/XmlProcessingInstruction.cs b/mcs/class/System.XML/System.Xml/XmlProcessingInstruction.cs
index c328935a7feb8f44cf52a6dd55e98d3cef4a1df7..089c18965422819567ec83fcb49339b26aea01fe 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlProcessingInstruction.cs
+++ b/mcs/class/System.XML/System.Xml/XmlProcessingInstruction.cs
@@ -8,6 +8,7 @@
 //
 
 using System;
+using System.Xml.XPath;
 
 namespace System.Xml
 {
@@ -58,6 +59,12 @@ namespace System.Xml
                {
                        get { return XmlNodeType.ProcessingInstruction; }
                }
+
+               internal override XPathNodeType XPathNodeType {
+                       get {
+                               return XPathNodeType.ProcessingInstruction;
+                       }
+               }
                
                public string Target
                {

diff --git a/mcs/class/System.XML/System.Xml/XmlSignificantWhitespace.cs b/mcs/class/System.XML/System.Xml/XmlSignificantWhitespace.cs
index d751df668362d18f3c1bb368e3ad586a845f421e..e9af5f3153c7b7f9447a82ec32a3d39d4f951e6c 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlSignificantWhitespace.cs
+++ b/mcs/class/System.XML/System.Xml/XmlSignificantWhitespace.cs
@@ -8,6 +8,7 @@
 //
 
 using System;
+using System.Xml.XPath;
 
 namespace System.Xml
 {
@@ -32,6 +33,12 @@ namespace System.Xml
                        get { return XmlNodeType.SignificantWhitespace; }
                }
 
+               internal override XPathNodeType XPathNodeType {
+                       get {
+                               return XPathNodeType.SignificantWhitespace;
+                       }
+               }
+               
                public override string Value {
                        get { return Data; }
                        [MonoTODO]

diff --git a/mcs/class/System.XML/System.Xml/XmlText.cs b/mcs/class/System.XML/System.Xml/XmlText.cs
index 59f2ba1477f64f1f0b327416599f694ca9cc0459..32b0311e184d4e4b3b88d5c7454bf2f2764ea305 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlText.cs
+++ b/mcs/class/System.XML/System.Xml/XmlText.cs
@@ -8,6 +8,7 @@
 //
 
 using System;
+using System.Xml.XPath;
 
 namespace System.Xml
 {
@@ -36,6 +37,12 @@ namespace System.Xml
                        get { return XmlNodeType.Text; }
                }
 
+               internal override XPathNodeType XPathNodeType {
+                       get {
+                               return XPathNodeType.Text;
+                       }
+               }
+               
                public override string Value {
                        get { return Data; }
                        set { Data = value; }

diff --git a/mcs/class/System.XML/System.Xml/XmlWhitespace.cs b/mcs/class/System.XML/System.Xml/XmlWhitespace.cs
index 62abbb824132e52fda7b9ba92d76e14b08b54df5..8c26a08511c3d549d32808ebe4ef389421444933 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlWhitespace.cs
+++ b/mcs/class/System.XML/System.Xml/XmlWhitespace.cs
@@ -8,6 +8,7 @@
 //
 
 using System;
+using System.Xml.XPath;
 
 namespace System.Xml
 {
@@ -32,6 +33,10 @@ namespace System.Xml
                        get { return XmlNodeType.Whitespace; }
                }
 
+               internal override XPathNodeType XPathNodeType {
+                       get { return XPathNodeType.Whitespace; }
+               }
+
                public override string Value {
                        get { return Data; }
                        [MonoTODO]