From 877ebf8bdbd0c77d1a6aca4896f0d1139e903b75 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sat, 23 Jul 2011 10:53:39 +0200 Subject: [PATCH] Remove operator == from AstNodeCollection. --- .../Ast/AstNodeCollection.cs | 21 +++++-------------- .../CSharp/Ast/AstNodeCollection.cs | 21 +++++-------------- 2 files changed, 10 insertions(+), 32 deletions(-) diff --git a/ICSharpCode.NRefactory.VB/Ast/AstNodeCollection.cs b/ICSharpCode.NRefactory.VB/Ast/AstNodeCollection.cs index 236f27a0ba..aa91bb5c9c 100644 --- a/ICSharpCode.NRefactory.VB/Ast/AstNodeCollection.cs +++ b/ICSharpCode.NRefactory.VB/Ast/AstNodeCollection.cs @@ -133,28 +133,17 @@ namespace ICSharpCode.NRefactory.VB } #region Equals and GetHashCode implementation - public override bool Equals(object obj) - { - if (obj is AstNodeCollection) { - return ((AstNodeCollection)obj) == this; - } else { - return false; - } - } - public override int GetHashCode() { return node.GetHashCode() ^ role.GetHashCode(); } - public static bool operator ==(AstNodeCollection left, AstNodeCollection right) - { - return left.role == right.role && left.node == right.node; - } - - public static bool operator !=(AstNodeCollection left, AstNodeCollection right) + public override bool Equals(object obj) { - return !(left.role == right.role && left.node == right.node); + AstNodeCollection other = obj as AstNodeCollection; + if (other == null) + return false; + return this.node == other.node && this.role == other.role; } #endregion diff --git a/ICSharpCode.NRefactory/CSharp/Ast/AstNodeCollection.cs b/ICSharpCode.NRefactory/CSharp/Ast/AstNodeCollection.cs index adc6e5e41e..267e083e94 100644 --- a/ICSharpCode.NRefactory/CSharp/Ast/AstNodeCollection.cs +++ b/ICSharpCode.NRefactory/CSharp/Ast/AstNodeCollection.cs @@ -132,28 +132,17 @@ namespace ICSharpCode.NRefactory.CSharp } #region Equals and GetHashCode implementation - public override bool Equals(object obj) - { - if (obj is AstNodeCollection) { - return ((AstNodeCollection)obj) == this; - } else { - return false; - } - } - public override int GetHashCode() { return node.GetHashCode() ^ role.GetHashCode(); } - public static bool operator ==(AstNodeCollection left, AstNodeCollection right) - { - return left.role == right.role && left.node == right.node; - } - - public static bool operator !=(AstNodeCollection left, AstNodeCollection right) + public override bool Equals(object obj) { - return !(left.role == right.role && left.node == right.node); + AstNodeCollection other = obj as AstNodeCollection; + if (other == null) + return false; + return this.node == other.node && this.role == other.role; } #endregion