diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogData.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogData.java index 6b39da7f3a74..d5a7a9316e40 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogData.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogData.java @@ -235,7 +235,7 @@ public class VcsLogData implements Disposable, VcsLogDataProvider { } } }; - myDataLoaderQueue.run(backgroundable, null, myRefresher.getProgress().createProgressIndicator(backgroundable)); + myDataLoaderQueue.run(backgroundable, null, myRefresher.getProgress().createProgressIndicator()); } /** diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogFiltererImpl.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogFiltererImpl.java index 632fae34125d..60b19b64308f 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogFiltererImpl.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogFiltererImpl.java @@ -67,7 +67,7 @@ public class VcsLogFiltererImpl implements VcsLogFilterer { UIUtil.invokeLaterIfNeeded(() -> { MyTask task = new MyTask(project, "Applying filters..."); ProgressManager.getInstance().runProcessWithProgressAsynchronously(task, - myLogData.getProgress().createProgressIndicator(task)); + myLogData.getProgress().createProgressIndicator()); }); } }; diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogProgress.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogProgress.java index 0873b2ab3f30..b208e68f6088 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogProgress.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogProgress.java @@ -19,11 +19,8 @@ import com.intellij.openapi.Disposable; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.progress.EmptyProgressIndicator; import com.intellij.openapi.progress.ProgressIndicator; -import com.intellij.openapi.progress.Task; -import com.intellij.openapi.progress.impl.BackgroundableProcessIndicator; import com.intellij.openapi.progress.util.AbstractProgressIndicatorBase; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.registry.Registry; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -37,16 +34,11 @@ public class VcsLogProgress { private int myRunningTasksCount = 0; @NotNull - public ProgressIndicator createProgressIndicator(@NotNull Task.Backgroundable task) { + public ProgressIndicator createProgressIndicator() { if (ApplicationManager.getApplication().isHeadlessEnvironment()) { return new EmptyProgressIndicator(); } - else if (showProgressInLog()) { - return new VcsLogProgressIndicator(); - } - else { - return new BackgroundableProcessIndicator(task); - } + return new VcsLogProgressIndicator(); } public void addProgressIndicatorListener(@NotNull ProgressListener listener, @Nullable Disposable parentDisposable) { @@ -92,10 +84,6 @@ public class VcsLogProgress { } } - public boolean showProgressInLog() { - return Registry.is("vcs.log.keep.up.to.date"); - } - private class VcsLogProgressIndicator extends AbstractProgressIndicatorBase { @Override public synchronized void start() { diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogRefresherImpl.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogRefresherImpl.java index 7c9e28105b5b..b6cf9f4efba8 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogRefresherImpl.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogRefresherImpl.java @@ -88,7 +88,7 @@ public class VcsLogRefresherImpl implements VcsLogRefresher { protected void startNewBackgroundTask(@NotNull final Task.Backgroundable refreshTask) { UIUtil.invokeLaterIfNeeded(() -> { LOG.debug("Starting a background task..."); - ProgressManager.getInstance().runProcessWithProgressAsynchronously(refreshTask, myProgress.createProgressIndicator(refreshTask)); + ProgressManager.getInstance().runProcessWithProgressAsynchronously(refreshTask, myProgress.createProgressIndicator()); }); }