Browse Source

Fixed SD2-1010: Method overloads for overridden abstract method

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.1@2363 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 19 years ago
parent
commit
016219676d
  1. 1
      src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/AbstractDecoration.cs
  2. 6
      src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultMethod.cs
  3. 9
      src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultParameter.cs
  4. 3
      src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultProperty.cs

1
src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/AbstractDecoration.cs

@ -221,7 +221,6 @@ namespace ICSharpCode.SharpDevelop.Dom @@ -221,7 +221,6 @@ namespace ICSharpCode.SharpDevelop.Dom
return IsAccessible(callingClass, isClassInInheritanceTree);
}
public virtual int CompareTo(IDecoration value)
{
return this.Modifiers - value.Modifiers;

6
src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultMethod.cs

@ -166,12 +166,6 @@ namespace ICSharpCode.SharpDevelop.Dom @@ -166,12 +166,6 @@ namespace ICSharpCode.SharpDevelop.Dom
{
int cmp;
cmp = base.CompareTo((IDecoration)value);
if (cmp != 0) {
return cmp;
}
if (FullyQualifiedName != null) {
cmp = FullyQualifiedName.CompareTo(value.FullyQualifiedName);
if (cmp != 0) {

9
src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultParameter.cs

@ -143,15 +143,14 @@ namespace ICSharpCode.SharpDevelop.Dom @@ -143,15 +143,14 @@ namespace ICSharpCode.SharpDevelop.Dom
public virtual int CompareTo(IParameter value)
{
if (value == null) return -1;
int cmp;
if(0 != (cmp = ((int)Modifiers - (int)value.Modifiers)))
return cmp;
// two parameters are equal if they have the same return type
// (they may have different names)
if (object.Equals(ReturnType, value.ReturnType))
return 0;
else
return -1;
return string.Compare(this.Name, value.Name);
// if the parameters are not equal, use the parameter name to provide the ordering
}
int IComparable.CompareTo(object value)

3
src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultProperty.cs

@ -105,9 +105,6 @@ namespace ICSharpCode.SharpDevelop.Dom { @@ -105,9 +105,6 @@ namespace ICSharpCode.SharpDevelop.Dom {
{
int cmp;
if(0 != (cmp = base.CompareTo((IDecoration)value)))
return cmp;
if (FullyQualifiedName != null) {
cmp = FullyQualifiedName.CompareTo(value.FullyQualifiedName);
if (cmp != 0) {

Loading…
Cancel
Save