diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-19 22:27:03 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-19 21:25:05 +0000 |
commit | 4ca751c002784c4bfd349cc5240b045b62277c80 (patch) | |
tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /platform/platform-impl/src/com/intellij/openapi/progress/impl/ProgressManagerImpl.java | |
parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
parent | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (diff) | |
download | idea-4ca751c002784c4bfd349cc5240b045b62277c80.tar.gz |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/platform-impl/src/com/intellij/openapi/progress/impl/ProgressManagerImpl.java')
-rw-r--r-- | platform/platform-impl/src/com/intellij/openapi/progress/impl/ProgressManagerImpl.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/platform/platform-impl/src/com/intellij/openapi/progress/impl/ProgressManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/progress/impl/ProgressManagerImpl.java index a393d937dcfb..27bb8eb5f245 100644 --- a/platform/platform-impl/src/com/intellij/openapi/progress/impl/ProgressManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/progress/impl/ProgressManagerImpl.java @@ -56,7 +56,10 @@ public class ProgressManagerImpl extends ProgressManager implements Disposable{ private final ScheduledFuture<?> myCheckCancelledFuture; public ProgressManagerImpl(Application application) { - if (/*!application.isUnitTestMode() && */!DISABLED) { + if (DISABLED) { + myCheckCancelledFuture = null; + } + else { myCheckCancelledFuture = JobScheduler.getScheduler().scheduleWithFixedDelay(new Runnable() { @Override public void run() { @@ -65,9 +68,6 @@ public class ProgressManagerImpl extends ProgressManager implements Disposable{ } }, 0, 10, TimeUnit.MILLISECONDS); } - else { - myCheckCancelledFuture = null; - } } @Override @@ -105,8 +105,8 @@ public class ProgressManagerImpl extends ProgressManager implements Disposable{ private static class NonCancelableIndicator extends EmptyProgressIndicator implements NonCancelableSection { private final ProgressIndicator myOld; - private NonCancelableIndicator(ProgressIndicator old) { - myOld = old; + private NonCancelableIndicator() { + myOld = myThreadIndicator.get(); } @Override @@ -124,16 +124,17 @@ public class ProgressManagerImpl extends ProgressManager implements Disposable{ } } + @NotNull @Override public final NonCancelableSection startNonCancelableSection() { - NonCancelableIndicator nonCancelor = new NonCancelableIndicator(myThreadIndicator.get()); + NonCancelableIndicator nonCancelor = new NonCancelableIndicator(); myThreadIndicator.set(nonCancelor); return nonCancelor; } @Override public void executeNonCancelableSection(@NotNull Runnable runnable) { - executeProcessUnderProgress(runnable, new NonCancelableIndicator(getProgressIndicator())); + executeProcessUnderProgress(runnable, new NonCancelableIndicator()); } @Override |