From 72cd5782ff9eb4bb3b3ef87a8ea859a29a89d76f Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Thu, 14 May 2015 15:29:05 +0300 Subject: [PATCH] diff: remove unnecessary check indicator.isCanceled() is already checked in BackgroundTaskUtil. This check also duplicates check for myDisposed. --- .../com/intellij/diff/util/DiffTaskQueue.java | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/platform/diff-impl/src/com/intellij/diff/util/DiffTaskQueue.java b/platform/diff-impl/src/com/intellij/diff/util/DiffTaskQueue.java index 96027e2a7356..40b6b6733967 100644 --- a/platform/diff-impl/src/com/intellij/diff/util/DiffTaskQueue.java +++ b/platform/diff-impl/src/com/intellij/diff/util/DiffTaskQueue.java @@ -91,26 +91,7 @@ public class DiffTaskQueue implements Disposable { if (myDisposed) return; abort(); - Function function = new Function() { - @Override - @CalledInBackground - public Runnable fun(final ProgressIndicator indicator) { - final Runnable callback = backgroundTask.fun(indicator); - return new Runnable() { - @Override - @CalledInAwt - public void run() { - synchronized (LOCK) { - if (myDisposed) return; - indicator.checkCanceled(); - } - callback.run(); - } - }; - } - }; - - myProgressIndicator.set(BackgroundTaskUtil.executeAndTryWait(function, onSlowAction, waitMillis, forceEDT)); + myProgressIndicator.set(BackgroundTaskUtil.executeAndTryWait(backgroundTask, onSlowAction, waitMillis, forceEDT)); } } }