diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2005-12-14 11:36:22 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2005-12-14 11:36:22 +0300 |
| commit | 260014cbd309760c06d1e17b88e28285d80b6b1d (patch) | |
| tree | c14360d24666acb52c2466ef0438b3215494f8b1 /mcs/class/System.XML | |
| parent | 5392ed3dbb3fa737b91318b549a3635e408c7562 (diff) | |
2005-12-14 Atsushi Enomoto <atsushi@ximian.com>
Added UnderlyingObject support.
svn path=/trunk/mcs/; revision=54353
Diffstat (limited to 'mcs/class/System.XML')
6 files changed, 22 insertions, 3 deletions
diff --git a/mcs/class/System.XML/Mono.Xml.XPath/ChangeLog b/mcs/class/System.XML/Mono.Xml.XPath/ChangeLog index bbe01849a08..8078a7b4ae4 100644 --- a/mcs/class/System.XML/Mono.Xml.XPath/ChangeLog +++ b/mcs/class/System.XML/Mono.Xml.XPath/ChangeLog @@ -1,5 +1,9 @@ 2005-12-14 Atsushi Enomoto <atsushi@ximian.com> + * XPathEditableDocument.cs : added UnderlyingObject. + +2005-12-14 Atsushi Enomoto <atsushi@ximian.com> + * XPathEditableDocument.cs : added 2.0 SchemaInfo. 2005-12-13 Atsushi Enomoto <atsushi@ximian.com> diff --git a/mcs/class/System.XML/Mono.Xml.XPath/XPathEditableDocument.cs b/mcs/class/System.XML/Mono.Xml.XPath/XPathEditableDocument.cs index 894b60ead9c..75f10cfb377 100644 --- a/mcs/class/System.XML/Mono.Xml.XPath/XPathEditableDocument.cs +++ b/mcs/class/System.XML/Mono.Xml.XPath/XPathEditableDocument.cs @@ -483,6 +483,10 @@ namespace Mono.Xml.XPath get { return navigator.SchemaInfo; } } + public override object UnderlyingObject { + get { return navigator.UnderlyingObject; } + } + public override string Value { get { return navigator.Value; } } diff --git a/mcs/class/System.XML/System.Xml.XPath/ChangeLog b/mcs/class/System.XML/System.Xml.XPath/ChangeLog index ac73bb0c65e..1ce990609c0 100644 --- a/mcs/class/System.XML/System.Xml.XPath/ChangeLog +++ b/mcs/class/System.XML/System.Xml.XPath/ChangeLog @@ -1,3 +1,7 @@ +2005-12-14 Atsushi Enomoto <atsushi@ximian.com> + + * XPathNavigator.cs : UnderlyingObject returns null by default. + 2005-12-13 Atsushi Enomoto <atsushi@ximian.com> * XPathNavigator.cs : Reimplemented MoveToFollowing() to avoid diff --git a/mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs b/mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs index ec8831684fe..0b24319ca73 100644 --- a/mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs +++ b/mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs @@ -903,7 +903,6 @@ namespace System.Xml.XPath } } - [MonoTODO] public override bool IsNode { get { return true; } } @@ -955,9 +954,8 @@ namespace System.Xml.XPath } } - [MonoTODO] public virtual object UnderlyingObject { - get { throw new NotImplementedException (); } + get { return null; } } public override bool ValueAsBoolean { diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog index ec257fb8dba..16b1c8d5f05 100644 --- a/mcs/class/System.XML/System.Xml/ChangeLog +++ b/mcs/class/System.XML/System.Xml/ChangeLog @@ -1,5 +1,10 @@ 2005-12-14 Atsushi Enomoto <atsushi@ximian.com> + * XmlDocumentNavigator.cs : added UnderlyingObject as to behave as + documented in MSDN. + +2005-12-14 Atsushi Enomoto <atsushi@ximian.com> + * XmlNode.cs : under 2.0 xml/xmlns are treated as special cases in GetNamespaceOfPrefix()/GetPrefixOfNamespace() (but it still does not implement IXmlNamespaceResolver, bummer). diff --git a/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs b/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs index c37198ce80d..b2ee93599a8 100644 --- a/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs +++ b/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs @@ -219,6 +219,10 @@ namespace System.Xml public override IXmlSchemaInfo SchemaInfo { get { return NsNode != null ? null : node.SchemaInfo; } } + + public override object UnderlyingObject { + get { return node; } + } #endif public override string Value { |