diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2005-11-07 20:22:05 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2005-11-07 20:22:05 +0300 |
| commit | 38e3987552c543237466fa175ab26efaf533f8d1 (patch) | |
| tree | 1ef35a5d45a16418c079b842b16e68a7f9879343 /mcs/class/System.XML/System.Xml/XmlReader.cs | |
| parent | 4b2982c3096e3b17156bf00a062777ed364e3674 (diff) | |
2005-11-07 Atsushi Enomoto <atsushi@ximian.com>
* XmlReader.cs : dependent XmlSchemaValidationFlags fix.
Added ReadElementContentAsObject() and ReadContentAsObject().
* XmlReader.cs, XmlTextReader.cs :
LookupNamespace(string,bool) is now private.
* XmlReader.cs, XmlNode,cs :
[DebuggerDisplay].
* XmlSchemaValidationFlags.cs : updated to match 2.0 RTM.
* XmlSchemaValidator.cs : related fix.
* XmlSchemaValidatingReader.cs : XmlSchemaValidationFlags is updated.
* XmlReaderSettingsTests.cs : XmlSchemaValidationFlags is updated.
svn path=/trunk/mcs/; revision=52659
Diffstat (limited to 'mcs/class/System.XML/System.Xml/XmlReader.cs')
| -rw-r--r-- | mcs/class/System.XML/System.Xml/XmlReader.cs | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/mcs/class/System.XML/System.Xml/XmlReader.cs b/mcs/class/System.XML/System.Xml/XmlReader.cs index eb5d0273aef..3add9fe4689 100644 --- a/mcs/class/System.XML/System.Xml/XmlReader.cs +++ b/mcs/class/System.XML/System.Xml/XmlReader.cs @@ -32,6 +32,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // using System.Collections; +using System.Diagnostics; using System.IO; using System.Text; using System.Xml.Schema; // only required for NET_2_0 (SchemaInfo) @@ -42,6 +43,7 @@ using Mono.Xml.Schema; // only required for NET_2_0 namespace System.Xml { #if NET_2_0 + [DebuggerDisplay ("Name")] public abstract class XmlReader : IDisposable #else public abstract class XmlReader @@ -418,7 +420,7 @@ namespace System.Xml throw new NotImplementedException (); if ((settings.ValidationFlags & XmlSchemaValidationFlags.ProcessSchemaLocation) != 0) throw new NotImplementedException (); - if ((settings.ValidationFlags & XmlSchemaValidationFlags.ProcessValidationWarnings) == 0) + if ((settings.ValidationFlags & XmlSchemaValidationFlags.ReportValidationWarnings) == 0) throw new NotImplementedException (); return xvr != null ? xvr : reader; @@ -479,15 +481,6 @@ namespace System.Xml public abstract string LookupNamespace (string prefix); -#if NET_2_0 - public virtual string LookupNamespace (string prefix, bool atomizedNames) -#else - internal virtual string LookupNamespace (string prefix, bool atomizedNames) -#endif - { - return LookupNamespace (prefix); - } - public abstract void MoveToAttribute (int i); public abstract bool MoveToAttribute (string name); @@ -887,6 +880,24 @@ namespace System.Xml } [MonoTODO] + public virtual object ReadElementContentAsObject () + { + return ReadElementContentAs (ValueType, null); + } + + [MonoTODO] + public virtual object ReadElementContentAsObject (string localName, string namespaceURI) + { + return ReadElementContentAs (ValueType, null, localName, namespaceURI); + } + + [MonoTODO] + public virtual object ReadContentAsObject () + { + return ReadContentAs (ValueType, null); + } + + [MonoTODO] public virtual object ReadElementContentAs (Type type, IXmlNamespaceResolver resolver) { return ValueAs (ReadElementString (), type, resolver); |