From e03ee479c40cfd08a609d42c0dd70a5a72aec9a2 Mon Sep 17 00:00:00 2001 From: Dmitry Kichinsky Date: Fri, 12 May 2023 14:14:17 +0200 Subject: [PATCH] [maven] IDEA-313767 LongRunningTask -> LongRunningEmbedderTask to avoid confusion with LongRunningTask GitOrigin-RevId: f853fe239a8944dfc46fab376445cb5412017f09 --- .../org/jetbrains/idea/maven/server/MavenEmbedderWrapper.java | 4 ++-- .../org/jetbrains/idea/maven/server/MavenEmbedderWrapperEx.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenEmbedderWrapper.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenEmbedderWrapper.java index 228d81f041f8..5dfa30cd3b22 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenEmbedderWrapper.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenEmbedderWrapper.java @@ -296,11 +296,11 @@ public abstract class MavenEmbedderWrapper extends MavenRemoteObjectWrapper R runLongRunningTask(@NotNull LongRunningTask task, + protected abstract R runLongRunningTask(@NotNull LongRunningEmbedderTask task, @Nullable MavenProgressIndicator progressIndicator) throws MavenProcessCanceledException; @FunctionalInterface - protected interface LongRunningTask { + protected interface LongRunningEmbedderTask { R run(MavenServerEmbedder embedder, String longRunningTaskId) throws RemoteException, MavenServerProcessCanceledException; } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenEmbedderWrapperEx.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenEmbedderWrapperEx.kt index c87a4e63ee53..2371e889d568 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenEmbedderWrapperEx.kt +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenEmbedderWrapperEx.kt @@ -9,7 +9,7 @@ import java.util.* abstract class MavenEmbedderWrapperEx(project: Project) : MavenEmbedderWrapper(project) { @Throws(MavenProcessCanceledException::class) - override fun runLongRunningTask(task: LongRunningTask, + override fun runLongRunningTask(task: LongRunningEmbedderTask, progressIndicator: MavenProgressIndicator?): R = runBlocking { val longRunningTaskId = UUID.randomUUID().toString()