From d7aa7e3044ed1000596f83b5a8d454536b8b649d Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 4 Nov 2011 19:17:15 +0100
Subject: [PATCH] override methods checks modality

---
 .../jet/plugin/codeInsight/OverrideMethodsHandler.java   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideMethodsHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideMethodsHandler.java
index c3fdd6ce0b9..2cb0be4bb09 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideMethodsHandler.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideMethodsHandler.java
@@ -4,6 +4,7 @@ import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor;
 import org.jetbrains.jet.lang.descriptors.MutableClassDescriptor;
 import org.jetbrains.jet.lang.resolve.OverrideResolver;
 
+import java.util.HashSet;
 import java.util.Set;
 
 /**
@@ -15,7 +16,13 @@ public class OverrideMethodsHandler extends OverrideImplementMethodsHandler {
         for (CallableMemberDescriptor member : descriptor.getCallableMembers()) {
             superMethods.removeAll(member.getOverriddenDescriptors());
         }
-        return superMethods;
+        Set<CallableMemberDescriptor> result = new HashSet<CallableMemberDescriptor>();
+        for (CallableMemberDescriptor superMethod : superMethods) {
+            if (superMethod.getModality().isOverridable()) {
+                result.add(superMethod);
+            }
+        }
+        return result;
     }
 
     protected String getChooserTitle() {