2005-01-31 Zoltan Varga <vargaz@freemail.hu>
[mono.git] / mcs / class / System.XML / System.Xml / XmlNodeListChildren.cs
index dde6c4243ac91af37ab952064f4d5c640d7abc40..16a67c7994a52f7712102f31ca6e435a3e205df0 100644 (file)
@@ -7,47 +7,81 @@
 // (C) 2002 Kral Ferch
 //
 
+//
+// 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;
 
 namespace System.Xml
 {
-       public class XmlNodeListChildren : XmlNodeList
+       internal class XmlNodeListChildren : XmlNodeList
        {
                #region Enumerator
-               ///////////////////////////////////////////////////////////////////////
-               //
-               //      Enumerator
-               //
-               ///////////////////////////////////////////////////////////////////////
+
                private class Enumerator : IEnumerator
                {
+                       XmlNode parent;
                        XmlLinkedNode currentChild;
-                       XmlLinkedNode lastChild;
+                       bool passedLastNode;
 
-                       internal Enumerator (XmlLinkedNode lastChild)
+                       internal Enumerator (XmlNode parent)
                        {
                                currentChild = null;
-                               this.lastChild = lastChild;
+                               this.parent = parent;
+                               passedLastNode = false;
                        }
 
                        public virtual object Current {
                                get {
+                                       if ((currentChild == null) ||
+                                               (parent.LastLinkedChild == null) ||
+                                               (passedLastNode == true))
+                                               throw new InvalidOperationException();
+
                                        return currentChild;
                                }
                        }
 
                        public virtual bool MoveNext()
                        {
-                               bool passedEndOfCollection = Object.ReferenceEquals(currentChild, lastChild);
+                               bool movedNext = true;
 
-                               if (currentChild == null) {
-                                       currentChild = lastChild;
+                               if (parent.LastLinkedChild == null) {
+                                       movedNext = false;
+                               }
+                               else if (currentChild == null) {
+                                       currentChild = parent.LastLinkedChild.NextLinkedSibling;
+                               }
+                               else {
+                                       if (Object.ReferenceEquals(currentChild, parent.LastLinkedChild)) {
+                                               movedNext = false;
+                                               passedLastNode = true;
+                                       }
+                                       else {
+                                               currentChild = currentChild.NextLinkedSibling;
+                                       }
                                }
 
-                               currentChild = currentChild.NextLinkedSibling;
-
-                               return passedEndOfCollection;
+                               return movedNext;
                        }
 
                        public virtual void Reset()
@@ -59,46 +93,30 @@ namespace System.Xml
                #endregion
 
                #region Fields
-               ///////////////////////////////////////////////////////////////////////
-               //
-               //      Fields
-               //
-               ///////////////////////////////////////////////////////////////////////
 
-               XmlLinkedNode lastChild;
+               XmlNode parent;
 
                #endregion
 
                #region Constructors
-               ///////////////////////////////////////////////////////////////////////
-               //
-               //      Constructors
-               //
-               ///////////////////////////////////////////////////////////////////////
-
-               public XmlNodeListChildren(XmlLinkedNode lastChild)
+               public XmlNodeListChildren(XmlNode parent)
                {
-                       this.lastChild = lastChild;
+                       this.parent = parent;
                }
 
                #endregion
 
                #region Properties
-               ///////////////////////////////////////////////////////////////////////
-               //
-               //      Properties
-               //
-               ///////////////////////////////////////////////////////////////////////
 
                public override int Count {
                        get {
                                int count = 0;
 
-                               if (lastChild != null) {
-                                       XmlLinkedNode currentChild = lastChild.NextLinkedSibling;
+                               if (parent.LastLinkedChild != null) {
+                                       XmlLinkedNode currentChild = parent.LastLinkedChild.NextLinkedSibling;
                                        
                                        count = 1;
-                                       while (!Object.ReferenceEquals(currentChild, lastChild)) {
+                                       while (!Object.ReferenceEquals(currentChild, parent.LastLinkedChild)) {
                                                currentChild = currentChild.NextLinkedSibling;
                                                count++;
                                        }
@@ -111,29 +129,28 @@ namespace System.Xml
                #endregion
 
                #region Methods
-               ///////////////////////////////////////////////////////////////////////
-               //
-               //      Methods
-               //
-               ///////////////////////////////////////////////////////////////////////
 
                public override IEnumerator GetEnumerator ()
                {
-                       return new Enumerator(lastChild);
+                       return new Enumerator(parent);
                }
 
                public override XmlNode Item (int index)
                {
                        XmlNode requestedNode = null;
 
+                       // Return null if index is out of range. by  DOM design.
+                       if (Count <= index)
+                               return null;
+
                        // Instead of checking for && index < Count which has to walk
                        // the whole list to get a count, we'll just keep a count since
                        // we have to walk the list anyways to get to index.
-                       if ((index >= 0) && (lastChild != null)) {
-                               XmlLinkedNode currentChild = lastChild.NextLinkedSibling;
+                       if ((index >= 0) && (parent.LastLinkedChild != null)) {
+                               XmlLinkedNode currentChild = parent.LastLinkedChild.NextLinkedSibling;
                                int count = 0;
 
-                               while ((count < index) && !Object.ReferenceEquals(currentChild, lastChild)) 
+                               while ((count < index) && !Object.ReferenceEquals(currentChild, parent.LastLinkedChild)) 
                                {
                                        currentChild = currentChild.NextLinkedSibling;
                                        count++;