2005-01-31 Zoltan Varga <vargaz@freemail.hu>

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

diff --git a/mcs/class/System.XML/System.Xml/XmlQualifiedName.cs b/mcs/class/System.XML/System.Xml/XmlQualifiedName.cs
index d2d5f6325674a0685832061d2597f1a2e5cdbb60..22857ff868fcc3e3e59f3bfb0538e90edc881af2 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlQualifiedName.cs
+++ b/mcs/class/System.XML/System.Xml/XmlQualifiedName.cs
@@ -8,10 +8,34 @@
 // Modified: 
 //             21st June 2002 : Ajay kumar Dwivedi (adwiv@yahoo.com)
 
+//
+// 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;
 
 namespace System.Xml
 {
+#if NET_2_0
+       [Serializable]
+#endif
        public class XmlQualifiedName
        {
                // Constructors         
@@ -28,23 +52,22 @@ namespace System.Xml
                public XmlQualifiedName (string name, string ns)
                        : base ()
                {
-                       this.name = name;
-                       this.ns = ns;
+                       this.name = (name == null) ? "" : name;
+                       this.ns = (ns == null) ? "" : ns;
+                       this.hash = this.name.GetHashCode () ^ this.ns.GetHashCode ();
                }
 
                // Fields
                public static readonly XmlQualifiedName Empty = new XmlQualifiedName ();                
-               private string name;
-               private string ns;
+               private readonly string name;
+               private readonly string ns;
+               private readonly int hash;
                
                // Properties
                public bool IsEmpty
                {
                        get {
-                               if ((name == String.Empty) && (ns == String.Empty))
-                                       return true;
-                               else
-                                       return false;
+                               return name.Length == 0 && ns.Length == 0;
                        }
                }
 
@@ -61,25 +84,17 @@ namespace System.Xml
                // Methods
                public override bool Equals (object other)
                {
-                       if(!(other is XmlQualifiedName))
-                               return false;
-
-                       if ((XmlQualifiedName) this == (XmlQualifiedName) other)
-                               return true;
-                       else
-                               return false;
+                       return this == (other as XmlQualifiedName);
                }
 
                public override int GetHashCode () 
                { 
-                       return unchecked (name.GetHashCode() + ns.GetHashCode()); 
+                       return hash;
                }
 
                public override string ToString ()
                {
-                       if (ns == null)
-                               return name;
-                       else if (ns == string.Empty)
+                       if (ns == string.Empty)
                                return name;
                        else
                                return ns + ":" + name;
@@ -93,24 +108,32 @@ namespace System.Xml
                                return ns + ":" + name;
                }
 
+               internal static XmlQualifiedName Parse (string name, IXmlNamespaceResolver resolver)
+               {
+                       int index = name.IndexOf (':');
+                       if (index < 0)
+                               return new XmlQualifiedName (name);
+                       string ns = resolver.LookupNamespace (name.Substring (0, index));
+                       if (ns == null)
+                               throw new ArgumentException ("Invalid qualified name.");
+                       return new XmlQualifiedName (name.Substring (index + 1), ns);
+               }
+
                // Operators
                public static bool operator == (XmlQualifiedName a, XmlQualifiedName b)
                {
+                       if((Object)a == (Object)b)
+                               return true;
+
                        if((Object)a == null || (Object)b == null)
                                return false;
 
-                       if ((a.Name == b.Name) && (a.Namespace == b.Namespace))
-                               return true;
-                       else
-                               return false;
+                       return (a.hash == b.hash) && (a.name == b.name) && (a.ns == b.ns);
                }
 
                public static bool operator != (XmlQualifiedName a, XmlQualifiedName b)
                {
-                       if (a == b)
-                               return false;
-                       else
-                               return true;
+                       return !(a == b);
                }
        }
 }