From 4e298bcdb58023f153c31dbb484e7e6e1c5b392e Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Tue, 19 Nov 2013 17:52:25 +0400 Subject: [PATCH] use indicator which is less dependencies demanding --- .../testSrc/com/intellij/concurrency/JobUtilTest.java | 3 ++- .../src/com/intellij/concurrency/JobLauncherImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/concurrency/JobUtilTest.java b/java/java-tests/testSrc/com/intellij/concurrency/JobUtilTest.java index 5df9119932da..fd68abd89066 100644 --- a/java/java-tests/testSrc/com/intellij/concurrency/JobUtilTest.java +++ b/java/java-tests/testSrc/com/intellij/concurrency/JobUtilTest.java @@ -20,6 +20,7 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; +import com.intellij.openapi.progress.util.AbstractProgressIndicatorBase; import com.intellij.openapi.progress.util.ProgressIndicatorBase; import com.intellij.testFramework.PlatformTestCase; import com.intellij.util.Processor; @@ -177,7 +178,7 @@ public class JobUtilTest extends PlatformTestCase { ProgressIndicator actualIndicator = ProgressManager.getInstance().getProgressIndicator(); if (progress == null) { assertNotNull(actualIndicator); - assertTrue(actualIndicator instanceof ProgressIndicatorBase); + assertTrue(actualIndicator instanceof AbstractProgressIndicatorBase); } else { assertTrue(actualIndicator instanceof SensitiveProgressWrapper); diff --git a/platform/platform-impl/src/com/intellij/concurrency/JobLauncherImpl.java b/platform/platform-impl/src/com/intellij/concurrency/JobLauncherImpl.java index d87b9aeb0449..4e9a9b948d5b 100644 --- a/platform/platform-impl/src/com/intellij/concurrency/JobLauncherImpl.java +++ b/platform/platform-impl/src/com/intellij/concurrency/JobLauncherImpl.java @@ -19,7 +19,7 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; -import com.intellij.openapi.progress.util.ProgressIndicatorBase; +import com.intellij.openapi.progress.util.AbstractProgressIndicatorBase; import com.intellij.util.Consumer; import com.intellij.util.IncorrectOperationException; import com.intellij.util.Processor; @@ -120,7 +120,7 @@ public class JobLauncherImpl extends JobLauncher { @NotNull final Processor thingProcessor) throws ProcessCanceledException { if (things.isEmpty()) return true; // supply our own indicator even if we haven't given one - to support cancellation - final ProgressIndicator wrapper = progress == null ? new ProgressIndicatorBase() : new SensitiveProgressWrapper(progress); + final ProgressIndicator wrapper = progress == null ? new AbstractProgressIndicatorBase() : new SensitiveProgressWrapper(progress); if (things.size() <= 1 || JobSchedulerImpl.CORES_COUNT <= CORES_FORK_THRESHOLD) { final AtomicBoolean result = new AtomicBoolean(true);