2005-11-14 Atsushi Enomoto <atsushi@ximian.com>

	* XmlNodeReader.cs : removed historical one.


svn path=/trunk/mcs/; revision=53013

2 files changed, 4 insertions, 1021 deletions

diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog
index 3345714402d..f90157dd8db 100644
--- a/mcs/class/System.XML/System.Xml/ChangeLog
+++ b/mcs/class/System.XML/System.Xml/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-14  Atsushi Enomoto <atsushi@ximian.com>
+
+	* XmlNodeReader.cs : removed historical one.
+
 2005-11-10  Atsushi Enomoto <atsushi@ximian.com>
 
 	* XmlReader.cs, XmlNode.cs :
diff --git a/mcs/class/System.XML/System.Xml/XmlNodeReader.cs b/mcs/class/System.XML/System.Xml/XmlNodeReader.cs
deleted file mode 100644
index d7a4398bb21..00000000000
--- a/mcs/class/System.XML/System.Xml/XmlNodeReader.cs
+++ /dev/null
@@ -1,1021 +0,0 @@
-//
-// System.Xml.XmlNodeReader.cs
-//
-// Author:
-//	Duncan Mak  (duncan@ximian.com)
-//	Atsushi Enomoto  (ginga@kit.hi-ho.ne.jp)
-//
-// (C) Ximian, Inc.
-// (C) Atsushi Enomoto
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Xml;
-using System.Text;
-using Mono.Xml;
-#if NET_2_0
-using System.Xml.Schema;
-#endif
-
-namespace System.Xml
-{
-#if NET_2_0
-	public class XmlNodeReader : XmlReader, IHasXmlParserContext, IXmlNamespaceResolver
-#else
-	public class XmlNodeReader : XmlReader, IHasXmlParserContext
-#endif
-	{
-		XmlDocument document;
-		XmlNode startNode;
-		XmlNode current;
-		ReadState state = ReadState.Initial;
-		int depth;
-		bool isEndElement;
-		bool alreadyRead;
-		XmlReader entityReader;
-
-		private XmlNode ownerLinkedNode {
-			get {
-				if (current.ParentNode != null && current.ParentNode.NodeType == XmlNodeType.Attribute)
-					return ((XmlAttribute) current.ParentNode).OwnerElement;
-				else if (current.NodeType == XmlNodeType.Attribute) 
-					return ((XmlAttribute) current).OwnerElement;
-				else
-					return current;
-			}
-		}
-
-		#region Constructor
-
-		public XmlNodeReader (XmlNode node)
-			: this (node, 0)
-		{
-		}
-		
-		private XmlNodeReader (XmlNode node, int startDepth)
-		{
-			startNode = node;
-			depth = startDepth;
-			document = startNode.NodeType == XmlNodeType.Document ?
-				startNode as XmlDocument : startNode.OwnerDocument;
-
-			switch (node.NodeType) {
-			case XmlNodeType.Document:
-			case XmlNodeType.DocumentFragment:
-			case XmlNodeType.EntityReference:
-				break;
-			default:
-				alreadyRead = true;
-				break;
-			}
-
-		}
-		
-		#endregion
-
-		#region Properties
-
-		public override int AttributeCount {
-			get {
-				if (entityReader != null)
-					return entityReader.ReadState == ReadState.Interactive ?
-						entityReader.AttributeCount : 0;
-				if (state != ReadState.Interactive)
-					return 0;
-
-				if (isEndElement || current == null)
-					return 0;
-				XmlNode n = ownerLinkedNode;
-				return n.Attributes != null ? n.Attributes.Count : 0;
-			}
-		}
-
-		public override string BaseURI {
-			get {
-				if (entityReader != null && entityReader.ReadState != ReadState.Initial)
-					return entityReader.BaseURI;
-
-				if (current == null)
-					return String.Empty;
-				return current.BaseURI;
-			}
-		}
-
-#if NET_2_0
-		public override bool CanReadBinaryContent {
-			get { return true; }
-		}
-
-		public override bool CanReadValueChunk {
-			get { return true; }
-		}
-#else
-		internal override bool CanReadBinaryContent {
-			get { return true; }
-		}
-
-		internal override bool CanReadValueChunk {
-			get { return true; }
-		}
-#endif
-
-		public override bool CanResolveEntity {
-			get {
-				return true;
-			}
-		}
-
-		public override int Depth {
-			get {
-				if (entityReader != null && entityReader.ReadState == ReadState.Interactive)
-					return entityReader.Depth + depth;// + entityReaderStack.Count + 1;
-
-				if (current == null)
-					return 0;
-				if (current.NodeType == XmlNodeType.Attribute)
-					return depth + 1;
-				if (current.ParentNode != null && current.ParentNode.NodeType == XmlNodeType.Attribute)
-					return depth + 2;
-
-				return depth;
-			}
-		}
-
-		public override bool EOF {
-			get {
-				return this.ReadState == ReadState.EndOfFile 
-				|| this.ReadState == ReadState.Error;
-			}
-		}
-
-		public override bool HasAttributes {
-			get {
-				if (entityReader != null)
-					return entityReader.ReadState == ReadState.Interactive ?
-					      entityReader.HasAttributes : false;
-
-				if (isEndElement || current == null)
-					return false;
-
-				// MS BUG: inconsistent return value between XmlTextReader and XmlNodeReader.
-				// As for attribute and its descendants, XmlReader returns element's HasAttributes.
-				XmlNode n = ownerLinkedNode;
-
-				if (n.Attributes == null ||
-					n.Attributes.Count == 0)
-					return false;
-				else
-					return true;
-			}
-		}
-
-		public override bool HasValue {
-			get {
-				if (entityReader != null)
-					return entityReader.ReadState == ReadState.Interactive ?
-						entityReader.HasValue : false;
-
-				if (current == null)
-					return false;
-
-				switch (current.NodeType) {
-				case XmlNodeType.Element:
-				case XmlNodeType.EntityReference:
-				case XmlNodeType.Document:
-				case XmlNodeType.DocumentFragment:
-				case XmlNodeType.Notation:
-				case XmlNodeType.EndElement:
-				case XmlNodeType.EndEntity:
-					return false;
-				default:
-					return true;
-				}
-			}
-			      
-		}
-
-		public override bool IsDefault {
-			get {
-				if (entityReader != null)
-					return entityReader.ReadState == ReadState.Interactive ?
-						entityReader.IsDefault : false;
-
-				if (current == null)
-					return false;
-
-				if (current.NodeType != XmlNodeType.Attribute)
-					return false;
-				else
-				{
-					return ((XmlAttribute) current).isDefault;
-				}
-			}
-		}
-
-		public override bool IsEmptyElement {
-			get {
-				if (entityReader != null)
-					return entityReader.ReadState == ReadState.Interactive ?
-						entityReader.IsEmptyElement : false;
-
-				if (current == null)
-					return false;
-
-				if(current.NodeType == XmlNodeType.Element)
-					return ((XmlElement) current).IsEmpty;
-				else 
-					return false;
-			}
-		}
-
-#if NET_2_0
-#else
-		public override string this [int i] {
-			get { return GetAttribute (i); }
-		}
-
-		public override string this [string name] {
-			get { return GetAttribute (name); }
-		}
-
-		public override string this [string name, string namespaceURI] {
-			get { return GetAttribute (name, namespaceURI); }
-		}
-#endif
-
-		public override string LocalName {
-			get {
-				if (entityReader != null && entityReader.ReadState != ReadState.Initial)
-					return entityReader.LocalName;
-
-				if (current == null)
-					return String.Empty;
-
-				switch (current.NodeType) {
-				case XmlNodeType.Attribute:
-				case XmlNodeType.DocumentType:
-				case XmlNodeType.Element:
-				case XmlNodeType.EntityReference:
-				case XmlNodeType.ProcessingInstruction:
-				case XmlNodeType.XmlDeclaration:
-					return current.LocalName;
-				}
-
-				return String.Empty;
-			}
-		}
-
-		public override string Name {
-			get {
-				if (entityReader != null && entityReader.ReadState != ReadState.Initial)
-					return entityReader.Name;
-
-				if (current == null)
-					return String.Empty;
-
-				switch (current.NodeType) {
-				case XmlNodeType.Attribute:
-				case XmlNodeType.DocumentType:
-				case XmlNodeType.Element:
-				case XmlNodeType.EntityReference:
-				case XmlNodeType.ProcessingInstruction:
-				case XmlNodeType.XmlDeclaration:
-					return current.Name;
-				}
-
-				return String.Empty;
-			}
-		}
-
-		public override string NamespaceURI {
-			get {
-				if (entityReader != null && entityReader.ReadState != ReadState.Initial)
-					return entityReader.NamespaceURI;
-
-				if (current == null)
-					return String.Empty;
-
-				return current.NamespaceURI;
-			}
-		}
-
-		public override XmlNameTable NameTable {
-			get { return document.NameTable; }
-		}
-
-		public override XmlNodeType NodeType {
-			get {
-				if (entityReader != null) {
-					switch (entityReader.ReadState) {
-					case ReadState.Interactive:
-						return entityReader.NodeType;
-					case ReadState.Initial:
-						return XmlNodeType.EntityReference;
-					case ReadState.EndOfFile:
-						return XmlNodeType.EndEntity;
-					}
-				}
-
-				if (current == null)
-					return XmlNodeType.None;
-
-				return isEndElement ? XmlNodeType.EndElement : current.NodeType;
-			}
-		}
-
-		public override string Prefix {
-			get { 
-				if (entityReader != null && entityReader.ReadState != ReadState.Initial)
-					return entityReader.Prefix;
-
-				if (current == null)
-					return String.Empty;
-
-				return current.Prefix;
-			}
-		}
-
-#if NET_2_0
-#else
-		public override char QuoteChar {
-			get {
-				if (entityReader != null && entityReader.ReadState != ReadState.Initial)
-					return entityReader.QuoteChar;
-
-				return '"';
-			}
-		}
-#endif
-
-		public override ReadState ReadState {
-			get { return state; }
-		}
-
-#if NET_2_0
-		public override IXmlSchemaInfo SchemaInfo {
-			get { return entityReader != null ? entityReader.SchemaInfo : current != null ? current.SchemaInfo : null; }
-		}
-#endif
-
-		public override string Value {
-			get {
-				if (entityReader != null && entityReader.ReadState != ReadState.Initial)
-					return entityReader.Value;
-
-				if (NodeType == XmlNodeType.DocumentType)
-					return ((XmlDocumentType) current).InternalSubset;
-				else
-					return HasValue ? current.Value : String.Empty;
-			}
-		}
-
-		public override string XmlLang {
-			get {
-				if (entityReader != null && entityReader.ReadState != ReadState.Initial)
-					return entityReader.XmlLang;
-
-				if (current == null)
-					return String.Empty;
-
-				return current.XmlLang;
-			}
-		}
-
-		public override XmlSpace XmlSpace {
-			get {
-				if (entityReader != null && entityReader.ReadState != ReadState.Initial)
-					return entityReader.XmlSpace;
-
-				if (current == null)
-					return XmlSpace.None;
-
-				return current.XmlSpace;
-			}
-		}
-		#endregion
-
-		#region Methods
-
-		// If current entityReference is a child of an attribute,
-		// then MoveToAttribute simply means that we no more need this entity reader.
-		// Otherwise, this invokation means that
-		// it is expected to move to resolved (maybe) element's attribute.
-		//
-		// This rule applies to many methods like MoveTo*Attribute().
-		private bool CheckAndResetEntityReaderOnMoveToAttribute ()
-		{
-			if (entityReader == null)
-				return false;
-
-			if (current != null && current.ParentNode != null &&
-				current.ParentNode.NodeType == XmlNodeType.Attribute) {
-				entityReader.Close ();
-				entityReader = null;
-				return true;
-			}
-			else
-				return false;
-		}
-
-		public override void Close ()
-		{
-			if (entityReader != null)
-				entityReader.Close ();
-			current = null;
-			state = ReadState.Closed;
-		}
-
-		public override string GetAttribute (int attributeIndex)
-		{
-			if (entityReader != null && entityReader.ReadState != ReadState.Initial)
-				return entityReader.GetAttribute (attributeIndex);
-
-			if (NodeType == XmlNodeType.XmlDeclaration) {
-				XmlDeclaration decl = current as XmlDeclaration;
-				if (attributeIndex == 0)
-					return decl.Version;
-				else if (attributeIndex == 1) {
-					if (decl.Encoding != String.Empty)
-						return decl.Encoding;
-					else if (decl.Standalone != String.Empty)
-						return decl.Standalone;
-				}
-				else if (attributeIndex == 2 &&
-						decl.Encoding != String.Empty && decl.Standalone != null)
-					return decl.Standalone;
-				throw new ArgumentOutOfRangeException ("Index out of range.");
-			} else if (NodeType == XmlNodeType.DocumentType) {
-				XmlDocumentType doctype = current as XmlDocumentType;
-				if (attributeIndex == 0) {
-					if (doctype.PublicId != "")
-						return doctype.PublicId;
-					else if (doctype.SystemId != "")
-						return doctype.SystemId;
-				} else if (attributeIndex == 1)
-					if (doctype.PublicId == "" && doctype.SystemId != "")
-						return doctype.SystemId;
-				throw new ArgumentOutOfRangeException ("Index out of range.");
-			}
-
-			// This is MS.NET bug which returns attributes in spite of EndElement.
-			if (isEndElement || current == null)
-				return null;
-
-			if (attributeIndex < 0 || attributeIndex > AttributeCount)
-				throw new ArgumentOutOfRangeException ("Index out of range.");
-
-			return ownerLinkedNode.Attributes [attributeIndex].Value;
-		}
-
-		public override string GetAttribute (string name)
-		{
-			if (entityReader != null && entityReader.ReadState != ReadState.Initial)
-				return entityReader.GetAttribute (name);
-
-			// This is MS.NET bug which returns attributes in spite of EndElement.
-			if (isEndElement || current == null)
-				return null;
-
-			if (NodeType == XmlNodeType.XmlDeclaration)
-				return GetXmlDeclarationAttribute (name);
-			else if (NodeType == XmlNodeType.DocumentType)
-				return GetDocumentTypeAttribute (name);
-
-			if (ownerLinkedNode.Attributes == null)
-				return null;
-			XmlAttribute attr = ownerLinkedNode.Attributes [name];
-			if (attr == null)
-				return null;
-			else
-				return attr.Value;
-		}
-
-		public override string GetAttribute (string name, string namespaceURI)
-		{
-			if (entityReader != null && entityReader.ReadState != ReadState.Initial)
-				return entityReader.GetAttribute (name, namespaceURI);
-
-			// This is MS.NET bug which returns attributes in spite of EndElement.
-			if (isEndElement || current == null)
-				return null;
-
-			if (NodeType == XmlNodeType.XmlDeclaration)
-				return GetXmlDeclarationAttribute (name);
-			else if (NodeType == XmlNodeType.DocumentType)
-				return GetDocumentTypeAttribute (name);
-
-			if (ownerLinkedNode.Attributes == null)
-				return null;
-			XmlAttribute attr = ownerLinkedNode.Attributes [name, namespaceURI];
-			if (attr == null)
-				return null;	// In fact MS.NET returns null instead of String.Empty.
-			else
-				return attr.Value;
-		}
-
-		private string GetXmlDeclarationAttribute (string name)
-		{
-			XmlDeclaration decl = current as XmlDeclaration;
-			switch (name) {
-			case "version":
-				return decl.Version;
-			case "encoding":
-				// This is MS.NET bug that XmlNodeReturns in case of string.empty.
-				return decl.Encoding != String.Empty ? decl.Encoding : null;
-			case "standalone":
-				return decl.Standalone;
-			}
-			return null;
-		}
-
-		private string GetDocumentTypeAttribute (string name)
-		{
-			XmlDocumentType doctype = current as XmlDocumentType;
-			switch (name) {
-			case "PUBLIC":
-				return doctype.PublicId;
-			case "SYSTEM":
-				return doctype.SystemId;
-			}
-			return null;
-		}
-
-		XmlParserContext IHasXmlParserContext.ParserContext {
-			get {
-				if (entityReader != null)
-					return ((IHasXmlParserContext) entityReader).ParserContext;
-				else
-					return new XmlParserContext (document.NameTable,
-						current.ConstructNamespaceManager (),
-						document.DocumentType != null ? document.DocumentType.DTD : null,
-						current.BaseURI, XmlLang, XmlSpace, Encoding.Unicode);
-			}
-		}
-
-#if NET_2_0
-		public IDictionary GetNamespacesInScope (XmlNamespaceScope scope)
-		{
-			Hashtable table = new Hashtable ();
-			XmlNode n = current;
-			do {
-				if (n.NodeType == XmlNodeType.Document)
-					break;
-				for (int i = 0; i < current.Attributes.Count; i++) {
-					XmlAttribute a = current.Attributes [i];
-					if (a.NamespaceURI == XmlNamespaceManager.XmlnsXmlns)
-						table.Add (a.Prefix == "xmlns" ? a.LocalName : String.Empty, a.Value);
-				}
-				if (scope == XmlNamespaceScope.Local)
-					return table;
-				n = n.ParentNode;
-			} while (n != null);
-			if (scope == XmlNamespaceScope.All)
-				table.Add ("xml", XmlNamespaceManager.XmlnsXml);
-			return table;
-		}
-#endif
-
-		private XmlElement GetCurrentElement ()
-		{
-			XmlElement el = null;
-			switch (current.NodeType) {
-			case XmlNodeType.Attribute:
-				el = ((XmlAttribute) current).OwnerElement;
-				break;
-			case XmlNodeType.Element:
-				el = (XmlElement) current;
-				break;
-			case XmlNodeType.Text:
-			case XmlNodeType.CDATA:
-			case XmlNodeType.EntityReference:
-			case XmlNodeType.Comment:
-			case XmlNodeType.SignificantWhitespace:
-			case XmlNodeType.Whitespace:
-			case XmlNodeType.ProcessingInstruction:
-				el = current.ParentNode as XmlElement;
-				break;
-			}
-			return el;
-		}
-
-		public override string LookupNamespace (string prefix)
-		{
-			if (entityReader != null && entityReader.ReadState != ReadState.Initial)
-				return entityReader.LookupNamespace (prefix);
-
-			if (current == null)
-				return null;
-
-			XmlElement el = GetCurrentElement ();
-
-			for (; el != null; el = el.ParentNode as XmlElement) {
-				for (int i = 0; i < el.Attributes.Count; i++) {
-					XmlAttribute attr = el.Attributes [i];
-					if (attr.NamespaceURI != XmlNamespaceManager.XmlnsXmlns)
-						continue;
-					if (prefix == "") {
-						if (attr.Prefix == "")
-							return attr.Value;
-					}
-					else if (attr.LocalName == prefix)
-						return attr.Value;
-					continue;
-				}
-			}
-
-			switch (prefix) {
-			case "xml":
-				return XmlNamespaceManager.XmlnsXml;
-			case "xmlns":
-				return XmlNamespaceManager.XmlnsXmlns;
-			}
-			return null;
-		}
-
-#if NET_2_0
-		public string LookupPrefix (string ns)
-		{
-			return LookupPrefix (ns, false);
-		}
-
-		public string LookupPrefix (string ns, bool atomizedNames)
-		{
-			if (entityReader != null && entityReader.ReadState != ReadState.Initial)
-				return ((IXmlNamespaceResolver) entityReader).LookupPrefix (ns, atomizedNames);
-
-			if (current == null)
-				return null;
-
-			XmlElement el = GetCurrentElement ();
-
-			for (; el != null; el = el.ParentNode as XmlElement) {
-				for (int i = 0; i < el.Attributes.Count; i++) {
-					XmlAttribute attr = el.Attributes [i];
-					if (atomizedNames) {
-						if (!Object.ReferenceEquals (attr.NamespaceURI, XmlNamespaceManager.XmlnsXmlns))
-							continue;
-						if (Object.ReferenceEquals (attr.Value, ns))
-							// xmlns:blah="..." -> LocalName, xmlns="..." -> String.Empty
-							return attr.Prefix != String.Empty ? attr.LocalName : String.Empty;
-					} else {
-						if (attr.NamespaceURI != XmlNamespaceManager.XmlnsXmlns)
-							continue;
-						if (attr.Value == ns)
-							// xmlns:blah="..." -> LocalName, xmlns="..." -> String.Empty
-							return attr.Prefix != String.Empty ? attr.LocalName : String.Empty;
-					}
-				}
-			}
-			switch (ns) {
-			case XmlNamespaceManager.XmlnsXml:
-				return XmlNamespaceManager.PrefixXml;
-			case XmlNamespaceManager.XmlnsXmlns:
-				return XmlNamespaceManager.PrefixXmlns;
-			}
-			return null;
-		}
-#endif
-
-		public override void MoveToAttribute (int attributeIndex)
-		{
-			if (entityReader != null) {
-				if (!this.CheckAndResetEntityReaderOnMoveToAttribute ()) {
-					entityReader.MoveToAttribute (attributeIndex);
-					return;
-				}
-				// And in case of abondoning entityReader, go on...
-			}
-
-			if (isEndElement || attributeIndex < 0 || attributeIndex > AttributeCount)
-				throw new ArgumentOutOfRangeException ();
-			
-			state = ReadState.Interactive;
-			current = ownerLinkedNode.Attributes [attributeIndex];
-		}
-
-		public override bool MoveToAttribute (string name)
-		{
-			if (entityReader != null) {
-				if (!this.CheckAndResetEntityReaderOnMoveToAttribute ())
-					return entityReader.MoveToAttribute (name);
-				// And in case of abondoning entityReader, go on...
-			}
-
-			if (isEndElement || current == null)
-				return false;
-			XmlNode tmpCurrent = current;
-			if (current.ParentNode.NodeType == XmlNodeType.Attribute)
-				current = current.ParentNode;
-
-			if (ownerLinkedNode.Attributes == null)
-				return false;
-			XmlAttribute attr = ownerLinkedNode.Attributes [name];
-			if (attr == null) {
-				current = tmpCurrent;
-				return false;
-			}
-			else {
-				current = attr;
-				return true;
-			}
-		}
-
-		public override bool MoveToAttribute (string name, string namespaceURI)
-		{
-			if (entityReader != null) {
-				if (!this.CheckAndResetEntityReaderOnMoveToAttribute ())
-					return entityReader.MoveToAttribute (name, namespaceURI);
-				// And in case of abondoning entityReader, go on...
-			}
-
-			if (isEndElement || current == null)
-				return false;
-
-			if (ownerLinkedNode.Attributes == null)
-				return false;
-			XmlAttribute attr = ownerLinkedNode.Attributes [name, namespaceURI];
-			if (attr == null)
-				return false;
-			else {
-				current = attr;
-				return true;
-			}
-		}
-
-		private void MoveToParentElement ()
-		{
-			// This is buggy. It is not only the case when EndElement = true.
-			isEndElement = true;
-			depth--;
-			current = current.ParentNode;
-		}
-
-		public override bool MoveToElement ()
-		{
-			if (entityReader != null) {
-				if (!this.CheckAndResetEntityReaderOnMoveToAttribute ())
-					return entityReader.MoveToElement ();
-				// And in case of abondoning entityReader, go on...
-			}
-
-			if (current == null)
-				return false;
-			XmlNode n = ownerLinkedNode;
-			if (current != n) {
-				current = n;
-				return true;
-			} else 
-				return false;
-		}
-
-		public override bool MoveToFirstAttribute ()
-		{
-			if (entityReader != null) {
-				if (!this.CheckAndResetEntityReaderOnMoveToAttribute ())
-					return entityReader.MoveToFirstAttribute ();
-				// And in case of abondoning entityReader, go on...
-			}
-
-			if (current == null)
-				return false;
-
-			if (ownerLinkedNode.Attributes == null)
-				return false;
-			if(ownerLinkedNode.Attributes.Count > 0)
-			{
-				current = ownerLinkedNode.Attributes [0];
-				return true;
-			}
-			else
-				return false;
-		}
-
-		public override bool MoveToNextAttribute ()
-		{
-			if (entityReader != null) {
-				if (!this.CheckAndResetEntityReaderOnMoveToAttribute ())
-					return entityReader.MoveToNextAttribute ();
-				// And in case of abondoning entityReader, go on...
-			}
-
-			if (current == null)
-				return false;
-
-			if (current.NodeType != XmlNodeType.Attribute)
-				return MoveToFirstAttribute ();
-			else
-			{
-				XmlAttributeCollection ac = ((XmlAttribute) current).OwnerElement.Attributes;
-				for (int i=0; i<ac.Count-1; i++)
-				{
-					XmlAttribute attr = ac [i];
-					if (attr == current)
-					{
-						i++;
-						if (i == ac.Count)
-							return false;
-						current = ac [i];
-						return true;
-					}
-				}
-				return false;
-			}
-		}
-
-		private bool MoveToNextSibling ()
-		{
-			if (alreadyRead) {
-				alreadyRead = false;
-				return current != null;
-			}
-			if (current.NextSibling != null) {
-				isEndElement = false;
-				current = current.NextSibling;
-			} else {
-				MoveToParentElement ();
-			}
-			if (current == null) {
-				state = ReadState.EndOfFile;
-				return false;
-			}
-			else
-				return true;
-		}
-
-		public override bool Read ()
-		{
-			if (EOF)
-				return false;
-
-#if NET_2_0
-			if (Binary != null)
-				Binary.Reset ();
-#endif
-
-			this.CheckAndResetEntityReaderOnMoveToAttribute ();
-			if (entityReader != null) {
-				// Read finalizes entity reader.
-				switch (entityReader.ReadState) {
-				case ReadState.Interactive:
-				case ReadState.Initial:
-					// If it is ended, then other properties/methods will take care.
-					entityReader.Read ();
-					return true;
-				default:
-					entityReader = null;
-					return Read ();
-				}
-				// and go on ...
-			}
-
-			if (ReadState == ReadState.Initial) {
-				current = startNode;
-				state = ReadState.Interactive;
-				// when startNode is document or fragment
-				if (!alreadyRead)
-					current = startNode.FirstChild;
-				else
-					alreadyRead = false;
-				if (current == null) {
-					state = ReadState.Error;
-					return false;
-				} else
-					return true;
-			}
-
-			MoveToElement ();
-
-			if (alreadyRead) {
-				alreadyRead = false;
-				return current != null;
-			}
-
-			bool isEnd = false;
-
-			if (IsEmptyElement || isEndElement) {
-				// Then go up and move to next.
-				// If no more nodes, then set EOF.
-				isEndElement = false;
-				if (current.ParentNode == null
-					|| current.ParentNode.NodeType == XmlNodeType.Document
-					|| current.ParentNode.NodeType == XmlNodeType.DocumentFragment) {
-					isEnd = true;
-				} else if (current.NextSibling == null) {
-					depth--;
-					current = current.ParentNode;
-					isEndElement = true;
-					return true;
-				} else {
-					current = current.NextSibling;
-					return true;
-				}
-			}
-
-			if (current.NextSibling == null
-				&& current.ParentNode is XmlEntityReference)
-				isEnd = true;
-
-			if (isEnd) {
-				current = null;
-				state = ReadState.EndOfFile;
-				return false;
-			}
-
-			if (!isEndElement && current.FirstChild != null && current.NodeType != XmlNodeType.EntityReference) {
-				isEndElement = false;
-				current = current.FirstChild;
-				depth++;
-			} else if (current.NodeType == XmlNodeType.Element) {
-				isEndElement = true;
-				if (current.FirstChild != null)
-					depth--;
-			} else
-				MoveToNextSibling ();
-
-			return current != null;
-		}
-
-		public override bool ReadAttributeValue ()
-		{
-			if (entityReader != null) {
-				switch (entityReader.ReadState) {
-				case ReadState.Interactive:
-				case ReadState.Initial:
-					// If it is ended, then other properties/methods will take care.
-					return entityReader.ReadAttributeValue ();
-				default:
-					entityReader = null;
-					// and go on ...
-					return ReadAttributeValue ();
-				}
-			}
-
-			if (current.NodeType == XmlNodeType.Attribute) {
-				if (current.FirstChild == null)
-					return false;
-				current = current.FirstChild;
-				return true;
-			} else if (current.ParentNode.NodeType == XmlNodeType.Attribute) {
-				if (current.NextSibling == null)
-					return false;
-				current = current.NextSibling;
-				return true;
-			} else
-				return false;
-		}
-
-#if NET_1_0
-		public override string ReadInnerXml ()
-		{
-			return ReadInnerXmlInternal ();
-		}
-
-		public override string ReadOuterXml ()
-		{
-			return ReadOuterXmlInternal ();
-		}
-#endif
-
-		public override string ReadString ()
-		{
-			return ReadStringInternal ();
-		}
-
-		public override void ResolveEntity ()
-		{
-			if (NodeType != XmlNodeType.EntityReference)
-				throw new InvalidOperationException ("The current node is not an Entity Reference");
-			entityReader = new XmlNodeReader (current, 1);
-		}
-
-		public override void Skip ()
-		{
-			// Why is this overriden? Such skipping might raise
-			// (or ignore) unexpected validation error.
-			base.Skip ();
-		}
-		#endregion
-	}
-}