2003-04-25 Atsushi Enomoto <ginga@kit.hi-ho.ne.jp>

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

diff --git a/mcs/class/System.XML/System.Xml/XmlNamedNodeMap.cs b/mcs/class/System.XML/System.Xml/XmlNamedNodeMap.cs
index c188272a28314094f3ff58855079b874c6f7b4db..b588fb19edb987c390f096b974a0f3ac78ee5704 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlNamedNodeMap.cs
+++ b/mcs/class/System.XML/System.Xml/XmlNamedNodeMap.cs
@@ -46,8 +46,8 @@ namespace System.Xml
                public virtual XmlNode GetNamedItem (string localName, string namespaceURI)
                {
                        foreach (XmlNode node in nodeList) {
-                               if ((node.Name == localName)
-                                   && (parent.NamespaceURI == namespaceURI))
+                               if ((node.LocalName == localName)
+                                   && (node.NamespaceURI == namespaceURI))
                                        return node;
                        }
 
@@ -66,18 +66,19 @@ namespace System.Xml
                {                       
                        foreach (XmlNode node in nodeList)
                                if (node.Name == name) {
+                                       if (node.IsReadOnly)
+                                               throw new InvalidOperationException ("Cannot remove. This node is read only: " + name);
                                        nodeList.Remove (node);
                                        return node;
                                }
-                       
                        return null;
                }
 
                public virtual XmlNode RemoveNamedItem (string localName, string namespaceURI)
                {
                        foreach (XmlNode node in nodeList)
-                               if ((node.Name == localName)
-                                   && (parent.NamespaceURI == namespaceURI)) {
+                               if ((node.LocalName == localName)
+                                   && (node.NamespaceURI == namespaceURI)) {
                                        nodeList.Remove (node);
                                        return node;
                                }
@@ -86,19 +87,29 @@ namespace System.Xml
                }
 
                public virtual XmlNode SetNamedItem (XmlNode node)
+               {
+                       return SetNamedItem(node, -1);
+               }
+
+               internal XmlNode SetNamedItem (XmlNode node, int pos)
                {
                        if (readOnly || (node.OwnerDocument != parent.OwnerDocument))
                                throw new ArgumentException ("Cannot add to NodeMap.");
-                                               
+
                        foreach (XmlNode x in nodeList)
-                               if (x.Name == node.Name) {
+                               if(x.LocalName == node.LocalName && x.NamespaceURI == node.NamespaceURI) {
                                        nodeList.Remove (x);
                                        nodeList.Add (node);
                                        return x;
                                }
                        
-                       nodeList.Add (node);
+                       if(pos < 0)
+                               nodeList.Add (node);
+                       else
+                               nodeList.Insert(pos, node);
                        return null;
                }
+
+               internal ArrayList Nodes { get { return nodeList; } }
        }
 }