From f4f667dbf6bb8bc743c0e29e2281f589fa4fa603 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Tue, 11 Jul 2006 16:44:59 +0000 Subject: [PATCH] Fixed SD2-850: Code generation for abstract EventBindingService class adds 'override virtual' modifiers git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.0@1566 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../CodeGenerators/AbstractClassImplementorCodeGenerator.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/AbstractClassImplementorCodeGenerator.cs b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/AbstractClassImplementorCodeGenerator.cs index 258d9aa140..d9d88ba18f 100644 --- a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/AbstractClassImplementorCodeGenerator.cs +++ b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/AbstractClassImplementorCodeGenerator.cs @@ -35,7 +35,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands foreach (IProperty property in currentClass.DefaultReturnType.GetProperties()) { if (property.IsAbstract) { AttributedNode node = CodeGenerator.ConvertMember(property, classFinderContext); - node.Modifier &= ~Modifier.Abstract; + node.Modifier &= ~(Modifier.Abstract | Modifier.Virtual); node.Modifier |= Modifier.Override; nodes.Add(node); } @@ -43,7 +43,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands foreach (IMethod method in currentClass.DefaultReturnType.GetMethods()) { if (method.IsAbstract) { AttributedNode node = CodeGenerator.ConvertMember(method, classFinderContext); - node.Modifier &= ~Modifier.Abstract; + node.Modifier &= ~(Modifier.Abstract | Modifier.Virtual); node.Modifier |= Modifier.Override; nodes.Add(node); }