From 0018d2cc288fde818140a4f578c47c4925884253 Mon Sep 17 00:00:00 2001 From: Atsushi Eno Date: Fri, 29 Oct 2004 01:13:03 +0000 Subject: [PATCH] 2004-10-29 Atsushi Enomoto * XmlDocumentNavigator.cs : GetNode() should consider namespace nodes. * XmlNode.cs : dustclean. svn path=/trunk/mcs/; revision=35415 --- mcs/class/System.XML/System.Xml/ChangeLog | 5 +++++ .../System.XML/System.Xml/XmlDocumentNavigator.cs | 10 +++++----- mcs/class/System.XML/System.Xml/XmlNode.cs | 3 --- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog index b36edbc2c58ec..6efbb9de45036 100644 --- a/mcs/class/System.XML/System.Xml/ChangeLog +++ b/mcs/class/System.XML/System.Xml/ChangeLog @@ -1,3 +1,8 @@ +2004-10-29 Atsushi Enomoto + + * XmlDocumentNavigator.cs : GetNode() should consider namespace nodes. + * XmlNode.cs : dustclean. + 2004-10-28 Atsushi Enomoto * XmlDocument.cs : use XPathEditableDocument again. diff --git a/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs b/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs index 972bd96e0194c..82661b92bd6cf 100644 --- a/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs +++ b/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs @@ -646,12 +646,12 @@ public override void MoveToRoot () NsNode = null; } - internal XmlNode Node { get { return NsNode != null ? NsNode : node; } } + private XmlNode Node { get { return NsNode != null ? NsNode : node; } } - XmlNode IHasXmlNode.GetNode () - { - return node; - } + XmlNode IHasXmlNode.GetNode () + { + return Node; + } #endregion } diff --git a/mcs/class/System.XML/System.Xml/XmlNode.cs b/mcs/class/System.XML/System.Xml/XmlNode.cs index dce9b0b300cd2..fc83a3476d6b8 100644 --- a/mcs/class/System.XML/System.Xml/XmlNode.cs +++ b/mcs/class/System.XML/System.Xml/XmlNode.cs @@ -749,10 +749,7 @@ public XmlNode SelectSingleNode (string xpath, XmlNamespaceManager nsmgr) XPathNodeIterator iter = nav.Select (expr); if (!iter.MoveNext ()) return null; -if (iter.Current is IHasXmlNode) return ((IHasXmlNode) iter.Current).GetNode (); -else -throw new Exception ("It should be IHasXmlNode: " + iter.Current.GetType ()); } internal static void SetReadOnly (XmlNode n)