From a0f7130f4157058d5fd04e36920346512a4bd79d Mon Sep 17 00:00:00 2001 From: Nikolay Chashnikov Date: Wed, 19 Jun 2024 13:37:13 +0200 Subject: [PATCH] [java] API cleanup: mark for removal API which was deprecated in 2023.3 or earlier (IJPL-503) GitOrigin-RevId: 76cae6e709fa5b22f2eabd37fa2d2dbd99938998 --- .../com/intellij/jarRepository/LibrarySynchronizationQueue.kt | 2 ++ .../intellij/jarRepository/repositoryLibrarySynchronizers.kt | 3 +++ .../roots/ui/configuration/IdeaProjectSettingsService.java | 2 +- .../codeInsight/generation/OverrideImplementUtil.java | 4 ++-- .../codeInsight/lookup/impl/JavaElementLookupRenderer.java | 2 +- .../src/com/intellij/coverage/JavaCoverageRunner.java | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/java/idea-ui/src/com/intellij/jarRepository/LibrarySynchronizationQueue.kt b/java/idea-ui/src/com/intellij/jarRepository/LibrarySynchronizationQueue.kt index 1495ccc26a48..76ae35daef53 100644 --- a/java/idea-ui/src/com/intellij/jarRepository/LibrarySynchronizationQueue.kt +++ b/java/idea-ui/src/com/intellij/jarRepository/LibrarySynchronizationQueue.kt @@ -12,10 +12,12 @@ import com.intellij.openapi.roots.impl.libraries.LibraryTableImplUtil import com.intellij.openapi.util.Computable import kotlinx.coroutines.* import kotlinx.coroutines.channels.Channel +import org.jetbrains.annotations.ApiStatus import org.jetbrains.idea.maven.utils.library.RepositoryLibraryProperties import org.jetbrains.idea.maven.utils.library.RepositoryUtils import kotlin.coroutines.coroutineContext +@ApiStatus.ScheduledForRemoval @Deprecated("Remove after the `workspace.model.custom.library.bridge` registry key removal") @Service(Service.Level.PROJECT) class LibrarySynchronizationQueue(private val project: Project, private val scope: CoroutineScope) { diff --git a/java/idea-ui/src/com/intellij/jarRepository/repositoryLibrarySynchronizers.kt b/java/idea-ui/src/com/intellij/jarRepository/repositoryLibrarySynchronizers.kt index b4ca71dad5df..5b6d40612f16 100644 --- a/java/idea-ui/src/com/intellij/jarRepository/repositoryLibrarySynchronizers.kt +++ b/java/idea-ui/src/com/intellij/jarRepository/repositoryLibrarySynchronizers.kt @@ -14,7 +14,9 @@ import com.intellij.platform.workspace.storage.EntityChange import com.intellij.platform.workspace.storage.EntityStorage import com.intellij.platform.workspace.storage.VersionedStorageChange import com.intellij.workspaceModel.ide.impl.legacyBridge.library.ProjectLibraryTableBridgeImpl.Companion.libraryMap +import org.jetbrains.annotations.ApiStatus +@ApiStatus.ScheduledForRemoval @Deprecated("Remove after the `workspace.model.custom.library.bridge` registry key removal") internal class GlobalChangedRepositoryLibrarySynchronizer(private val queue: LibrarySynchronizationQueue, private val disposable: Disposable) @@ -45,6 +47,7 @@ internal class GlobalChangedRepositoryLibrarySynchronizer(private val queue: Lib } } +@ApiStatus.ScheduledForRemoval @Deprecated("Remove after the `workspace.model.custom.library.bridge` registry key removal") internal class ChangedRepositoryLibrarySynchronizer(private val project: Project, private val queue: LibrarySynchronizationQueue) : WorkspaceModelChangeListener { diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/IdeaProjectSettingsService.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/IdeaProjectSettingsService.java index 71cededdd769..07ad87cf7859 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/IdeaProjectSettingsService.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/IdeaProjectSettingsService.java @@ -134,7 +134,7 @@ public final class IdeaProjectSettingsService extends ProjectSettingsService imp * avoid breaking the older code scenarios. */ @Override - @Deprecated + @Deprecated(forRemoval = true) public Sdk chooseAndSetSdk() { Logger .getInstance(getClass()) diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java b/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java index ad06e11e9509..b5f320debd25 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java @@ -501,7 +501,7 @@ public final class OverrideImplementUtil extends OverrideImplementExploreUtil { /** * @deprecated use {@link OverrideImplementUtil#showJavaOverrideImplementChooser(Editor, PsiElement, boolean, Collection, Collection, java.util.function.Consumer)} */ - @Deprecated + @Deprecated(forRemoval = true) public static @Nullable MemberChooser showOverrideImplementChooser(@NotNull Editor editor, @NotNull PsiElement aClass, final boolean toImplement, @@ -515,7 +515,7 @@ public final class OverrideImplementUtil extends OverrideImplementExploreUtil { * It is used only for backward compatibility. * @deprecated use {@link OverrideImplementUtil#showJavaOverrideImplementChooser(Editor, PsiElement, boolean, Collection, Collection, java.util.function.Consumer)} */ - @Deprecated + @Deprecated(forRemoval = true) public static @Nullable JavaOverrideImplementMemberChooser showJavaOverrideImplementChooser(@NotNull Editor editor, @NotNull PsiElement aClass, final boolean toImplement, diff --git a/java/java-impl/src/com/intellij/codeInsight/lookup/impl/JavaElementLookupRenderer.java b/java/java-impl/src/com/intellij/codeInsight/lookup/impl/JavaElementLookupRenderer.java index 4a88894b4dc2..0feace13d871 100644 --- a/java/java-impl/src/com/intellij/codeInsight/lookup/impl/JavaElementLookupRenderer.java +++ b/java/java-impl/src/com/intellij/codeInsight/lookup/impl/JavaElementLookupRenderer.java @@ -57,7 +57,7 @@ public final class JavaElementLookupRenderer implements ElementLookupRenderer { /** * @deprecated use {@link JavaDeprecationUtils#isDeprecated(PsiElement, PsiElement)} */ - @Deprecated + @Deprecated(forRemoval = true) public static boolean isDeprecated(@Nullable PsiElement element) { return element instanceof PsiDocCommentOwner && ((PsiDocCommentOwner)element).isDeprecated(); } diff --git a/plugins/coverage/src/com/intellij/coverage/JavaCoverageRunner.java b/plugins/coverage/src/com/intellij/coverage/JavaCoverageRunner.java index 7f923e65ec5d..9ca8d3251ffb 100644 --- a/plugins/coverage/src/com/intellij/coverage/JavaCoverageRunner.java +++ b/plugins/coverage/src/com/intellij/coverage/JavaCoverageRunner.java @@ -132,7 +132,7 @@ public abstract class JavaCoverageRunner extends CoverageRunner { /** * @deprecated This method is not used anymore, as all the runners support JDK 7+. */ - @Deprecated + @Deprecated(forRemoval = true) public boolean isJdk7Compatible() { return true; }