From 7d1bf2d13a73ac98e73f8bfe46d5499b710c3f80 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sat, 25 Aug 2012 20:04:29 +0400 Subject: [PATCH] Utility method extracted --- .../refactoring/BaseRefactoringProcessor.java | 18 +++++------------- .../openapi/wm/impl/status/StatusBarUtil.java | 14 ++++++++++---- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java index 8ed14a19b991..705846251265 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java +++ b/platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,8 +38,7 @@ import com.intellij.openapi.util.EmptyRunnable; import com.intellij.openapi.util.Factory; import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.openapi.wm.StatusBar; -import com.intellij.openapi.wm.WindowManager; +import com.intellij.openapi.wm.impl.status.StatusBarUtil; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; @@ -210,7 +209,7 @@ public abstract class BaseRefactoringProcessor { if (!isPreview) { isPreview = !ensureElementsWritable(usages, descriptor) || UsageViewUtil.hasReadOnlyUsages(usages); if (isPreview) { - setStatusBarInfo(RefactoringBundle.message("readonly.occurences.found")); + StatusBarUtil.setStatusBarInfo(myProject, RefactoringBundle.message("readonly.occurences.found")); } } if (isPreview) { @@ -221,13 +220,6 @@ public abstract class BaseRefactoringProcessor { } } - private void setStatusBarInfo(final String message) { - final StatusBar statusBar = WindowManager.getInstance().getStatusBar(myProject); - if (statusBar != null) { - statusBar.setInfo(message); - } - } - protected void previewRefactoring(final UsageInfo[] usages) { if (ApplicationManager.getApplication().isUnitTestMode()) { execute(usages); @@ -468,11 +460,11 @@ public abstract class BaseRefactoringProcessor { int count = writableUsageInfos.length; if (count > 0) { - setStatusBarInfo(RefactoringBundle.message("statusBar.refactoring.result", count)); + StatusBarUtil.setStatusBarInfo(myProject, RefactoringBundle.message("statusBar.refactoring.result", count)); } else { if (!isPreviewUsages(writableUsageInfos)) { - setStatusBarInfo(RefactoringBundle.message("statusBar.noUsages")); + StatusBarUtil.setStatusBarInfo(myProject, RefactoringBundle.message("statusBar.noUsages")); } } } diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/StatusBarUtil.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/StatusBarUtil.java index 90e249530cb3..94fbc875a640 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/StatusBarUtil.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/StatusBarUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,8 +21,10 @@ import com.intellij.openapi.fileEditor.impl.EditorWithProviderComposite; import com.intellij.openapi.fileEditor.impl.EditorsSplitters; import com.intellij.openapi.project.Project; import com.intellij.openapi.wm.StatusBar; +import com.intellij.openapi.wm.WindowManager; import com.intellij.ui.docking.DockContainer; import com.intellij.ui.docking.DockManager; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -30,9 +32,7 @@ import org.jetbrains.annotations.Nullable; * @author Kirill Likhodedov */ public class StatusBarUtil { - - private StatusBarUtil() { - } + private StatusBarUtil() { } /** * Finds the current file editor. @@ -58,4 +58,10 @@ public class StatusBarUtil { return null; } + public static void setStatusBarInfo(@NotNull Project project, @NotNull @Nls String message) { + final StatusBar statusBar = WindowManager.getInstance().getStatusBar(project); + if (statusBar != null) { + statusBar.setInfo(message); + } + } }