projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2002-11-24 Duncan Mak <duncan@ximian.com>
[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 0af8bbfcc6a52a6e9fe3fe45b2bc479427062440..c7c8197ff7fd679f9bf59780a71b818877eaa826 100644
(file)
--- a/
mcs/class/System.XML/System.Xml/XmlQualifiedName.cs
+++ b/
mcs/class/System.XML/System.Xml/XmlQualifiedName.cs
@@
-2,9
+2,11
@@
// System.Xml.XmlQualifiedName.cs
//
// Author: Duncan Mak (duncan@ximian.com)
// System.Xml.XmlQualifiedName.cs
//
// Author: Duncan Mak (duncan@ximian.com)
-//
+//
// (C) Ximian, Inc.
// (C) Ximian, Inc.
-//
+//
+// Modified:
+// 21st June 2002 : Ajay kumar Dwivedi (adwiv@yahoo.com)
using System;
using System;
@@
-14,14
+16,13
@@
namespace System.Xml
{
// Constructors
public XmlQualifiedName ()
{
// Constructors
public XmlQualifiedName ()
- :
base (
)
+ :
this (string.Empty, string.Empty
)
{
}
public XmlQualifiedName (string name)
{
}
public XmlQualifiedName (string name)
- :
base (
)
+ :
this (name, string.Empty
)
{
{
- this.name = name;
}
public XmlQualifiedName (string name, string ns)
}
public XmlQualifiedName (string name, string ns)
@@
-32,8
+33,7
@@
namespace System.Xml
}
// Fields
}
// Fields
- [MonoTODO] public static readonly XmlQualifiedName Empty = new XmlQualifiedName ();
-
+ public static readonly XmlQualifiedName Empty = new XmlQualifiedName ();
private string name;
private string ns;
private string name;
private string ns;
@@
-61,13
+61,19
@@
namespace System.Xml
// Methods
public override bool Equals (object other)
{
// Methods
public override bool Equals (object other)
{
- if (this == other)
+ if(!(other is XmlQualifiedName))
+ return false;
+
+ if ((XmlQualifiedName) this == (XmlQualifiedName) other)
return true;
else
return false;
}
return true;
else
return false;
}
- [MonoTODO] public override int GetHashCode () { return 42; }
+ public override int GetHashCode ()
+ {
+ return unchecked (name.GetHashCode() + ns.GetHashCode());
+ }
public override string ToString ()
{
public override string ToString ()
{
@@
-79,7
+85,7
@@
namespace System.Xml
public static 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;
return name;
else
return ns + ":" + name;
@@
-88,6
+94,9
@@
namespace System.Xml
// Operators
public static bool operator == (XmlQualifiedName a, XmlQualifiedName b)
{
// Operators
public static bool operator == (XmlQualifiedName a, XmlQualifiedName b)
{
+ if((Object)a == null || (Object)b == null)
+ return false;
+
if ((a.Name == b.Name) && (a.Namespace == b.Namespace))
return true;
else
if ((a.Name == b.Name) && (a.Namespace == b.Namespace))
return true;
else
@@
-96,10
+105,10
@@
namespace System.Xml
public static bool operator != (XmlQualifiedName a, XmlQualifiedName b)
{
public static bool operator != (XmlQualifiedName a, XmlQualifiedName b)
{
- if (
!(a == b)
)
+ if (
a == b
)
return false;
else
return true;
}
}
return false;
else
return true;
}
}
-}
+}
\ No newline at end of file