diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/buildtool/MavenImportSpec.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/buildtool/MavenImportSpec.java deleted file mode 100644 index 6b848c9ebff3..000000000000 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/buildtool/MavenImportSpec.java +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.idea.maven.buildtool; - -/** - * @deprecated use MavenSyncSpec - */ -@Deprecated(forRemoval = true) -public final class MavenImportSpec { - public static final MavenImportSpec IMPLICIT_IMPORT = new MavenImportSpec(); -} diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java index 25805aacabfa..0b82d36a8cec 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java @@ -22,9 +22,6 @@ import com.intellij.openapi.util.ModificationTracker; import com.intellij.openapi.util.Pair; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileManager; -import com.intellij.psi.util.CachedValueProvider; -import com.intellij.psi.util.CachedValuesManager; -import com.intellij.psi.util.PsiModificationTracker; import com.intellij.util.EventDispatcher; import com.intellij.util.SmartList; import com.intellij.util.concurrency.annotations.RequiresEdt; @@ -39,7 +36,6 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; import org.jetbrains.concurrency.AsyncPromise; import org.jetbrains.concurrency.Promise; -import org.jetbrains.idea.maven.buildtool.MavenImportSpec; import org.jetbrains.idea.maven.buildtool.MavenSyncConsole; import org.jetbrains.idea.maven.buildtool.MavenSyncSpec; import org.jetbrains.idea.maven.externalSystemIntegration.output.quickfixes.CacheForCompilerErrorMessages; @@ -155,7 +151,7 @@ public abstract class MavenProjectsManager extends MavenSimpleProjectComponent @Deprecated(forRemoval = true) public File getLocalRepository() { - return getRepositoryPath().toFile(); + return getRepositoryPathUnderModalProgress().toFile(); } public Path getRepositoryPathUnderModalProgress() { @@ -462,24 +458,6 @@ public abstract class MavenProjectsManager extends MavenSimpleProjectComponent return findProject(pomXml); } - private MavenProject getMavenProject(@NotNull Module module) { - return CachedValuesManager.getManager(module.getProject()).getCachedValue(module, () -> { - VirtualFile f = findPomFile(module, new MavenModelsProvider() { - @Override - public Module[] getModules() { - throw new UnsupportedOperationException(); - } - - @Override - public VirtualFile[] getContentRoots(Module module) { - return ModuleRootManager.getInstance(module).getContentRoots(); - } - }); - MavenProject result = f == null ? null : findProject(f); - return CachedValueProvider.Result.create(result, PsiModificationTracker.MODIFICATION_COUNT); - }); - } - @RequiresReadLock public @Nullable Module findModule(@NotNull MavenProject project) { if (!isInitialized()) return null; @@ -601,7 +579,7 @@ public abstract class MavenProjectsManager extends MavenSimpleProjectComponent * @deprecated Use {@link #scheduleUpdateAllMavenProjects(MavenSyncSpec)} */ @Deprecated(forRemoval = true) - protected abstract List updateAllMavenProjectsSync(MavenImportSpec spec); + protected abstract List updateAllMavenProjectsSync(); public synchronized void removeManagedFiles(@NotNull List<@NotNull VirtualFile> files) { getProjectsTree().removeManagedFiles(files); @@ -653,7 +631,7 @@ public abstract class MavenProjectsManager extends MavenSimpleProjectComponent @Deprecated public Promise> scheduleImportAndResolve() { var promise = new AsyncPromise>(); - var modules = updateAllMavenProjectsSync(MavenImportSpec.IMPLICIT_IMPORT); + var modules = updateAllMavenProjectsSync(); promise.setResult(modules); return promise; } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerEx.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerEx.kt index 70ec77d510af..98a7e8d0f423 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerEx.kt +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerEx.kt @@ -41,7 +41,6 @@ import kotlinx.coroutines.sync.withLock import org.jetbrains.annotations.ApiStatus import org.jetbrains.concurrency.AsyncPromise import org.jetbrains.idea.maven.buildtool.MavenDownloadConsole -import org.jetbrains.idea.maven.buildtool.MavenImportSpec import org.jetbrains.idea.maven.buildtool.MavenSyncSpec import org.jetbrains.idea.maven.buildtool.incrementalMode import org.jetbrains.idea.maven.importing.MavenImportStats @@ -267,7 +266,7 @@ open class MavenProjectsManagerEx(project: Project, private val cs: CoroutineSco } @Deprecated("Use {@link #scheduleUpdateAllMavenProjects(List)}}") - override fun updateAllMavenProjectsSync(deprecatedSpec: MavenImportSpec): List { + override fun updateAllMavenProjectsSync(): List { MavenLog.LOG.warn("updateAllMavenProjectsSync started, edt=" + ApplicationManager.getApplication().isDispatchThread) val spec = MavenSyncSpec.full("MavenProjectsManagerEx.updateAllMavenProjectsSync") try {