2003-02-16 Atsushi Enomoto <ginga@kit.hi-ho.ne.jp>

[mono.git] / mcs / class / System.XML / System.Xml / XmlDocumentNavigator.cs

diff --git a/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs b/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs
index 9959bc432929d9f862e15b5aff11c9d5cb90e37f..4df3fa7f169c187d0fffd0d434020710a8b04ad7 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs
+++ b/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs
@@ -105,25 +105,7 @@ namespace System.Xml
 
                public override XPathNodeType NodeType {
                        get {
-                               switch (node.NodeType) {
-                               case XmlNodeType.Document:
-                                       return XPathNodeType.Root;
-                               case XmlNodeType.Element:
-                                       return XPathNodeType.Element;
-                               case XmlNodeType.Attribute:
-                                       return XPathNodeType.Attribute;
-                               case XmlNodeType.Text:
-                                       return XPathNodeType.Text;
-                               case XmlNodeType.Whitespace:
-                                       return XPathNodeType.Whitespace;
-                               case XmlNodeType.SignificantWhitespace:
-                                       return XPathNodeType.SignificantWhitespace;
-                               case XmlNodeType.Comment:
-                                       return XPathNodeType.Comment;
-                               case XmlNodeType.ProcessingInstruction:
-                                       return XPathNodeType.ProcessingInstruction;
-                               }
-                               throw new InvalidOperationException ();
+                               return node.XPathNodeType;
                        }
                }
 
@@ -137,19 +119,13 @@ namespace System.Xml
                        get {
                                switch (NodeType) {
                                case XPathNodeType.Attribute:
-                                       return node.Value;
-                               case XPathNodeType.Element:
-                                       return node.InnerText;
                                case XPathNodeType.Comment:
-                                       return node.Value;
                                case XPathNodeType.ProcessingInstruction:
-                                       return node.Value;
                                case XPathNodeType.Text:
-                                       return node.Value;
                                case XPathNodeType.Whitespace:
-                                       return node.Value;
                                case XPathNodeType.SignificantWhitespace:
                                        return node.Value;
+                               case XPathNodeType.Element:
                                case XPathNodeType.Root:
                                        return node.InnerText;
                                }