From 51361a29c1b9f179124da6be2d416d2c05cede8e Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Fri, 2 Mar 2012 23:57:49 +0400 Subject: [PATCH] Fix for KT-1375 Rename "No methods to implement found" to "No method to override found" where it is needed --- .../jet/plugin/codeInsight/ImplementMethodsHandler.java | 5 +++++ .../plugin/codeInsight/OverrideImplementMethodsHandler.java | 4 +++- .../jet/plugin/codeInsight/OverrideMethodsHandler.java | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ImplementMethodsHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/ImplementMethodsHandler.java index 631dbb82a8d..57f0952e678 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ImplementMethodsHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/ImplementMethodsHandler.java @@ -44,6 +44,11 @@ public class ImplementMethodsHandler extends OverrideImplementMethodsHandler imp return "Implement Members"; } + @Override + protected String getNoMethodsFoundHint() { + return "No methods to implement have been found"; + } + @NotNull @Override public String getText() { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java index 0643538142c..2b115788cff 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java @@ -169,13 +169,15 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns return classOrObject != null; } + protected abstract String getNoMethodsFoundHint(); + public void invoke(@NotNull final Project project, @NotNull final Editor editor, @NotNull PsiFile file, boolean implementAll) { final PsiElement elementAtCaret = file.findElementAt(editor.getCaretModel().getOffset()); final JetClassOrObject classOrObject = PsiTreeUtil.getParentOfType(elementAtCaret, JetClassOrObject.class); Set missingImplementations = collectMethodsToGenerate(classOrObject); if (missingImplementations.isEmpty() && !implementAll) { - HintManager.getInstance().showErrorHint(editor, "No methods to implement have been found"); + HintManager.getInstance().showErrorHint(editor, getNoMethodsFoundHint()); return; } List members = membersFromDescriptors(missingImplementations); diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideMethodsHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideMethodsHandler.java index 16a8b2956e5..29e2eb3a404 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideMethodsHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideMethodsHandler.java @@ -44,4 +44,9 @@ public class OverrideMethodsHandler extends OverrideImplementMethodsHandler { protected String getChooserTitle() { return "Override Members"; } + + @Override + protected String getNoMethodsFoundHint() { + return "No methods to override have been found"; + } }