2004-07-28 Atsushi Enomoto <atsushi@ximian.com>

	* XPathEditableNavigator.cs : Implemented InsertAfter() and
	  PrependChild(); they are virtual, not abstract.
	* XPathNavigator.cs :
	  Implemented many 2.0 virtual properties and methods that were
	  abstract in 1.x.
	  Implemented some Select() methods that uses IXmlNamespaceResolver.
	  Implemented most of ValueAsXxx() using XQueryConvert.
	  IsNode is always true. Implemented OuterXml and WriteSubtree() (but
	  actually they don't work because it depends on ReadSubtree()).

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

diff --git a/mcs/class/System.XML/System.Xml.XPath/ChangeLog b/mcs/class/System.XML/System.Xml.XPath/ChangeLog
index d4b093ed1f06abda1c4af7192d3828db68fb07dc..cb5427ad6bd374c081c791ca49b48117237ec6ea 100644 (file)
--- a/mcs/class/System.XML/System.Xml.XPath/ChangeLog
+++ b/mcs/class/System.XML/System.Xml.XPath/ChangeLog
@@ -1,3 +1,15 @@
+2004-07-28  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * XPathEditableNavigator.cs : Implemented InsertAfter() and 
+         PrependChild(); they are virtual, not abstract.
+       * XPathNavigator.cs :
+         Implemented many 2.0 virtual properties and methods that were 
+         abstract in 1.x.
+         Implemented some Select() methods that uses IXmlNamespaceResolver.
+         Implemented most of ValueAsXxx() using XQueryConvert.
+         IsNode is always true. Implemented OuterXml and WriteSubtree() (but
+         actually they don't work because it depends on ReadSubtree()).
+
 2004-07-26  Atsushi Enomoto  <atsushi@ximian.com>
 
        * XPathDocument.cs : added missing && not-likely-to-be-removed members.

diff --git a/mcs/class/System.XML/System.Xml.XPath/XPathEditableNavigator.cs b/mcs/class/System.XML/System.Xml.XPath/XPathEditableNavigator.cs
index 144b822b42311dd55dad39cf3bd44e46205b78d7..82472cd2bb2b22d9cf221fd0839e0be56b8f86d4 100755 (executable)
--- a/mcs/class/System.XML/System.Xml.XPath/XPathEditableNavigator.cs
+++ b/mcs/class/System.XML/System.Xml.XPath/XPathEditableNavigator.cs
@@ -119,8 +119,14 @@ namespace System.Xml.XPath
                [MonoTODO ("No implementation as yet")]\r
                public abstract bool DeleteCurrent ();\r
 \r
-               [MonoTODO ("No implementation as yet")]\r
-               public abstract XmlWriter InsertAfter ();\r
+               public virtual XmlWriter InsertAfter ()\r
+               {\r
+                       XPathEditableNavigator nav = (XPathEditableNavigator) Clone ();\r
+                       if (nav.MoveToNext ())\r
+                               return nav.InsertBefore ();\r
+                       else\r
+                               return AppendChild ();\r
+               }\r
 \r
                public virtual XPathEditableNavigator InsertAfter (string xmlFragments)\r
                {\r
@@ -183,8 +189,14 @@ namespace System.Xml.XPath
                        }\r
                }\r
 \r
-               [MonoTODO ("No implementation as yet")]\r
-               public abstract XmlWriter PrependChild ();\r
+               public virtual XmlWriter PrependChild ()\r
+               {\r
+                       XPathEditableNavigator nav = (XPathEditableNavigator) Clone ();\r
+                       if (nav.MoveToFirstChild ())\r
+                               return nav.InsertBefore ();\r
+                       else\r
+                               return InsertBefore ();\r
+               }\r
 \r
                public virtual XPathEditableNavigator PrependChild (string xmlFragments)\r
                {\r

diff --git a/mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs b/mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs
index 1048981491978aed5c28380585f5c3f36924acf9..2e72e136cc8741bf7531393198cb79db539c2a36 100644 (file)
--- a/mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs
+++ b/mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs
@@ -32,9 +32,13 @@
 
 using System;
 using System.Collections;
+using System.IO;
 using System.Xml;
 using System.Xml.Schema;
 using Mono.Xml.XPath;
+#if NET_2_0
+using MS.Internal.Xml;
+#endif
 
 #if NET_2_0
 using NSResolver = System.Xml.IXmlNamespaceResolver;
@@ -63,9 +67,19 @@ namespace System.Xml.XPath
 
                public abstract string BaseURI { get; }
 
+#if NET_2_0
+               public virtual bool HasAttributes {
+                       get { return Clone ().MoveToFirstAttribute (); }
+               }
+
+               public virtual bool HasChildren {
+                       get { return Clone ().MoveToFirstChild (); }
+               }
+#else
                public abstract bool HasAttributes { get; }
 
                public abstract bool HasChildren { get; }
+#endif
 
                public abstract bool IsEmptyElement { get; }
 
@@ -82,11 +96,27 @@ namespace System.Xml.XPath
                public abstract string Prefix { get; }
 
 #if NET_2_0
+               public virtual string XmlLang {
+                       get {
+                               XPathNavigator nav = Clone ();
+                               switch (nav.NodeType) {
+                               case XPathNodeType.Attribute:
+                               case XPathNodeType.Namespace:
+                                       nav.MoveToParent ();
+                                       break;
+                               }
+                               do {
+                                       if (nav.MoveToAttribute ("lang", "http://www.w3.org/XML/1998/namespace"))
+                                               return nav.Value;
+                               } while (nav.MoveToParent ());
+                               return String.Empty;
+                       }
+               }
 #else
                public abstract string Value { get; }
-#endif
 
                public abstract string XmlLang { get; }
+#endif
 
                int Depth
                {
@@ -282,9 +312,30 @@ namespace System.Xml.XPath
                        return cexpr.EvaluateBoolean (iterContext);
                }
 
+#if NET_2_0
+               public virtual string GetAttribute (string localName, string namespaceURI)
+               {
+                       XPathNavigator nav = Clone ();
+                       if (nav.MoveToAttribute (localName, namespaceURI))
+                               return nav.Value;
+                       else
+                               return String.Empty;
+               }
+
+               public virtual string GetNamespace (string name)
+               {
+                       XPathNavigator nav = Clone ();
+                       if (nav.MoveToNamespace (name))
+                               return nav.Value;
+                       else
+                               return String.Empty;
+               }
+
+#else
                public abstract string GetAttribute (string localName, string namespaceURI);
 
                public abstract string GetNamespace (string name);
+#endif
                
                object ICloneable.Clone ()
                {
@@ -380,10 +431,57 @@ namespace System.Xml.XPath
 
                public abstract bool MoveTo (XPathNavigator other);
 
+#if NET_2_0
+               public virtual bool MoveToAttribute (string localName, string namespaceURI)
+               {
+                       if (MoveToFirstAttribute ()) {
+                               do {
+                                       if (LocalName == localName && NamespaceURI == namespaceURI)
+                                               return true;
+                               } while (MoveToNextAttribute ());
+                               MoveToParent ();
+                       }
+                       return false;
+               }
+
+               public virtual bool MoveToNamespace (string name)
+               {
+                       if (MoveToFirstNamespace ()) {
+                               do {
+                                       if (LocalName == name)
+                                               return true;
+                               } while (MoveToNextNamespace ());
+                               MoveToParent ();
+                       }
+                       return false;
+               }
+
+               public virtual bool MoveToFirst ()
+               {
+                       if (MoveToPrevious ()) {
+                               // It would be able to invoke MoveToPrevious() until the end, but this way would be much faster
+                               MoveToParent ();
+                               MoveToFirstChild ();
+                               return true;
+                       }
+                       return false;
+               }
+
+               public virtual void MoveToRoot ()
+               {
+                       while (MoveToParent ())
+                               ;
+               }
+#else
                public abstract bool MoveToAttribute (string localName, string namespaceURI);
 
+               public abstract bool MoveToNamespace (string name);
+
                public abstract bool MoveToFirst ();
 
+               public abstract void MoveToRoot ();
+#endif
+
                public abstract bool MoveToFirstAttribute ();
 
                public abstract bool MoveToFirstChild ();
@@ -397,8 +495,6 @@ namespace System.Xml.XPath
 
                public abstract bool MoveToId (string id);
 
-               public abstract bool MoveToNamespace (string name);
-
                public abstract bool MoveToNext ();
 
                public abstract bool MoveToNextAttribute ();
@@ -414,8 +510,6 @@ namespace System.Xml.XPath
 
                public abstract bool MoveToPrevious ();
 
-               public abstract void MoveToRoot ();
-
                public virtual XPathNodeIterator Select (string xpath)
                {
                        return Select (Compile (xpath));
@@ -644,10 +738,9 @@ namespace System.Xml.XPath
                        throw new NotImplementedException ();
                }
 
-               [MonoTODO]
                public virtual XPathNodeIterator Select (string xpath, IXmlNamespaceResolver nsResolver)
                {
-                       throw new NotImplementedException ();
+                       return Select (Compile (xpath), nsResolver);
                }
 
                public virtual XPathNavigator SelectSingleNode (string xpath)
@@ -655,16 +748,20 @@ namespace System.Xml.XPath
                        return SelectSingleNode (xpath, null);
                }
 
-               [MonoTODO]
                public virtual XPathNavigator SelectSingleNode (string xpath, IXmlNamespaceResolver nsResolver)
                {
-                       throw new NotImplementedException ();
+                       XPathExpression expr = Compile (xpath);
+                       expr.SetContext (nsResolver);
+                       return SelectSingleNode (expr);
                }
 
-               [MonoTODO]
                public XPathNavigator SelectSingleNode (XPathExpression expression)
                {
-                       throw new NotImplementedException ();
+                       XPathNodeIterator iter = Select (expression);
+                       if (iter.MoveNext ())
+                               return iter.Current;
+                       else
+                               return null;
                }
 
                [MonoTODO]
@@ -676,7 +773,8 @@ namespace System.Xml.XPath
                [MonoTODO]
                public virtual void WriteSubtree (XmlWriter writer)
                {
-                       throw new NotImplementedException ();
+                       XmlReader st = ReadSubtree ();
+                       writer.WriteNode (st, false);
                }
 
                [MonoTODO]
@@ -686,7 +784,7 @@ namespace System.Xml.XPath
 
                [MonoTODO]
                public override bool IsNode {
-                       get { throw new NotImplementedException (); }
+                       get { return true; }
                }
 
                [MonoTODO]
@@ -696,7 +794,13 @@ namespace System.Xml.XPath
 
                [MonoTODO]
                public virtual string OuterXml {
-                       get { throw new NotImplementedException (); }
+                       get {
+                               StringWriter sw = new StringWriter ();
+                               XmlTextWriter xtw = new XmlTextWriter (sw);
+                               WriteSubtree (xtw);
+                               xtw.Close ();
+                               return sw.ToString ();
+                       }
                }
 
                [MonoTODO]
@@ -716,32 +820,32 @@ namespace System.Xml.XPath
 
                [MonoTODO]
                public override bool ValueAsBoolean {
-                       get { throw new NotImplementedException (); }
+                       get { return XQueryConvert.StringToBoolean (Value); }
                }
 
                [MonoTODO]
                public override DateTime ValueAsDateTime {
-                       get { throw new NotImplementedException (); }
+                       get { return XmlConvert.ToDateTime (Value); }
                }
 
                [MonoTODO]
                public override decimal ValueAsDecimal {
-                       get { throw new NotImplementedException (); }
+                       get { return XQueryConvert.StringToDecimal (Value); }
                }
 
                [MonoTODO]
                public override double ValueAsDouble {
-                       get { throw new NotImplementedException (); }
+                       get { return XQueryConvert.StringToDouble (Value); }
                }
 
                [MonoTODO]
                public override int ValueAsInt32 {
-                       get { throw new NotImplementedException (); }
+                       get { return XQueryConvert.StringToInt (Value); }
                }
 
                [MonoTODO]
                public override long ValueAsInt64 {
-                       get { throw new NotImplementedException (); }
+                       get { return XQueryConvert.StringToInteger (Value); }
                }
 
                [MonoTODO]
@@ -751,7 +855,7 @@ namespace System.Xml.XPath
 
                [MonoTODO]
                public override float ValueAsSingle {
-                       get { throw new NotImplementedException (); }
+                       get { return XQueryConvert.StringToFloat (Value); }
                }
 
                [MonoTODO]