2005-05-09 Atsushi Enomoto <atsushi@ximian.com>

	* XmlReader.cs : added ReadElementContentAsLong().
	* XmlWriter.cs : removed some obsolete WriteValue() overloads.
	* XmlResolver.cs,
	  IXmlNamespaceResolver.cs : removed deprecated 2.0 bits.
	* XQueryConvert.cs : obsolete (yeah, now XQuery should be hidden).

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

diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog
index 107f9080a51668ae317d9fb3977a86aa8b81f852..9f589f0e8a3b1a9e05007f9dff0f1c2d775d61d0 100644 (file)
--- a/mcs/class/System.XML/System.Xml/ChangeLog
+++ b/mcs/class/System.XML/System.Xml/ChangeLog
@@ -1,3 +1,11 @@
+2005-05-09  Atsushi Enomoto <atsushi@ximian.com>
+
+       * XmlReader.cs : added ReadElementContentAsLong().
+       * XmlWriter.cs : removed some obsolete WriteValue() overloads.
+       * XmlResolver.cs,
+         IXmlNamespaceResolver.cs : removed deprecated 2.0 bits.
+       * XQueryConvert.cs : obsolete (yeah, now XQuery should be hidden).
+
 2005-05-06  Atsushi Enomoto <atsushi@ximian.com>
 
        * XmlInputStream.cs : Now XmlStreamReader uses non-blocking TextReader

diff --git a/mcs/class/System.XML/System.Xml/IXmlNamespaceResolver.cs b/mcs/class/System.XML/System.Xml/IXmlNamespaceResolver.cs
index a7e736ed2730361e7b28d94ff5e26c091bf591d6..9a049392fc0f8e62425f4a817fbd3e9801ccfc34 100644 (file)
--- a/mcs/class/System.XML/System.Xml/IXmlNamespaceResolver.cs
+++ b/mcs/class/System.XML/System.Xml/IXmlNamespaceResolver.cs
@@ -42,9 +42,6 @@ namespace System.Xml
        internal interface IXmlNamespaceResolver
 #endif
        {
-               [Obsolete]
-               XmlNameTable NameTable { get; } 
-
                IDictionary GetNamespacesInScope (XmlNamespaceScope scope);
 
                string LookupNamespace (string prefix);  

diff --git a/mcs/class/System.XML/System.Xml/XQueryConvert.cs b/mcs/class/System.XML/System.Xml/XQueryConvert.cs
index 86d19d7a1da1fd6d9fcec38f63cfe3f74735935f..d75b116d3c871475d01e2724a69b3951e99aa00f 100755 (executable)
--- a/mcs/class/System.XML/System.Xml/XQueryConvert.cs
+++ b/mcs/class/System.XML/System.Xml/XQueryConvert.cs
@@ -39,7 +39,7 @@ using System.Xml.XPath;
 
 namespace System.Xml
 {
-       public class XQueryConvert
+       internal class XQueryConvert
        {
                private XQueryConvert ()
                {

diff --git a/mcs/class/System.XML/System.Xml/XmlReader.cs b/mcs/class/System.XML/System.Xml/XmlReader.cs
index de4cd1edaec117edbc245e619a51447da6371630..31c5fd438b10d8576b6c92b86d5e3c87f0e66756 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlReader.cs
+++ b/mcs/class/System.XML/System.Xml/XmlReader.cs
@@ -934,6 +934,12 @@ namespace System.Xml
                        return XQueryConvert.StringToInt (ReadElementString ());
                }
 
+               [MonoTODO]
+               public virtual long ReadElementContentAsLong ()
+               {
+                       return XQueryConvert.StringToInteger (ReadElementString ());
+               }
+
                [MonoTODO]
                public virtual string ReadElementContentAsString ()
                {

diff --git a/mcs/class/System.XML/System.Xml/XmlResolver.cs b/mcs/class/System.XML/System.Xml/XmlResolver.cs
index 6d85e5ea6df8960e4b8de7029c6c43fad9c4f069..9f94f373447cba70f6b37d355a3cb467ac9fbebc 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlResolver.cs
+++ b/mcs/class/System.XML/System.Xml/XmlResolver.cs
@@ -38,12 +38,6 @@ namespace System.Xml
 {\r
        public abstract class XmlResolver\r
        {\r
-#if NET_2_0\r
-               public virtual XmlNameTable NameTable {\r
-                       get { return null; }\r
-               }\r
-#endif\r
-\r
                public abstract ICredentials Credentials { set; }\r
 \r
                public abstract object GetEntity (\r

diff --git a/mcs/class/System.XML/System.Xml/XmlWriter.cs b/mcs/class/System.XML/System.Xml/XmlWriter.cs
index 2e3bdc2096af9a22f0d79580cca60b9c0353f7bc..a92c3aeac153f60b1d3cf263335c6f9d5acd15c6 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlWriter.cs
+++ b/mcs/class/System.XML/System.Xml/XmlWriter.cs
@@ -550,12 +550,6 @@ namespace System.Xml
                        WriteString (XmlConvert.ToString (value));
                }
 
-               [MonoTODO]
-               public virtual void WriteValue (Decimal value)
-               {
-                       WriteString (XQueryConvert.DecimalToString (value));
-               }
-
                [MonoTODO]
                public virtual void WriteValue (double value)
                {
@@ -574,18 +568,6 @@ namespace System.Xml
                        WriteString (XQueryConvert.IntegerToString (value));
                }
 
-               [MonoTODO]
-               public virtual void WriteValue (Stream value)
-               {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               public virtual void WriteValue (TextReader value)
-               {
-                       throw new NotImplementedException ();
-               }
-
                [MonoTODO]
                public virtual void WriteValue (object value)
                {