From d78389e7d8029be51d36b99bb5994d21335fd1bc Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Mon, 23 Oct 2017 16:39:36 +0300 Subject: [PATCH] progress indicators are indeterminate by default more indicators fixed --- .../intellij/refactoring/OptimizeImportsRefactoringHelper.java | 3 +++ .../codeInsight/actions/AbstractLayoutCodeProcessor.java | 1 + .../codeInspection/ex/GlobalInspectionContextImpl.java | 1 + .../com/intellij/codeInspection/ex/PerformFixesModalTask.java | 1 + 4 files changed, 6 insertions(+) diff --git a/java/java-impl/src/com/intellij/refactoring/OptimizeImportsRefactoringHelper.java b/java/java-impl/src/com/intellij/refactoring/OptimizeImportsRefactoringHelper.java index 4ffef12ee25e..c2216a4640c0 100644 --- a/java/java-impl/src/com/intellij/refactoring/OptimizeImportsRefactoringHelper.java +++ b/java/java-impl/src/com/intellij/refactoring/OptimizeImportsRefactoringHelper.java @@ -58,6 +58,9 @@ public class OptimizeImportsRefactoringHelper implements RefactoringHelper ReadAction.run(() -> { final JavaCodeStyleManager styleManager = JavaCodeStyleManager.getInstance(project); final ProgressIndicator progressIndicator = ProgressManager.getInstance().getProgressIndicator(); + if (progressIndicator != null) { + progressIndicator.setIndeterminate(false); + } final SmartPointerManager pointerManager = SmartPointerManager.getInstance(project); int i = 0; final int fileCount = javaFiles.size(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/AbstractLayoutCodeProcessor.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/AbstractLayoutCodeProcessor.java index 2ece595c2446..fc9e29f53823 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/actions/AbstractLayoutCodeProcessor.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/AbstractLayoutCodeProcessor.java @@ -375,6 +375,7 @@ public abstract class AbstractLayoutCodeProcessor { private void runProcessFiles(@NotNull final FileTreeIterator fileIterator) { boolean isSuccess = ProgressManager.getInstance().runProcessWithProgressSynchronously(() -> { ProgressIndicator indicator = ProgressManager.getInstance().getProgressIndicator(); + indicator.setIndeterminate(false); ReformatFilesTask task = new ReformatFilesTask(fileIterator, indicator); while (!task.isDone()) { task.iteration(); diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java index 3533f01044b3..1de7dd96ebf5 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java @@ -936,6 +936,7 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextBase imp setCurrentScope(scope); final int fileCount = scope.getFileCount(); final ProgressIndicator progressIndicator = ProgressManager.getInstance().getProgressIndicator(); + progressIndicator.setIndeterminate(false); final SearchScope searchScope = ReadAction.compute(scope::toSearchScope); final TextRange range; diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/PerformFixesModalTask.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/PerformFixesModalTask.java index 315ac8ffd2dd..0fa7ed656ee7 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/PerformFixesModalTask.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/PerformFixesModalTask.java @@ -56,6 +56,7 @@ public abstract class PerformFixesModalTask implements SequentialTask { } public void doRun(ProgressIndicator indicator) { + indicator.setIndeterminate(false); while (!isDone()) { if (indicator.isCanceled()) { break;