X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.XML%2FSystem.Xml%2FXmlQualifiedName.cs;h=e0bfd505886ea366c446a6920dac0a1667ec50b4;hb=2d23bfcbce7a3f7e54dcd5911adb88b244baca35;hp=04b6c580f3393bf1d8e68d5922e936cb68bd0d34;hpb=bb9dd14220b8a60ad5ec8cd18378671434e207e8;p=mono.git

diff --git a/mcs/class/System.XML/System.Xml/XmlQualifiedName.cs b/mcs/class/System.XML/System.Xml/XmlQualifiedName.cs
index 04b6c580f33..e0bfd505886 100644
--- a/mcs/class/System.XML/System.Xml/XmlQualifiedName.cs
+++ b/mcs/class/System.XML/System.Xml/XmlQualifiedName.cs
@@ -2,48 +2,73 @@
 // System.Xml.XmlQualifiedName.cs
 //
 // Author: Duncan Mak (duncan@ximian.com)
-//
+//		 
 // (C) Ximian, Inc.
+// 
+// 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		
 		public XmlQualifiedName ()
-			: base ()
+			: this (string.Empty, string.Empty)
 		{
 		}
 
 		public XmlQualifiedName (string name)
-			: base ()
+			: this (name, string.Empty)
 		{
-			this.name = name;
 		}
 
 		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
-		[MonoTODO] public static readonly XmlQualifiedName Empty = new XmlQualifiedName ();
+		public static readonly XmlQualifiedName Empty = new XmlQualifiedName ();		
+		private readonly string name;
+		private readonly string ns;
+		private readonly int hash;
 		
-		private string name;
-		private string namespace;
-		
-		public XmlQualifiedName (string name) {}
-
 		// Properties
 		public bool IsEmpty
 		{
-			if ((name == String.Empty) && (ns == String.Empty))
-				return true;
-			else
-				return false;
+			get {
+				return name.Length == 0 && ns.Length == 0;
+			}
 		}
 
 		public string Name
@@ -53,31 +78,89 @@ namespace System.Xml
 
 		public string Namespace
 		{
-			get { return namespace; }
+			get { return ns; }
 		}
 
 		// Methods
 		public override bool Equals (object other)
 		{
-			if ((this.Name == other.Name) && (this.Namespace == other.Namespace))
-				return true;
-			else
-				return false;
+			return this == (other as XmlQualifiedName);
 		}
 
-		public override int GetHashCode ();
+		public override int GetHashCode () 
+		{ 
+			return hash;
+		}
 
 		public override string ToString ()
 		{
-			return ns + ":" + name;
+			if (ns == string.Empty)
+				return name;
+			else
+			 	return ns + ":" + name;
 		}
 
-		public override string ToString (string name, string ns)
+		public static string ToString (string name, string ns)
 		{
-			if (ns == null)
+			if (ns == string.Empty)
 				return name;
-			else
-			 	return ns + ":" + name;
+			else				
+				return ns + ":" + name;
+		}
+
+		internal static XmlQualifiedName Parse (string name, IXmlNamespaceResolver resolver)
+		{
+			return Parse (name, resolver, false);
+		}
+
+		internal static XmlQualifiedName Parse (string name, IXmlNamespaceResolver resolver, bool considerDefaultNamespace)
+		{
+			int index = name.IndexOf (':');
+			if (index < 0 && !considerDefaultNamespace)
+				return new XmlQualifiedName (name);
+			string prefix = index < 0 ? String.Empty : name.Substring (0, index);
+			string localName = index < 0 ? name : name.Substring (index + 1);
+			string ns = resolver.LookupNamespace (prefix);
+			if (ns == null) {
+				if (prefix.Length > 0)
+					throw new ArgumentException ("Invalid qualified name.");
+				else
+					ns = String.Empty;
+			}
+			return new XmlQualifiedName (localName, ns);
+		}
+
+		internal static XmlQualifiedName Parse (string name, XmlReader reader)
+		{
+			return Parse (name, reader, false);
+		}
+
+		internal static XmlQualifiedName Parse (string name, XmlReader reader, bool considerDefaultNamespace)
+		{
+			int index = name.IndexOf (':');
+			if (index < 0 && !considerDefaultNamespace)
+				return new XmlQualifiedName (name);
+			string ns = reader.LookupNamespace (index < 0 ? String.Empty : name.Substring (0, index));
+			if (ns == null)
+				throw new ArgumentException ("Invalid qualified name.");
+			return new XmlQualifiedName (index < 0 ? name : 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;
+
+			return (a.hash == b.hash) && (a.name == b.name) && (a.ns == b.ns);
+		}
+
+		public static bool operator != (XmlQualifiedName a, XmlQualifiedName b)
+		{
+			return !(a == b);
 		}
 	}
 }