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

	* XmlReader.cs : Implemented new 2.0 virtual members that used to be
	  abstract in 1.x. Implemented ReadSubtree().

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

diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog
index 93df209911e7874f703356e2c91a58df4e3138fa..c7472785f73199ebb1c458decd57ffd36d358b9d 100644 (file)
--- a/mcs/class/System.XML/System.Xml/ChangeLog
+++ b/mcs/class/System.XML/System.Xml/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-29  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * XmlReader.cs : Implemented new 2.0 virtual members that used to be
+         abstract in 1.x. Implemented ReadSubtree().
+
 2004-07-28  Lluis Sanchez Gual  <lluis@novell.com>
 
        * XmlTextReader.cs: Stop parsing when a null character is found.

diff --git a/mcs/class/System.XML/System.Xml/XmlReader.cs b/mcs/class/System.XML/System.Xml/XmlReader.cs
index f7aa2c971efdb98d04d14866abd486a7a56c5d39..877790105125f751f80c5e1395f6ddabd0ba9ea7 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlReader.cs
+++ b/mcs/class/System.XML/System.Xml/XmlReader.cs
@@ -36,7 +36,7 @@ using System.IO;
 using System.Security.Policy;
 using System.Text;
 using System.Xml.Schema; // only required for NET_2_0 (SchemaInfo)
-using Mono.Xml; // only required for NET_2_0 (XmlFilterReader)
+using Mono.Xml; // only required for NET_2_0
 #if NET_2_0
 using MS.Internal.Xml; // only required for NET_2_0
 #endif
@@ -92,11 +92,15 @@ namespace System.Xml
 
                public abstract bool HasValue { get; }
 
-               public abstract bool IsDefault { get; }
+#if NET_2_0
+               public virtual bool IsDefault {
+                       get { return false; }
+               }
 
-               public abstract bool IsEmptyElement { get; }
+               public virtual bool IsEmptyElement {
+                       get { return false; }
+               }
 
-#if NET_2_0
                public virtual string this [int i] {
                        get { return GetAttribute (i); }
                }
@@ -109,6 +113,10 @@ namespace System.Xml
                        get { return GetAttribute (name, namespaceURI); }
                }
 #else
+               public abstract bool IsDefault { get; }
+
+               public abstract bool IsEmptyElement { get; }
+
                public abstract string this [int i] { get; }
 
                public abstract string this [string name] { get; }
@@ -153,9 +161,19 @@ namespace System.Xml
 
                public abstract string Value { get; }
 
+#if NET_2_0
+               public virtual string XmlLang {
+                       get { return String.Empty; }
+               }
+
+               public virtual XmlSpace XmlSpace {
+                       get { return XmlSpace.None; }
+               }
+#else
                public abstract string XmlLang { get; }
 
                public abstract XmlSpace XmlSpace { get; }
+#endif
 
                #endregion
 
@@ -720,7 +738,7 @@ namespace System.Xml
                [MonoTODO]
                public XmlReader ReadSubtree ()
                {
-                       throw new NotImplementedException ();
+                       return new SubtreeXmlReader (this);
                }
 
                [MonoTODO]