diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java index 90613bef7e6b..5c6cc8e3e895 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java @@ -25,6 +25,7 @@ import com.intellij.openapi.diff.impl.patch.formove.FilePathComparator; import com.intellij.openapi.fileTypes.FileTypeManager; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ShowSettingsUtil; +import com.intellij.openapi.progress.util.BackgroundTaskUtil; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.vcs.*; @@ -402,10 +403,10 @@ public class HgVcs extends AbstractVcs { @Override @CalledInAwt public void enableIntegration() { - HgUtil.executeOnPooledThread(() -> { + BackgroundTaskUtil.executeOnPooledThread(myProject, () -> { Collection roots = ServiceManager.getService(myProject, VcsRootDetector.class).detect(); - new HgIntegrationEnabler(HgVcs.this).enable(roots); - }, myProject); + new HgIntegrationEnabler(this).enable(roots); + }); } @Override diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/branch/HgBranchPopupActions.java b/plugins/hg4idea/src/org/zmlx/hg4idea/branch/HgBranchPopupActions.java index b560a5cefcb8..614d333394ca 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/branch/HgBranchPopupActions.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/branch/HgBranchPopupActions.java @@ -28,6 +28,7 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.Task; +import com.intellij.openapi.progress.util.BackgroundTaskUtil; import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; @@ -324,11 +325,11 @@ public class HgBranchPopupActions { @Override public void actionPerformed(AnActionEvent e) { - HgUtil.executeOnPooledThread(() -> { + BackgroundTaskUtil.executeOnPooledThread(myProject, () -> { for (HgRepository repository : myRepositories) { HgBookmarkCommand.deleteBookmarkSynchronously(myProject, repository.getRoot(), myBranchName); } - }, myProject); + }); } } } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgAddCommand.java b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgAddCommand.java index 25ccfffba3db..1a12af4f5f02 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgAddCommand.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgAddCommand.java @@ -14,6 +14,7 @@ package org.zmlx.hg4idea.command; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.Task; +import com.intellij.openapi.progress.util.BackgroundTaskUtil; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.vcsUtil.VcsFileUtil; @@ -56,7 +57,7 @@ public class HgAddCommand { }.queue(); } else { - HgUtil.executeOnPooledThread(() -> executeInCurrentThread(files), myProject); + BackgroundTaskUtil.executeOnPooledThread(myProject, () -> executeInCurrentThread(files)); } } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/command/mq/HgQImportCommand.java b/plugins/hg4idea/src/org/zmlx/hg4idea/command/mq/HgQImportCommand.java index a45150e63818..b076a259ac2f 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/command/mq/HgQImportCommand.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/command/mq/HgQImportCommand.java @@ -15,6 +15,7 @@ */ package org.zmlx.hg4idea.command.mq; +import com.intellij.openapi.progress.util.BackgroundTaskUtil; import com.intellij.openapi.project.Project; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; @@ -23,7 +24,6 @@ import org.zmlx.hg4idea.execution.HgCommandExecutor; import org.zmlx.hg4idea.execution.HgCommandResult; import org.zmlx.hg4idea.repo.HgRepository; import org.zmlx.hg4idea.util.HgErrorUtil; -import org.zmlx.hg4idea.util.HgUtil; import java.util.List; @@ -36,7 +36,7 @@ public class HgQImportCommand { } public void execute(@NotNull final String startRevisionNumber) { - HgUtil.executeOnPooledThread(() -> executeInCurrentThread(startRevisionNumber), myRepository.getProject()); + BackgroundTaskUtil.executeOnPooledThread(myRepository.getProject(), () -> executeInCurrentThread(startRevisionNumber)); } public void executeInCurrentThread(@NotNull final String startRevisionNumber) { diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandExecutor.java b/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandExecutor.java index 2c9c0ec1a7f6..8f5d0354827b 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandExecutor.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandExecutor.java @@ -17,6 +17,7 @@ package org.zmlx.hg4idea.execution; import com.intellij.execution.ui.ConsoleViewContentType; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.progress.util.BackgroundTaskUtil; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; @@ -102,12 +103,12 @@ public class HgCommandExecutor { @NotNull final String operation, @Nullable final List arguments, @Nullable final HgCommandResultHandler handler) { - HgUtil.executeOnPooledThread(() -> { + BackgroundTaskUtil.executeOnPooledThread(myProject, () -> { HgCommandResult result = executeInCurrentThread(repo, operation, arguments); if (handler != null) { handler.process(result); } - }, myProject); + }); } @Nullable diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/repo/HgRepositoryImpl.java b/plugins/hg4idea/src/org/zmlx/hg4idea/repo/HgRepositoryImpl.java index ae57d41aed40..17b62e86de89 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/repo/HgRepositoryImpl.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/repo/HgRepositoryImpl.java @@ -231,7 +231,8 @@ public class HgRepositoryImpl extends RepositoryImpl implements HgRepository { myOpenedBranches = HgBranchesCommand.collectNames(branchCommandResult); } - HgUtil.executeOnPooledThread(() -> BackgroundTaskUtil.syncPublisher(project, HgVcs.STATUS_TOPIC).update(project, getRoot()), project); + BackgroundTaskUtil.executeOnPooledThread(project, () + -> BackgroundTaskUtil.syncPublisher(project, HgVcs.STATUS_TOPIC).update(project, getRoot())); } } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java index 7407cb601b5b..9b0aa8e64074 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java @@ -13,12 +13,9 @@ package org.zmlx.hg4idea.util; import com.intellij.dvcs.DvcsUtil; -import com.intellij.openapi.Disposable; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.diagnostic.Logger; -import com.intellij.openapi.progress.ProgressIndicator; -import com.intellij.openapi.progress.util.BackgroundTaskUtil; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.Couple; @@ -386,11 +383,6 @@ public abstract class HgUtil { return sorted; } - @NotNull - public static ProgressIndicator executeOnPooledThread(@NotNull Runnable runnable, @NotNull Disposable parentDisposable) { - return BackgroundTaskUtil.executeOnPooledThread(parentDisposable, runnable); - } - /** * Convert {@link VcsVirtualFile} to the {@link LocalFileSystem local} Virtual File. *