New test.

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

diff --git a/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs b/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs
index 44cbaf7c852e78b48153a884fbd0869b05438683..50bb0401b5f37be721d0bd707e4b6bdcfff00530 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs
+++ b/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs
@@ -33,6 +33,9 @@
 //
 
 using System.Collections;
+#if NET_2_0
+using System.Collections.Generic;
+#endif
 using System.Collections.Specialized;
 
 namespace System.Xml
@@ -117,7 +120,11 @@ namespace System.Xml
                        get { return defaultNamespace == null ? string.Empty : defaultNamespace; }
                }
 
+#if NET_2_0
+               public virtual XmlNameTable NameTable {
+#else
                public XmlNameTable NameTable {
+#endif
                        get { return nameTable; }
                }
 
@@ -130,11 +137,7 @@ namespace System.Xml
                        AddNamespace (prefix, uri, false);
                }
 
-#if NET_2_0
-               public virtual void AddNamespace (string prefix, string uri, bool atomizedNames)
-#else
                internal virtual void AddNamespace (string prefix, string uri, bool atomizedNames)
-#endif
                {
                        if (prefix == null)
                                throw new ArgumentNullException ("prefix", "Value cannot be null.");
@@ -167,16 +170,16 @@ namespace System.Xml
                        decls [declPos].Uri = uri;
                }
 
-               internal static string IsValidDeclaration (string prefix, string uri, bool throwException)
+               static string IsValidDeclaration (string prefix, string uri, bool throwException)
                {
                        string message = null;
+                       // It is funky, but it does not check whether prefix
+                       // is equivalent to "xml" in case-insensitive means.
                        if (prefix == PrefixXml && uri != XmlnsXml)
-                               message = String.Format ("Prefix \"xml\" is only allowed to the fixed uri \"{0}\"", XmlnsXml);
-                       else if (uri == XmlnsXml)
-                               message = String.Format ("Namespace URI \"{0}\" is reserved to be mapped to \"xml\" and cannot be declared.", XmlnsXml);
-                       if (message == null && prefix == "xmlns")
+                               message = String.Format ("Prefix \"xml\" can only be bound to the fixed namespace URI \"{0}\". \"{1}\" is invalid.", XmlnsXml, uri);
+                       else if (message == null && prefix == "xmlns")
                                message = "Declaring prefix named \"xmlns\" is not allowed to any namespace.";
-                       if (message == null && uri == XmlnsXmlns)
+                       else if (message == null && uri == XmlnsXmlns)
                                message = String.Format ("Namespace URI \"{0}\" cannot be declared with any namespace.", XmlnsXmlns);
                        if (message != null && throwException)
                                throw new ArgumentException (message);
@@ -204,15 +207,24 @@ namespace System.Xml
                }
 
 #if NET_2_0
-               public virtual IDictionary GetNamespacesInScope (XmlNamespaceScope scope)
+               public virtual IDictionary<string, string> GetNamespacesInScope (XmlNamespaceScope scope)
+               {
+                       IDictionary namespaceTable = GetNamespacesInScopeImpl (scope);
+                       IDictionary<string, string> namespaces = new Dictionary<string, string>(namespaceTable.Count);
+
+                       foreach (DictionaryEntry entry in namespaceTable) {
+                               namespaces[(string) entry.Key] = (string) entry.Value;
+                       }
+                       return namespaces;
+               }
 #else
                IDictionary IXmlNamespaceResolver.GetNamespacesInScope (XmlNamespaceScope scope)
                {
-                       return GetNamespacesInScope (scope);
+                       return GetNamespacesInScopeImpl (scope);
                }
-
-               internal virtual IDictionary GetNamespacesInScope (XmlNamespaceScope scope)
 #endif
+
+               internal virtual IDictionary GetNamespacesInScopeImpl (XmlNamespaceScope scope)
                {
                        Hashtable table = new Hashtable ();
 
@@ -246,12 +258,8 @@ namespace System.Xml
                {
                        return HasNamespace (prefix, false);
                }
-               
-#if NET_2_0
-               public virtual bool HasNamespace (string prefix, bool atomizedNames)
-#else
+
                internal virtual bool HasNamespace (string prefix, bool atomizedNames)
-#endif
                {
                        if (prefix == null || count == 0)
                                return false;
@@ -273,16 +281,7 @@ namespace System.Xml
 #endif
                }
 
-#if NET_2_0
-               public virtual string LookupNamespace (string prefix, bool atomizedNames)
-#else
-               string IXmlNamespaceResolver.LookupNamespace (string prefix, bool atomizedNames)
-               {
-                       return LookupNamespace (prefix, atomizedNames);
-               }
-
                internal virtual string LookupNamespace (string prefix, bool atomizedNames)
-#endif
                {
                        switch (prefix) {
                        case PrefixXmlns:
@@ -320,16 +319,17 @@ namespace System.Xml
                                return s1 == s2;
                }
 
-#if NET_2_0
-               public string LookupPrefix (string uri, bool atomizedName)
-#else
-               string IXmlNamespaceResolver.LookupPrefix (string uri, bool atomizedName)
+               internal string LookupPrefix (string uri, bool atomizedName)
                {
-                       return LookupPrefix (uri, atomizedName);
+                       return LookupPrefixCore (uri, atomizedName, false);
                }
 
-               internal string LookupPrefix (string uri, bool atomizedName)
-#endif
+               internal string LookupPrefixExclusive (string uri, bool atomizedName)
+               {
+                       return LookupPrefixCore (uri, atomizedName, true);
+               }
+
+               string LookupPrefixCore (string uri, bool atomizedName, bool excludeOverriden)
                {
                        if (uri == null)
                                return null;
@@ -345,7 +345,8 @@ namespace System.Xml
 
                        for (int i = declPos; i >= 0; i--) {
                                if (CompareString (decls [i].Uri, uri, atomizedName) && decls [i].Prefix.Length > 0) // we already looked for ""
-                                       return decls [i].Prefix;
+                                       if (!excludeOverriden || !IsOverriden (i))
+                                               return decls [i].Prefix;
                        }
 
                        // ECMA specifies that this method returns String.Empty
@@ -356,6 +357,17 @@ namespace System.Xml
                        return null;
                }
 
+               bool IsOverriden (int idx)
+               {
+                       if (idx == declPos)
+                               return false;
+                       string prefix = decls [idx + 1].Prefix;
+                       for (int i = idx + 1; i <= declPos; i++)
+                               if ((object) decls [idx].Prefix == prefix)
+                                       return true;
+                       return false;
+               }
+
                public virtual bool PopScope ()
                {
                        if (scopePos == -1)
@@ -385,11 +397,7 @@ namespace System.Xml
                        RemoveNamespace (prefix, uri, false);
                }
 
-#if NET_2_0
-               public virtual void RemoveNamespace (string prefix, string uri, bool atomizedNames)
-#else
                internal virtual void RemoveNamespace (string prefix, string uri, bool atomizedNames)
-#endif
                {
                        if (prefix == null)
                                throw new ArgumentNullException ("prefix");