From 459db72717b07308a9898f4cc628895a9b3e89f7 Mon Sep 17 00:00:00 2001 From: Atsushi Eno Date: Mon, 9 May 2005 05:26:33 +0000 Subject: [PATCH 1/1] 2005-05-09 Atsushi Enomoto * 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 --- mcs/class/System.XML/System.Xml/ChangeLog | 8 ++++++++ .../System.Xml/IXmlNamespaceResolver.cs | 3 --- .../System.XML/System.Xml/XQueryConvert.cs | 2 +- mcs/class/System.XML/System.Xml/XmlReader.cs | 6 ++++++ mcs/class/System.XML/System.Xml/XmlResolver.cs | 6 ------ mcs/class/System.XML/System.Xml/XmlWriter.cs | 18 ------------------ 6 files changed, 15 insertions(+), 28 deletions(-) diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog index 107f9080a51..9f589f0e8a3 100644 --- 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 + + * 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 * 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 a7e736ed273..9a049392fc0 100644 --- 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 86d19d7a1da..d75b116d3c8 100755 --- 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 de4cd1edaec..31c5fd438b1 100644 --- 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 6d85e5ea6df..9f94f373447 100644 --- 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 { public abstract class XmlResolver { -#if NET_2_0 - public virtual XmlNameTable NameTable { - get { return null; } - } -#endif - public abstract ICredentials Credentials { set; } public abstract object GetEntity ( diff --git a/mcs/class/System.XML/System.Xml/XmlWriter.cs b/mcs/class/System.XML/System.Xml/XmlWriter.cs index 2e3bdc2096a..a92c3aeac15 100644 --- 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) { -- 2.25.1