From 49b817fb613d8416be3985c22e3e1e7b0d117aef Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Tue, 30 Apr 2013 17:02:34 +0200 Subject: [PATCH] use ProgressWrapper instead of DelegatingPRogressIndicator anonymous subclass --- .../openapi/project/CacheUpdateRunner.java | 40 ++++++------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/project/CacheUpdateRunner.java b/platform/platform-impl/src/com/intellij/openapi/project/CacheUpdateRunner.java index 5dc95903aace..758c12a38ec4 100644 --- a/platform/platform-impl/src/com/intellij/openapi/project/CacheUpdateRunner.java +++ b/platform/platform-impl/src/com/intellij/openapi/project/CacheUpdateRunner.java @@ -27,6 +27,7 @@ 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.ProgressWrapper; import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.vfs.VirtualFile; @@ -234,34 +235,19 @@ class CacheUpdateRunner { } }; try { - ProgressManager.getInstance().runProcess(new Runnable() { - @Override - public void run() { - if (myProcessInReadAction) { - myApplication.runReadAction(action); + ProgressManager.getInstance().runProcess( + new Runnable() { + @Override + public void run() { + if (myProcessInReadAction) { + myApplication.runReadAction(action); + } + else { + action.run(); + } } - else { - action.run(); - } - } - }, new DelegatingProgressIndicator(myInnerIndicator) { - boolean myStarted; - - @Override - public void start() { - myStarted = true; - } - - @Override - public void stop() { - myStarted = false; - } - - @Override - public boolean isRunning() { - return myStarted; - } - } + }, + ProgressWrapper.wrap(myInnerIndicator) ); } catch (ProcessCanceledException e) {