From a024a17b03b042a1b75009e3ff5b279feb9b8483 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 19 Jul 2013 22:27:40 +0400 Subject: [PATCH] Extracted methods. --- .../inline/KotlinInlineLocalHandler.java | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineLocalHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineLocalHandler.java index 99a445d356f..25755a25495 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineLocalHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineLocalHandler.java @@ -114,17 +114,7 @@ public class KotlinInlineLocalHandler extends InlineActionHandler { EditorColorsManager editorColorsManager = EditorColorsManager.getInstance(); TextAttributes attributes = editorColorsManager.getGlobalScheme().getAttributes(EditorColors.SEARCH_RESULT_ATTRIBUTES); HighlightManager.getInstance(project).addOccurrenceHighlights(editor, referencesArray, attributes, true, null); - RefactoringMessageDialog dialog = new RefactoringMessageDialog( - RefactoringBundle.message("inline.variable.title"), - RefactoringBundle.message("inline.local.variable.prompt", name) + " " + - RefactoringBundle.message("occurences.string", references.size()), - HelpID.INLINE_VARIABLE, - "OptionPane.questionIcon", - true, - project); - - dialog.show(); - if (!dialog.isOK()){ + if (!showDialog(project, name, references)) { StatusBar statusBar = WindowManager.getInstance().getStatusBar(project); if (statusBar != null) { statusBar.setInfo(RefactoringBundle.message("press.escape.to.remove.the.highlighting")); @@ -168,6 +158,20 @@ public class KotlinInlineLocalHandler extends InlineActionHandler { }, RefactoringBundle.message("inline.command", name), null); } + private static boolean showDialog(Project project, String name, Collection references) { + RefactoringMessageDialog dialog = new RefactoringMessageDialog( + RefactoringBundle.message("inline.variable.title"), + RefactoringBundle.message("inline.local.variable.prompt", name) + " " + + RefactoringBundle.message("occurences.string", references.size()), + HelpID.INLINE_VARIABLE, + "OptionPane.questionIcon", + true, + project); + + dialog.show(); + return dialog.isOK(); + } + @Nullable private static String getParametersForFunctionLiteral(JetExpression initializer) { JetFunctionLiteralExpression functionLiteralExpression = getFunctionLiteralExpression(initializer);