Browse Source

Fix SD-1754 - Forms Designer should use case insensitive method name comparison for VB

pull/14/head
Matt Ward 15 years ago
parent
commit
b7c5d1f128
  1. 7
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/AbstractDesignerGenerator.cs
  2. 5
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/VBNetDesignerGenerator.cs

7
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/AbstractDesignerGenerator.cs

@ -474,7 +474,7 @@ namespace ICSharpCode.FormsDesigner
LoggingService.Debug("Forms designer: AbstractDesignerGenerator.InsertComponentEvent: eventMethodName=" + eventMethodName); LoggingService.Debug("Forms designer: AbstractDesignerGenerator.InsertComponentEvent: eventMethodName=" + eventMethodName);
foreach (IMethod method in completeClass.Methods) { foreach (IMethod method in completeClass.Methods) {
if (method.Name == eventMethodName) { if (CompareMethodNames(method.Name, eventMethodName)) {
file = method.DeclaringType.CompilationUnit.FileName; file = method.DeclaringType.CompilationUnit.FileName;
OpenedFile openedFile = FileService.GetOpenedFile(file); OpenedFile openedFile = FileService.GetOpenedFile(file);
IDocument doc; IDocument doc;
@ -513,6 +513,11 @@ namespace ICSharpCode.FormsDesigner
return true; return true;
} }
protected virtual bool CompareMethodNames(string strA, string strB)
{
return strA == strB;
}
/// <summary> /// <summary>
/// Gets a method implementing the signature specified by the event descriptor /// Gets a method implementing the signature specified by the event descriptor
/// </summary> /// </summary>

5
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/VBNetDesignerGenerator.cs

@ -67,5 +67,10 @@ namespace ICSharpCode.FormsDesigner
} }
return v.Text; return v.Text;
} }
protected override bool CompareMethodNames(string strA, string strB)
{
return String.Compare(strA, strB, StringComparison.InvariantCultureIgnoreCase) == 0;
}
} }
} }

Loading…
Cancel
Save