2010-06-30 Atsushi Enomoto <atsushi@ximian.com>

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

diff --git a/mcs/class/System.XML/Mono.Xml/SubtreeXmlReader.cs b/mcs/class/System.XML/Mono.Xml/SubtreeXmlReader.cs
old mode 100755 (executable)
new mode 100644 (file)
index 3d3e402..38919be
--- a/mcs/class/System.XML/Mono.Xml/SubtreeXmlReader.cs
+++ b/mcs/class/System.XML/Mono.Xml/SubtreeXmlReader.cs
@@ -29,7 +29,7 @@
 #if NET_2_0
 
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using System.Xml;
 using System.Xml.Schema;
 
@@ -60,7 +60,6 @@ namespace Mono.Xml
                        get { return initial ? 0 : Reader.AttributeCount; }
                }
 
-#if NET_2_0
                public override bool CanReadBinaryContent {
                        get { return Reader.CanReadBinaryContent; }
                }
@@ -68,7 +67,6 @@ namespace Mono.Xml
                public override bool CanReadValueChunk {
                        get { return Reader.CanReadValueChunk; }
                }
-#endif
 
                public override int Depth {
                        get { return Reader.Depth - startDepth; }
@@ -82,6 +80,10 @@ namespace Mono.Xml
                        get { return eof || Reader.EOF; }
                }
 
+               public override bool IsEmptyElement {
+                       get { return Reader.IsEmptyElement; }
+               }
+
                public int LineNumber {
                        get { return initial ? 0 : li != null ? li.LineNumber : 0; }
                }
@@ -91,15 +93,15 @@ namespace Mono.Xml
                }
 
                public override bool HasValue {
-                       get { return initial ? false : Reader.HasValue; }
+                       get { return initial || eof ? false : Reader.HasValue; }
                }
 
                public override string LocalName {
-                       get { return initial ? String.Empty : Reader.LocalName; }
+                       get { return initial || eof ? String.Empty : Reader.LocalName; }
                }
 
                public override string Name {
-                       get { return initial ? String.Empty : Reader.Name; }
+                       get { return initial || eof ? String.Empty : Reader.Name; }
                }
 
                public override XmlNameTable NameTable {
@@ -107,24 +109,26 @@ namespace Mono.Xml
                }
 
                public override string NamespaceURI {
-                       get { return initial ? String.Empty : Reader.NamespaceURI; }
+                       get { return initial || eof ? String.Empty : Reader.NamespaceURI; }
                }
 
                public override XmlNodeType NodeType {
-                       get { return initial ? XmlNodeType.None : Reader.NodeType; }
+                       get { return initial || eof ? XmlNodeType.None : Reader.NodeType; }
                }
 
                public override string Prefix {
-                       get { return initial ? String.Empty : Reader.Prefix; }
+                       get { return initial || eof ? String.Empty : Reader.Prefix; }
                }
 
                public override ReadState ReadState {
                        get { return initial ? ReadState.Initial : eof ? ReadState.EndOfFile : Reader.ReadState ; }
                }
 
+#if !NET_2_1
                public override IXmlSchemaInfo SchemaInfo {
                        get { return Reader.SchemaInfo; }
                }
+#endif
 
                public override XmlReaderSettings Settings {
                        get { return Reader.Settings; }
@@ -136,7 +140,8 @@ namespace Mono.Xml
 
                public override void Close ()
                {
-                       // do nothing
+                       while (Read ())
+                               ;
                }
 
                public override string GetAttribute (int i)
@@ -154,9 +159,10 @@ namespace Mono.Xml
                        return initial ? null : Reader.GetAttribute (local, ns);
                }
 
-               IDictionary IXmlNamespaceResolver.GetNamespacesInScope (XmlNamespaceScope scope)
+               IDictionary<string, string> IXmlNamespaceResolver.GetNamespacesInScope (XmlNamespaceScope scope)
                {
-                       return nsResolver != null ? nsResolver.GetNamespacesInScope (scope) : new Hashtable ();
+                       return nsResolver != null ? nsResolver.GetNamespacesInScope (scope) : 
+                               new Dictionary<string, string> ();
                }
 
                public bool HasLineInfo ()
@@ -213,8 +219,13 @@ namespace Mono.Xml
                        }
                        if (!read) {
                                read = true;
-                               return !Reader.IsEmptyElement && Reader.Read ();
+                               Reader.MoveToElement ();
+                               bool ret = !Reader.IsEmptyElement && Reader.Read ();
+                               if (!ret)
+                                       eof = true;
+                               return ret;
                        }
+                       Reader.MoveToElement ();
                        if (Reader.Depth > startDepth)
                                if (Reader.Read ())
                                        return true;