diff --git a/platform/analysis-api/src/com/intellij/analysis/AnalysisScopeBundle.java b/platform/analysis-api/src/com/intellij/analysis/AnalysisScopeBundle.java index e2c44a1ed14e..223b7e89b33a 100644 --- a/platform/analysis-api/src/com/intellij/analysis/AnalysisScopeBundle.java +++ b/platform/analysis-api/src/com/intellij/analysis/AnalysisScopeBundle.java @@ -2,15 +2,13 @@ package com.intellij.analysis; import com.intellij.core.CoreDeprecatedMessagesBundle; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; /** * @deprecated use other bundles ({@link AnalysisBundle}, {@link com.intellij.codeInsight.CodeInsightBundle}) instead */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public final class AnalysisScopeBundle { private AnalysisScopeBundle() { } diff --git a/platform/analysis-api/src/com/intellij/codeHighlighting/HighlightDisplayLevel.java b/platform/analysis-api/src/com/intellij/codeHighlighting/HighlightDisplayLevel.java index 61f92d019a8e..491e06a35fdf 100644 --- a/platform/analysis-api/src/com/intellij/codeHighlighting/HighlightDisplayLevel.java +++ b/platform/analysis-api/src/com/intellij/codeHighlighting/HighlightDisplayLevel.java @@ -16,7 +16,6 @@ import com.intellij.util.ObjectUtils; import com.intellij.util.ui.ColorIcon; import com.intellij.util.ui.ColorizeProxyIcon; import com.intellij.util.ui.EmptyIcon; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -49,8 +48,7 @@ public class HighlightDisplayLevel { /** * @deprecated use {@link #WEAK_WARNING} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static final HighlightDisplayLevel INFO = new HighlightDisplayLevel(HighlightSeverity.INFO, createIconByKey(DO_NOT_SHOW_KEY)); public static final HighlightDisplayLevel WEAK_WARNING = diff --git a/platform/analysis-api/src/com/intellij/codeInsight/completion/CompletionContributor.java b/platform/analysis-api/src/com/intellij/codeInsight/completion/CompletionContributor.java index 8e68fbb7ad44..406d782daa0e 100644 --- a/platform/analysis-api/src/com/intellij/codeInsight/completion/CompletionContributor.java +++ b/platform/analysis-api/src/com/intellij/codeInsight/completion/CompletionContributor.java @@ -20,7 +20,6 @@ import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.Consumer; import com.intellij.util.ProcessingContext; import com.intellij.util.containers.MultiMap; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -182,8 +181,7 @@ public abstract class CompletionContributor { * @deprecated use {@link CompletionResultSet#addLookupAdvertisement(String)} * @return text to be shown at the bottom of the lookup list */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @Nullable @Nls(capitalization = Nls.Capitalization.Sentence) public String advertise(@NotNull CompletionParameters parameters) { diff --git a/platform/analysis-api/src/com/intellij/codeInsight/completion/CompletionContributorEP.java b/platform/analysis-api/src/com/intellij/codeInsight/completion/CompletionContributorEP.java index 80752f479058..30adacdff408 100644 --- a/platform/analysis-api/src/com/intellij/codeInsight/completion/CompletionContributorEP.java +++ b/platform/analysis-api/src/com/intellij/codeInsight/completion/CompletionContributorEP.java @@ -13,8 +13,7 @@ public class CompletionContributorEP extends LanguageExtensionPoint condition) {} } diff --git a/platform/analysis-api/src/com/intellij/codeInsight/intention/IntentionAction.java b/platform/analysis-api/src/com/intellij/codeInsight/intention/IntentionAction.java index 5a7f9f9f0173..8778ad2d091f 100644 --- a/platform/analysis-api/src/com/intellij/codeInsight/intention/IntentionAction.java +++ b/platform/analysis-api/src/com/intellij/codeInsight/intention/IntentionAction.java @@ -11,7 +11,6 @@ import com.intellij.openapi.util.Iconable; import com.intellij.psi.PsiFile; import com.intellij.util.IncorrectOperationException; import com.intellij.util.ObjectUtils; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -106,8 +105,7 @@ public interface IntentionAction extends FileModifier { * @return true if the action was applied successfully to the non-physical file. * @deprecated do not call or override this method: this API will be changed. */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) default boolean invokeForPreview(@NotNull Project project, Editor editor, PsiFile file) { if (!startInWriteAction()) return false; var copy = ObjectUtils.tryCast(getFileModifierForPreview(file), IntentionAction.class); diff --git a/platform/analysis-api/src/com/intellij/codeInsight/intention/IntentionManager.java b/platform/analysis-api/src/com/intellij/codeInsight/intention/IntentionManager.java index 1a46a49ea564..e27f2d69bad0 100644 --- a/platform/analysis-api/src/com/intellij/codeInsight/intention/IntentionManager.java +++ b/platform/analysis-api/src/com/intellij/codeInsight/intention/IntentionManager.java @@ -9,7 +9,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.UserDataHolder; import com.intellij.psi.PsiElement; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -30,8 +29,7 @@ public abstract class IntentionManager { /** * @deprecated Use {@link #getInstance()} instead. */ - @ApiStatus.ScheduledForRemoval(inVersion = "2020.2") - @Deprecated + @Deprecated(forRemoval = true) public static IntentionManager getInstance(Project project) { return getInstance(); } diff --git a/platform/analysis-api/src/com/intellij/codeInsight/lookup/LookupElementBuilder.java b/platform/analysis-api/src/com/intellij/codeInsight/lookup/LookupElementBuilder.java index 71224e0a5ebf..ad96a2a4dcd3 100644 --- a/platform/analysis-api/src/com/intellij/codeInsight/lookup/LookupElementBuilder.java +++ b/platform/analysis-api/src/com/intellij/codeInsight/lookup/LookupElementBuilder.java @@ -10,7 +10,6 @@ import com.intellij.psi.PsiNamedElement; import com.intellij.psi.SmartPointerManager; import com.intellij.psi.SmartPsiElementPointer; import com.intellij.psi.util.PsiUtilCore; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -109,8 +108,7 @@ public final class LookupElementBuilder extends LookupElement { /** * @deprecated use {@link #withInsertHandler(InsertHandler)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @Contract(pure=true) public @NotNull LookupElementBuilder setInsertHandler(@Nullable InsertHandler insertHandler) { return withInsertHandler(insertHandler); @@ -228,8 +226,7 @@ public final class LookupElementBuilder extends LookupElement { /** * @deprecated use {@link #withTypeText(String)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @Contract(pure=true) public @NotNull LookupElementBuilder setTypeText(@Nullable String typeText) { return withTypeText(typeText); @@ -263,8 +260,7 @@ public final class LookupElementBuilder extends LookupElement { /** * @deprecated use {@link #withPresentableText(String)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @Contract(pure=true) public @NotNull LookupElementBuilder setPresentableText(@NotNull String presentableText) { return withPresentableText(presentableText); @@ -306,8 +302,7 @@ public final class LookupElementBuilder extends LookupElement { /** * @deprecated use {@link #withTailText(String)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @Contract(pure=true) public @NotNull LookupElementBuilder setTailText(@Nullable String tailText) { return withTailText(tailText); diff --git a/platform/analysis-api/src/com/intellij/codeInspection/InspectionManager.java b/platform/analysis-api/src/com/intellij/codeInspection/InspectionManager.java index 6270d5c17137..1816b2e7d346 100644 --- a/platform/analysis-api/src/com/intellij/codeInspection/InspectionManager.java +++ b/platform/analysis-api/src/com/intellij/codeInspection/InspectionManager.java @@ -9,7 +9,6 @@ import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -111,8 +110,7 @@ public abstract class InspectionManager { /** * @deprecated use {@link #createProblemDescriptor(PsiElement, String, boolean, LocalQuickFix[], ProblemHighlightType)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @NotNull @Contract(pure = true) public abstract ProblemDescriptor createProblemDescriptor(@NotNull PsiElement psiElement, @@ -123,8 +121,7 @@ public abstract class InspectionManager { /** * @deprecated use {@link #createProblemDescriptor(PsiElement, String, LocalQuickFix[], ProblemHighlightType, boolean, boolean)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @NotNull @Contract(pure = true) public abstract ProblemDescriptor createProblemDescriptor(@NotNull PsiElement psiElement, @@ -149,8 +146,7 @@ public abstract class InspectionManager { /** * @deprecated use {@link #createProblemDescriptor(PsiElement, TextRange, String, ProblemHighlightType, boolean, LocalQuickFix...)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @NotNull @Contract(pure = true) public abstract ProblemDescriptor createProblemDescriptor(@NotNull final PsiElement psiElement, @@ -162,8 +158,7 @@ public abstract class InspectionManager { /** * @deprecated use {@link #createNewGlobalContext()} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @NotNull @Contract(pure = true) public abstract GlobalInspectionContext createNewGlobalContext(boolean reuse); diff --git a/platform/analysis-api/src/com/intellij/codeInspection/InspectionProfileEntry.java b/platform/analysis-api/src/com/intellij/codeInspection/InspectionProfileEntry.java index 7b277d004049..741556608724 100644 --- a/platform/analysis-api/src/com/intellij/codeInspection/InspectionProfileEntry.java +++ b/platform/analysis-api/src/com/intellij/codeInspection/InspectionProfileEntry.java @@ -428,8 +428,7 @@ public abstract class InspectionProfileEntry implements BatchSuppressableTool { * @return serialization filter. */ @SuppressWarnings("DeprecatedIsStillUsed") - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected @Nullable SerializationFilter getSerializationFilter() { return XmlSerializer.getJdomSerializer().getDefaultSerializationFilter(); } diff --git a/platform/analysis-api/src/com/intellij/codeInspection/LocalQuickFix.java b/platform/analysis-api/src/com/intellij/codeInspection/LocalQuickFix.java index 5aec90bebdc5..1eb4bab2fe28 100644 --- a/platform/analysis-api/src/com/intellij/codeInspection/LocalQuickFix.java +++ b/platform/analysis-api/src/com/intellij/codeInspection/LocalQuickFix.java @@ -7,7 +7,6 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.util.ObjectUtils; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -57,8 +56,7 @@ public interface LocalQuickFix extends QuickFix, FileModifier * @return true if the fix was successfully applied to the copy; false otherwise * @deprecated do not call or override this method: this API will be changed. */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) default boolean applyFixForPreview(@NotNull Project project, @NotNull ProblemDescriptor previewDescriptor) { if (!startInWriteAction()) return false; PsiElement element = previewDescriptor.getStartElement(); diff --git a/platform/analysis-api/src/com/intellij/codeInspection/ProblemHighlightType.java b/platform/analysis-api/src/com/intellij/codeInspection/ProblemHighlightType.java index 7354798cf1a7..841d15136861 100644 --- a/platform/analysis-api/src/com/intellij/codeInspection/ProblemHighlightType.java +++ b/platform/analysis-api/src/com/intellij/codeInspection/ProblemHighlightType.java @@ -1,8 +1,6 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.codeInspection; -import org.jetbrains.annotations.ApiStatus; - /** * Defines type used to determine highlighting of {@link ProblemDescriptor}. * Please use {@link #GENERIC_ERROR_OR_WARNING} if you are not sure which one to pick, otherwise user's settings would be ignored. @@ -45,8 +43,7 @@ public enum ProblemHighlightType { * * @deprecated use {@link #WEAK_WARNING} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) INFO, /** diff --git a/platform/analysis-api/src/com/intellij/codeInspection/lang/InspectionExtensionsFactory.java b/platform/analysis-api/src/com/intellij/codeInspection/lang/InspectionExtensionsFactory.java index 535fdd331409..ade1942a54e3 100644 --- a/platform/analysis-api/src/com/intellij/codeInspection/lang/InspectionExtensionsFactory.java +++ b/platform/analysis-api/src/com/intellij/codeInspection/lang/InspectionExtensionsFactory.java @@ -6,7 +6,6 @@ import com.intellij.codeInspection.reference.RefManager; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -31,8 +30,7 @@ public abstract class InspectionExtensionsFactory { /** * @deprecated use {@link #isProjectConfiguredToRunInspections(Project, boolean, Runnable)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean isProjectConfiguredToRunInspections(@NotNull Project project, boolean online) { return true; } diff --git a/platform/analysis-api/src/com/intellij/codeInspection/reference/RefElement.java b/platform/analysis-api/src/com/intellij/codeInspection/reference/RefElement.java index 5fbadedb4a57..d0f27d3242ff 100644 --- a/platform/analysis-api/src/com/intellij/codeInspection/reference/RefElement.java +++ b/platform/analysis-api/src/com/intellij/codeInspection/reference/RefElement.java @@ -3,7 +3,6 @@ package com.intellij.codeInspection.reference; import com.intellij.psi.PsiElement; import com.intellij.psi.SmartPsiElementPointer; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -35,8 +34,7 @@ public interface RefElement extends RefEntity { /** * @deprecated use {@link #getPsiElement()} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) default PsiElement getElement() { return getPsiElement(); } diff --git a/platform/analysis-api/src/com/intellij/lang/annotation/AnnotationBuilder.java b/platform/analysis-api/src/com/intellij/lang/annotation/AnnotationBuilder.java index a173c5ce7b48..a4098f2ae756 100644 --- a/platform/analysis-api/src/com/intellij/lang/annotation/AnnotationBuilder.java +++ b/platform/analysis-api/src/com/intellij/lang/annotation/AnnotationBuilder.java @@ -195,6 +195,5 @@ public interface AnnotationBuilder { /** @deprecated Use {@link #create()} instead */ @Deprecated(forRemoval = true) - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") Annotation createAnnotation(); } diff --git a/platform/analysis-api/src/com/intellij/openapi/fileEditor/FileEditorManager.java b/platform/analysis-api/src/com/intellij/openapi/fileEditor/FileEditorManager.java index 12c11d9bf1a6..0c313f9982af 100644 --- a/platform/analysis-api/src/com/intellij/openapi/fileEditor/FileEditorManager.java +++ b/platform/analysis-api/src/com/intellij/openapi/fileEditor/FileEditorManager.java @@ -64,8 +64,7 @@ public abstract class FileEditorManager { /** * @deprecated use {@link #openTextEditor(OpenFileDescriptor, boolean)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void navigateToTextEditor(@NotNull OpenFileDescriptor descriptor, boolean focusEditor) { openTextEditor(descriptor, focusEditor); } diff --git a/platform/analysis-api/src/com/intellij/openapi/fileEditor/FileEditorManagerListener.java b/platform/analysis-api/src/com/intellij/openapi/fileEditor/FileEditorManagerListener.java index 75ac9b702536..aeaf3f80d96b 100644 --- a/platform/analysis-api/src/com/intellij/openapi/fileEditor/FileEditorManagerListener.java +++ b/platform/analysis-api/src/com/intellij/openapi/fileEditor/FileEditorManagerListener.java @@ -7,7 +7,6 @@ import com.intellij.openapi.util.Pair; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.messages.Topic; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.EventListener; @@ -79,8 +78,7 @@ public interface FileEditorManagerListener extends EventListener { /** * @deprecated use {@link Before} directly */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) class Adapter implements Before { @Override public void beforeFileOpened(@NotNull FileEditorManager source, @NotNull VirtualFile file) { } diff --git a/platform/analysis-api/src/com/intellij/problems/WolfTheProblemSolver.java b/platform/analysis-api/src/com/intellij/problems/WolfTheProblemSolver.java index af8a81ea73e0..9059a42ff5bb 100644 --- a/platform/analysis-api/src/com/intellij/problems/WolfTheProblemSolver.java +++ b/platform/analysis-api/src/com/intellij/problems/WolfTheProblemSolver.java @@ -8,7 +8,6 @@ import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Condition; import com.intellij.openapi.vfs.VirtualFile; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -56,8 +55,7 @@ public abstract class WolfTheProblemSolver { /** * @deprecated use {@link com.intellij.problems.ProblemListener} directly */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public abstract static class ProblemListener implements com.intellij.problems.ProblemListener { @Override public void problemsAppeared(@NotNull VirtualFile file) {} @@ -69,8 +67,7 @@ public abstract class WolfTheProblemSolver { /** * @deprecated Use message bus {@link ProblemListener#TOPIC} instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public abstract void addProblemListener(@NotNull ProblemListener listener, @NotNull Disposable parentDisposable); public abstract void queue(@NotNull VirtualFile suspiciousFile); diff --git a/platform/analysis-api/src/com/intellij/psi/search/scope/ProblemsScope.java b/platform/analysis-api/src/com/intellij/psi/search/scope/ProblemsScope.java index 02732c5053e7..fb3955742a25 100644 --- a/platform/analysis-api/src/com/intellij/psi/search/scope/ProblemsScope.java +++ b/platform/analysis-api/src/com/intellij/psi/search/scope/ProblemsScope.java @@ -8,15 +8,13 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.problems.WolfTheProblemSolver; import com.intellij.psi.search.scope.packageSet.FilteredPackageSet; import com.intellij.psi.search.scope.packageSet.NamedScope; -import org.jetbrains.annotations.ApiStatus.ScheduledForRemoval; import org.jetbrains.annotations.NotNull; /** * @see com.intellij.codeInsight.problems.WolfTheProblemSolverImpl#processProblemFiles * @deprecated this scope is obsolete and will be removed soon */ -@ScheduledForRemoval(inVersion = "2022.2") -@Deprecated +@Deprecated(forRemoval = true) public final class ProblemsScope extends NamedScope { public static final ProblemsScope INSTANCE = new ProblemsScope(); diff --git a/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/PackageSetBase.java b/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/PackageSetBase.java index fbf62a62ccbc..0221cf593a18 100644 --- a/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/PackageSetBase.java +++ b/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/PackageSetBase.java @@ -6,14 +6,12 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; public abstract class PackageSetBase implements PackageSet { /** @deprecated use {@link PackageSetBase#contains(VirtualFile, Project, NamedScopesHolder)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean contains(@NotNull VirtualFile file, NamedScopesHolder holder) { return false; } diff --git a/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/UnionPackageSet.java b/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/UnionPackageSet.java index 61d93c178399..7edaf6aa2481 100644 --- a/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/UnionPackageSet.java +++ b/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/UnionPackageSet.java @@ -19,7 +19,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiFile; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -35,8 +34,7 @@ public class UnionPackageSet extends CompoundPackageSet { /** * @deprecated use {@link #create(PackageSet...)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public UnionPackageSet(@NotNull PackageSet set1, @NotNull PackageSet set2) { super(set1, set2); } diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/CodeInsightSettings.java b/platform/analysis-impl/src/com/intellij/codeInsight/CodeInsightSettings.java index 3ff37917d541..f43df7ba8658 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/CodeInsightSettings.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/CodeInsightSettings.java @@ -22,7 +22,6 @@ import com.intellij.util.xmlb.annotations.Transient; import com.intellij.util.xmlb.annotations.XCollection; import org.intellij.lang.annotations.MagicConstant; import org.jdom.Element; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -89,7 +88,7 @@ public class CodeInsightSettings implements PersistentStateComponent, C /** * @deprecated use accessors instead */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SELECT_AUTOPOPUP_SUGGESTIONS_BY_CHARS; public boolean isSelectAutopopupSuggestionsByChars() { diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionData.java b/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionData.java index 23569384fda5..f2255e31037a 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionData.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionData.java @@ -20,7 +20,6 @@ import com.intellij.psi.impl.source.resolve.reference.impl.PsiMultiReference; import com.intellij.psi.meta.PsiMetaData; import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -31,8 +30,7 @@ import static com.intellij.patterns.StandardPatterns.not; /** * @deprecated see {@link CompletionContributor} */ -@ApiStatus.ScheduledForRemoval(inVersion = "2021.1") -@Deprecated +@Deprecated(forRemoval = true) public class CompletionData { private static final Logger LOG = Logger.getInstance(CompletionData.class); public static final ObjectPattern.Capture NOT_JAVA_ID = not(CharPattern.javaIdentifierPartCharacter()); @@ -53,8 +51,7 @@ public class CompletionData { /** * @deprecated see {@link CompletionContributor} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected void registerVariant(CompletionVariant variant){ myCompletionVariants.add(variant); } @@ -164,8 +161,7 @@ public class CompletionData { /** * @deprecated Use {@link CompletionUtil} methods instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static String findPrefixDefault(final PsiElement insertedElement, final int offset, @NotNull final ElementPattern trimStart) { String substr = insertedElement.getText().substring(0, offset - insertedElement.getTextRange().getStartOffset()); if (substr.length() == 0 || Character.isWhitespace(substr.charAt(substr.length() - 1))) return ""; diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionVariant.java b/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionVariant.java index ed7515929a75..3febcdc7a52b 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionVariant.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionVariant.java @@ -10,7 +10,6 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.PsiReference; import com.intellij.psi.filters.ElementFilter; import com.intellij.util.ReflectionUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import java.util.*; @@ -18,8 +17,7 @@ import java.util.*; /** * @deprecated use CompletionContributor */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.1") +@Deprecated(forRemoval = true) public class CompletionVariant { protected static final TailType DEFAULT_TAIL_TYPE = TailType.SPACE; diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QuickFixAction.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QuickFixAction.java index b66333e0d982..2ad6f218d373 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QuickFixAction.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QuickFixAction.java @@ -6,7 +6,6 @@ import com.intellij.codeInsight.daemon.HighlightDisplayKey; import com.intellij.codeInsight.daemon.impl.HighlightInfo; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.openapi.util.TextRange; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -28,8 +27,7 @@ public final class QuickFixAction { } /** @deprecated This is used by TeamCity plugin */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static void registerQuickFixAction(@Nullable HighlightInfo info, @Nullable IntentionAction action, @Nullable List options, diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/lookup/DefaultLookupItemRenderer.java b/platform/analysis-impl/src/com/intellij/codeInsight/lookup/DefaultLookupItemRenderer.java index e152ed683413..f301bbc8a3ac 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/lookup/DefaultLookupItemRenderer.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/lookup/DefaultLookupItemRenderer.java @@ -23,7 +23,6 @@ import com.intellij.psi.meta.PsiMetaData; import com.intellij.psi.util.PsiUtilCore; import com.intellij.ui.SizedIcon; import com.intellij.util.PlatformIcons; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -48,8 +47,7 @@ public class DefaultLookupItemRenderer extends LookupElementRenderer extends HashMap { } diff --git a/platform/analysis-impl/src/com/intellij/find/FindSettings.java b/platform/analysis-impl/src/com/intellij/find/FindSettings.java index d0ffc46f7a57..36bc8be0e9a0 100644 --- a/platform/analysis-impl/src/com/intellij/find/FindSettings.java +++ b/platform/analysis-impl/src/com/intellij/find/FindSettings.java @@ -4,7 +4,6 @@ package com.intellij.find; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.util.NlsSafe; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -69,15 +68,13 @@ public abstract class FindSettings { /** * @deprecated use {@link FindInProjectSettings#getRecentFindStrings()} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public abstract String @NotNull [] getRecentFindStrings(); /** * @deprecated use {@link FindInProjectSettings#getRecentReplaceStrings()} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public abstract String @NotNull [] getRecentReplaceStrings(); /** diff --git a/platform/analysis-impl/src/com/intellij/profile/codeInspection/InspectionProfileManager.java b/platform/analysis-impl/src/com/intellij/profile/codeInspection/InspectionProfileManager.java index a7c11a5a02ce..ca0027b9ceba 100644 --- a/platform/analysis-impl/src/com/intellij/profile/codeInspection/InspectionProfileManager.java +++ b/platform/analysis-impl/src/com/intellij/profile/codeInspection/InspectionProfileManager.java @@ -6,7 +6,6 @@ import com.intellij.codeInspection.ex.InspectionProfileImpl; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.Project; import com.intellij.psi.search.scope.packageSet.NamedScopesHolder; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -49,8 +48,7 @@ public interface InspectionProfileManager { /** * @deprecated use {@link #getSeverityRegistrar()} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) default @NotNull SeverityRegistrar getOwnSeverityRegistrar() { return getSeverityRegistrar(); } diff --git a/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java b/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java index 9a1b4074bf5a..3b5510094156 100644 --- a/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java +++ b/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java @@ -20,7 +20,6 @@ import com.intellij.psi.*; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.indexing.FileBasedIndex; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -116,8 +115,7 @@ public class FileReferenceSet { * This should be removed. * @deprecated use {@link FileReference#getContexts()} instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected Collection getExtraContexts() { return emptyList(); } diff --git a/platform/analysis-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedFileViewProvider.java b/platform/analysis-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedFileViewProvider.java index 05bc0e5fab37..4416892ae440 100644 --- a/platform/analysis-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedFileViewProvider.java +++ b/platform/analysis-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedFileViewProvider.java @@ -14,7 +14,6 @@ import com.intellij.psi.*; import com.intellij.psi.impl.FreeThreadedFileViewProvider; import com.intellij.psi.impl.PsiManagerEx; import com.intellij.psi.templateLanguages.TemplateLanguageFileViewProvider; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -22,8 +21,7 @@ import java.util.List; /** * @deprecated Use methods from {@link InjectedLanguageManager} instead */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public interface InjectedFileViewProvider extends FileViewProvider, FreeThreadedFileViewProvider { default void rootChangedImpl(@NotNull PsiFile psiFile) { if (!isPhysical()) return; // injected PSI change happened inside reparse; ignore diff --git a/platform/analysis-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtilBase.java b/platform/analysis-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtilBase.java index 0b2e498c214b..eec1fc5ada0f 100644 --- a/platform/analysis-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtilBase.java +++ b/platform/analysis-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtilBase.java @@ -27,7 +27,6 @@ import com.intellij.reference.SoftReference; import com.intellij.testFramework.LightVirtualFile; import com.intellij.util.containers.ConcurrentList; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -39,8 +38,7 @@ import java.util.function.Supplier; /** * @deprecated Use {@link InjectedLanguageManager} instead */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public class InjectedLanguageUtilBase { public static final Key INJECTED_FRAGMENT_TYPE = Key.create("INJECTED_FRAGMENT_TYPE"); @@ -431,8 +429,7 @@ public class InjectedLanguageUtilBase { * @deprecated use {@link InjectedLanguageManager#getCachedInjectedDocumentsInRange(PsiFile, TextRange)} instead */ @NotNull - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static ConcurrentList getCachedInjectedDocuments(@NotNull PsiFile hostPsiFile) { // modification of cachedInjectedDocuments must be under InjectedLanguageManagerImpl.ourInjectionPsiLock only List injected = hostPsiFile.getUserData(INJECTED_DOCS_KEY); @@ -536,8 +533,7 @@ public class InjectedLanguageUtilBase { /** * @deprecated Use {@link InjectedLanguageManager#getInjectedPsiFiles(PsiElement)} != null instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static boolean hasInjections(@NotNull PsiLanguageInjectionHost host) { if (!host.isPhysical()) return false; final Ref result = Ref.create(false); diff --git a/platform/analysis-impl/src/com/intellij/psi/templateLanguages/TemplateDataElementType.java b/platform/analysis-impl/src/com/intellij/psi/templateLanguages/TemplateDataElementType.java index 0f586e8164c6..7f9cb0659cc6 100644 --- a/platform/analysis-impl/src/com/intellij/psi/templateLanguages/TemplateDataElementType.java +++ b/platform/analysis-impl/src/com/intellij/psi/templateLanguages/TemplateDataElementType.java @@ -243,8 +243,7 @@ public class TemplateDataElementType extends IFileElementType implements ITempla /** * @deprecated Use {@link #isInsertionToken(IElementType, CharSequence)} instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected @NotNull TokenSet getTemplateDataInsertionTokens() { return TokenSet.EMPTY; } @@ -273,8 +272,7 @@ public class TemplateDataElementType extends IFileElementType implements ITempla * * @deprecated this method is going to be removed and com.intellij.lang.ASTFactory#leaf(com.intellij.psi.tree.IElementType, java.lang.CharSequence) going to be used instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected OuterLanguageElementImpl createOuterLanguageElement(@NotNull CharSequence internedTokenText, @NotNull IElementType outerElementType) { var factoryCreatedElement = ASTFactory.leaf(outerElementType, internedTokenText); diff --git a/platform/bootstrap/src/com/intellij/ide/startup/StartupActionScriptManager.java b/platform/bootstrap/src/com/intellij/ide/startup/StartupActionScriptManager.java index 21793baf51fd..a0527c6155b2 100644 --- a/platform/bootstrap/src/com/intellij/ide/startup/StartupActionScriptManager.java +++ b/platform/bootstrap/src/com/intellij/ide/startup/StartupActionScriptManager.java @@ -173,8 +173,7 @@ public final class StartupActionScriptManager { } /** @deprecated Use {@link #CopyCommand(Path, Path)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public CopyCommand(@NotNull File source, @NotNull File destination) { mySource = source.getAbsolutePath(); myDestination = destination.getAbsolutePath(); diff --git a/platform/code-style-api/src/com/intellij/codeStyle/CodeStyleFacade.java b/platform/code-style-api/src/com/intellij/codeStyle/CodeStyleFacade.java index a3be04c9f2dc..33196431a7c2 100644 --- a/platform/code-style-api/src/com/intellij/codeStyle/CodeStyleFacade.java +++ b/platform/code-style-api/src/com/intellij/codeStyle/CodeStyleFacade.java @@ -9,15 +9,13 @@ import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; import com.intellij.psi.codeStyle.CodeStyleSettingsFacade; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** * @deprecated See deprecations for specific methods, use methods of {@link com.intellij.application.options.CodeStyle} instead. */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public abstract class CodeStyleFacade { public static CodeStyleFacade getInstance() { return ApplicationManager.getApplication().getService(CodeStyleFacade.class); @@ -38,8 +36,7 @@ public abstract class CodeStyleFacade { /** * @deprecated Use {@link com.intellij.application.options.CodeStyle#getLineIndent(Editor, Language, int, boolean)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @Nullable public String getLineIndent(@NotNull Editor editor, @Nullable Language language, int offset, boolean allowDocCommit) { return getLineIndent(editor.getDocument(), offset); @@ -48,31 +45,27 @@ public abstract class CodeStyleFacade { /** * @deprecated Use {@link com.intellij.application.options.CodeStyle#getIndentSize(PsiFile)} instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public abstract int getIndentSize(FileType fileType); /** * @deprecated Use {@link com.intellij.application.options.CodeStyle#getFacade} and * {@link CodeStyleSettingsFacade#getTabSize()} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public abstract int getTabSize(final FileType fileType); /** * @deprecated Use {@code CodeStyle.getIndentOptions(PsiFile).USE_TAB_CHARACTER}. See {@code CodeStyle for more information} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public abstract boolean useTabCharacter(final FileType fileType); /** * @deprecated Use {@code getLineSeparator()} method of {@code CodeStyle.getSettings(PsiFile)} or * {@code CodeStyle.getSettings(Project)} if there is no {@code PsiFile} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public abstract String getLineSeparator(); } diff --git a/platform/code-style-api/src/com/intellij/formatting/FormattingModelBuilder.java b/platform/code-style-api/src/com/intellij/formatting/FormattingModelBuilder.java index fb2430607fb0..b330a3352b4c 100644 --- a/platform/code-style-api/src/com/intellij/formatting/FormattingModelBuilder.java +++ b/platform/code-style-api/src/com/intellij/formatting/FormattingModelBuilder.java @@ -6,7 +6,6 @@ import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.codeStyle.CodeStyleSettings; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -54,8 +53,7 @@ public interface FormattingModelBuilder { /** * @deprecated use {@link #createModel(FormattingContext)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.1") + @Deprecated(forRemoval = true) default @NotNull FormattingModel createModel(final @NotNull PsiElement element, final @NotNull TextRange range, final @NotNull CodeStyleSettings settings, @@ -66,8 +64,7 @@ public interface FormattingModelBuilder { /** * @deprecated use {@link #createModel(FormattingContext)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.1") + @Deprecated(forRemoval = true) default @NotNull FormattingModel createModel(final @NotNull PsiElement element, final @NotNull CodeStyleSettings settings, @NotNull FormattingMode mode) { @@ -77,8 +74,7 @@ public interface FormattingModelBuilder { /** * @deprecated use {@link #createModel(FormattingContext)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.1") + @Deprecated(forRemoval = true) default @NotNull FormattingModel createModel(final PsiElement element, final CodeStyleSettings settings) { return createModel(FormattingContext.create(element, settings)); } diff --git a/platform/code-style-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java b/platform/code-style-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java index fdb05c8c07f1..469f4700085c 100644 --- a/platform/code-style-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java +++ b/platform/code-style-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java @@ -83,8 +83,7 @@ public class CodeStyleSettings extends LegacyCodeStyleSettings implements Clonea /** * @deprecated See {@link #CodeStyleSettings()} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public CodeStyleSettings(boolean loadExtensions) { this(loadExtensions, true); } @@ -206,28 +205,23 @@ public class CodeStyleSettings extends LegacyCodeStyleSettings implements Clonea @Deprecated public String FIELD_NAME_PREFIX = ""; /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#STATIC_FIELD_NAME_PREFIX} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public String STATIC_FIELD_NAME_PREFIX = ""; /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#PARAMETER_NAME_PREFIX} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public String PARAMETER_NAME_PREFIX = ""; /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#LOCAL_VARIABLE_NAME_PREFIX} */ @Deprecated public String LOCAL_VARIABLE_NAME_PREFIX = ""; /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#FIELD_NAME_SUFFIX} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public String FIELD_NAME_SUFFIX = ""; /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#STATIC_FIELD_NAME_SUFFIX} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public String STATIC_FIELD_NAME_SUFFIX = ""; /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#PARAMETER_NAME_SUFFIX} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public String PARAMETER_NAME_SUFFIX = ""; /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#LOCAL_VARIABLE_NAME_SUFFIX} */ @Deprecated @@ -239,12 +233,10 @@ public class CodeStyleSettings extends LegacyCodeStyleSettings implements Clonea //----------------- 'final' modifier settings ------- /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#GENERATE_FINAL_LOCALS} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean GENERATE_FINAL_LOCALS; /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#GENERATE_FINAL_PARAMETERS} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean GENERATE_FINAL_PARAMETERS; //----------------- visibility ----------------------------- @@ -254,24 +246,20 @@ public class CodeStyleSettings extends LegacyCodeStyleSettings implements Clonea //----------------- generate parentheses around method arguments ---------- /** @deprecated Use RubyCodeStyleSettings.PARENTHESES_AROUND_METHOD_ARGUMENTS */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean PARENTHESES_AROUND_METHOD_ARGUMENTS = true; //----------------- annotations ---------------- /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#USE_EXTERNAL_ANNOTATIONS} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean USE_EXTERNAL_ANNOTATIONS; /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#INSERT_OVERRIDE_ANNOTATION} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean INSERT_OVERRIDE_ANNOTATION = true; //----------------- override ------------------- /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#REPEAT_SYNCHRONIZED} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean REPEAT_SYNCHRONIZED = true; private final List myRepeatAnnotations = new ArrayList<>(); @@ -293,50 +281,41 @@ public class CodeStyleSettings extends LegacyCodeStyleSettings implements Clonea /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#LAYOUT_STATIC_IMPORTS_SEPARATELY} */ @SuppressWarnings("DeprecatedIsStillUsed") - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean LAYOUT_STATIC_IMPORTS_SEPARATELY = true; /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#USE_FQ_CLASS_NAMES} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean USE_FQ_CLASS_NAMES; /** @deprecated use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#CLASS_NAMES_IN_JAVADOC} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean USE_FQ_CLASS_NAMES_IN_JAVADOC = true; /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#USE_SINGLE_CLASS_IMPORTS */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean USE_SINGLE_CLASS_IMPORTS = true; /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#INSERT_INNER_CLASS_IMPORTS */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean INSERT_INNER_CLASS_IMPORTS; /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public int CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND = 5; /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public int NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND = 3; /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#PACKAGES_TO_USE_IMPORT_ON_DEMAND */ @SuppressWarnings("DeprecatedIsStillUsed") - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public final PackageEntryTable PACKAGES_TO_USE_IMPORT_ON_DEMAND = new PackageEntryTable(); /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#IMPORT_LAYOUT_TABLE */ @SuppressWarnings("DeprecatedIsStillUsed") - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public final PackageEntryTable IMPORT_LAYOUT_TABLE = new PackageEntryTable(); /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#isLayoutStaticImportsSeparately()} */ @@ -441,13 +420,13 @@ public class CodeStyleSettings extends LegacyCodeStyleSettings implements Clonea // region ORDER OF MEMBERS - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") public int STATIC_FIELDS_ORDER_WEIGHT = 1; - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") public int FIELDS_ORDER_WEIGHT = 2; - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") public int CONSTRUCTORS_ORDER_WEIGHT = 3; - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") public int STATIC_METHODS_ORDER_WEIGHT = 4; - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") public int METHODS_ORDER_WEIGHT = 5; - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") public int STATIC_INNER_CLASSES_ORDER_WEIGHT = 6; - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") public int INNER_CLASSES_ORDER_WEIGHT = 7; + @Deprecated(forRemoval = true) public int STATIC_FIELDS_ORDER_WEIGHT = 1; + @Deprecated(forRemoval = true) public int FIELDS_ORDER_WEIGHT = 2; + @Deprecated(forRemoval = true) public int CONSTRUCTORS_ORDER_WEIGHT = 3; + @Deprecated(forRemoval = true) public int STATIC_METHODS_ORDER_WEIGHT = 4; + @Deprecated(forRemoval = true) public int METHODS_ORDER_WEIGHT = 5; + @Deprecated(forRemoval = true) public int STATIC_INNER_CLASSES_ORDER_WEIGHT = 6; + @Deprecated(forRemoval = true) public int INNER_CLASSES_ORDER_WEIGHT = 7; // endregion @@ -483,16 +462,14 @@ public class CodeStyleSettings extends LegacyCodeStyleSettings implements Clonea /** * @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#JD_LEADING_ASTERISKS_ARE_ENABLED} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean JD_LEADING_ASTERISKS_ARE_ENABLED = true; // endregion /** @deprecated Use {@link com.intellij.application.options.JspCodeStyleSettings#JSP_PREFER_COMMA_SEPARATED_IMPORT_LIST} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean JSP_PREFER_COMMA_SEPARATED_IMPORT_LIST; //---------------------------------------------------------------------------------------- diff --git a/platform/code-style-api/src/com/intellij/psi/codeStyle/CodeStyleSettingsManager.java b/platform/code-style-api/src/com/intellij/psi/codeStyle/CodeStyleSettingsManager.java index e1aadba5294a..48335a7a7c15 100644 --- a/platform/code-style-api/src/com/intellij/psi/codeStyle/CodeStyleSettingsManager.java +++ b/platform/code-style-api/src/com/intellij/psi/codeStyle/CodeStyleSettingsManager.java @@ -34,8 +34,7 @@ public class CodeStyleSettingsManager implements PersistentStateComponentWithMod /** * @deprecated Use {@link #setMainProjectCodeStyle(CodeStyleSettings)} or {@link #getMainProjectCodeStyle()} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @Nullable public volatile CodeStyleSettings PER_PROJECT_SETTINGS; diff --git a/platform/code-style-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettings.java b/platform/code-style-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettings.java index b441f32261da..a5023c1f3ac6 100644 --- a/platform/code-style-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettings.java +++ b/platform/code-style-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettings.java @@ -23,7 +23,6 @@ import com.intellij.util.xmlb.SerializationFilter; import com.intellij.util.xmlb.SkipDefaultValuesSerializationFilters; import org.intellij.lang.annotations.MagicConstant; import org.jdom.Element; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -1196,8 +1195,7 @@ public class CommonCodeStyleSettings { /** * @deprecated Use {@link CodeStyle#getLocalLanguageSettings(Editor, int)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static CommonCodeStyleSettings getLocalCodeStyleSettings(Editor editor, int tailOffset) { return CodeStyle.getLocalLanguageSettings(editor, tailOffset); } diff --git a/platform/code-style-api/src/com/intellij/psi/codeStyle/LegacyCodeStyleSettings.java b/platform/code-style-api/src/com/intellij/psi/codeStyle/LegacyCodeStyleSettings.java index 08589648b64f..a405e2cf5de8 100644 --- a/platform/code-style-api/src/com/intellij/psi/codeStyle/LegacyCodeStyleSettings.java +++ b/platform/code-style-api/src/com/intellij/psi/codeStyle/LegacyCodeStyleSettings.java @@ -15,7 +15,6 @@ package com.intellij.psi.codeStyle; import com.intellij.lang.Language; import com.intellij.psi.PsiFile; -import org.jetbrains.annotations.ApiStatus; /** * Contains fields which are left for compatibility with earlier versions. These fields shouldn't be used anymore. Every language must have @@ -29,27 +28,27 @@ public class LegacyCodeStyleSettings extends CommonCodeStyleSettings { /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean KEEP_LINE_BREAKS = true; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public int KEEP_BLANK_LINES_IN_DECLARATIONS = 2; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public int KEEP_BLANK_LINES_IN_CODE = 2; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public int BLANK_LINES_AROUND_CLASS = 1; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean INDENT_CASE_FROM_SWITCH = true; /** * @deprecated See {@link LegacyCodeStyleSettings} @@ -59,152 +58,152 @@ public class LegacyCodeStyleSettings extends CommonCodeStyleSettings { /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_AROUND_LOGICAL_OPERATORS = true; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_AROUND_EQUALITY_OPERATORS = true; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_AROUND_RELATIONAL_OPERATORS = true; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_AROUND_BITWISE_OPERATORS = true; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_AROUND_ADDITIVE_OPERATORS = true; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_AROUND_MULTIPLICATIVE_OPERATORS = true; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_AROUND_SHIFT_OPERATORS = true; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_AFTER_COMMA = true; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_BEFORE_COMMA = false; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_AFTER_SEMICOLON = true; // in for-statement /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_BEFORE_SEMICOLON = false; // in for-statement /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_WITHIN_PARENTHESES = false; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_WITHIN_METHOD_CALL_PARENTHESES = false; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_WITHIN_METHOD_PARENTHESES = false; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_WITHIN_IF_PARENTHESES = false; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_WITHIN_WHILE_PARENTHESES = false; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_WITHIN_BRACKETS = false; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_AFTER_TYPE_CAST = true; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_BEFORE_METHOD_CALL_PARENTHESES = false; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_BEFORE_METHOD_PARENTHESES = false; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_BEFORE_IF_PARENTHESES = true; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_BEFORE_WHILE_PARENTHESES = true; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_BEFORE_CLASS_LBRACE = true; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_BEFORE_METHOD_LBRACE = true; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_BEFORE_IF_LBRACE = true; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_BEFORE_WHILE_LBRACE = true; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_BEFORE_QUEST = true; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_AFTER_QUEST = true; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_BEFORE_COLON = true; /** * @deprecated See {@link LegacyCodeStyleSettings} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean SPACE_AFTER_COLON = true; public LegacyCodeStyleSettings() { diff --git a/platform/code-style-impl/src/com/intellij/psi/formatter/FormatterUtil.java b/platform/code-style-impl/src/com/intellij/psi/formatter/FormatterUtil.java index 893ae9af3732..d5023afe0fce 100644 --- a/platform/code-style-impl/src/com/intellij/psi/formatter/FormatterUtil.java +++ b/platform/code-style-impl/src/com/intellij/psi/formatter/FormatterUtil.java @@ -15,7 +15,6 @@ import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.TokenSet; import com.intellij.util.CharTable; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -29,8 +28,7 @@ public final class FormatterUtil { /** * @deprecated Use {@link #getReformatBeforeCommitCommandName()} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static final String REFORMAT_BEFORE_COMMIT_COMMAND_NAME = "Reformat Code Before Commit"; public static final Collection FORMATTER_ACTION_NAMES = Collections.unmodifiableCollection(ContainerUtil.newHashSet( diff --git a/platform/core-ui/src/ui/TreeUIHelper.java b/platform/core-ui/src/ui/TreeUIHelper.java index d946d8a029a6..cb63432e1713 100644 --- a/platform/core-ui/src/ui/TreeUIHelper.java +++ b/platform/core-ui/src/ui/TreeUIHelper.java @@ -3,7 +3,6 @@ package com.intellij.ui; import com.intellij.openapi.application.ApplicationManager; import com.intellij.util.containers.Convertor; -import org.jetbrains.annotations.ApiStatus; import javax.swing.*; import javax.swing.tree.TreePath; @@ -16,8 +15,7 @@ public abstract class TreeUIHelper { /** * @deprecated use JBTree class instead, it will automatically configure tool tips */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public abstract void installToolTipHandler(JTree tree); public abstract void installEditSourceOnDoubleClick(JTree tree); diff --git a/platform/core-ui/src/util/IconUtil.java b/platform/core-ui/src/util/IconUtil.java index 6fae012525bb..196f4897a960 100644 --- a/platform/core-ui/src/util/IconUtil.java +++ b/platform/core-ui/src/util/IconUtil.java @@ -308,8 +308,7 @@ public final class IconUtil { /** * @deprecated This icon is not used by platform anymore. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static @NotNull Icon getAnalyzeIcon() { return IconLoader.getIcon(getToolbarDecoratorIconsFolder() + "analyze.png", IconUtil.class.getClassLoader()); } @@ -810,8 +809,7 @@ public final class IconUtil { /** * @deprecated Use {@link #createImageIcon(Image)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static @NotNull JBImageIcon createImageIcon(final @NotNull BufferedImage img) { return createImageIcon((Image)img); } diff --git a/platform/diff-api/src/com/intellij/diff/chains/DiffRequestChain.java b/platform/diff-api/src/com/intellij/diff/chains/DiffRequestChain.java index d11489b338b3..0c0f2daa6667 100644 --- a/platform/diff-api/src/com/intellij/diff/chains/DiffRequestChain.java +++ b/platform/diff-api/src/com/intellij/diff/chains/DiffRequestChain.java @@ -5,7 +5,6 @@ import com.intellij.diff.DiffDialogHints; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.UserDataHolder; import com.intellij.util.concurrency.annotations.RequiresEdt; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -33,8 +32,7 @@ public interface DiffRequestChain extends UserDataHolder { * @see com.intellij.diff.impl.CacheDiffRequestChainProcessor#setCurrentRequest * @deprecated This method will not change selected position if chain was already shown. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @RequiresEdt void setIndex(int index); } diff --git a/platform/diff-api/src/com/intellij/diff/contents/DiffContent.java b/platform/diff-api/src/com/intellij/diff/contents/DiffContent.java index defea1738df6..7b61953bffdd 100644 --- a/platform/diff-api/src/com/intellij/diff/contents/DiffContent.java +++ b/platform/diff-api/src/com/intellij/diff/contents/DiffContent.java @@ -22,7 +22,6 @@ import com.intellij.openapi.util.UserDataHolder; import com.intellij.pom.Navigatable; import com.intellij.util.ObjectUtils; import com.intellij.util.concurrency.annotations.RequiresEdt; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; /** @@ -51,8 +50,7 @@ public interface DiffContent extends UserDataHolder { * @deprecated isn't called by the platform anymore */ @Nullable - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) default OpenFileDescriptor getOpenFileDescriptor() { return ObjectUtils.tryCast(getNavigatable(), OpenFileDescriptor.class); } diff --git a/platform/diff-api/src/com/intellij/diff/contents/DocumentContent.java b/platform/diff-api/src/com/intellij/diff/contents/DocumentContent.java index 0a4bde897dab..3d8b343dc145 100644 --- a/platform/diff-api/src/com/intellij/diff/contents/DocumentContent.java +++ b/platform/diff-api/src/com/intellij/diff/contents/DocumentContent.java @@ -22,7 +22,6 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.pom.Navigatable; import com.intellij.util.LineSeparator; import com.intellij.util.ObjectUtils; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -70,8 +69,7 @@ public interface DocumentContent extends DiffContent { * @deprecated isn't called by the platform anymore */ @Nullable - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) default OpenFileDescriptor getOpenFileDescriptor(int offset) { LineCol position = LineCol.fromOffset(getDocument(), offset); return ObjectUtils.tryCast(getNavigatable(position), OpenFileDescriptor.class); diff --git a/platform/diff-api/src/com/intellij/diff/util/DiffUserDataKeys.java b/platform/diff-api/src/com/intellij/diff/util/DiffUserDataKeys.java index db00b3a5c2be..a56906996fc9 100644 --- a/platform/diff-api/src/com/intellij/diff/util/DiffUserDataKeys.java +++ b/platform/diff-api/src/com/intellij/diff/util/DiffUserDataKeys.java @@ -6,7 +6,6 @@ import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.Pair; -import org.jetbrains.annotations.ApiStatus; import javax.swing.*; import java.util.List; @@ -106,8 +105,7 @@ public interface DiffUserDataKeys { /** * @deprecated Use {@link DiffUtil#addNotification} */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) Key> NOTIFICATIONS = Key.create("Diff.Notifications"); /** diff --git a/platform/diff-api/src/org/jetbrains/annotations/CalledInBackground.java b/platform/diff-api/src/org/jetbrains/annotations/CalledInBackground.java index 1c6870fed732..0b064c4412cf 100644 --- a/platform/diff-api/src/org/jetbrains/annotations/CalledInBackground.java +++ b/platform/diff-api/src/org/jetbrains/annotations/CalledInBackground.java @@ -26,8 +26,7 @@ import java.lang.annotation.Target; * Used to indicate that a method should be called in background thread * @deprecated Use {@link RequiresBackgroundThread}. */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) @Retention(RetentionPolicy.CLASS) @Target({ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.PARAMETER}) public @interface CalledInBackground { diff --git a/platform/diff-impl/src/com/intellij/diff/util/DiffUserDataKeysEx.java b/platform/diff-impl/src/com/intellij/diff/util/DiffUserDataKeysEx.java index ca7f032805d7..64d723f46249 100644 --- a/platform/diff-impl/src/com/intellij/diff/util/DiffUserDataKeysEx.java +++ b/platform/diff-impl/src/com/intellij/diff/util/DiffUserDataKeysEx.java @@ -17,7 +17,6 @@ import com.intellij.openapi.util.Key; import com.intellij.openapi.util.NlsActions; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -102,8 +101,7 @@ public interface DiffUserDataKeysEx extends DiffUserDataKeys { * * @deprecated use {@link DiffEditorTabFilesManager#isEditorDiffAvailable} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) Key DIFF_IN_EDITOR = Key.create("Diff.DiffInEditor"); /** diff --git a/platform/diff-impl/src/com/intellij/openapi/vcs/ex/LineStatusMarkerPopupRenderer.java b/platform/diff-impl/src/com/intellij/openapi/vcs/ex/LineStatusMarkerPopupRenderer.java index 77e0d57465a2..a7ff5d092ba5 100644 --- a/platform/diff-impl/src/com/intellij/openapi/vcs/ex/LineStatusMarkerPopupRenderer.java +++ b/platform/diff-impl/src/com/intellij/openapi/vcs/ex/LineStatusMarkerPopupRenderer.java @@ -35,7 +35,6 @@ import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.EditorTextField; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -52,8 +51,7 @@ public abstract class LineStatusMarkerPopupRenderer extends LineStatusMarkerRend /** * @deprecated Use {@link LineStatusMarkerPopupRenderer#LineStatusMarkerPopupRenderer(LineStatusTrackerI)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public LineStatusMarkerPopupRenderer(@NotNull LineStatusTrackerBase tracker) { this((LineStatusTrackerI)tracker); } diff --git a/platform/dvcs-api/src/com/intellij/dvcs/hosting/RepositoryListLoader.java b/platform/dvcs-api/src/com/intellij/dvcs/hosting/RepositoryListLoader.java index ee85ec0139f7..a60d86b8604c 100644 --- a/platform/dvcs-api/src/com/intellij/dvcs/hosting/RepositoryListLoader.java +++ b/platform/dvcs-api/src/com/intellij/dvcs/hosting/RepositoryListLoader.java @@ -5,7 +5,6 @@ package com.intellij.dvcs.hosting; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.util.concurrency.annotations.RequiresBackgroundThread; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -36,8 +35,7 @@ public interface RepositoryListLoader { /** * @deprecated parent component is required for dialogs to not fall through on welcome screen */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) default boolean enable() { return false; } /** diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/ui/CloneDvcsDialog.java b/platform/dvcs-impl/src/com/intellij/dvcs/ui/CloneDvcsDialog.java index c30ccb45ceea..902e42812801 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/ui/CloneDvcsDialog.java +++ b/platform/dvcs-impl/src/com/intellij/dvcs/ui/CloneDvcsDialog.java @@ -61,8 +61,7 @@ import static com.intellij.util.ui.UI.PanelFactory; * @deprecated Migrate to {@link com.intellij.openapi.vcs.ui.cloneDialog.VcsCloneDialogExtension} * or {@link com.intellij.openapi.vcs.ui.VcsCloneComponent} */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public abstract class CloneDvcsDialog extends DialogWrapper { private ComboBox myRepositoryUrlCombobox; @@ -392,8 +391,7 @@ public abstract class CloneDvcsDialog extends DialogWrapper { /** * @deprecated use {@link #getRepositoryHostingServices()} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void prependToHistory(@NotNull final String item) { myRepositoryUrlComboboxModel.add(item); } diff --git a/platform/editor-ui-api/src/com/intellij/ide/projectView/PresentationData.java b/platform/editor-ui-api/src/com/intellij/ide/projectView/PresentationData.java index b147f2df82b9..44457e96669a 100644 --- a/platform/editor-ui-api/src/com/intellij/ide/projectView/PresentationData.java +++ b/platform/editor-ui-api/src/com/intellij/ide/projectView/PresentationData.java @@ -16,7 +16,6 @@ import com.intellij.util.FontUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.update.ComparableObject; import com.intellij.util.ui.update.ComparableObjectCheck; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -138,8 +137,7 @@ public class PresentationData implements ColoredItemPresentation, ComparableObje * Sets the icon shown for the node when it is collapsed in a tree, or when it is displayed * in a non-tree view. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void setClosedIcon(Icon closedIcon) { setIcon(closedIcon); } @@ -150,8 +148,7 @@ public class PresentationData implements ColoredItemPresentation, ComparableObje * @deprecated Different icons for open/closed no longer supported. This function is no op. * Sets the icon shown for the node when it is expanded in the tree. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void setOpenIcon(Icon openIcon) { } diff --git a/platform/editor-ui-api/src/com/intellij/ide/util/treeView/AbstractTreeNode.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/AbstractTreeNode.java index 4b8779dd0817..554783caa737 100644 --- a/platform/editor-ui-api/src/com/intellij/ide/util/treeView/AbstractTreeNode.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/AbstractTreeNode.java @@ -263,8 +263,7 @@ public abstract class AbstractTreeNode extends PresentableNodeDescriptor extends Disposable /** * @deprecated Use {@link #update()} instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) default void updateSize() { update(); } diff --git a/platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorColors.java b/platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorColors.java index cec3c47c98d0..cd5f8530a30d 100644 --- a/platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorColors.java +++ b/platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorColors.java @@ -7,7 +7,6 @@ import com.intellij.openapi.editor.markup.TextAttributes; import com.intellij.openapi.util.SystemInfo; import com.intellij.ui.JBColor; import com.intellij.util.containers.Stack; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -34,8 +33,7 @@ public interface EditorColors { /** * @deprecated use {@code ScrollBarPainter.THUMB_OPAQUE_BACKGROUND} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") + @Deprecated(forRemoval = true) ColorKey SCROLLBAR_THUMB_COLOR = ColorKey.createColorKey(SystemInfo.isMac ? "ScrollBar.Mac.thumbColor" : "ScrollBar.thumbColor"); TextAttributesKey TAB_SELECTED = TextAttributesKey.createTextAttributesKey("TAB_SELECTED"); @@ -66,7 +64,7 @@ public interface EditorColors { /** * @deprecated use {@link #GUTTER_BACKGROUND} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) ColorKey LEFT_GUTTER_BACKGROUND = GUTTER_BACKGROUND; ColorKey NOTIFICATION_BACKGROUND = ColorKey.createColorKey("NOTIFICATION_BACKGROUND"); diff --git a/platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorColorsManager.java b/platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorColorsManager.java index 311d4f56703a..a2475e3fc2c1 100644 --- a/platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorColorsManager.java +++ b/platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorColorsManager.java @@ -4,7 +4,6 @@ package com.intellij.openapi.editor.colors; import com.intellij.openapi.application.ApplicationManager; import com.intellij.ui.ColorUtil; import com.intellij.util.messages.Topic; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -38,7 +37,6 @@ public abstract class EditorColorsManager { */ @SuppressWarnings("MethodMayBeStatic") @Deprecated(forRemoval = true) - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") public final void addEditorColorsListener(@NotNull EditorColorsListener listener) { ApplicationManager.getApplication().getMessageBus().connect().subscribe(TOPIC, listener); } diff --git a/platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorColorsScheme.java b/platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorColorsScheme.java index 7a3fa9f163a4..84455ba17db2 100644 --- a/platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorColorsScheme.java +++ b/platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorColorsScheme.java @@ -7,7 +7,6 @@ import com.intellij.openapi.options.Scheme; import com.intellij.openapi.options.SchemeMetaInfo; import com.intellij.openapi.util.NlsSafe; import org.jdom.Element; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -66,16 +65,14 @@ public interface EditorColorsScheme extends Cloneable, TextAttributesScheme, Sch * @deprecated Quick documentation component's font size is stored in application level property, and can be obtained * using {@link com.intellij.codeInsight.documentation.DocumentationComponent#getQuickDocFontSize()}. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) default FontSize getQuickDocFontSize() { return FontSize.SMALL; } /** * @deprecated Quick documentation component's font size is stored in application level property, and can be set * using {@link com.intellij.codeInsight.documentation.DocumentationComponent#setQuickDocFontSize(FontSize)}. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) default void setQuickDocFontSize(@NotNull FontSize fontSize) {} @NotNull @@ -85,8 +82,7 @@ public interface EditorColorsScheme extends Cloneable, TextAttributesScheme, Sch * @deprecated Use {@link #getFontPreferences()} and {@link ModifiableFontPreferences} * to change fonts. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) void setFont(EditorFontType key, Font font); float getLineSpacing(); diff --git a/platform/editor-ui-api/src/com/intellij/openapi/editor/event/EditorEventMulticaster.java b/platform/editor-ui-api/src/com/intellij/openapi/editor/event/EditorEventMulticaster.java index 6c015bd8a145..4920e4666117 100644 --- a/platform/editor-ui-api/src/com/intellij/openapi/editor/event/EditorEventMulticaster.java +++ b/platform/editor-ui-api/src/com/intellij/openapi/editor/event/EditorEventMulticaster.java @@ -2,7 +2,6 @@ package com.intellij.openapi.editor.event; import com.intellij.openapi.Disposable; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -55,8 +54,7 @@ public interface EditorEventMulticaster { /** * @deprecated Use {@link #addSelectionListener(SelectionListener, Disposable)} instead to avoid leaking listeners */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) void addSelectionListener(@NotNull SelectionListener listener); void addSelectionListener(@NotNull SelectionListener listener, @NotNull Disposable parentDisposable); diff --git a/platform/editor-ui-api/src/com/intellij/openapi/editor/ex/util/EmptyEditorHighlighter.java b/platform/editor-ui-api/src/com/intellij/openapi/editor/ex/util/EmptyEditorHighlighter.java index 54201f57e3d5..50be3dd0143f 100644 --- a/platform/editor-ui-api/src/com/intellij/openapi/editor/ex/util/EmptyEditorHighlighter.java +++ b/platform/editor-ui-api/src/com/intellij/openapi/editor/ex/util/EmptyEditorHighlighter.java @@ -13,7 +13,6 @@ import com.intellij.openapi.editor.highlighter.HighlighterClient; import com.intellij.openapi.editor.highlighter.HighlighterIterator; import com.intellij.openapi.editor.markup.TextAttributes; import com.intellij.psi.tree.IElementType; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -42,8 +41,7 @@ public class EmptyEditorHighlighter implements EditorHighlighter, PrioritizedDoc /** * @deprecated Avoid specifying text attributes. Use {@link TextAttributesKey} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") + @Deprecated(forRemoval = true) public void setAttributes(TextAttributes attributes) { myCachedAttributes = attributes; } diff --git a/platform/editor-ui-api/src/com/intellij/openapi/editor/markup/RangeHighlighter.java b/platform/editor-ui-api/src/com/intellij/openapi/editor/markup/RangeHighlighter.java index 501d31fa56f1..084c1d8b1ff0 100644 --- a/platform/editor-ui-api/src/com/intellij/openapi/editor/markup/RangeHighlighter.java +++ b/platform/editor-ui-api/src/com/intellij/openapi/editor/markup/RangeHighlighter.java @@ -5,7 +5,6 @@ import com.intellij.openapi.editor.RangeMarker; import com.intellij.openapi.editor.colors.EditorColorsScheme; import com.intellij.openapi.editor.colors.TextAttributesKey; import com.intellij.openapi.util.NlsContexts.Tooltip; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -124,8 +123,7 @@ public interface RangeHighlighter extends RangeMarker { /** * @deprecated Use the overload with {@link EditorColorsScheme} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @Nullable default Color getErrorStripeMarkColor() { return getErrorStripeMarkColor(null); diff --git a/platform/editor-ui-api/src/com/intellij/openapi/fileTypes/SyntaxHighlighter.java b/platform/editor-ui-api/src/com/intellij/openapi/fileTypes/SyntaxHighlighter.java index 2f67e8d3895b..2b5479039003 100644 --- a/platform/editor-ui-api/src/com/intellij/openapi/fileTypes/SyntaxHighlighter.java +++ b/platform/editor-ui-api/src/com/intellij/openapi/fileTypes/SyntaxHighlighter.java @@ -20,7 +20,6 @@ import com.intellij.openapi.editor.colors.TextAttributesKey; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.extensions.KeyedFactoryEPBean; import com.intellij.psi.tree.IElementType; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -40,8 +39,7 @@ public interface SyntaxHighlighter { * {@link SyntaxHighlighterFactory#getSyntaxHighlighter(com.intellij.lang.Language, com.intellij.openapi.project.Project, com.intellij.openapi.vfs.VirtualFile)} */ @SuppressWarnings("DeprecatedIsStillUsed") - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) SyntaxHighlighterProvider PROVIDER = new FileTypeExtensionFactory<>(SyntaxHighlighterProvider.class, EP_NAME).get(); /** diff --git a/platform/editor-ui-api/src/com/intellij/openapi/vcs/FileStatus.java b/platform/editor-ui-api/src/com/intellij/openapi/vcs/FileStatus.java index 5a975e100f3a..f64b7fef836d 100644 --- a/platform/editor-ui-api/src/com/intellij/openapi/vcs/FileStatus.java +++ b/platform/editor-ui-api/src/com/intellij/openapi/vcs/FileStatus.java @@ -25,22 +25,22 @@ import java.awt.*; @SuppressWarnings("UseJBColor") public interface FileStatus { /** @deprecated use {@link FileStatus#getColor} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) Color COLOR_MERGE = new Color(117, 3, 220); /** @deprecated use {@link FileStatus#getColor} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) Color COLOR_MODIFIED = new Color(0, 50, 160); /** @deprecated use {@link FileStatus#getColor} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) Color COLOR_MISSING = Gray._97; /** @deprecated use {@link FileStatus#getColor} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) Color COLOR_OUT_OF_DATE = Color.yellow.darker().darker(); /** @deprecated use {@link FileStatus#getColor} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) Color COLOR_SWITCHED = new Color(8, 151, 143); /** @deprecated use {@link FileStatus#getColor} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) Color COLOR_UNKNOWN = new Color(153, 51, 0); FileStatus NOT_CHANGED = FileStatusFactory.getInstance().createFileStatus("NOT_CHANGED", PlatformEditorBundle diff --git a/platform/execution-impl/src/com/intellij/execution/ConsoleFolding.java b/platform/execution-impl/src/com/intellij/execution/ConsoleFolding.java index 9d9f46c0b5e1..61c9e49bf365 100644 --- a/platform/execution-impl/src/com/intellij/execution/ConsoleFolding.java +++ b/platform/execution-impl/src/com/intellij/execution/ConsoleFolding.java @@ -4,7 +4,6 @@ package com.intellij.execution; import com.intellij.execution.ui.ConsoleView; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.project.Project; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -59,8 +58,7 @@ public abstract class ConsoleFolding { * @return {@code true} if line should be folded, {@code false} if not * @deprecated since 2018.1. Use {@link #shouldFoldLine(Project, String)} instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean shouldFoldLine(@SuppressWarnings("unused") @NotNull String line) { return false; } /** @@ -68,8 +66,7 @@ public abstract class ConsoleFolding { * @return placeholder for lines * @deprecated since 2018.1. Use {@link #getPlaceholderText(Project, List)} instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @Nullable public String getPlaceholderText(@SuppressWarnings("unused") @NotNull List lines) { return null; } } diff --git a/platform/execution-impl/src/com/intellij/execution/RunManagerEx.java b/platform/execution-impl/src/com/intellij/execution/RunManagerEx.java index ef00ca344d87..f7830ac5413d 100644 --- a/platform/execution-impl/src/com/intellij/execution/RunManagerEx.java +++ b/platform/execution-impl/src/com/intellij/execution/RunManagerEx.java @@ -4,7 +4,6 @@ package com.intellij.execution; import com.intellij.execution.configurations.RunConfiguration; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -22,8 +21,7 @@ public abstract class RunManagerEx extends RunManager { /** * @deprecated Use {@link #setSelectedConfiguration(RunnerAndConfigurationSettings)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public final void setActiveConfiguration(@Nullable RunnerAndConfigurationSettings configuration) { setSelectedConfiguration(configuration); } @@ -31,8 +29,7 @@ public abstract class RunManagerEx extends RunManager { /** * @deprecated Use {@link #addConfiguration(RunnerAndConfigurationSettings)}. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public final void addConfiguration(RunnerAndConfigurationSettings settings, boolean storeInDotIdeaFolder, List tasks, @@ -77,8 +74,7 @@ public abstract class RunManagerEx extends RunManager { * @deprecated Use {@link #getAllSettings()} */ @NotNull - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public final Collection getSortedConfigurations() { return getAllSettings(); } @@ -86,8 +82,7 @@ public abstract class RunManagerEx extends RunManager { /** * @deprecated Use {@link RunManagerListener#TOPIC} instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void addRunManagerListener(@NotNull RunManagerListener listener) { } diff --git a/platform/execution-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java b/platform/execution-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java index 5702dd856587..cfc14ad5efe9 100644 --- a/platform/execution-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java +++ b/platform/execution-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java @@ -23,7 +23,6 @@ import com.intellij.ui.components.fields.ExtendableTextField; import com.intellij.util.PathUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.UIUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -116,8 +115,7 @@ public class CommonProgramParametersPanel extends JPanel implements PanelWithAnc /** * @deprecated use {@link MacroComboBoxWithBrowseButton} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected JComponent createComponentWithMacroBrowse(@NotNull final TextFieldWithBrowseButton textAccessor) { final FixedSizeButton button = new FixedSizeButton(textAccessor); button.setIcon(AllIcons.Actions.ListFiles); diff --git a/platform/execution-impl/src/com/intellij/testIntegration/TestLocationProvider.java b/platform/execution-impl/src/com/intellij/testIntegration/TestLocationProvider.java index dfb559a3a6fb..38051000d5dd 100644 --- a/platform/execution-impl/src/com/intellij/testIntegration/TestLocationProvider.java +++ b/platform/execution-impl/src/com/intellij/testIntegration/TestLocationProvider.java @@ -4,14 +4,12 @@ package com.intellij.testIntegration; import com.intellij.execution.Location; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.project.Project; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.List; /** @deprecated override SMTRunnerConsoleProperties.getTestLocator() instead */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.1") +@Deprecated(forRemoval = true) public interface TestLocationProvider { ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.testSrcLocator"); diff --git a/platform/execution/src/com/intellij/execution/BeforeRunTaskProvider.java b/platform/execution/src/com/intellij/execution/BeforeRunTaskProvider.java index 11db5ee88676..174f1298dfcf 100644 --- a/platform/execution/src/com/intellij/execution/BeforeRunTaskProvider.java +++ b/platform/execution/src/com/intellij/execution/BeforeRunTaskProvider.java @@ -8,7 +8,6 @@ import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.extensions.ProjectExtensionPointName; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -30,8 +29,7 @@ public abstract class BeforeRunTaskProvider> { /** * @deprecated Use {@link #EP_NAME} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static final ExtensionPointName>> EXTENSION_POINT_NAME = new ExtensionPointName<>("com.intellij.stepsBeforeRunProvider"); diff --git a/platform/execution/src/com/intellij/execution/CantRunException.java b/platform/execution/src/com/intellij/execution/CantRunException.java index acd032ddfa61..16504956598b 100644 --- a/platform/execution/src/com/intellij/execution/CantRunException.java +++ b/platform/execution/src/com/intellij/execution/CantRunException.java @@ -5,7 +5,6 @@ import com.intellij.openapi.module.Module; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.util.NlsContexts.DialogMessage; import com.intellij.openapi.util.text.StringUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -29,8 +28,7 @@ public class CantRunException extends ExecutionException { } /** @deprecated please use {@link #jdkMisconfigured(Sdk)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static CantRunException jdkMisconfigured(@NotNull Sdk jdk, @NotNull Module module) { return jdkMisconfigured(jdk); } diff --git a/platform/execution/src/com/intellij/execution/DefaultExecutionResult.java b/platform/execution/src/com/intellij/execution/DefaultExecutionResult.java index c47b6a571639..175b7cb48cba 100644 --- a/platform/execution/src/com/intellij/execution/DefaultExecutionResult.java +++ b/platform/execution/src/com/intellij/execution/DefaultExecutionResult.java @@ -18,7 +18,6 @@ package com.intellij.execution; import com.intellij.execution.process.ProcessHandler; import com.intellij.execution.ui.ExecutionConsole; import com.intellij.openapi.actionSystem.AnAction; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -74,8 +73,7 @@ public class DefaultExecutionResult implements ExecutionResult { /** * @deprecated unused */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public AnAction @NotNull [] getAdditionalStopActions() { return AnAction.EMPTY_ARRAY; } diff --git a/platform/execution/src/com/intellij/execution/ExecutionTarget.java b/platform/execution/src/com/intellij/execution/ExecutionTarget.java index 0e3810ec2abb..ea0c5ee794c9 100644 --- a/platform/execution/src/com/intellij/execution/ExecutionTarget.java +++ b/platform/execution/src/com/intellij/execution/ExecutionTarget.java @@ -41,8 +41,7 @@ public abstract class ExecutionTarget { /** * @deprecated implement {@link #canRun(RunConfiguration)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean canRun(@NotNull RunnerAndConfigurationSettings configuration) { return canRun(configuration.getConfiguration()); } diff --git a/platform/execution/src/com/intellij/execution/ExecutionTargetManager.java b/platform/execution/src/com/intellij/execution/ExecutionTargetManager.java index e336411bfbf8..3667f007575e 100644 --- a/platform/execution/src/com/intellij/execution/ExecutionTargetManager.java +++ b/platform/execution/src/com/intellij/execution/ExecutionTargetManager.java @@ -6,7 +6,6 @@ import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.openapi.project.Project; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.messages.Topic; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -44,8 +43,7 @@ public abstract class ExecutionTargetManager { /** * @deprecated use {@link #canRun(RunConfiguration, ExecutionTarget)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static boolean canRun(@Nullable RunnerAndConfigurationSettings settings, @Nullable ExecutionTarget target) { return canRun(settings != null ? settings.getConfiguration() : null, target); } @@ -82,8 +80,7 @@ public abstract class ExecutionTargetManager { * @deprecated Use {@link #getTargetsFor(RunConfiguration)} */ @NotNull - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public List getTargetsFor(@Nullable RunnerAndConfigurationSettings settings) { return getTargetsFor(settings == null ? null : settings.getConfiguration()); } diff --git a/platform/execution/src/com/intellij/execution/RunProfileStarter.java b/platform/execution/src/com/intellij/execution/RunProfileStarter.java index 835eaed6d33d..c54e1c9e4a0e 100644 --- a/platform/execution/src/com/intellij/execution/RunProfileStarter.java +++ b/platform/execution/src/com/intellij/execution/RunProfileStarter.java @@ -22,8 +22,7 @@ public abstract class RunProfileStarter { */ @SuppressWarnings("unused") @Nullable - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public RunContentDescriptor execute(@NotNull RunProfileState state, @NotNull ExecutionEnvironment environment) throws ExecutionException { throw new AbstractMethodError(); } diff --git a/platform/execution/src/com/intellij/execution/RunnerAndConfigurationSettings.java b/platform/execution/src/com/intellij/execution/RunnerAndConfigurationSettings.java index 9b64f3ebdac3..16afbd572b33 100644 --- a/platform/execution/src/com/intellij/execution/RunnerAndConfigurationSettings.java +++ b/platform/execution/src/com/intellij/execution/RunnerAndConfigurationSettings.java @@ -5,7 +5,6 @@ import com.intellij.execution.configurations.*; import com.intellij.execution.runners.ProgramRunner; import com.intellij.openapi.util.Factory; import com.intellij.openapi.util.NlsSafe; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -65,8 +64,7 @@ public interface RunnerAndConfigurationSettings { * @deprecated There are different ways of storing run configuration in a file, * use {@link #storeInLocalWorkspace()}, {@link #storeInDotIdeaFolder()} or {@link #storeInArbitraryFileInProject(String)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) default void setShared(boolean value) { if (value) { storeInDotIdeaFolder(); @@ -252,8 +250,7 @@ public interface RunnerAndConfigurationSettings { /** * @deprecated Use {@link RunConfiguration#isAllowRunningInParallel()} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) default boolean isSingleton() { return !getConfiguration().isAllowRunningInParallel(); } diff --git a/platform/execution/src/com/intellij/execution/configurations/RunConfigurationBase.java b/platform/execution/src/com/intellij/execution/configurations/RunConfigurationBase.java index 5a175260ab6c..dd11618e1168 100644 --- a/platform/execution/src/com/intellij/execution/configurations/RunConfigurationBase.java +++ b/platform/execution/src/com/intellij/execution/configurations/RunConfigurationBase.java @@ -350,8 +350,7 @@ public abstract class RunConfigurationBase extends UserDataHolderBase impleme /** * @deprecated Not used anymore. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected boolean isNewSerializationUsed() { return false; } diff --git a/platform/execution/src/com/intellij/execution/configurations/RunConfigurationModule.java b/platform/execution/src/com/intellij/execution/configurations/RunConfigurationModule.java index 1db0429b9193..8b219f033341 100644 --- a/platform/execution/src/com/intellij/execution/configurations/RunConfigurationModule.java +++ b/platform/execution/src/com/intellij/execution/configurations/RunConfigurationModule.java @@ -15,7 +15,6 @@ import com.intellij.util.xmlb.annotations.Attribute; import com.intellij.util.xmlb.annotations.Tag; import com.intellij.util.xmlb.annotations.Transient; import org.jdom.Element; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -66,8 +65,7 @@ public class RunConfigurationModule implements JDOMExternalizable { /** * @deprecated It is not init. It sets module to any first module if no module yet configured. Use {@link #setModuleToAnyFirstIfNotSpecified} if need. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void init() { setModuleToAnyFirstIfNotSpecified(); } diff --git a/platform/execution/src/com/intellij/execution/configurations/SimpleProgramParameters.java b/platform/execution/src/com/intellij/execution/configurations/SimpleProgramParameters.java index fdf37853406a..a1dbed043bad 100644 --- a/platform/execution/src/com/intellij/execution/configurations/SimpleProgramParameters.java +++ b/platform/execution/src/com/intellij/execution/configurations/SimpleProgramParameters.java @@ -2,7 +2,6 @@ package com.intellij.execution.configurations; import com.intellij.util.EnvironmentUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.io.File; @@ -53,8 +52,7 @@ public class SimpleProgramParameters { } /** @deprecated Use {@link #setEnv(Map)} and {@link #setPassParentEnvs(boolean)} instead with already preprocessed variables */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void setupEnvs(Map envs, boolean passDefault) { if (!envs.isEmpty()) { envs = new HashMap<>(envs); diff --git a/platform/execution/src/com/intellij/execution/rmi/RemoteProcessSupport.java b/platform/execution/src/com/intellij/execution/rmi/RemoteProcessSupport.java index be82d15ca65c..6be25527408b 100644 --- a/platform/execution/src/com/intellij/execution/rmi/RemoteProcessSupport.java +++ b/platform/execution/src/com/intellij/execution/rmi/RemoteProcessSupport.java @@ -22,7 +22,6 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ExceptionUtil; import com.intellij.util.ObjectUtils; import com.intellij.util.concurrency.AppExecutorUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; @@ -142,8 +141,7 @@ public abstract class RemoteProcessSupport { @deprecated * use acquire(Target, Parameters, ProgressIndicator) */ - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") - @Deprecated + @Deprecated(forRemoval = true) public EntryPoint acquire(@NotNull Target target, @NotNull Parameters configuration) throws Exception { return acquire(target, configuration, null); } diff --git a/platform/execution/src/com/intellij/execution/ui/layout/LayoutViewOptions.java b/platform/execution/src/com/intellij/execution/ui/layout/LayoutViewOptions.java index cc0d3ff296c9..55408aa99e67 100644 --- a/platform/execution/src/com/intellij/execution/ui/layout/LayoutViewOptions.java +++ b/platform/execution/src/com/intellij/execution/ui/layout/LayoutViewOptions.java @@ -6,7 +6,6 @@ import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.util.Pair; import com.intellij.ui.content.Content; import com.intellij.util.Producer; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -23,8 +22,7 @@ public interface LayoutViewOptions { * @deprecated use {@link #setTopLeftToolbar(ActionGroup, String)} */ @NotNull - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) LayoutViewOptions setTopToolbar(@NotNull ActionGroup actions, @NotNull String place); @NotNull diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/ExternalSystemManager.java b/platform/external-system-api/src/com/intellij/openapi/externalSystem/ExternalSystemManager.java index e50d92e096e3..5b2ef81350c5 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/ExternalSystemManager.java +++ b/platform/external-system-api/src/com/intellij/openapi/externalSystem/ExternalSystemManager.java @@ -19,7 +19,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.util.Function; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -107,8 +106,7 @@ public interface ExternalSystemManager< * for your {@link com.intellij.openapi.externalSystem.service.execution.ExternalSystemRunConfiguration} instead */ @Nullable - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2020.1") + @Deprecated(forRemoval = true) default Object createTestConsoleProperties(@NotNull Project project, @NotNull Executor executor, @NotNull RunConfiguration runConfiguration) { diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ModuleData.java b/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ModuleData.java index 1854401b3e74..42c50ba9563b 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ModuleData.java +++ b/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ModuleData.java @@ -7,7 +7,6 @@ import com.intellij.openapi.util.NlsSafe; import com.intellij.serialization.Property; import com.intellij.serialization.PropertyMapping; import com.intellij.util.ArrayUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -216,8 +215,7 @@ public class ModuleData extends AbstractNamedData implements Named, ExternalConf * @deprecated use {@link JavaModuleData#getLanguageLevel} instead */ @Nullable - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.1") + @Deprecated(forRemoval = true) public String getSourceCompatibility() { return sourceCompatibility; } @@ -225,8 +223,7 @@ public class ModuleData extends AbstractNamedData implements Named, ExternalConf /** * @deprecated use {@link JavaModuleData#setLanguageLevel} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.1") + @Deprecated(forRemoval = true) public void setSourceCompatibility(@Nullable String sourceCompatibility) { this.isSetSourceCompatibility = true; this.sourceCompatibility = sourceCompatibility; @@ -236,8 +233,7 @@ public class ModuleData extends AbstractNamedData implements Named, ExternalConf * @deprecated use {@link JavaModuleData#getTargetBytecodeVersion} instead */ @Nullable - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.1") + @Deprecated(forRemoval = true) public String getTargetCompatibility() { return targetCompatibility; } @@ -245,8 +241,7 @@ public class ModuleData extends AbstractNamedData implements Named, ExternalConf /** * @deprecated use {@link JavaModuleData#setTargetBytecodeVersion} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.1") + @Deprecated(forRemoval = true) public void setTargetCompatibility(@Nullable String targetCompatibility) { this.isSetTargetCompatibility = true; this.targetCompatibility = targetCompatibility; @@ -256,8 +251,7 @@ public class ModuleData extends AbstractNamedData implements Named, ExternalConf * @deprecated use {@link ModuleSdkData#getSdkName} instead */ @Nullable - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.1") + @Deprecated(forRemoval = true) public String getSdkName() { return sdkName; } @@ -265,8 +259,7 @@ public class ModuleData extends AbstractNamedData implements Named, ExternalConf /** * @deprecated use {@link ModuleSdkData#setSdkName} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.1") + @Deprecated(forRemoval = true) public void setSdkName(@Nullable String sdkName) { this.isSetSdkName = true; this.sdkName = sdkName; @@ -274,43 +267,37 @@ public class ModuleData extends AbstractNamedData implements Named, ExternalConf // Remove it in version 2021.1 // - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.1") + @Deprecated(forRemoval = true) @SuppressWarnings({"MissingDeprecatedAnnotation", "DeprecatedIsStillUsed"}) public void internalSetSourceCompatibility(@Nullable String sourceCompatibility) { this.sourceCompatibility = sourceCompatibility; } - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.1") + @Deprecated(forRemoval = true) @SuppressWarnings({"MissingDeprecatedAnnotation", "DeprecatedIsStillUsed"}) public void internalSetTargetCompatibility(@Nullable String targetCompatibility) { this.targetCompatibility = targetCompatibility; } - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.1") + @Deprecated(forRemoval = true) @SuppressWarnings({"MissingDeprecatedAnnotation", "DeprecatedIsStillUsed"}) public void internalSetSdkName(@Nullable String sdkName) { this.sdkName = sdkName; } - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.1") + @Deprecated(forRemoval = true) @SuppressWarnings("MissingDeprecatedAnnotation") public boolean isSetSourceCompatibility() { return isSetSourceCompatibility; } - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.1") + @Deprecated(forRemoval = true) @SuppressWarnings("MissingDeprecatedAnnotation") public boolean isSetTargetCompatibility() { return isSetTargetCompatibility; } - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.1") + @Deprecated(forRemoval = true) @SuppressWarnings({"MissingDeprecatedAnnotation", "DeprecatedIsStillUsed"}) public boolean isSetSdkName() { return isSetSdkName; diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/task/ExternalSystemTaskNotificationListener.java b/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/task/ExternalSystemTaskNotificationListener.java index ec00420eedae..7bffe568ef8b 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/task/ExternalSystemTaskNotificationListener.java +++ b/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/task/ExternalSystemTaskNotificationListener.java @@ -1,7 +1,6 @@ package com.intellij.openapi.externalSystem.model.task; import com.intellij.openapi.extensions.ExtensionPointName; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.EventListener; @@ -29,8 +28,7 @@ public interface ExternalSystemTaskNotificationListener extends EventListener { /** * @deprecated use {@link #onStart(ExternalSystemTaskId, String)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2020.3") + @Deprecated(forRemoval = true) void onStart(@NotNull ExternalSystemTaskId id); /** diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/task/ExternalSystemTaskNotificationListenerAdapter.java b/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/task/ExternalSystemTaskNotificationListenerAdapter.java index 642c62144355..c5b36e524d22 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/task/ExternalSystemTaskNotificationListenerAdapter.java +++ b/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/task/ExternalSystemTaskNotificationListenerAdapter.java @@ -1,7 +1,6 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.externalSystem.model.task; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -37,8 +36,7 @@ public abstract class ExternalSystemTaskNotificationListenerAdapter implements E * @deprecated use {@link #onStart(ExternalSystemTaskId, String)} */ @Override - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2020.3") + @Deprecated(forRemoval = true) public void onStart(@NotNull ExternalSystemTaskId id) { if (myDelegate != null) { myDelegate.onStart(id); diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/AbstractExternalSystemLocalSettings.java b/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/AbstractExternalSystemLocalSettings.java index 0d7d50b37d91..d23fafe43370 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/AbstractExternalSystemLocalSettings.java +++ b/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/AbstractExternalSystemLocalSettings.java @@ -13,7 +13,6 @@ import com.intellij.openapi.project.Project; import com.intellij.util.SmartList; import com.intellij.util.containers.CollectionFactory; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -166,8 +165,7 @@ public abstract class AbstractExternalSystemLocalSettings { private static final int MAX_PATH_LENGTH = 50; @@ -174,8 +173,7 @@ public final class ExternalSystemJdkComboBox extends ComboBoxWithWidePopup dataId2data, @Nullable DataContext parent) { return new SimpleDataContext(dataId2data, parent); } /** @deprecated use {@link SimpleDataContext#getSimpleContext(DataKey, Object)} instead. */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) @NotNull public static DataContext getSimpleContext(@NotNull String dataId, @NotNull Object data) { return getSimpleContext(dataId, data, null); diff --git a/platform/ide-core-impl/src/com/intellij/openapi/fileEditor/impl/NonProjectFileWritingAccessProvider.java b/platform/ide-core-impl/src/com/intellij/openapi/fileEditor/impl/NonProjectFileWritingAccessProvider.java index e50c1620dd67..cd1560fbe232 100644 --- a/platform/ide-core-impl/src/com/intellij/openapi/fileEditor/impl/NonProjectFileWritingAccessProvider.java +++ b/platform/ide-core-impl/src/com/intellij/openapi/fileEditor/impl/NonProjectFileWritingAccessProvider.java @@ -23,7 +23,6 @@ import com.intellij.openapi.vfs.ex.temp.TempFileSystemMarker; import com.intellij.project.ProjectKt; import com.intellij.util.NullableFunction; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; @@ -159,8 +158,7 @@ public class NonProjectFileWritingAccessProvider extends WritingAccessProvider { /** * @deprecated use {@link #allowWriting(Iterable)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static void allowWriting(VirtualFile... allowedFiles) { allowWriting(Arrays.asList(allowedFiles)); } diff --git a/platform/ide-core-impl/src/com/intellij/openapi/project/ex/ProjectManagerEx.java b/platform/ide-core-impl/src/com/intellij/openapi/project/ex/ProjectManagerEx.java index 783f19dd0c0f..4f6b75cfe97b 100644 --- a/platform/ide-core-impl/src/com/intellij/openapi/project/ex/ProjectManagerEx.java +++ b/platform/ide-core-impl/src/com/intellij/openapi/project/ex/ProjectManagerEx.java @@ -32,8 +32,7 @@ public abstract class ProjectManagerEx extends ProjectManager { /** * @deprecated Pass {@code projectName} using {@link OpenProjectTask#projectName}. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public final @Nullable Project newProject(@NotNull Path file, @Nullable String projectName, @NotNull OpenProjectTask options) { return newProject(file, projectName == null ? options : options.withProjectName(projectName)); } diff --git a/platform/ide-core/src/com/intellij/CommonBundle.java b/platform/ide-core/src/com/intellij/CommonBundle.java index 68894ea8c5f2..71f9359b880c 100644 --- a/platform/ide-core/src/com/intellij/CommonBundle.java +++ b/platform/ide-core/src/com/intellij/CommonBundle.java @@ -80,8 +80,7 @@ public final class CommonBundle extends DynamicBundle { /** * @deprecated Use more informative title instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.2") + @Deprecated(forRemoval = true) public static @DialogTitle String getWarningTitle() { return message("title.warning"); } diff --git a/platform/ide-core/src/com/intellij/facet/frameworks/beans/Artifact.java b/platform/ide-core/src/com/intellij/facet/frameworks/beans/Artifact.java index 1821ea11700a..0fc271c5b34e 100644 --- a/platform/ide-core/src/com/intellij/facet/frameworks/beans/Artifact.java +++ b/platform/ide-core/src/com/intellij/facet/frameworks/beans/Artifact.java @@ -10,10 +10,9 @@ import org.jetbrains.annotations.ApiStatus; /** * @deprecated this class will be removed from open API in IDEA 11. Use {@link com.intellij.util.download.DownloadableFileService} instead */ -@Deprecated +@Deprecated(forRemoval = true) @ApiStatus.Internal @Tag("artifact") -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") public class Artifact { public static final Artifact[] EMPTY_ARRAY = new Artifact[0]; diff --git a/platform/ide-core/src/com/intellij/ide/RecentProjectsManager.java b/platform/ide-core/src/com/intellij/ide/RecentProjectsManager.java index 19e0a6571c8f..2a58966bd523 100644 --- a/platform/ide-core/src/com/intellij/ide/RecentProjectsManager.java +++ b/platform/ide-core/src/com/intellij/ide/RecentProjectsManager.java @@ -45,8 +45,7 @@ public abstract class RecentProjectsManager { /** * @deprecated Use {@link RecentProjectListActionProvider#getActions} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public AnAction @NotNull [] getRecentProjectsActions(boolean addClearListItem, boolean useGroups) { return getRecentProjectsActions(addClearListItem); } diff --git a/platform/ide-core/src/com/intellij/ide/dnd/DnDSource.java b/platform/ide-core/src/com/intellij/ide/dnd/DnDSource.java index cf3a7f75a50e..95bae7a9d538 100644 --- a/platform/ide-core/src/com/intellij/ide/dnd/DnDSource.java +++ b/platform/ide-core/src/com/intellij/ide/dnd/DnDSource.java @@ -2,7 +2,6 @@ package com.intellij.ide.dnd; import com.intellij.openapi.util.Pair; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -33,8 +32,7 @@ public interface DnDSource extends DnDDropActionHandler { /** * @deprecated override {@link DnDSource#createDraggedImage(DnDAction, Point, DnDDragStartBean)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @Nullable default Pair createDraggedImage(DnDAction action, Point dragOrigin) { return null; diff --git a/platform/ide-core/src/com/intellij/notification/Notifications.java b/platform/ide-core/src/com/intellij/notification/Notifications.java index 5aed5d6bbbd5..0d598df29a03 100644 --- a/platform/ide-core/src/com/intellij/notification/Notifications.java +++ b/platform/ide-core/src/com/intellij/notification/Notifications.java @@ -51,8 +51,7 @@ public interface Notifications { * * @deprecated use {@link NotificationGroup} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static void register(@NotNull String groupId, @NotNull NotificationDisplayType defaultDisplayType) { if (ApplicationManager.getApplication().isUnitTestMode()) return; SwingUtilities.invokeLater(() -> { diff --git a/platform/ide-core/src/com/intellij/openapi/actionSystem/TypeSafeDataProvider.java b/platform/ide-core/src/com/intellij/openapi/actionSystem/TypeSafeDataProvider.java index c3e2a96f0937..d51ac234d67a 100644 --- a/platform/ide-core/src/com/intellij/openapi/actionSystem/TypeSafeDataProvider.java +++ b/platform/ide-core/src/com/intellij/openapi/actionSystem/TypeSafeDataProvider.java @@ -2,15 +2,13 @@ package com.intellij.openapi.actionSystem; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** * @deprecated This API proved to be rather inconvenient * @see DataProvider */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.1") +@Deprecated(forRemoval = true) public interface TypeSafeDataProvider { void calcData(@NotNull DataKey key, @NotNull DataSink sink); } diff --git a/platform/ide-core/src/com/intellij/openapi/fileTypes/FileTypeManager.java b/platform/ide-core/src/com/intellij/openapi/fileTypes/FileTypeManager.java index 4ca7963820ae..1075e7f2fc91 100644 --- a/platform/ide-core/src/com/intellij/openapi/fileTypes/FileTypeManager.java +++ b/platform/ide-core/src/com/intellij/openapi/fileTypes/FileTypeManager.java @@ -7,7 +7,6 @@ import com.intellij.openapi.application.CachedSingletonsRegistry; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.messages.Topic; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jps.model.fileTypes.FileNameMatcherFactory; @@ -41,7 +40,6 @@ public abstract class FileTypeManager extends FileTypeRegistry { /** @deprecated use {@code com.intellij.fileType} extension point instead */ @Deprecated(forRemoval = true) - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") public abstract void registerFileType(@NotNull FileType type, String @Nullable ... defaultAssociatedExtensions); /** @@ -55,7 +53,6 @@ public abstract class FileTypeManager extends FileTypeRegistry { /** @deprecated obsolete - file type associations aren't limited to mere extensions list (see {@link #getAssociations}) */ @Deprecated(forRemoval = true) - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") public abstract String @NotNull [] getAssociatedExtensions(@NotNull FileType type); public abstract @NotNull List getAssociations(@NotNull FileType type); diff --git a/platform/ide-core/src/com/intellij/openapi/fileTypes/StdFileTypes.java b/platform/ide-core/src/com/intellij/openapi/fileTypes/StdFileTypes.java index 01d8c0bf4af2..636291043811 100644 --- a/platform/ide-core/src/com/intellij/openapi/fileTypes/StdFileTypes.java +++ b/platform/ide-core/src/com/intellij/openapi/fileTypes/StdFileTypes.java @@ -4,7 +4,6 @@ package com.intellij.openapi.fileTypes; import com.intellij.ide.highlighter.ModuleFileType; import com.intellij.ide.highlighter.ProjectFileType; import com.intellij.ide.highlighter.WorkspaceFileType; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -30,15 +29,13 @@ public final class StdFileTypes extends FileTypes { /** * @deprecated use {@link com.intellij.jsp.highlighter.NewJspFileType#INSTANCE} instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static volatile LanguageFileType JSP = (LanguageFileType)FileTypeManager.getInstance().getStdFileType("JSP"); /** * @deprecated use {@link com.intellij.jsp.highlighter.JspxFileType#INSTANCE} instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static volatile LanguageFileType JSPX = (LanguageFileType)FileTypeManager.getInstance().getStdFileType("JSPX"); /** @@ -50,8 +47,7 @@ public final class StdFileTypes extends FileTypes { /** * @deprecated use {@link com.intellij.ide.highlighter.DTDFileType#INSTANCE} instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static volatile LanguageFileType DTD = (LanguageFileType)FileTypeManager.getInstance().getStdFileType("DTD"); /** @@ -63,8 +59,7 @@ public final class StdFileTypes extends FileTypes { /** * @deprecated use {@link com.intellij.ide.highlighter.XHtmlFileType#INSTANCE} instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static volatile LanguageFileType XHTML = (LanguageFileType)FileTypeManager.getInstance().getStdFileType("XHTML"); /** @@ -77,36 +72,31 @@ public final class StdFileTypes extends FileTypes { /** * @deprecated use {@link com.intellij.lang.properties.PropertiesFileType#INSTANCE} instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static volatile LanguageFileType PROPERTIES = (LanguageFileType)FileTypeManager.getInstance().getStdFileType("Properties"); /** * @deprecated use {@link com.intellij.uiDesigner.GuiFormFileType#INSTANCE} instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static volatile FileType GUI_DESIGNER_FORM = FileTypeManager.getInstance().getStdFileType("GUI_DESIGNER_FORM"); /** * @deprecated use {@link WorkspaceFileType#INSTANCE} instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static volatile FileType IDEA_WORKSPACE = FileTypeManager.getInstance().getStdFileType("IDEA_WORKSPACE"); /** * @deprecated use {@link ProjectFileType#INSTANCE} instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static volatile FileType IDEA_PROJECT = FileTypeManager.getInstance().getStdFileType("IDEA_PROJECT"); /** * @deprecated use {@link ModuleFileType#INSTANCE} instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static volatile FileType IDEA_MODULE = FileTypeManager.getInstance().getStdFileType("IDEA_MODULE"); diff --git a/platform/ide-core/src/com/intellij/openapi/options/ConfigurableEP.java b/platform/ide-core/src/com/intellij/openapi/options/ConfigurableEP.java index 647d8e35c78a..89cc76adcdd8 100644 --- a/platform/ide-core/src/com/intellij/openapi/options/ConfigurableEP.java +++ b/platform/ide-core/src/com/intellij/openapi/options/ConfigurableEP.java @@ -16,7 +16,6 @@ import com.intellij.openapi.util.NlsContexts; import com.intellij.openapi.util.NotNullLazyValue; import com.intellij.serviceContainer.NonInjectable; import com.intellij.util.xmlb.annotations.*; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -233,8 +232,7 @@ public class ConfigurableEP implements PluginAwar /** * @deprecated use '{@link #instanceClass instance}' or '{@link #providerClass provider}' attribute instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @Attribute("implementation") public String implementationClass; diff --git a/platform/ide-core/src/com/intellij/openapi/ui/popup/JBPopupListener.java b/platform/ide-core/src/com/intellij/openapi/ui/popup/JBPopupListener.java index cb8c48366551..d6ab6b12a1ee 100644 --- a/platform/ide-core/src/com/intellij/openapi/ui/popup/JBPopupListener.java +++ b/platform/ide-core/src/com/intellij/openapi/ui/popup/JBPopupListener.java @@ -1,7 +1,6 @@ // Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.ui.popup; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; public interface JBPopupListener { @@ -14,8 +13,7 @@ public interface JBPopupListener { /** * @deprecated Use {@link JBPopupListener} directly. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) class Adapter implements JBPopupListener { } } diff --git a/platform/ide-core/src/com/intellij/openapi/vcs/FilePath.java b/platform/ide-core/src/com/intellij/openapi/vcs/FilePath.java index 82eaef306161..8d51c8b3f47a 100644 --- a/platform/ide-core/src/com/intellij/openapi/vcs/FilePath.java +++ b/platform/ide-core/src/com/intellij/openapi/vcs/FilePath.java @@ -6,7 +6,6 @@ import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.NlsSafe; import com.intellij.openapi.vfs.VirtualFile; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.SystemIndependent; @@ -56,8 +55,7 @@ public interface FilePath { * @deprecated to remove in IDEA 16. * Use {@link com.intellij.openapi.fileEditor.FileDocumentManager#getDocument(VirtualFile)} directly. */ - @ApiStatus.ScheduledForRemoval(inVersion = "2021.2") - @Deprecated + @Deprecated(forRemoval = true) @Nullable Document getDocument(); @@ -80,16 +78,14 @@ public interface FilePath { * @deprecated to remove in IDEA 16. * Use {@link com.intellij.openapi.vfs.VfsUtil#findFileByIoFile} or {@link com.intellij.openapi.vfs.LocalFileSystem#findFileByPath} instead. */ - @ApiStatus.ScheduledForRemoval(inVersion = "2021.2") - @Deprecated + @Deprecated(forRemoval = true) void refresh(); /** * @deprecated to remove in IDEA 16. * Use {@link com.intellij.openapi.vfs.LocalFileSystem#refreshAndFindFileByPath} instead. */ - @ApiStatus.ScheduledForRemoval(inVersion = "2021.2") - @Deprecated + @Deprecated(forRemoval = true) void hardRefresh(); /** diff --git a/platform/ide-core/src/com/intellij/openapi/wm/StatusBar.java b/platform/ide-core/src/com/intellij/openapi/wm/StatusBar.java index 9361b9052792..9907806f7c5d 100644 --- a/platform/ide-core/src/com/intellij/openapi/wm/StatusBar.java +++ b/platform/ide-core/src/com/intellij/openapi/wm/StatusBar.java @@ -62,8 +62,7 @@ public interface StatusBar extends StatusBarInfo, Disposable { * * @deprecated Use {@link StatusBarWidgetFactory} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) void addWidget(@NotNull StatusBarWidget widget); /** @@ -71,8 +70,7 @@ public interface StatusBar extends StatusBarInfo, Disposable { * * @deprecated Use {@link StatusBarWidgetFactory} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) void addWidget(@NotNull StatusBarWidget widget, @NonNls @NotNull String anchor); /** @@ -97,15 +95,13 @@ public interface StatusBar extends StatusBarInfo, Disposable { /** * @deprecated Use {@link StatusBarWidgetFactory} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) void addCustomIndicationComponent(@NotNull JComponent c); /** * @deprecated Use {@link StatusBarWidgetFactory} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) void removeCustomIndicationComponent(@NotNull JComponent c); /** diff --git a/platform/ide-core/src/com/intellij/openapi/wm/StatusBarWidget.java b/platform/ide-core/src/com/intellij/openapi/wm/StatusBarWidget.java index 3873f2777604..4130567c16c4 100644 --- a/platform/ide-core/src/com/intellij/openapi/wm/StatusBarWidget.java +++ b/platform/ide-core/src/com/intellij/openapi/wm/StatusBarWidget.java @@ -21,8 +21,7 @@ public interface StatusBarWidget extends Disposable { /** * @deprecated do not use it */ - @ApiStatus.ScheduledForRemoval(inVersion = "2020.2") - @Deprecated + @Deprecated(forRemoval = true) enum PlatformType { DEFAULT, MAC } @@ -38,8 +37,7 @@ public interface StatusBarWidget extends Disposable { /** * @deprecated use this{@link #getPresentation()} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2020.2") - @Deprecated + @Deprecated(forRemoval = true) @Nullable default WidgetPresentation getPresentation(@NotNull PlatformType type) { return null; @@ -78,8 +76,7 @@ public interface StatusBarWidget extends Disposable { * @deprecated unused */ @NotNull - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2020.2") + @Deprecated(forRemoval = true) default String getMaxPossibleText() { return ""; } float getAlignment(); @@ -96,8 +93,7 @@ public interface StatusBarWidget extends Disposable { * @deprecated unused */ @NotNull - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2020.2") + @Deprecated(forRemoval = true) default String getMaxValue() { return ""; } @Nullable diff --git a/platform/ide-core/src/com/intellij/openapi/wm/ToolWindowId.java b/platform/ide-core/src/com/intellij/openapi/wm/ToolWindowId.java index 46589bd26498..6c4598112546 100644 --- a/platform/ide-core/src/com/intellij/openapi/wm/ToolWindowId.java +++ b/platform/ide-core/src/com/intellij/openapi/wm/ToolWindowId.java @@ -1,8 +1,6 @@ // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.wm; -import org.jetbrains.annotations.ApiStatus; - public interface ToolWindowId { String COMMANDER = "Commander"; String MESSAGES_WINDOW = "Messages"; @@ -17,8 +15,7 @@ public interface ToolWindowId { /** * @deprecated Use {@link com.intellij.analysis.problemsView.toolWindow.ProblemsView} */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) String INSPECTION = "Inspection Results"; String FIND = "Find"; diff --git a/platform/ide-core/src/com/intellij/util/download/DownloadableFileService.java b/platform/ide-core/src/com/intellij/util/download/DownloadableFileService.java index ab9e729fb68c..1bb7991ea55f 100644 --- a/platform/ide-core/src/com/intellij/util/download/DownloadableFileService.java +++ b/platform/ide-core/src/com/intellij/util/download/DownloadableFileService.java @@ -39,8 +39,7 @@ public abstract class DownloadableFileService { /** * @deprecated use {@link #createDownloader(List, String)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @NotNull public abstract FileDownloader createDownloader(List fileDescriptions, @Nullable Project project, JComponent parent, @NotNull String presentableDownloadName); diff --git a/platform/ide-core/src/com/intellij/util/download/FileDownloader.java b/platform/ide-core/src/com/intellij/util/download/FileDownloader.java index 1ae6cc7d582c..8dbd7cea0d90 100644 --- a/platform/ide-core/src/com/intellij/util/download/FileDownloader.java +++ b/platform/ide-core/src/com/intellij/util/download/FileDownloader.java @@ -59,15 +59,13 @@ public interface FileDownloader { /** * @deprecated specify target directory in {@link #downloadWithProgress} or {@link #downloadFilesWithProgress} method instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @NotNull FileDownloader toDirectory(@NotNull String directoryForDownloadedFilesPath); /** * @deprecated use {@link #downloadFilesWithProgress} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) VirtualFile @Nullable [] download(); } \ No newline at end of file diff --git a/platform/indexing-api/src/com/intellij/find/FindModel.java b/platform/indexing-api/src/com/intellij/find/FindModel.java index 0e2a9e8e63ca..30054d67606f 100644 --- a/platform/indexing-api/src/com/intellij/find/FindModel.java +++ b/platform/indexing-api/src/com/intellij/find/FindModel.java @@ -9,7 +9,6 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.search.SearchScope; import com.intellij.util.PatternUtil; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -502,8 +501,7 @@ public class FindModel extends UserDataHolderBase implements Cloneable { * @param showInNewTab the value of the Open in New Tab flag. * @deprecated and not used anymore */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void setOpenInNewTab(boolean showInNewTab) { } @@ -513,8 +511,7 @@ public class FindModel extends UserDataHolderBase implements Cloneable { * @return true if Open in New Tab is enabled, false otherwise. * @deprecated and not used anymore */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean isOpenInNewTabEnabled() { return true; } @@ -525,16 +522,14 @@ public class FindModel extends UserDataHolderBase implements Cloneable { * @param showInNewTabEnabled true if Open in New Tab is enabled, false otherwise. * @deprecated and not used anymore */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void setOpenInNewTabEnabled(boolean showInNewTabEnabled) { } /** * @deprecated and not used anymore */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean isOpenInNewTabVisible() { return true; } @@ -542,8 +537,7 @@ public class FindModel extends UserDataHolderBase implements Cloneable { /** * @deprecated and not used anymore */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void setOpenInNewTabVisible(boolean showInNewTabVisible) { } diff --git a/platform/indexing-api/src/com/intellij/psi/impl/cache/CacheManager.java b/platform/indexing-api/src/com/intellij/psi/impl/cache/CacheManager.java index 9f161acbf472..f1c2e2c2c139 100644 --- a/platform/indexing-api/src/com/intellij/psi/impl/cache/CacheManager.java +++ b/platform/indexing-api/src/com/intellij/psi/impl/cache/CacheManager.java @@ -10,7 +10,6 @@ import com.intellij.psi.search.PsiSearchHelper; import com.intellij.psi.search.UsageSearchContext; import com.intellij.util.Processor; import org.intellij.lang.annotations.MagicConstant; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -34,8 +33,7 @@ public interface CacheManager { /** * @deprecated use {@link CacheManager#getInstance(Project)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static CacheManager getInstance(Project project) { return project.getService(CacheManager.class); } diff --git a/platform/indexing-api/src/com/intellij/psi/search/ProjectAndLibrariesScope.java b/platform/indexing-api/src/com/intellij/psi/search/ProjectAndLibrariesScope.java index 13980917b4b3..4da5f7f6cf6d 100644 --- a/platform/indexing-api/src/com/intellij/psi/search/ProjectAndLibrariesScope.java +++ b/platform/indexing-api/src/com/intellij/psi/search/ProjectAndLibrariesScope.java @@ -9,7 +9,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.*; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.indexing.IndexingBundle; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; @@ -32,8 +31,7 @@ public class ProjectAndLibrariesScope extends GlobalSearchScope { /** * @deprecated use {@link #ProjectAndLibrariesScope(Project)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public ProjectAndLibrariesScope(Project project, boolean searchOutsideRootModel) { this(project); } diff --git a/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java b/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java index 086a34743639..617119520527 100644 --- a/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java +++ b/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java @@ -9,7 +9,6 @@ import com.intellij.psi.PsiReference; import com.intellij.psi.search.*; import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.*; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -83,8 +82,7 @@ public final class ReferencesSearch extends ExtensibleQueryFactory indexId) { @@ -344,8 +343,7 @@ public abstract class FileBasedIndex { } /** @deprecated inline true */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static final boolean ourEnableTracingOfKeyHashToVirtualFileMapping = true; @ApiStatus.Internal diff --git a/platform/indexing-api/src/com/intellij/util/indexing/PsiDependentIndex.java b/platform/indexing-api/src/com/intellij/util/indexing/PsiDependentIndex.java index 495ebb7ea9b4..9758c9c1583a 100644 --- a/platform/indexing-api/src/com/intellij/util/indexing/PsiDependentIndex.java +++ b/platform/indexing-api/src/com/intellij/util/indexing/PsiDependentIndex.java @@ -15,14 +15,11 @@ */ package com.intellij.util.indexing; -import org.jetbrains.annotations.ApiStatus; - /** * Marker interface of index that is built from PSI, meaning its invalidation will happen upon producing new PSI. * * @deprecated because all content-aware indices are PSI dependent. */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public interface PsiDependentIndex { } diff --git a/platform/indexing-api/src/com/intellij/util/indexing/ScalarIndexExtension.java b/platform/indexing-api/src/com/intellij/util/indexing/ScalarIndexExtension.java index 1858f6b48b11..1ab547a5420c 100644 --- a/platform/indexing-api/src/com/intellij/util/indexing/ScalarIndexExtension.java +++ b/platform/indexing-api/src/com/intellij/util/indexing/ScalarIndexExtension.java @@ -18,8 +18,7 @@ public abstract class ScalarIndexExtension extends FileBasedIndexExtension VOID_DATA_EXTERNALIZER = VoidDataExternalizer.INSTANCE; @NotNull diff --git a/platform/indexing-impl/src/com/intellij/psi/stubs/SerializationManagerEx.java b/platform/indexing-impl/src/com/intellij/psi/stubs/SerializationManagerEx.java index 885f61acc169..0bc7167edeaa 100644 --- a/platform/indexing-impl/src/com/intellij/psi/stubs/SerializationManagerEx.java +++ b/platform/indexing-impl/src/com/intellij/psi/stubs/SerializationManagerEx.java @@ -40,8 +40,7 @@ public abstract class SerializationManagerEx implements StubTreeSerializer { * @deprecated use {@link SerializationManagerEx#repairNameStorage(Exception)} * with specified corruption cause */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void repairNameStorage() { repairNameStorage(new Exception()); } diff --git a/platform/indexing-impl/src/com/intellij/util/xml/NanoXmlUtil.java b/platform/indexing-impl/src/com/intellij/util/xml/NanoXmlUtil.java index a85eeb04d7a2..4069dbf11df7 100644 --- a/platform/indexing-impl/src/com/intellij/util/xml/NanoXmlUtil.java +++ b/platform/indexing-impl/src/com/intellij/util/xml/NanoXmlUtil.java @@ -9,7 +9,6 @@ import com.intellij.psi.PsiFile; import com.intellij.util.containers.Stack; import com.intellij.util.text.CharSequenceReader; import net.n3.nanoxml.*; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -125,8 +124,7 @@ public final class NanoXmlUtil { /** * @deprecated left for API compatibility */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static abstract class IXMLBuilderAdapter implements NanoXmlBuilder { /** diff --git a/platform/lang-api/src/com/intellij/application/options/IndentOptionsEditor.java b/platform/lang-api/src/com/intellij/application/options/IndentOptionsEditor.java index 7ceeb25117e4..5ea06e59af2f 100644 --- a/platform/lang-api/src/com/intellij/application/options/IndentOptionsEditor.java +++ b/platform/lang-api/src/com/intellij/application/options/IndentOptionsEditor.java @@ -10,7 +10,6 @@ import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider; import com.intellij.ui.OptionGroup; import com.intellij.ui.components.fields.IntegerField; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -73,8 +72,7 @@ public class IndentOptionsEditor extends OptionGroup implements CodeStyleSetting /** * @deprecated Use {@link #createIndentTextField(String, int, int, int)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected JTextField createIndentTextField() { return createIndentTextField(null, Integer.MIN_VALUE, Integer.MAX_VALUE, 0); } diff --git a/platform/lang-api/src/com/intellij/codeInsight/completion/AlwaysFocusLookup.java b/platform/lang-api/src/com/intellij/codeInsight/completion/AlwaysFocusLookup.java index 3d3486fbf9f6..716f68689c71 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/completion/AlwaysFocusLookup.java +++ b/platform/lang-api/src/com/intellij/codeInsight/completion/AlwaysFocusLookup.java @@ -15,12 +15,9 @@ */ package com.intellij.codeInsight.completion; -import org.jetbrains.annotations.ApiStatus; - /** * @deprecated does nothing */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.1") +@Deprecated(forRemoval = true) public class AlwaysFocusLookup extends CompletionConfidence { } diff --git a/platform/lang-api/src/com/intellij/codeInsight/completion/UnfocusedNameIdentifier.java b/platform/lang-api/src/com/intellij/codeInsight/completion/UnfocusedNameIdentifier.java index 2678bca1ee5c..2d3e06e4aa9a 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/completion/UnfocusedNameIdentifier.java +++ b/platform/lang-api/src/com/intellij/codeInsight/completion/UnfocusedNameIdentifier.java @@ -15,12 +15,9 @@ */ package com.intellij.codeInsight.completion; -import org.jetbrains.annotations.ApiStatus; - /** * @deprecated does nothing */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.1") +@Deprecated(forRemoval = true) public class UnfocusedNameIdentifier extends CompletionConfidence { } diff --git a/platform/lang-api/src/com/intellij/codeInsight/completion/ml/ContextFeatureProvider.java b/platform/lang-api/src/com/intellij/codeInsight/completion/ml/ContextFeatureProvider.java index 2a669f8bde40..c829fa6ff2d9 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/completion/ml/ContextFeatureProvider.java +++ b/platform/lang-api/src/com/intellij/codeInsight/completion/ml/ContextFeatureProvider.java @@ -39,8 +39,7 @@ public interface ContextFeatureProvider { * @deprecated Use {@link #calculateFeatures(CompletionEnvironment)} instead */ @NotNull - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) default Map calculateFeatures(@NotNull Lookup lookup) { return Collections.emptyMap(); } diff --git a/platform/lang-api/src/com/intellij/codeInsight/daemon/LineMarkerProviders.java b/platform/lang-api/src/com/intellij/codeInsight/daemon/LineMarkerProviders.java index c102834fa639..82c367397b4c 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/daemon/LineMarkerProviders.java +++ b/platform/lang-api/src/com/intellij/codeInsight/daemon/LineMarkerProviders.java @@ -6,7 +6,6 @@ import com.intellij.lang.LanguageExtensionPoint; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.Service; import com.intellij.openapi.extensions.ExtensionPointName; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @Service @@ -16,8 +15,7 @@ public final class LineMarkerProviders extends LanguageExtension extends MergeableLi /** * @deprecated Use {@link #RelatedItemLineMarkerInfo(PsiElement, TextRange, Icon, Function, GutterIconNavigationHandler, GutterIconRenderer.Alignment, NotNullFactory)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public RelatedItemLineMarkerInfo(@NotNull T element, @NotNull TextRange range, Icon icon, int updatePass, @Nullable Function tooltipProvider, @Nullable GutterIconNavigationHandler navHandler, diff --git a/platform/lang-api/src/com/intellij/execution/ExecutionAdapter.java b/platform/lang-api/src/com/intellij/execution/ExecutionAdapter.java index 90b465062714..0f5a5974092f 100644 --- a/platform/lang-api/src/com/intellij/execution/ExecutionAdapter.java +++ b/platform/lang-api/src/com/intellij/execution/ExecutionAdapter.java @@ -15,12 +15,9 @@ */ package com.intellij.execution; -import org.jetbrains.annotations.ApiStatus; - /** * @deprecated use {@link ExecutionListener} directly */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public class ExecutionAdapter implements ExecutionListener { } diff --git a/platform/lang-api/src/com/intellij/execution/ExecutionTargetProvider.java b/platform/lang-api/src/com/intellij/execution/ExecutionTargetProvider.java index 758868d39573..a3764141745d 100644 --- a/platform/lang-api/src/com/intellij/execution/ExecutionTargetProvider.java +++ b/platform/lang-api/src/com/intellij/execution/ExecutionTargetProvider.java @@ -4,7 +4,6 @@ package com.intellij.execution; import com.intellij.execution.configurations.RunConfiguration; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.project.Project; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -21,8 +20,7 @@ public abstract class ExecutionTargetProvider { * @deprecated use {@link #getTargets(Project, RunConfiguration)} instead */ @NotNull - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public List getTargets(@NotNull Project project, @NotNull RunnerAndConfigurationSettings configuration) { throw new AbstractMethodError(); } diff --git a/platform/lang-api/src/com/intellij/execution/RunnerRegistry.java b/platform/lang-api/src/com/intellij/execution/RunnerRegistry.java index 4afa25ff737f..34cfd8af6eb0 100644 --- a/platform/lang-api/src/com/intellij/execution/RunnerRegistry.java +++ b/platform/lang-api/src/com/intellij/execution/RunnerRegistry.java @@ -5,7 +5,6 @@ import com.intellij.execution.configurations.RunProfile; import com.intellij.execution.runners.ProgramRunner; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.Service; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -29,8 +28,7 @@ public final class RunnerRegistry { * @deprecated Use {@link ProgramRunner#findRunnerById(String)} */ @Nullable - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public ProgramRunner findRunnerById(@NotNull String id) { return ProgramRunner.findRunnerById(id); } diff --git a/platform/lang-api/src/com/intellij/execution/actions/CompatibleRunConfigurationProducer.java b/platform/lang-api/src/com/intellij/execution/actions/CompatibleRunConfigurationProducer.java index 26afb6b356b9..4ae9b5deea6c 100644 --- a/platform/lang-api/src/com/intellij/execution/actions/CompatibleRunConfigurationProducer.java +++ b/platform/lang-api/src/com/intellij/execution/actions/CompatibleRunConfigurationProducer.java @@ -5,15 +5,13 @@ import com.intellij.execution.configurations.ConfigurationType; import com.intellij.execution.configurations.RunConfiguration; import com.intellij.openapi.util.Ref; import com.intellij.psi.PsiElement; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; public abstract class CompatibleRunConfigurationProducer extends RunConfigurationProducer { /** * @deprecated Override {@link #getConfigurationFactory()}. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected CompatibleRunConfigurationProducer(@NotNull ConfigurationType configurationType) { super(configurationType); } diff --git a/platform/lang-api/src/com/intellij/execution/actions/ConfigurationContext.java b/platform/lang-api/src/com/intellij/execution/actions/ConfigurationContext.java index e2f9f57894cd..7d9cdf4c4977 100644 --- a/platform/lang-api/src/com/intellij/execution/actions/ConfigurationContext.java +++ b/platform/lang-api/src/com/intellij/execution/actions/ConfigurationContext.java @@ -29,7 +29,6 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -398,8 +397,7 @@ public class ConfigurationContext { return myRuntimeConfiguration == null || myRuntimeConfiguration.getType() == type; } - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @Nullable public List findPreferredProducers() { if (myPreferredProducers == null) { diff --git a/platform/lang-api/src/com/intellij/execution/actions/RunConfigurationProducer.java b/platform/lang-api/src/com/intellij/execution/actions/RunConfigurationProducer.java index 89c6f789a59c..b965d50b0ebd 100644 --- a/platform/lang-api/src/com/intellij/execution/actions/RunConfigurationProducer.java +++ b/platform/lang-api/src/com/intellij/execution/actions/RunConfigurationProducer.java @@ -14,7 +14,6 @@ import com.intellij.openapi.project.IndexNotReadyException; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Ref; import com.intellij.psi.PsiElement; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -55,8 +54,7 @@ public abstract class RunConfigurationProducer { /** * @deprecated Use {@link LazyRunConfigurationProducer}. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected RunConfigurationProducer(@NotNull Class type) { this(ConfigurationTypeUtil.findConfigurationType(type)); } diff --git a/platform/lang-api/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereContributorFactory.java b/platform/lang-api/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereContributorFactory.java index 5b3392af11e5..5fcacd4fe69f 100644 --- a/platform/lang-api/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereContributorFactory.java +++ b/platform/lang-api/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereContributorFactory.java @@ -1,7 +1,6 @@ package com.intellij.ide.actions.searcheverywhere; import com.intellij.openapi.actionSystem.AnActionEvent; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -29,8 +28,7 @@ public interface SearchEverywhereContributorFactory { * @deprecated to be removed in IDEA 2022.2 */ @NotNull - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2022.2") + @Deprecated(forRemoval = true) default SearchEverywhereTabDescriptor getTab() { return SearchEverywhereTabDescriptor.PROJECT; } diff --git a/platform/lang-api/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereTabDescriptor.java b/platform/lang-api/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereTabDescriptor.java index 92a1bfa3e78c..7a510f2aa307 100644 --- a/platform/lang-api/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereTabDescriptor.java +++ b/platform/lang-api/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereTabDescriptor.java @@ -1,13 +1,10 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.ide.actions.searcheverywhere; -import org.jetbrains.annotations.ApiStatus; - /** * @deprecated to be removed in IDEA 2022.2 */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2022.2") +@Deprecated(forRemoval = true) public final class SearchEverywhereTabDescriptor { public static final SearchEverywhereTabDescriptor PROJECT = new SearchEverywhereTabDescriptor("SearchEverywhere.Project"); diff --git a/platform/lang-api/src/com/intellij/lang/parameterInfo/ParameterInfoHandler.java b/platform/lang-api/src/com/intellij/lang/parameterInfo/ParameterInfoHandler.java index 19363d7d6d70..790f82e4578a 100644 --- a/platform/lang-api/src/com/intellij/lang/parameterInfo/ParameterInfoHandler.java +++ b/platform/lang-api/src/com/intellij/lang/parameterInfo/ParameterInfoHandler.java @@ -16,7 +16,6 @@ package com.intellij.lang.parameterInfo; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.psi.PsiElement; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -95,28 +94,23 @@ public interface ParameterInfoHandler getModuleType(@NotNull Module module) { return ModuleType.get(module); } diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettingsCustomizable.java b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettingsCustomizable.java index 37b4230d251f..a8a4ececfa42 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettingsCustomizable.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettingsCustomizable.java @@ -228,8 +228,7 @@ public interface CodeStyleSettingsCustomizable { @Deprecated @Nls String SPACES_OTHER = CodeStyleSettingsCustomizableOptions.getInstance().SPACES_OTHER; - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @Nls String BLANK_LINES_KEEP = CodeStyleSettingsCustomizableOptions.getInstance().BLANK_LINES_KEEP; @Deprecated @Nls String BLANK_LINES = CodeStyleSettingsCustomizableOptions.getInstance().BLANK_LINES; @@ -258,7 +257,7 @@ public interface CodeStyleSettingsCustomizable { /** * @deprecated use {@link CodeStyleSettingsCustomizableOptions#BRACE_OPTIONS} instead */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @Nls String[] BRACE_OPTIONS = CodeStyleSettingsCustomizableOptions.getInstance().BRACE_OPTIONS; int[] BRACE_VALUES = { diff --git a/platform/lang-api/src/com/intellij/task/ProjectTaskListener.java b/platform/lang-api/src/com/intellij/task/ProjectTaskListener.java index 76846fbb4fac..81239f4231a7 100644 --- a/platform/lang-api/src/com/intellij/task/ProjectTaskListener.java +++ b/platform/lang-api/src/com/intellij/task/ProjectTaskListener.java @@ -2,7 +2,6 @@ package com.intellij.task; import com.intellij.util.messages.Topic; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; public interface ProjectTaskListener { @@ -26,7 +25,6 @@ public interface ProjectTaskListener { * @param executionResult provides aggregated information about the {@link ProjectTask} execution * @deprecated use {@link #finished(ProjectTaskManager.Result)} */ - @ApiStatus.ScheduledForRemoval(inVersion = "2021.2") - @Deprecated + @Deprecated(forRemoval = true) default void finished(@NotNull ProjectTaskContext context, @NotNull ProjectTaskResult executionResult) {} } diff --git a/platform/lang-api/src/com/intellij/task/ProjectTaskNotification.java b/platform/lang-api/src/com/intellij/task/ProjectTaskNotification.java index 17a70564767c..2783069cce3b 100644 --- a/platform/lang-api/src/com/intellij/task/ProjectTaskNotification.java +++ b/platform/lang-api/src/com/intellij/task/ProjectTaskNotification.java @@ -1,15 +1,13 @@ // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.task; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** * @author Vladislav.Soroka * @deprecated replaced in with promises of {@link ProjectTaskManager.Result} and {@link ProjectTaskRunner.Result} */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2020.1") +@Deprecated(forRemoval = true) public interface ProjectTaskNotification { /** * @param executionResult provides aggregated information about the {@link ProjectTask} execution diff --git a/platform/lang-api/src/com/intellij/task/ProjectTaskResult.java b/platform/lang-api/src/com/intellij/task/ProjectTaskResult.java index 8050793c2eaa..cee8ff5b0399 100644 --- a/platform/lang-api/src/com/intellij/task/ProjectTaskResult.java +++ b/platform/lang-api/src/com/intellij/task/ProjectTaskResult.java @@ -18,7 +18,6 @@ package com.intellij.task; import com.intellij.openapi.module.Module; import com.intellij.openapi.roots.ProjectModelBuildableElement; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Collections; @@ -32,8 +31,7 @@ import java.util.stream.Collectors; * @author Vladislav.Soroka * @deprecated in favour of {@link ProjectTaskManager.Result} */ -@ApiStatus.ScheduledForRemoval(inVersion = "2020.1") -@Deprecated +@Deprecated(forRemoval = true) public class ProjectTaskResult { private final boolean myAborted; private final int myErrors; diff --git a/platform/lang-api/src/com/intellij/task/ProjectTaskRunner.java b/platform/lang-api/src/com/intellij/task/ProjectTaskRunner.java index d96810f68c0c..6a4091d6ad09 100644 --- a/platform/lang-api/src/com/intellij/task/ProjectTaskRunner.java +++ b/platform/lang-api/src/com/intellij/task/ProjectTaskRunner.java @@ -13,7 +13,6 @@ import org.jetbrains.concurrency.Promise; import java.util.Arrays; import java.util.Collection; -import java.util.List; /** * {@link ProjectTaskRunner} provides an extension point to run any IDE tasks using {@link ProjectTaskManager} api. @@ -103,8 +102,7 @@ public abstract class ProjectTaskRunner { /** * @deprecated use {@link #run(Project, ProjectTaskContext, ProjectTask...)} */ - @ApiStatus.ScheduledForRemoval(inVersion = "2020.1") - @Deprecated + @Deprecated(forRemoval = true) public void run(@NotNull Project project, @NotNull ProjectTaskContext context, @Nullable ProjectTaskNotification callback, diff --git a/platform/lang-api/src/com/intellij/util/ActionRunner.java b/platform/lang-api/src/com/intellij/util/ActionRunner.java index 95249e208560..6d17b6a9420a 100644 --- a/platform/lang-api/src/com/intellij/util/ActionRunner.java +++ b/platform/lang-api/src/com/intellij/util/ActionRunner.java @@ -18,7 +18,6 @@ package com.intellij.util; import com.intellij.openapi.application.ReadAction; import com.intellij.openapi.application.WriteAction; import com.intellij.openapi.util.ThrowableComputable; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -41,8 +40,7 @@ public abstract class ActionRunner { /** * @deprecated use {@link WriteAction#run(ThrowableRunnable)} or {@link WriteAction#compute(ThrowableComputable)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static T runInsideWriteAction(@NotNull final InterruptibleRunnableWithResult runnable) throws Exception { return WriteAction.computeAndWait(() -> runnable.run()); } @@ -50,8 +48,7 @@ public abstract class ActionRunner { /** * @deprecated use {@link ReadAction#run(ThrowableRunnable)} or {@link ReadAction#compute(ThrowableComputable)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static void runInsideReadAction(@NotNull final InterruptibleRunnable runnable) throws Exception { ReadAction.run(() -> runnable.run()); } @@ -67,8 +64,7 @@ public abstract class ActionRunner { /** * @deprecated obsolete API */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public interface InterruptibleRunnableWithResult { T run() throws Exception; } diff --git a/platform/lang-core/src/com/intellij/execution/ShortenCommandLine.java b/platform/lang-core/src/com/intellij/execution/ShortenCommandLine.java index f2529f32671a..b37db74d3d05 100644 --- a/platform/lang-core/src/com/intellij/execution/ShortenCommandLine.java +++ b/platform/lang-core/src/com/intellij/execution/ShortenCommandLine.java @@ -7,7 +7,6 @@ import com.intellij.openapi.projectRoots.JdkUtil; import com.intellij.openapi.util.NlsContexts; import com.intellij.openapi.util.NlsSafe; import org.jdom.Element; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.PropertyKey; @@ -67,16 +66,14 @@ public enum ShortenCommandLine { } /** @deprecated do not use in a new code */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static ShortenCommandLine readShortenClasspathMethod(@NotNull Element element) { Element mode = element.getChild("shortenClasspath"); return mode != null ? valueOf(mode.getAttributeValue("name")) : null; } /** @deprecated do not use in a new code */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static void writeShortenClasspathMethod(@NotNull Element element, ShortenCommandLine shortenCommandLine) { if (shortenCommandLine != null) { element.addContent(new Element("shortenClasspath").setAttribute("name", shortenCommandLine.name())); diff --git a/platform/lang-core/src/com/intellij/facet/FacetTypeId.java b/platform/lang-core/src/com/intellij/facet/FacetTypeId.java index ef0602a1756b..b3ff17a00d42 100644 --- a/platform/lang-core/src/com/intellij/facet/FacetTypeId.java +++ b/platform/lang-core/src/com/intellij/facet/FacetTypeId.java @@ -2,7 +2,6 @@ package com.intellij.facet; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; public final class FacetTypeId { @@ -11,8 +10,7 @@ public final class FacetTypeId { /** * @deprecated use {@link FacetTypeId#FacetTypeId(String)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public FacetTypeId() { this("unknown"); } diff --git a/platform/lang-core/src/com/intellij/ide/util/projectWizard/WizardContext.java b/platform/lang-core/src/com/intellij/ide/util/projectWizard/WizardContext.java index 44f6289da017..e8204bf4f362 100644 --- a/platform/lang-core/src/com/intellij/ide/util/projectWizard/WizardContext.java +++ b/platform/lang-core/src/com/intellij/ide/util/projectWizard/WizardContext.java @@ -13,7 +13,6 @@ import com.intellij.openapi.roots.ui.configuration.ModulesProvider; import com.intellij.openapi.util.UserDataHolderBase; import com.intellij.platform.ProjectTemplate; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -53,8 +52,7 @@ public class WizardContext extends UserDataHolderBase { /** * @deprecated useless */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean isNewWizard() { return true; } diff --git a/platform/lang-core/src/com/intellij/openapi/roots/ui/configuration/ModuleConfigurationState.java b/platform/lang-core/src/com/intellij/openapi/roots/ui/configuration/ModuleConfigurationState.java index f3817c3fc4a8..0eedfe3d08d2 100644 --- a/platform/lang-core/src/com/intellij/openapi/roots/ui/configuration/ModuleConfigurationState.java +++ b/platform/lang-core/src/com/intellij/openapi/roots/ui/configuration/ModuleConfigurationState.java @@ -5,7 +5,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ModifiableRootModel; import com.intellij.openapi.roots.ModuleRootModel; import com.intellij.openapi.util.UserDataHolder; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; public interface ModuleConfigurationState extends UserDataHolder { @@ -29,8 +28,7 @@ public interface ModuleConfigurationState extends UserDataHolder { * @deprecated use {@link #getModifiableRootModel()}} if you need to modify the model and use {@link #getCurrentRootModel()} if you just * need to read the current state */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.2") - @Deprecated + @Deprecated(forRemoval = true) default ModifiableRootModel getRootModel() { return getModifiableRootModel(); } diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java b/platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java index d7e6f68698d2..c0bf9995a2c2 100644 --- a/platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java @@ -47,7 +47,6 @@ import com.intellij.util.LocalTimeCounter; import com.intellij.util.ObjectUtils; import com.intellij.util.ui.PresentableEnumUtil; import com.intellij.util.ui.update.UiNotifyConnector; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -306,8 +305,7 @@ public abstract class CodeStyleAbstractPanel implements Disposable, ComponentHig * @deprecated Do not override this method. Use LanguageCodeStyleSettingsProvider.createFileFromText() instead. * @see LanguageCodeStyleSettingsProvider#createFileFromText(Project, String) */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected PsiFile createFileFromText(Project project, String text) { Language language = getDefaultLanguage(); if (language != null) { diff --git a/platform/lang-impl/src/com/intellij/build/events/impl/StartBuildEventImpl.java b/platform/lang-impl/src/com/intellij/build/events/impl/StartBuildEventImpl.java index 94fef4522f5b..23c7a0b3d201 100644 --- a/platform/lang-impl/src/com/intellij/build/events/impl/StartBuildEventImpl.java +++ b/platform/lang-impl/src/com/intellij/build/events/impl/StartBuildEventImpl.java @@ -57,8 +57,7 @@ public class StartBuildEventImpl extends StartEventImpl implements StartBuildEve /** * @deprecated use {@link DefaultBuildDescriptor#withProcessHandler} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public StartBuildEventImpl withProcessHandler(@Nullable BuildProcessHandler processHandler, @Nullable Consumer attachedConsoleConsumer) { myBuildDescriptor.withProcessHandler(processHandler, attachedConsoleConsumer); @@ -68,8 +67,7 @@ public class StartBuildEventImpl extends StartEventImpl implements StartBuildEve /** * @deprecated use {@link DefaultBuildDescriptor#withProcessHandler} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public StartBuildEventImpl withRestartAction(@NotNull AnAction anAction) { myBuildDescriptor.withRestartAction(anAction); return this; @@ -78,8 +76,7 @@ public class StartBuildEventImpl extends StartEventImpl implements StartBuildEve /** * @deprecated use {@link DefaultBuildDescriptor#withProcessHandler} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public StartBuildEventImpl withRestartActions(AnAction... actions) { Arrays.stream(actions).forEach(myBuildDescriptor::withRestartAction); return this; @@ -88,8 +85,7 @@ public class StartBuildEventImpl extends StartEventImpl implements StartBuildEve /** * @deprecated use {@link DefaultBuildDescriptor#withProcessHandler} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public StartBuildEventImpl withContentDescriptorSupplier(Supplier contentDescriptorSupplier) { myBuildDescriptor.withContentDescriptor(contentDescriptorSupplier); return this; @@ -98,8 +94,7 @@ public class StartBuildEventImpl extends StartEventImpl implements StartBuildEve /** * @deprecated use {@link DefaultBuildDescriptor#withProcessHandler} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.2") + @Deprecated(forRemoval = true) public StartBuildEventImpl withExecutionFilter(@NotNull Filter filter) { myBuildDescriptor.withExecutionFilter(filter); return this; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/quickFix/CreateFileFix.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/quickFix/CreateFileFix.java index bcb00829c4ed..6126211c6e32 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/quickFix/CreateFileFix.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/quickFix/CreateFileFix.java @@ -21,7 +21,6 @@ import com.intellij.psi.*; import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.PropertyKey; @@ -32,8 +31,7 @@ import java.io.IOException; * @author peter * @deprecated Use {@link CreateDirectoryPathFix} or {@link CreateFilePathFix} instead. */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public class CreateFileFix extends LocalQuickFixAndIntentionActionOnPsiElement { private static final int REFRESH_INTERVAL = 1000; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationPreviewPanelProvider.java b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationPreviewPanelProvider.java index 516304d6493f..94a0fc0f039f 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationPreviewPanelProvider.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationPreviewPanelProvider.java @@ -4,13 +4,11 @@ package com.intellij.codeInsight.documentation; import com.intellij.openapi.preview.PreviewProviderId; import com.intellij.openapi.util.Couple; import com.intellij.psi.PsiElement; -import org.jetbrains.annotations.ApiStatus; /** * @deprecated this class isn't used by the platform anymore */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public final class DocumentationPreviewPanelProvider { public static final PreviewProviderId, DocumentationComponent> ID = null; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java index b6139d1766ed..260903fd81fa 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java @@ -15,7 +15,6 @@ import com.intellij.openapi.editor.EditorModificationUtil; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; import com.intellij.psi.PsiFile; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -60,7 +59,7 @@ public class CompletionAutoPopupHandler extends TypedHandlerDelegate { /** * @deprecated can be emulated with {@link AppUIExecutor} */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static void runLaterWithCommitted(@NotNull Project project, Document document, @NotNull Runnable runnable) { AppUIExecutor.onUiThread().later().withDocumentsCommitted(project).execute(runnable); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightUsagesHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightUsagesHandler.java index 3f2a34182557..061fdf7c06cd 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightUsagesHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightUsagesHandler.java @@ -275,8 +275,7 @@ public class HighlightUsagesHandler extends HighlightHandlerBase { /** * @deprecated Use the overload with TextAttributesKey */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static void highlightRanges(@NotNull HighlightManager highlightManager, @NotNull Editor editor, @NotNull TextAttributes attributes, diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/ElementLocationUtil.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/ElementLocationUtil.java index 40213532471e..c259beef9787 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/hint/ElementLocationUtil.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/ElementLocationUtil.java @@ -11,7 +11,6 @@ import com.intellij.openapi.util.Ref; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import org.jetbrains.annotations.ApiStatus; import javax.swing.*; import java.util.List; @@ -24,8 +23,7 @@ public final class ElementLocationUtil { /** * @deprecated use {@link #renderElementLocation(PsiElement, Ref)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static void customizeElementLabel(final PsiElement element, final JLabel label) { Ref ref = new Ref<>(); label.setText(renderElementLocation(element, ref)); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupUsageDescriptor.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupUsageDescriptor.java index 85ee5dbee757..d746430ec027 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupUsageDescriptor.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupUsageDescriptor.java @@ -33,8 +33,7 @@ public interface LookupUsageDescriptor { /** * @deprecated use {@link LookupUsageDescriptor#getAdditionalUsageData(LookupResultDescriptor)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2022.2") + @Deprecated(forRemoval = true) default void fillUsageData(@NotNull Lookup lookup, @NotNull FeatureUsageData usageData) { LookupResultDescriptor lookupResultDescriptor = new LookupResultDescriptor() { @Override diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/BackgroundUpdaterTaskBase.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/BackgroundUpdaterTaskBase.java index ed0e8e690568..13c25478ef20 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/BackgroundUpdaterTaskBase.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/BackgroundUpdaterTaskBase.java @@ -16,7 +16,6 @@ import com.intellij.usages.UsageView; import com.intellij.usages.impl.UsageViewImpl; import com.intellij.util.Alarm; import com.intellij.util.SmartList; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; @@ -79,8 +78,7 @@ public abstract class BackgroundUpdaterTaskBase extends Task.Backgroundable { /** * @deprecated Use {@link #BackgroundUpdaterTaskBase(Project, String, Comparator)} and {@link #updateComponent(T)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean updateComponent(@NotNull T element, @Nullable Comparator comparator) { if (tryAppendUsage(element)) return true; if (myCanceled) return false; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoTargetHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoTargetHandler.java index d8e5677e8895..39e6bd4eb81b 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoTargetHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoTargetHandler.java @@ -256,8 +256,7 @@ public abstract class GotoTargetHandler implements CodeInsightActionHandler { /** * @deprecated, use getChooserTitle(PsiElement, String, int, boolean) instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @NotNull protected @NlsContexts.PopupTitle String getChooserTitle(PsiElement sourceElement, String name, int length) { LOG.warn("Please override getChooserTitle(PsiElement, String, int, boolean) instead"); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/ListBackgroundUpdaterTask.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/ListBackgroundUpdaterTask.java index be92621dc38b..cacb9cb3e7d0 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/ListBackgroundUpdaterTask.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/ListBackgroundUpdaterTask.java @@ -24,7 +24,6 @@ import com.intellij.psi.PsiElement; import com.intellij.ui.components.JBList; import com.intellij.ui.popup.AbstractPopup; import com.intellij.usages.UsageView; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -33,8 +32,7 @@ import java.util.Comparator; /** * @deprecated please use {@link BackgroundUpdaterTask} */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public abstract class ListBackgroundUpdaterTask extends BackgroundUpdaterTask { protected AbstractPopup myPopup; @@ -46,8 +44,7 @@ public abstract class ListBackgroundUpdaterTask extends BackgroundUpdaterTask { /** * @deprecated please use {@link BackgroundUpdaterTask} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void init(@NotNull AbstractPopup popup, @NotNull Object component, @NotNull Ref usageView) { myPopup = popup; if (component instanceof JBList) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationAction.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationAction.java index aa8721dbb9f6..cea5b6a8679a 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationAction.java @@ -41,7 +41,6 @@ import com.intellij.psi.util.PsiUtilCore; import com.intellij.ui.awt.RelativePoint; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.EDT; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; @@ -128,8 +127,7 @@ public class GotoDeclarationAction extends BaseCodeInsightAction implements Dumb /** * @deprecated use chooseAmbiguousTarget(Project, Editor, int, PsiElementProcessor, String, PsiElement[]) */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static boolean chooseAmbiguousTarget(@NotNull Editor editor, int offset, @NotNull PsiElementProcessor processor, diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/TemplateSubstitutor.java b/platform/lang-impl/src/com/intellij/codeInsight/template/TemplateSubstitutor.java index bbe6a014bfb4..e371d7d12fe8 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/TemplateSubstitutor.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/TemplateSubstitutor.java @@ -5,7 +5,6 @@ import com.intellij.codeInsight.template.impl.TemplateImpl; import com.intellij.codeInsight.template.impl.TemplateSubstitutionContext; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.psi.PsiFile; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -15,8 +14,7 @@ public interface TemplateSubstitutor { /** * @deprecated use {@link #substituteTemplate(TemplateSubstitutionContext, TemplateImpl)} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2020.3") - @Deprecated + @Deprecated(forRemoval = true) @Nullable default TemplateImpl substituteTemplate(@NotNull PsiFile file, int caretOffset, @NotNull TemplateImpl template) { throw new RuntimeException( diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java index 0633c727dfb3..ef4a8162887d 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java @@ -28,7 +28,6 @@ import com.intellij.testFramework.TestModeFlags; import com.intellij.util.PairProcessor; import com.intellij.util.containers.ConcurrentFactoryMap; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; @@ -523,8 +522,7 @@ public final class TemplateManagerImpl extends TemplateManager implements Dispos /** * @deprecated use {@link #isApplicable(TemplateImpl, TemplateActionContext)} */ - @ApiStatus.ScheduledForRemoval(inVersion = "2021.1") - @Deprecated + @Deprecated(forRemoval = true) public static boolean isApplicable(PsiFile file, int offset, TemplateImpl template) { return isApplicable(template, TemplateActionContext.expanding(file, offset)); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/PostfixTemplate.java b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/PostfixTemplate.java index ac1befe5195a..d6c0c74efcc1 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/PostfixTemplate.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/PostfixTemplate.java @@ -10,7 +10,6 @@ import com.intellij.openapi.util.NlsContexts; import com.intellij.openapi.util.NlsSafe; import com.intellij.openapi.util.NotNullLazyValue; import com.intellij.psi.PsiElement; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -48,8 +47,7 @@ public abstract class PostfixTemplate { /** * @deprecated use {@link #PostfixTemplate(String, String, String, PostfixTemplateProvider)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected PostfixTemplate(@NotNull @NlsSafe String name, @NotNull @NlsSafe String example) { this(null, name, "." + name, example, null); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/PostfixTemplateWithExpressionSelector.java b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/PostfixTemplateWithExpressionSelector.java index 6b7f36d7b03d..40b19920e9b5 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/PostfixTemplateWithExpressionSelector.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/PostfixTemplateWithExpressionSelector.java @@ -12,7 +12,6 @@ import com.intellij.openapi.util.Pass; import com.intellij.psi.PsiElement; import com.intellij.refactoring.IntroduceTargetChooser; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -26,8 +25,7 @@ public abstract class PostfixTemplateWithExpressionSelector extends PostfixTempl /** * @deprecated use {@link #PostfixTemplateWithExpressionSelector(String, String, String, String, PostfixTemplateExpressionSelector, PostfixTemplateProvider)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected PostfixTemplateWithExpressionSelector(@NotNull @NlsSafe String name, @NotNull @NlsSafe String key, @NotNull @NlsSafe String example, @@ -38,8 +36,7 @@ public abstract class PostfixTemplateWithExpressionSelector extends PostfixTempl /** * @deprecated use {@link #PostfixTemplateWithExpressionSelector(String, String, String, PostfixTemplateExpressionSelector, PostfixTemplateProvider)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected PostfixTemplateWithExpressionSelector(@NotNull @NlsSafe String name, @NotNull @NlsSafe String example, @NotNull PostfixTemplateExpressionSelector selector) { diff --git a/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineViewParseUtil.java b/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineViewParseUtil.java index 0071c91731c8..6808d2762ada 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineViewParseUtil.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineViewParseUtil.java @@ -10,7 +10,6 @@ import com.thoughtworks.xstream.io.xml.XppReader; import io.github.xstream.mxparser.MXParser; import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -41,8 +40,7 @@ public final class OfflineViewParseUtil { /** * @deprecated use {@link #parse(File)} or {@link #parse(Reader)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static Map> parse(String problemText) { return parse(new StringReader(problemText)); } @@ -127,8 +125,7 @@ public final class OfflineViewParseUtil { /** * @deprecated use {@link #parseProfileName(File)} or {@link #parseProfileName(Reader)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @Nullable public static String parseProfileName(String descriptorText) { return parseProfileName(new StringReader(descriptorText)); diff --git a/platform/lang-impl/src/com/intellij/execution/console/ConsoleHistoryController.java b/platform/lang-impl/src/com/intellij/execution/console/ConsoleHistoryController.java index ec104a06f458..16e152dec140 100644 --- a/platform/lang-impl/src/com/intellij/execution/console/ConsoleHistoryController.java +++ b/platform/lang-impl/src/com/intellij/execution/console/ConsoleHistoryController.java @@ -43,7 +43,6 @@ import com.intellij.psi.PsiFileFactory; import com.intellij.testFramework.LightVirtualFile; import com.intellij.util.PathUtil; import com.intellij.util.containers.CollectionFactory; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; @@ -89,8 +88,7 @@ public class ConsoleHistoryController implements Disposable { /** * @deprecated use {@link #ConsoleHistoryController(ConsoleRootType, String, LanguageConsoleView)} or {@link #ConsoleHistoryController(ConsoleRootType, String, LanguageConsoleView, ConsoleHistoryModel)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public ConsoleHistoryController(@NotNull String type, @Nullable String persistenceId, @NotNull LanguageConsoleView console) { this(new ConsoleRootType(type, null) { }, persistenceId, console); } diff --git a/platform/lang-impl/src/com/intellij/execution/console/IdeConsoleRootType.java b/platform/lang-impl/src/com/intellij/execution/console/IdeConsoleRootType.java index 6b7c285dd72b..832435b6efa3 100644 --- a/platform/lang-impl/src/com/intellij/execution/console/IdeConsoleRootType.java +++ b/platform/lang-impl/src/com/intellij/execution/console/IdeConsoleRootType.java @@ -8,8 +8,7 @@ import org.jetbrains.annotations.*; * * @deprecated Use {@link com.intellij.ide.script.IdeConsoleRootType} instead. */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.2") +@Deprecated(forRemoval = true) public class IdeConsoleRootType extends ConsoleRootType { protected IdeConsoleRootType(@NonNls @NotNull String consoleTypeId, @Nls @Nullable String displayName) { super(consoleTypeId, displayName); diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java index 3c039fe27c9b..5e06f3194b8b 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java @@ -1118,8 +1118,7 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo /** * @deprecated use {@link ClearConsoleAction} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") + @Deprecated(forRemoval = true) public static class ClearAllAction extends ClearConsoleAction { } diff --git a/platform/lang-impl/src/com/intellij/find/SearchTextArea.java b/platform/lang-impl/src/com/intellij/find/SearchTextArea.java index 5b61e3493635..d10f10cb4426 100644 --- a/platform/lang-impl/src/com/intellij/find/SearchTextArea.java +++ b/platform/lang-impl/src/com/intellij/find/SearchTextArea.java @@ -34,7 +34,6 @@ import com.intellij.util.ui.JBInsets; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.StartupUiUtil; import com.intellij.util.ui.UIUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -105,8 +104,7 @@ public class SearchTextArea extends JPanel implements PropertyChangeListener { /** * @deprecated infoMode is not used. Use the other constructor. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public SearchTextArea(@NotNull JTextArea textArea, boolean searchMode, @SuppressWarnings("unused") boolean infoMode) { this (textArea, searchMode); } diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java b/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java index d7d7ce017274..8e6059924f65 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java @@ -3,7 +3,6 @@ package com.intellij.find.impl; import com.intellij.find.FindModel; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; public final class FindDialog { @@ -11,8 +10,7 @@ public final class FindDialog { /** * @deprecated use {@link FindInProjectUtil#getPresentableName(FindModel.SearchContext)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static String getPresentableName(@NotNull FindModel.SearchContext searchContext) { return FindInProjectUtil.getPresentableName(searchContext); } diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindPopupScopeUI.java b/platform/lang-impl/src/com/intellij/find/impl/FindPopupScopeUI.java index dd28a03d7d7f..80532aa6aee1 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindPopupScopeUI.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindPopupScopeUI.java @@ -20,7 +20,6 @@ import com.intellij.find.FindSettings; import com.intellij.openapi.ui.ValidationInfo; import com.intellij.openapi.util.NlsContexts; import com.intellij.openapi.util.Pair; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -51,8 +50,7 @@ public interface FindPopupScopeUI { /** * @deprecated Use {@link #textComputable} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public final @NlsContexts.ListItem String text; public final Icon icon; diff --git a/platform/lang-impl/src/com/intellij/find/impl/RegExHelpPopup.java b/platform/lang-impl/src/com/intellij/find/impl/RegExHelpPopup.java index 39b9b21ff9d3..eadd724995e2 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/RegExHelpPopup.java +++ b/platform/lang-impl/src/com/intellij/find/impl/RegExHelpPopup.java @@ -21,7 +21,6 @@ import com.intellij.ui.components.labels.LinkListener; import com.intellij.util.ui.HTMLEditorKitBuilder; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.UIUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -78,8 +77,7 @@ public final class RegExHelpPopup extends JPanel { /** * @deprecated Use {@link #createRegExLink(String, Component)} */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) public static LinkLabel createRegExLink(@NotNull @NlsContexts.LinkLabel String title, @Nullable Component owner, @SuppressWarnings("unused") @Nullable Logger logger) { return createRegExLink(title, owner, (String)null); } diff --git a/platform/lang-impl/src/com/intellij/formatting/FormattingModelBuilderEx.java b/platform/lang-impl/src/com/intellij/formatting/FormattingModelBuilderEx.java index 586da042c98e..bdb551bd4f2e 100644 --- a/platform/lang-impl/src/com/intellij/formatting/FormattingModelBuilderEx.java +++ b/platform/lang-impl/src/com/intellij/formatting/FormattingModelBuilderEx.java @@ -4,15 +4,13 @@ package com.intellij.formatting; import com.intellij.psi.PsiFile; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CommonCodeStyleSettings; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** * @deprecated use {@link FormattingModelBuilder} */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.1") +@Deprecated(forRemoval = true) public interface FormattingModelBuilderEx extends FormattingModelBuilder { /** * Allows to adjust indent options to used during performing formatting operation on the given ranges of the given file. diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java index 26e03793c955..3dd2ecaac6ce 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java @@ -17,7 +17,6 @@ import com.intellij.openapi.ui.popup.ListPopup; import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.wm.IdeFocusManager; import org.intellij.lang.annotations.JdkConstants; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -36,7 +35,6 @@ public class GotoActionAction extends SearchEverywhereBaseAction implements Dumb /** @deprecated please use {@link #openOptionOrPerformAction(Object, String, Project, Component, int)} instead */ @Deprecated(forRemoval = true) - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") public static void openOptionOrPerformAction(@NotNull Object element, String enteredText, @Nullable Project project, diff --git a/platform/lang-impl/src/com/intellij/ide/actions/runAnything/groups/RunAnythingHelpGroup.java b/platform/lang-impl/src/com/intellij/ide/actions/runAnything/groups/RunAnythingHelpGroup.java index 59cda2ed294a..bb76886053d3 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/runAnything/groups/RunAnythingHelpGroup.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/runAnything/groups/RunAnythingHelpGroup.java @@ -6,7 +6,6 @@ import com.intellij.ide.actions.runAnything.items.RunAnythingItem; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; @@ -35,8 +34,7 @@ public class RunAnythingHelpGroup

extends RunAnyt /** * @deprecated API compatibility */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public RunAnythingHelpGroup() { } @NotNull @@ -50,8 +48,7 @@ public class RunAnythingHelpGroup

extends RunAnyt * See also {@code RunAnythingProviderBase.getHelp*()} methods. * @deprecated please use {@link RunAnythingProvider#getHelpGroupTitle()} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @NotNull public Collection

getProviders() { return myProviders; diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/AbstractGotoSEContributor.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/AbstractGotoSEContributor.java index f9927940c331..e3ec6a83d152 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/AbstractGotoSEContributor.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/AbstractGotoSEContributor.java @@ -43,7 +43,6 @@ import com.intellij.util.Processor; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.JBIterable; import com.intellij.util.indexing.FindSymbolParameters; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -144,8 +143,7 @@ public abstract class AbstractGotoSEContributor implements WeightedSearchEverywh } /** @deprecated override {@link #doGetActions(PersistentSearchEverywhereContributorFilter, ElementsChooser.StatisticsCollector, Runnable)} instead**/ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) @NotNull protected List doGetActions(@NotNull @NlsContexts.Checkbox String ignored, @Nullable PersistentSearchEverywhereContributorFilter filter, diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/MethodHierarchyBrowserBase.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/MethodHierarchyBrowserBase.java index 2efa71c21b09..82e19e5b45b8 100644 --- a/platform/lang-impl/src/com/intellij/ide/hierarchy/MethodHierarchyBrowserBase.java +++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/MethodHierarchyBrowserBase.java @@ -11,7 +11,6 @@ import com.intellij.openapi.ui.MultiLineLabelUI; import com.intellij.openapi.util.NlsContexts; import com.intellij.psi.PsiElement; import com.intellij.util.ui.JBUI; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; @@ -23,8 +22,7 @@ import java.util.function.Supplier; public abstract class MethodHierarchyBrowserBase extends HierarchyBrowserBaseEx { /** @deprecated Use {@link #HIERARCHY_BROWSER} data key instead. */ - @ApiStatus.ScheduledForRemoval(inVersion = "2021.2") - @Deprecated + @Deprecated(forRemoval = true) public static final DataKey DATA_KEY = DataKey.create("com.intellij.ide.hierarchy.MethodHierarchyBrowserBase"); public MethodHierarchyBrowserBase(Project project, PsiElement method) { diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/BaseProjectTreeBuilder.java b/platform/lang-impl/src/com/intellij/ide/projectView/BaseProjectTreeBuilder.java index e4ad67df18b8..92888c34a4c1 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/BaseProjectTreeBuilder.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/BaseProjectTreeBuilder.java @@ -20,7 +20,6 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.ObjectUtils; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.concurrency.AsyncPromise; @@ -39,8 +38,7 @@ import java.util.List; /** * @deprecated use {@link com.intellij.ui.tree.AsyncTreeModel} and {@link com.intellij.ui.tree.StructureTreeModel} instead. */ -@ApiStatus.ScheduledForRemoval(inVersion = "2020.3") -@Deprecated +@Deprecated(forRemoval = true) public abstract class BaseProjectTreeBuilder extends AbstractTreeBuilder { protected final Project myProject; @@ -131,8 +129,7 @@ public abstract class BaseProjectTreeBuilder extends AbstractTreeBuilder { /** * @deprecated Use {@link #selectAsync} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @NotNull public ActionCallback select(Object element, VirtualFile file, final boolean requestFocus) { return Promises.toActionCallback(_select(element, file, requestFocus, Conditions.alwaysTrue())); diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPane.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPane.java index 7988cc683bdf..0dda4d8aa52b 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPane.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPane.java @@ -100,8 +100,7 @@ public abstract class AbstractProjectViewPane implements DataProvider, Disposabl /** * @deprecated use {@link #EP} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2022.2") + @Deprecated(forRemoval = true) public static final ExtensionPointName EP_NAME = new ExtensionPointName<>("com.intellij.projectViewPane"); protected final @NotNull Project myProject; @@ -189,8 +188,7 @@ public abstract class AbstractProjectViewPane implements DataProvider, Disposabl /** * @deprecated unused */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected final void fireTreeChangeListener() { } @@ -1167,9 +1165,8 @@ public abstract class AbstractProjectViewPane implements DataProvider, Disposabl * @deprecated temporary API */ @TestOnly - @Deprecated + @Deprecated(forRemoval = true) @NotNull - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") public Promise promisePathToElement(@NotNull Object element) { AbstractTreeBuilder builder = getTreeBuilder(); if (builder != null) { diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java index 4931ceca32c2..c2b47aff935a 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java @@ -79,7 +79,6 @@ import com.intellij.util.containers.JBIterable; import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.tree.TreeUtil; import org.jdom.Element; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -1458,8 +1457,7 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo /** * @deprecated use {@link ProjectView#isFoldersAlwaysOnTop(String)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean isFoldersAlwaysOnTop() { return myFoldersAlwaysOnTop.isSelected() && myFoldersAlwaysOnTop.isEnabled(); } diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewTree.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewTree.java index 8213e221a0fe..f697d30a56bb 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewTree.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewTree.java @@ -11,7 +11,6 @@ import com.intellij.ui.popup.HintUpdateSupply; import com.intellij.ui.tabs.FileColorManagerImpl; import com.intellij.util.ObjectUtils; import com.intellij.util.ui.tree.TreeUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -31,9 +30,8 @@ public class ProjectViewTree extends DnDAwareTree { /** * @deprecated use another constructor instead */ - @Deprecated + @Deprecated(forRemoval = true) @SuppressWarnings("unused") - @ApiStatus.ScheduledForRemoval(inVersion = "2022.2") protected ProjectViewTree(Project project, TreeModel model) { this(model); } @@ -58,8 +56,7 @@ public class ProjectViewTree extends DnDAwareTree { * @deprecated Not every tree employs {@link DefaultMutableTreeNode} so * use {@link #getSelectionPaths()} or {@link TreeUtil#getSelectedPathIfOne(JTree)} directly. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public DefaultMutableTreeNode getSelectedNode() { TreePath path = TreeUtil.getSelectedPathIfOne(this); return path == null ? null : ObjectUtils.tryCast(path.getLastPathComponent(), DefaultMutableTreeNode.class); diff --git a/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileType.java b/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileType.java index 984170e1b8f0..6ef5cdb317e5 100644 --- a/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileType.java +++ b/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileType.java @@ -5,7 +5,6 @@ import com.intellij.openapi.fileTypes.LanguageFileType; import com.intellij.openapi.fileTypes.PlainTextFileType; import com.intellij.openapi.fileTypes.PlainTextLanguage; import com.intellij.openapi.vfs.VirtualFile; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -17,13 +16,11 @@ import javax.swing.*; * * @deprecated use {@link ScratchFileService#findRootType(VirtualFile)} or {@link ScratchUtil#isScratch(VirtualFile)}. */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2020.3") +@Deprecated(forRemoval = true) public class ScratchFileType extends LanguageFileType { /** @deprecated use {@link ScratchFileService#findRootType(VirtualFile)} or {@link ScratchUtil#isScratch(VirtualFile)}. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2020.3") + @Deprecated(forRemoval = true) public static final LanguageFileType INSTANCE = new ScratchFileType(); private ScratchFileType() { diff --git a/platform/lang-impl/src/com/intellij/ide/scratch/ScratchTreeStructureProvider.java b/platform/lang-impl/src/com/intellij/ide/scratch/ScratchTreeStructureProvider.java index c26de1ef813d..42723974a94e 100644 --- a/platform/lang-impl/src/com/intellij/ide/scratch/ScratchTreeStructureProvider.java +++ b/platform/lang-impl/src/com/intellij/ide/scratch/ScratchTreeStructureProvider.java @@ -41,7 +41,6 @@ import com.intellij.util.concurrency.NonUrgentExecutor; import com.intellij.util.containers.ConcurrentFactoryMap; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.JBIterable; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -184,8 +183,7 @@ public class ScratchTreeStructureProvider implements TreeStructureProvider, Dumb /** * @deprecated Use modify method instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static AbstractTreeNode createRootNode(@NotNull Project project, ViewSettings settings) { return new MyProjectNode(project, settings); } diff --git a/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java b/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java index 1cc6bb08fa4c..d953a4e6899f 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java +++ b/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java @@ -128,8 +128,7 @@ public class FileStructurePopup implements Disposable, TreeActionsOwner { * @noinspection unused * @deprecated use {@link #FileStructurePopup(Project, FileEditor, StructureViewModel)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public FileStructurePopup(@NotNull Project project, @NotNull FileEditor fileEditor, @NotNull StructureView structureView, diff --git a/platform/lang-impl/src/com/intellij/ide/util/PsiElementListCellRenderer.java b/platform/lang-impl/src/com/intellij/ide/util/PsiElementListCellRenderer.java index ec2a40127479..df474a688309 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/PsiElementListCellRenderer.java +++ b/platform/lang-impl/src/com/intellij/ide/util/PsiElementListCellRenderer.java @@ -269,8 +269,7 @@ public abstract class PsiElementListCellRenderer extends J /** * @deprecated method has no effect */ - @ApiStatus.ScheduledForRemoval(inVersion = "2021.2") - @Deprecated + @Deprecated(forRemoval = true) protected final void setFocusBorderEnabled(boolean enabled) { } protected boolean customizeNonPsiElementLeftRenderer(ColoredListCellRenderer renderer, diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java index ba7b0e251886..82021ebae5a6 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java @@ -1051,8 +1051,7 @@ public abstract class ChooseByNameBase implements ChooseByNameViewModel { /** * @deprecated unused */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean hasPostponedAction() { return false; } diff --git a/platform/lang-impl/src/com/intellij/openapi/editor/actions/FindAction.java b/platform/lang-impl/src/com/intellij/openapi/editor/actions/FindAction.java index 16ef97ec444b..20a73df020a6 100644 --- a/platform/lang-impl/src/com/intellij/openapi/editor/actions/FindAction.java +++ b/platform/lang-impl/src/com/intellij/openapi/editor/actions/FindAction.java @@ -24,15 +24,13 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.actionSystem.EditorAction; import com.intellij.openapi.editor.actionSystem.EditorActionHandler; import com.intellij.openapi.project.Project; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.Objects; /** @deprecated Replaced by {@link com.intellij.find.actions.FindInPathAction} */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public class FindAction extends EditorAction { private static class Handler extends EditorActionHandler { @Override diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/libraries/ui/FileTypeBasedRootFilter.java b/platform/lang-impl/src/com/intellij/openapi/roots/libraries/ui/FileTypeBasedRootFilter.java index df556555f7d8..d71cf76acbfa 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/libraries/ui/FileTypeBasedRootFilter.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/libraries/ui/FileTypeBasedRootFilter.java @@ -20,7 +20,6 @@ import com.intellij.openapi.fileTypes.FileTypeRegistry; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.vfs.VirtualFile; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -28,8 +27,7 @@ import org.jetbrains.annotations.NotNull; * * @deprecated use {@link DescendentBasedRootFilter#createFileTypeBasedFilter(OrderRootType, boolean, FileType, String)} instead */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public class FileTypeBasedRootFilter extends RootFilter { private final FileType myFileType; private final RootFilter myDelegate; diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java index ea1e61250281..b2f219e0b15b 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java @@ -33,7 +33,6 @@ import com.intellij.ui.roots.ToolbarPanel; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.JBInsets; import com.intellij.util.ui.UIUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jps.model.module.JpsModuleSourceRootType; @@ -57,8 +56,7 @@ public class CommonContentEntriesEditor extends ModuleElementsEditor { /** * @deprecated Use {@link #getName()} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static final String NAME = "Sources"; protected ContentEntryTreeEditor myRootTreeEditor; diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ModulesCombobox.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ModulesCombobox.java index bf19f0aa5f09..1ecff839c1b8 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ModulesCombobox.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ModulesCombobox.java @@ -16,12 +16,10 @@ package com.intellij.openapi.roots.ui.configuration; import com.intellij.application.options.ModulesComboBox; -import org.jetbrains.annotations.ApiStatus; /** * @deprecated use {@link ModulesComboBox} instead */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public class ModulesCombobox extends ModulesComboBox { } diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/SdkListItem.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/SdkListItem.java index 83be383bf04c..f9e92743ffb5 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/SdkListItem.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/SdkListItem.java @@ -35,8 +35,7 @@ public abstract class SdkListItem { } /** @deprecated use {@link #name} */ - @ApiStatus.ScheduledForRemoval(inVersion = "20201.1") - @Deprecated + @Deprecated(forRemoval = true) public @NotNull String getName() { return name; } @@ -63,8 +62,7 @@ public abstract class SdkListItem { } /** @deprecated use {@link #sdk} */ - @ApiStatus.ScheduledForRemoval(inVersion = "20201.1") - @Deprecated + @Deprecated(forRemoval = true) public @NotNull Sdk getSdk() { return sdk; } diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/DefaultScopesProvider.java b/platform/lang-impl/src/com/intellij/packageDependencies/DefaultScopesProvider.java index e06c0a4d5040..71f8190d0a6b 100644 --- a/platform/lang-impl/src/com/intellij/packageDependencies/DefaultScopesProvider.java +++ b/platform/lang-impl/src/com/intellij/packageDependencies/DefaultScopesProvider.java @@ -8,7 +8,6 @@ import com.intellij.psi.search.scope.ProblemsScope; import com.intellij.psi.search.scope.ProjectFilesScope; import com.intellij.psi.search.scope.packageSet.CustomScopesProviderEx; import com.intellij.psi.search.scope.packageSet.NamedScope; -import org.jetbrains.annotations.ApiStatus.ScheduledForRemoval; import org.jetbrains.annotations.NotNull; import java.util.Arrays; @@ -40,8 +39,7 @@ public final class DefaultScopesProvider extends CustomScopesProviderEx { /** * @deprecated use {@link ProblemsScope#INSTANCE} instead */ - @ScheduledForRemoval(inVersion = "2022.2") - @Deprecated + @Deprecated(forRemoval = true) @NotNull public NamedScope getProblemsScope() { return ProblemsScope.INSTANCE; diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java index e87a84139e58..0bb10916bfa4 100644 --- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java +++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java @@ -703,8 +703,7 @@ public class SingleInspectionProfilePanel extends JPanel { /** * @deprecated Use {@link DescriptionEditorPaneKt#readHTML(JEditorPane, String)} instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static void readHTML(JEditorPane browser, String text) { DescriptionEditorPaneKt.readHTML(browser, text); } @@ -712,8 +711,7 @@ public class SingleInspectionProfilePanel extends JPanel { /** * @deprecated Use {@link DescriptionEditorPaneKt#toHTML(JEditorPane, String, boolean)} instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static String toHTML(JEditorPane browser, @Nls String text, boolean miniFontSize) { return DescriptionEditorPaneKt.toHTML(browser, text, miniFontSize); } diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/PostFormatProcessorHelper.java b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/PostFormatProcessorHelper.java index 79d4c2d8635b..10a1c1d510d8 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/PostFormatProcessorHelper.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/PostFormatProcessorHelper.java @@ -20,7 +20,6 @@ import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CommonCodeStyleSettings; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -36,8 +35,7 @@ public class PostFormatProcessorHelper { * @deprecated Use {@link #PostFormatProcessorHelper(CommonCodeStyleSettings)} first getting correct language settings * with {@link CodeStyleSettings#getCommonSettings(Language)}! */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public PostFormatProcessorHelper(final CodeStyleSettings rootSettings) { mySettings = rootSettings.getCommonSettings(""); } diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/PsiReferenceProviderBase.java b/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/PsiReferenceProviderBase.java index b096f8f7357b..55528e67fd54 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/PsiReferenceProviderBase.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/PsiReferenceProviderBase.java @@ -17,15 +17,13 @@ package com.intellij.psi.impl.source.resolve.reference; import com.intellij.psi.PsiReferenceProvider; -import org.jetbrains.annotations.ApiStatus; /** * * @author Dmitry Avdeev * @deprecated use PsiReferenceProvider instead */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public abstract class PsiReferenceProviderBase extends PsiReferenceProvider { } diff --git a/platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesDialog.java b/platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesDialog.java index 890f84073635..b26c7fea07eb 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesDialog.java +++ b/platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesDialog.java @@ -36,7 +36,6 @@ import com.intellij.util.PathUtil; import com.intellij.util.PathUtilRt; import com.intellij.util.ui.FormBuilder; import com.intellij.util.ui.UIUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -62,8 +61,7 @@ public class CopyFilesOrDirectoriesDialog extends RefactoringDialog implements D * * @deprecated use {@link RefactoringDialog#RefactoringDialog(Project, boolean, boolean)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static JCheckBox createOpenInEditorCB() { JCheckBox checkBox = new JCheckBox(RefactoringBundle.message("open.copy.in.editor"), PropertiesComponent.getInstance().getBoolean(COPY_OPEN_IN_EDITOR, true)); checkBox.setMnemonic('o'); @@ -75,8 +73,7 @@ public class CopyFilesOrDirectoriesDialog extends RefactoringDialog implements D * * @deprecated use {@link RefactoringDialog#RefactoringDialog(Project, boolean, boolean)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static void saveOpenInEditorState(boolean selected) { PropertiesComponent.getInstance().setValue(COPY_OPEN_IN_EDITOR, String.valueOf(selected)); } diff --git a/platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java b/platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java index 97fe26decec1..ab73e8d44cc9 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java +++ b/platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java @@ -75,8 +75,7 @@ public class ConflictsDialog extends DialogWrapper implements ConflictsDialogBas /** * @deprecated use other CTORs */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public ConflictsDialog(Project project, String... conflictDescriptions) { super(project, true); myProject = project; diff --git a/platform/platform-api/src/com/intellij/execution/process/OSProcessManager.java b/platform/platform-api/src/com/intellij/execution/process/OSProcessManager.java index f295ddef1aad..f62817e82677 100644 --- a/platform/platform-api/src/com/intellij/execution/process/OSProcessManager.java +++ b/platform/platform-api/src/com/intellij/execution/process/OSProcessManager.java @@ -2,7 +2,6 @@ package com.intellij.execution.process; import com.intellij.openapi.application.ApplicationManager; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -19,8 +18,7 @@ public abstract class OSProcessManager { /** * @deprecated Use {@link OSProcessUtil#killProcessTree(Process)} directly. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @SuppressWarnings("MethodMayBeStatic") public final boolean killProcessTree(@NotNull Process process) { return OSProcessUtil.killProcessTree(process); diff --git a/platform/platform-api/src/com/intellij/ide/CommonActionsManager.java b/platform/platform-api/src/com/intellij/ide/CommonActionsManager.java index 70ca157372ae..9764c2130967 100644 --- a/platform/platform-api/src/com/intellij/ide/CommonActionsManager.java +++ b/platform/platform-api/src/com/intellij/ide/CommonActionsManager.java @@ -5,7 +5,6 @@ import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.Project; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -22,8 +21,7 @@ public abstract class CommonActionsManager { /** * @deprecated use {@link #createCollapseAllAction(TreeExpander, JComponent)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public abstract AnAction createExpandAllAction(TreeExpander expander); public abstract AnAction createExpandAllAction(TreeExpander expander, JComponent component); @@ -35,8 +33,7 @@ public abstract class CommonActionsManager { /** * @deprecated use {@link #createCollapseAllAction(TreeExpander, JComponent)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public abstract AnAction createCollapseAllAction(TreeExpander expander); public abstract AnAction createCollapseAllAction(TreeExpander expander, JComponent component); diff --git a/platform/platform-api/src/com/intellij/ide/GeneralSettings.java b/platform/platform-api/src/com/intellij/ide/GeneralSettings.java index 177b1cb403a2..233560853b09 100644 --- a/platform/platform-api/src/com/intellij/ide/GeneralSettings.java +++ b/platform/platform-api/src/com/intellij/ide/GeneralSettings.java @@ -14,7 +14,6 @@ import com.intellij.util.xmlb.XmlSerializerUtil; import com.intellij.util.xmlb.annotations.OptionTag; import com.intellij.util.xmlb.annotations.Transient; import org.intellij.lang.annotations.MagicConstant; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.SystemDependent; @@ -218,8 +217,7 @@ public final class GeneralSettings implements PersistentStateComponent { diff --git a/platform/platform-api/src/com/intellij/ide/actions/TreeCollapseAllActionBase.java b/platform/platform-api/src/com/intellij/ide/actions/TreeCollapseAllActionBase.java index 2a99b17f503d..455485395e4b 100644 --- a/platform/platform-api/src/com/intellij/ide/actions/TreeCollapseAllActionBase.java +++ b/platform/platform-api/src/com/intellij/ide/actions/TreeCollapseAllActionBase.java @@ -6,15 +6,13 @@ import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.project.DumbAwareAction; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** * @deprecated use {@link CollapseAllAction} instead */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.1") +@Deprecated(forRemoval = true) public abstract class TreeCollapseAllActionBase extends DumbAwareAction { protected abstract @Nullable TreeExpander getExpander(@NotNull DataContext context); diff --git a/platform/platform-api/src/com/intellij/ide/actions/TreeExpandAllActionBase.java b/platform/platform-api/src/com/intellij/ide/actions/TreeExpandAllActionBase.java index 33c2372efd34..0eab35f3eb5a 100644 --- a/platform/platform-api/src/com/intellij/ide/actions/TreeExpandAllActionBase.java +++ b/platform/platform-api/src/com/intellij/ide/actions/TreeExpandAllActionBase.java @@ -6,15 +6,13 @@ import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.project.DumbAwareAction; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** * @deprecated use {@link ExpandAllAction} instead */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.1") +@Deprecated(forRemoval = true) public abstract class TreeExpandAllActionBase extends DumbAwareAction { protected abstract @Nullable TreeExpander getExpander(@NotNull DataContext context); diff --git a/platform/platform-api/src/com/intellij/ide/ui/PublicMethodBasedOptionDescription.java b/platform/platform-api/src/com/intellij/ide/ui/PublicMethodBasedOptionDescription.java index c1f556ed658f..ec4eba326265 100644 --- a/platform/platform-api/src/com/intellij/ide/ui/PublicMethodBasedOptionDescription.java +++ b/platform/platform-api/src/com/intellij/ide/ui/PublicMethodBasedOptionDescription.java @@ -4,7 +4,6 @@ package com.intellij.ide.ui; import com.intellij.ide.ui.search.BooleanOptionDescription; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.NlsContexts; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.lang.invoke.MethodHandles; @@ -21,8 +20,7 @@ public class PublicMethodBasedOptionDescription extends BooleanOptionDescription /** * @deprecated Use {@link #PublicMethodBasedOptionDescription(String, String, String, String, Supplier)} */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) public PublicMethodBasedOptionDescription(@NlsContexts.Label String option, String configurableId, String getterName, String setterName) { super(option, configurableId); myGetterName = getterName; diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeBuilder.java b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeBuilder.java index b49309038eb6..bf33d03d46dc 100644 --- a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeBuilder.java +++ b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeBuilder.java @@ -14,7 +14,6 @@ import com.intellij.reference.SoftReference; import com.intellij.util.concurrency.EdtExecutorService; import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.update.MergingUpdateQueue; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -33,8 +32,7 @@ import java.util.*; /** * @deprecated use {@link com.intellij.ui.tree.AsyncTreeModel} and {@link com.intellij.ui.tree.StructureTreeModel} instead. */ -@ApiStatus.ScheduledForRemoval(inVersion = "2020.3") -@Deprecated +@Deprecated(forRemoval = true) public class AbstractTreeBuilder implements Disposable { private AbstractTreeUi myUi; private static final @NonNls String TREE_BUILDER = "TreeBuilder"; @@ -268,8 +266,7 @@ public class AbstractTreeBuilder implements Disposable { /** * @deprecated use {@link AbstractTreeUi#buildNodeForElement(Object)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void buildNodeForElement(@NotNull Object element) { AbstractTreeUi ui = getUi(); if (ui != null) ui.buildNodeForElement(element); @@ -278,8 +275,7 @@ public class AbstractTreeBuilder implements Disposable { /** * @deprecated use {@link AbstractTreeUi#getNodeForElement(Object, boolean)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public @Nullable DefaultMutableTreeNode getNodeForElement(@NotNull Object element) { AbstractTreeUi ui = getUi(); return ui == null ? null : ui.getNodeForElement(element, false); diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java index 112952adb832..8c4766f1fdf4 100644 --- a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java +++ b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java @@ -47,8 +47,7 @@ import java.util.function.Supplier; /** * @deprecated use {@link com.intellij.ui.tree.AsyncTreeModel} and {@link com.intellij.ui.tree.StructureTreeModel} instead. */ -@ApiStatus.ScheduledForRemoval(inVersion = "2020.3") -@Deprecated +@Deprecated(forRemoval = true) public class AbstractTreeUi { private static final Logger LOG = Logger.getInstance(AbstractTreeBuilder.class); protected JTree myTree;// protected for TestNG diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUpdater.java b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUpdater.java index af2b97b59380..053516532d23 100644 --- a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUpdater.java +++ b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUpdater.java @@ -13,7 +13,6 @@ import com.intellij.util.ui.update.Activatable; import com.intellij.util.ui.update.MergingUpdateQueue; import com.intellij.util.ui.update.UiNotifyConnector; import com.intellij.util.ui.update.Update; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -24,8 +23,7 @@ import java.util.*; /** * @deprecated use {@link com.intellij.ui.tree.AsyncTreeModel} and {@link com.intellij.ui.tree.StructureTreeModel} instead. */ -@ApiStatus.ScheduledForRemoval(inVersion = "2020.3") -@Deprecated +@Deprecated(forRemoval = true) public class AbstractTreeUpdater implements Disposable, Activatable { private static final Logger LOG = Logger.getInstance(AbstractTreeUpdater.class); @@ -79,8 +77,7 @@ public class AbstractTreeUpdater implements Disposable, Activatable { /** * @deprecated use {@link AbstractTreeBuilder#queueUpdateFrom(Object, boolean)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public synchronized void addSubtreeToUpdate(@NotNull DefaultMutableTreeNode rootNode) { addSubtreeToUpdate(new TreeUpdatePass(rootNode).setUpdateStamp(-1)); } @@ -88,8 +85,7 @@ public class AbstractTreeUpdater implements Disposable, Activatable { /** * @deprecated use {@link AbstractTreeBuilder#queueUpdateFrom(Object, boolean)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) synchronized void requeue(@NotNull TreeUpdatePass toAdd) { addSubtreeToUpdate(toAdd.setUpdateStamp(-1)); } @@ -97,8 +93,7 @@ public class AbstractTreeUpdater implements Disposable, Activatable { /** * @deprecated use {@link AbstractTreeBuilder#queueUpdateFrom(Object, boolean)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) synchronized void addSubtreeToUpdate(@NotNull TreeUpdatePass toAdd) { if (myReleaseRequested) return; @@ -279,8 +274,7 @@ public class AbstractTreeUpdater implements Disposable, Activatable { /** * @deprecated use {@link AbstractTreeBuilder#queueUpdateFrom(Object, boolean)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean addSubtreeToUpdateByElement(@NotNull Object element) { DefaultMutableTreeNode node = myTreeBuilder.getNodeForElement(element); if (node != null) { diff --git a/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java b/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java index 5b06dbdf8943..904d4c99f409 100644 --- a/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java +++ b/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java @@ -24,7 +24,6 @@ import com.intellij.util.ui.JBInsets; import com.intellij.util.ui.StartupUiUtil; import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.update.UiNotifyConnector; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -37,7 +36,6 @@ import java.awt.event.KeyEvent; import java.awt.image.BufferedImage; import java.util.List; import java.util.*; -import java.util.function.Supplier; public abstract class AbstractWizard extends DialogWrapper { private static final Logger LOG = Logger.getInstance(AbstractWizard.class); @@ -591,8 +589,7 @@ public abstract class AbstractWizard extends DialogWrapper { /** * @deprecated unused */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected JButton getFinishButton() { return new JButton(); } diff --git a/platform/platform-api/src/com/intellij/lang/StdLanguages.java b/platform/platform-api/src/com/intellij/lang/StdLanguages.java index 4b9a962b99ef..de5801e402cb 100644 --- a/platform/platform-api/src/com/intellij/lang/StdLanguages.java +++ b/platform/platform-api/src/com/intellij/lang/StdLanguages.java @@ -3,7 +3,6 @@ package com.intellij.lang; import com.intellij.openapi.fileTypes.FileTypes; import com.intellij.openapi.fileTypes.StdFileTypes; -import org.jetbrains.annotations.ApiStatus; /** * Defines the standard languages supported by IDEA. @@ -16,7 +15,7 @@ public final class StdLanguages { * * @deprecated use {@linkplain com.intellij.lang.java.JavaLanguage#INSTANCE} instead. */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static final Language JAVA = StdFileTypes.JAVA.getLanguage(); /** @@ -31,7 +30,7 @@ public final class StdLanguages { * * @deprecated use {@linkplain com.intellij.openapi.fileTypes.PlainTextLanguage#INSTANCE} instead. */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static final Language TEXT = FileTypes.PLAIN_TEXT.getLanguage(); private StdLanguages() { } diff --git a/platform/platform-api/src/com/intellij/notification/NotificationsAdapter.java b/platform/platform-api/src/com/intellij/notification/NotificationsAdapter.java index 1a789c9848e4..13161e6f76db 100644 --- a/platform/platform-api/src/com/intellij/notification/NotificationsAdapter.java +++ b/platform/platform-api/src/com/intellij/notification/NotificationsAdapter.java @@ -1,12 +1,9 @@ // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.notification; -import org.jetbrains.annotations.ApiStatus; - /** * @deprecated Use {@link Notifications} directly */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public class NotificationsAdapter implements Notifications { } diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/AlwaysPerformingActionGroup.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/AlwaysPerformingActionGroup.java index d20806b9a282..0133e41ea92f 100644 --- a/platform/platform-api/src/com/intellij/openapi/actionSystem/AlwaysPerformingActionGroup.java +++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/AlwaysPerformingActionGroup.java @@ -15,8 +15,6 @@ */ package com.intellij.openapi.actionSystem; -import org.jetbrains.annotations.ApiStatus; - /** * Markup interface to ignore the visible children count and always call "actionPerformed". * In menus {@link Presentation#isPerformGroup()} and {@link ActionGroup#canBePerformed(DataContext)} @@ -28,8 +26,7 @@ import org.jetbrains.annotations.ApiStatus; * * @deprecated Use {@link com.intellij.openapi.actionSystem.impl.ActionMenu#SUPPRESS_SUBMENU} instead. */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2022.2") +@Deprecated(forRemoval = true) public interface AlwaysPerformingActionGroup { } diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/CommonShortcuts.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/CommonShortcuts.java index 89624f87a231..006298d6ba89 100644 --- a/platform/platform-api/src/com/intellij/openapi/actionSystem/CommonShortcuts.java +++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/CommonShortcuts.java @@ -3,7 +3,6 @@ package com.intellij.openapi.actionSystem; import com.intellij.openapi.util.SystemInfo; import com.intellij.util.BitUtil; -import org.jetbrains.annotations.ApiStatus; import javax.swing.*; import java.awt.event.InputEvent; @@ -28,7 +27,7 @@ public final class CommonShortcuts { /** * @deprecated use getDelete() instead to support keymap-specific and user-configured shortcuts */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static final ShortcutSet DELETE = new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0)); public static final ShortcutSet ESCAPE = new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0)); diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/DataConstants.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/DataConstants.java index 4d45694df910..4628edbf89e1 100644 --- a/platform/platform-api/src/com/intellij/openapi/actionSystem/DataConstants.java +++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/DataConstants.java @@ -15,23 +15,20 @@ */ package com.intellij.openapi.actionSystem; -import org.jetbrains.annotations.ApiStatus; - /** * Identifiers for data items which can be returned from {@link DataContext#getData(String)} and * {@link DataProvider#getData(String)}. * * @deprecated use {@link DataKeys} and {@link DataKey#getData} instead */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2022.1") +@Deprecated(forRemoval = true) public interface DataConstants { /** * Returns {@link com.intellij.openapi.project.Project} * * @deprecated use {@link PlatformDataKeys#PROJECT} instead */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") + @Deprecated(forRemoval = true) String PROJECT = CommonDataKeys.PROJECT.getName(); /** @@ -39,7 +36,7 @@ public interface DataConstants { * * @deprecated use {@link PlatformDataKeys#VIRTUAL_FILE} instead */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) String VIRTUAL_FILE = CommonDataKeys.VIRTUAL_FILE.getName(); /** @@ -47,6 +44,6 @@ public interface DataConstants { * * @deprecated use {@link PlatformDataKeys#EDITOR} instead */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) String EDITOR = CommonDataKeys.EDITOR.getName(); } diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/PlatformDataKeys.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/PlatformDataKeys.java index 62b86d344d6f..895ce9ef0a28 100644 --- a/platform/platform-api/src/com/intellij/openapi/actionSystem/PlatformDataKeys.java +++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/PlatformDataKeys.java @@ -75,7 +75,6 @@ public class PlatformDataKeys extends PlatformCoreDataKeys { * * @deprecated use {@link ActionPromoter} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static final DataKey> ACTIONS_SORTER = DataKey.create("actionsSorter"); } diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionManagerEx.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionManagerEx.java index 1072555b7306..0e78e68ed380 100644 --- a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionManagerEx.java +++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionManagerEx.java @@ -33,15 +33,13 @@ public abstract class ActionManagerEx extends ActionManager { /** @deprecated use {@link #fireBeforeActionPerformed(AnAction, AnActionEvent)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public final void fireBeforeActionPerformed(@NotNull AnAction action, @NotNull DataContext dataContext, @NotNull AnActionEvent event) { fireBeforeActionPerformed(action, event); } /** @deprecated use {@link #fireAfterActionPerformed(AnAction, AnActionEvent, AnActionResult)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public final void fireAfterActionPerformed(@NotNull AnAction action, @NotNull DataContext dataContext, @NotNull AnActionEvent event) { fireAfterActionPerformed(action, event, AnActionResult.PERFORMED); } diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionUtil.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionUtil.java index 1f40c6e76931..6bfa0be0628e 100644 --- a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionUtil.java +++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionUtil.java @@ -168,8 +168,7 @@ public final class ActionUtil { /** * @deprecated use {@link #performDumbAwareUpdate(boolean, AnAction, AnActionEvent, boolean)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static boolean performDumbAwareUpdate(@NotNull AnAction action, @NotNull AnActionEvent e, boolean beforeActionPerformed) { return performDumbAwareUpdate(false, action, e, beforeActionPerformed); } diff --git a/platform/platform-api/src/com/intellij/openapi/application/ApplicationStarterEx.java b/platform/platform-api/src/com/intellij/openapi/application/ApplicationStarterEx.java index 5937f4c12e9c..3629bf936f44 100644 --- a/platform/platform-api/src/com/intellij/openapi/application/ApplicationStarterEx.java +++ b/platform/platform-api/src/com/intellij/openapi/application/ApplicationStarterEx.java @@ -3,7 +3,6 @@ package com.intellij.openapi.application; import com.intellij.ide.CliResult; import com.intellij.util.ArrayUtilRt; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -12,8 +11,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.Future; /** @deprecated override {@link ApplicationStarter} instead */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.2") +@Deprecated(forRemoval = true) public abstract class ApplicationStarterEx implements ApplicationStarter { @NotNull @Override @@ -25,8 +23,7 @@ public abstract class ApplicationStarterEx implements ApplicationStarter { /** * @deprecated use async version {@link #processExternalCommandLineAsync} */ - @ApiStatus.ScheduledForRemoval(inVersion = "2021.2") - @Deprecated + @Deprecated(forRemoval = true) public void processExternalCommandLine(String @NotNull [] args, @Nullable String currentDirectory) { throw new UnsupportedOperationException("Class " + getClass().getName() + " must implement `processExternalCommandLine()`"); } diff --git a/platform/platform-api/src/com/intellij/openapi/editor/event/EditorMouseMotionAdapter.java b/platform/platform-api/src/com/intellij/openapi/editor/event/EditorMouseMotionAdapter.java index 79cb03a99735..5484f477e8a8 100644 --- a/platform/platform-api/src/com/intellij/openapi/editor/event/EditorMouseMotionAdapter.java +++ b/platform/platform-api/src/com/intellij/openapi/editor/event/EditorMouseMotionAdapter.java @@ -1,12 +1,9 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.editor.event; -import org.jetbrains.annotations.ApiStatus; - /** * @deprecated Use {@link EditorMouseMotionListener} directly. */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public abstract class EditorMouseMotionAdapter implements EditorMouseMotionListener { } diff --git a/platform/platform-api/src/com/intellij/openapi/keymap/KeymapManager.java b/platform/platform-api/src/com/intellij/openapi/keymap/KeymapManager.java index 9762a5e36c71..3406e6ac71f4 100644 --- a/platform/platform-api/src/com/intellij/openapi/keymap/KeymapManager.java +++ b/platform/platform-api/src/com/intellij/openapi/keymap/KeymapManager.java @@ -5,7 +5,6 @@ import com.intellij.diagnostic.LoadingState; import com.intellij.openapi.Disposable; import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -42,15 +41,13 @@ public abstract class KeymapManager { /** * @deprecated use {@link KeymapManagerListener#TOPIC} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public abstract void addKeymapManagerListener(@NotNull KeymapManagerListener listener, @NotNull Disposable parentDisposable); /** * @deprecated use {@link KeymapManagerListener#TOPIC} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public abstract void removeKeymapManagerListener(@NotNull KeymapManagerListener listener); /** diff --git a/platform/platform-api/src/com/intellij/openapi/options/ConfigurableGroup.java b/platform/platform-api/src/com/intellij/openapi/options/ConfigurableGroup.java index 5aa79893f3f0..e58db34903ab 100644 --- a/platform/platform-api/src/com/intellij/openapi/options/ConfigurableGroup.java +++ b/platform/platform-api/src/com/intellij/openapi/options/ConfigurableGroup.java @@ -2,7 +2,6 @@ package com.intellij.openapi.options; import com.intellij.openapi.util.NlsContexts; -import org.jetbrains.annotations.ApiStatus; public interface ConfigurableGroup extends Configurable.Composite { @NlsContexts.ConfigurableName @@ -11,7 +10,6 @@ public interface ConfigurableGroup extends Configurable.Composite { /** * @deprecated unused */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) default String getShortName() { return null; } } diff --git a/platform/platform-api/src/com/intellij/openapi/options/NonDefaultProjectConfigurable.java b/platform/platform-api/src/com/intellij/openapi/options/NonDefaultProjectConfigurable.java index 670446b2ceaf..0cb5c58bfb63 100644 --- a/platform/platform-api/src/com/intellij/openapi/options/NonDefaultProjectConfigurable.java +++ b/platform/platform-api/src/com/intellij/openapi/options/NonDefaultProjectConfigurable.java @@ -1,15 +1,12 @@ // Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.options; -import org.jetbrains.annotations.ApiStatus; - /** * @deprecated Please use {@link ConfigurableEP#nonDefaultProject} instead. * * Marker interface that should be implemented by project level configurables that do not apply * to the default project. */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public interface NonDefaultProjectConfigurable { } \ No newline at end of file diff --git a/platform/platform-api/src/com/intellij/openapi/project/impl/ProjectLifecycleListener.java b/platform/platform-api/src/com/intellij/openapi/project/impl/ProjectLifecycleListener.java index 391c31f5ddc3..92b871e261c7 100644 --- a/platform/platform-api/src/com/intellij/openapi/project/impl/ProjectLifecycleListener.java +++ b/platform/platform-api/src/com/intellij/openapi/project/impl/ProjectLifecycleListener.java @@ -3,7 +3,6 @@ package com.intellij.openapi.project.impl; import com.intellij.openapi.project.Project; import com.intellij.util.messages.Topic; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.nio.file.Path; @@ -18,24 +17,21 @@ public interface ProjectLifecycleListener { /** * @deprecated Do not use. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) default void projectComponentsInitialized(@NotNull Project project) { } /** * @deprecated Deprecated for performance and stability reasons. Please find another solution. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) default void beforeProjectLoaded(@NotNull Project project) { } /** * @deprecated Deprecated for performance and stability reasons. Please find another solution. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) default void beforeProjectLoaded(@NotNull Path projectPath, @NotNull Project project) { beforeProjectLoaded(project); } @@ -43,8 +39,7 @@ public interface ProjectLifecycleListener { /** * @deprecated Use {@link com.intellij.openapi.project.ProjectManagerListener#projectClosed(Project)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) default void afterProjectClosed(@NotNull Project project) { } } diff --git a/platform/platform-api/src/com/intellij/openapi/roots/ui/CellAppearanceEx.java b/platform/platform-api/src/com/intellij/openapi/roots/ui/CellAppearanceEx.java index 38932d74caa7..a42d1af8dbe1 100644 --- a/platform/platform-api/src/com/intellij/openapi/roots/ui/CellAppearanceEx.java +++ b/platform/platform-api/src/com/intellij/openapi/roots/ui/CellAppearanceEx.java @@ -3,15 +3,13 @@ package com.intellij.openapi.roots.ui; import com.intellij.openapi.util.NlsContexts.ListItem; import com.intellij.ui.SimpleColoredComponent; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; public interface CellAppearanceEx { @NotNull @ListItem String getText(); /** @deprecated don't implement this method - it's never called */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) default void customize(@SuppressWarnings("ALL") com.intellij.ui.HtmlListCellRenderer renderer) { } void customize(@NotNull SimpleColoredComponent component); diff --git a/platform/platform-api/src/com/intellij/openapi/ui/ComponentValidator.java b/platform/platform-api/src/com/intellij/openapi/ui/ComponentValidator.java index fdc3d35ab989..5135da12d6cb 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/ComponentValidator.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/ComponentValidator.java @@ -20,7 +20,6 @@ import com.intellij.ui.awt.RelativePoint; import com.intellij.ui.scale.JBUIScale; import com.intellij.util.Alarm; import com.intellij.util.ui.*; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -84,8 +83,7 @@ public class ComponentValidator { /** * @deprecated Use {@link ComponentValidator#withValidator(Supplier)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public ComponentValidator withValidator(@NotNull Consumer validator) { this.validator = () -> { validator.accept(this); diff --git a/platform/platform-api/src/com/intellij/openapi/ui/ComponentWithBrowseButton.java b/platform/platform-api/src/com/intellij/openapi/ui/ComponentWithBrowseButton.java index fc13c4a654ac..98f6c4c7ef8a 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/ComponentWithBrowseButton.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/ComponentWithBrowseButton.java @@ -25,7 +25,6 @@ import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.accessibility.ScreenReader; import com.intellij.util.ui.update.Activatable; import com.intellij.util.ui.update.UiNotifyConnector; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -225,8 +224,7 @@ public class ComponentWithBrowseButton extends JPanel i * @see #setButtonVisible * @see #setButtonEnabled */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.2") - @Deprecated + @Deprecated(forRemoval = true) public FixedSizeButton getButton() { return myBrowseButton; } @@ -309,8 +307,7 @@ public class ComponentWithBrowseButton extends JPanel i /** * @deprecated use {@link #addActionListener(ActionListener)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void addBrowseFolderListener(@Nullable Project project, final BrowseFolderActionListener actionListener, boolean autoRemoveOnHide) { addActionListener(actionListener); } diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DialogBuilder.java b/platform/platform-api/src/com/intellij/openapi/ui/DialogBuilder.java index 6daf8c1ecb48..c35360128b41 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/DialogBuilder.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogBuilder.java @@ -11,7 +11,6 @@ import com.intellij.openapi.util.NlsContexts.DialogTitle; import com.intellij.openapi.util.NlsSafe; import com.intellij.util.containers.ContainerUtil; import org.intellij.lang.annotations.MagicConstant; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -168,8 +167,7 @@ public class DialogBuilder implements Disposable { /** * @deprecated Dialog action buttons should be right-aligned. */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.2") - @Deprecated + @Deprecated(forRemoval = true) public void setButtonsAlignment(@MagicConstant(intValues = {SwingConstants.CENTER, SwingConstants.RIGHT}) int alignment) { myDialogWrapper.setButtonsAlignment(alignment); } diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java index 761edcc9bcb4..f499378fd620 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java @@ -337,8 +337,7 @@ public abstract class DialogWrapper { /** * @deprecated Please use setDoNotAskOption(com.intellij.openapi.ui.DoNotAskOption) instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2022.2") + @Deprecated(forRemoval = true) public void setDoNotAskOption(@Nullable DoNotAskOption doNotAsk) { myDoNotAsk = doNotAsk; } @@ -1450,8 +1449,7 @@ public abstract class DialogWrapper { } /** @deprecated Dialog action buttons should be right-aligned. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2022.2") + @Deprecated(forRemoval = true) protected final void setButtonsAlignment(@MagicConstant(intValues = {SwingConstants.CENTER, SwingConstants.RIGHT}) int alignment) { if (SwingConstants.CENTER != alignment && SwingConstants.RIGHT != alignment) { throw new IllegalArgumentException("unknown alignment: " + alignment); @@ -2138,8 +2136,7 @@ public abstract class DialogWrapper { /** * @deprecated Please use com.intellij.openapi.ui.DoNotAskOption instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2022.2") + @Deprecated(forRemoval = true) public interface DoNotAskOption extends com.intellij.openapi.ui.DoNotAskOption { abstract class Adapter extends com.intellij.openapi.ui.DoNotAskOption.Adapter implements DoNotAskOption {} } diff --git a/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java b/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java index 47ddc45cce50..6d7656e4dce5 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java @@ -25,7 +25,6 @@ import com.intellij.util.ui.JBUI; import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.tree.TreeUtil; import com.intellij.util.xmlb.XmlSerializerUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -788,8 +787,7 @@ public abstract class MasterDetailsComponent implements Configurable, DetailsCom /** * @deprecated Use {@link #MyDeleteAction(Predicate)} */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) public MyDeleteAction(@Nullable Condition availableCondition) { this(availableCondition == null ? null : (Predicate)availableCondition::value); } diff --git a/platform/platform-api/src/com/intellij/openapi/ui/Messages.java b/platform/platform-api/src/com/intellij/openapi/ui/Messages.java index fc700f34f644..43ff5150d4a7 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/Messages.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/Messages.java @@ -116,13 +116,11 @@ public class Messages { public static final String OK_BUTTON = "OK"; /** @deprecated Use {@link #getYesButton()} instead */ - @SuppressWarnings("HardCodedStringLiteral") @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @SuppressWarnings("HardCodedStringLiteral") @Deprecated(forRemoval = true) public static final String YES_BUTTON = "&Yes"; /** @deprecated Use {@link #getNoButton()} instead */ - @SuppressWarnings("HardCodedStringLiteral") @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @SuppressWarnings("HardCodedStringLiteral") @Deprecated(forRemoval = true) public static final String NO_BUTTON = "&No"; /** @deprecated Use {@link #getCancelButton()} instead */ @@ -400,8 +398,7 @@ public class Messages { } /** @deprecated Use {@link MessageDialogBuilder#yesNo} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static int showYesNoDialog(@Nullable Project project, @DialogMessage String message, @NotNull @DialogTitle String title, diff --git a/platform/platform-api/src/com/intellij/openapi/ui/NamedItemsListEditor.java b/platform/platform-api/src/com/intellij/openapi/ui/NamedItemsListEditor.java index 118a55322f1e..6112cea72836 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/NamedItemsListEditor.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/NamedItemsListEditor.java @@ -12,7 +12,6 @@ import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.util.*; import com.intellij.util.IconUtil; import com.intellij.util.ui.tree.TreeUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -86,8 +85,7 @@ public abstract class NamedItemsListEditor extends MasterDetailsComponent { * @deprecated override {@link #getCopyDialogTitle()}, {@link #getCreateNewDialogTitle()}, {@link #getNewLabelText()} instead */ @SuppressWarnings({"DeprecatedIsStillUsed", "HardCodedStringLiteral"}) - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected String subjDisplayName() { return "item"; } diff --git a/platform/platform-api/src/com/intellij/openapi/ui/ThreeComponentsSplitter.java b/platform/platform-api/src/com/intellij/openapi/ui/ThreeComponentsSplitter.java index 3c642c43a3ec..424df202f120 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/ThreeComponentsSplitter.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/ThreeComponentsSplitter.java @@ -23,7 +23,6 @@ import com.intellij.util.ui.JBUI; import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.update.Activatable; import com.intellij.util.ui.update.UiNotifyConnector; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -207,8 +206,7 @@ public class ThreeComponentsSplitter extends JPanel implements Disposable { /** * @deprecated Use {@link #ThreeComponentsSplitter(Disposable)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public ThreeComponentsSplitter(boolean vertical, boolean onePixelDividers) { this(vertical, onePixelDividers, null, true); } diff --git a/platform/platform-api/src/com/intellij/openapi/ui/popup/IdePopupEventDispatcher.java b/platform/platform-api/src/com/intellij/openapi/ui/popup/IdePopupEventDispatcher.java index bbc216f73191..e984137a5baa 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/popup/IdePopupEventDispatcher.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/popup/IdePopupEventDispatcher.java @@ -16,7 +16,6 @@ package com.intellij.openapi.ui.popup; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -43,7 +42,6 @@ public interface IdePopupEventDispatcher { } /** @deprecated use {@link IdePopupEventDispatcher#setRestoreFocusSilently()} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) default void setRestoreFocusSilentely() {} } diff --git a/platform/platform-api/src/com/intellij/openapi/ui/popup/JBPopupFactory.java b/platform/platform-api/src/com/intellij/openapi/ui/popup/JBPopupFactory.java index c451583b3720..c3d5b903e15f 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/popup/JBPopupFactory.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/popup/JBPopupFactory.java @@ -14,7 +14,6 @@ import com.intellij.openapi.util.Condition; import com.intellij.ui.awt.RelativePoint; import com.intellij.openapi.util.NlsContexts; import com.intellij.openapi.util.NlsContexts.PopupTitle; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -158,8 +157,7 @@ public abstract class JBPopupFactory { /** * @deprecated use {@link #createActionsStep(ActionGroup, DataContext, String, boolean, boolean, String, Component, boolean, int, boolean)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @NotNull public ListPopupStep createActionsStep(@NotNull ActionGroup actionGroup, @NotNull DataContext dataContext, @@ -174,8 +172,7 @@ public abstract class JBPopupFactory { /** * @deprecated use {@link #createActionsStep(ActionGroup, DataContext, String, boolean, boolean, String, Component, boolean, int, boolean)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @NotNull public ListPopupStep createActionsStep(@NotNull ActionGroup actionGroup, @NotNull DataContext dataContext, diff --git a/platform/platform-api/src/com/intellij/openapi/util/DimensionService.java b/platform/platform-api/src/com/intellij/openapi/util/DimensionService.java index 76d4e0158106..4a5fbd367ebf 100644 --- a/platform/platform-api/src/com/intellij/openapi/util/DimensionService.java +++ b/platform/platform-api/src/com/intellij/openapi/util/DimensionService.java @@ -17,7 +17,6 @@ import com.intellij.util.containers.ObjectIntHashMap; import com.intellij.util.containers.ObjectIntMap; import com.intellij.util.ui.JBUI; import org.jdom.Element; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -63,8 +62,7 @@ public final class DimensionService extends SimpleModificationTracker implements * * @deprecated use {@link #getLocation(String, Project)} instead. */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) @Nullable public synchronized Point getLocation(String key) { return getLocation(key, guessProject()); @@ -98,8 +96,7 @@ public final class DimensionService extends SimpleModificationTracker implements * * @deprecated use {@link #setLocation(String, Point, Project)} instead. */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) public synchronized void setLocation(String key, Point point) { setLocation(key, point, guessProject()); } @@ -127,8 +124,7 @@ public final class DimensionService extends SimpleModificationTracker implements * * @deprecated use {@link #getSize(String, Project)} instead. */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) @Nullable public synchronized Dimension getSize(@NotNull @NonNls String key) { return getSize(key, guessProject()); @@ -159,8 +155,7 @@ public final class DimensionService extends SimpleModificationTracker implements * * @deprecated use {@link #setSize(String, Dimension, Project)} instead. */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) public synchronized void setSize(@NotNull @NonNls String key, Dimension size) { setSize(key, size, guessProject()); } diff --git a/platform/platform-api/src/com/intellij/ui/CheckboxTreeBase.java b/platform/platform-api/src/com/intellij/ui/CheckboxTreeBase.java index b222269e30f0..b1d1f599671a 100644 --- a/platform/platform-api/src/com/intellij/ui/CheckboxTreeBase.java +++ b/platform/platform-api/src/com/intellij/ui/CheckboxTreeBase.java @@ -19,7 +19,6 @@ import com.intellij.util.ui.ThreeStateCheckBox; import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.accessibility.AccessibleContextDelegate; import com.intellij.util.ui.accessibility.AccessibleContextUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -233,8 +232,7 @@ public class CheckboxTreeBase extends Tree { * @deprecated use {@link CheckboxTreeCellRendererBase#customizeRenderer(JTree, Object, boolean, boolean, boolean, int, boolean)} */ @SuppressWarnings({"DeprecatedIsStillUsed", "unused"}) - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void customizeCellRenderer(JTree tree, Object value, boolean selected, @@ -257,8 +255,7 @@ public class CheckboxTreeBase extends Tree { * @see State * @deprecated Don't use this enum. Left for API compatibility. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public enum NodeState { FULL, CLEAR, PARTIAL } diff --git a/platform/platform-api/src/com/intellij/ui/ColorChooserService.java b/platform/platform-api/src/com/intellij/ui/ColorChooserService.java index cc8a07730977..d1bd8fe213cc 100644 --- a/platform/platform-api/src/com/intellij/ui/ColorChooserService.java +++ b/platform/platform-api/src/com/intellij/ui/ColorChooserService.java @@ -6,7 +6,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.NlsContexts.DialogTitle; import com.intellij.ui.awt.RelativePoint; import com.intellij.ui.picker.ColorListener; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -24,8 +23,7 @@ public abstract class ColorChooserService { /** * @deprecated this overload does not work with headless implementation, use one with the Project instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @Nullable public abstract Color showDialog(Component parent, @DialogTitle String caption, Color preselectedColor, boolean enableOpacity, List listeners, boolean opacityInPercent); diff --git a/platform/platform-api/src/com/intellij/ui/ColoredListCellRendererWrapper.java b/platform/platform-api/src/com/intellij/ui/ColoredListCellRendererWrapper.java index 5673990e135f..371978647aa6 100644 --- a/platform/platform-api/src/com/intellij/ui/ColoredListCellRendererWrapper.java +++ b/platform/platform-api/src/com/intellij/ui/ColoredListCellRendererWrapper.java @@ -1,13 +1,12 @@ // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.ui; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import javax.swing.*; /** @deprecated useless, go for {@link ColoredListCellRenderer} directly */ -@Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public abstract class ColoredListCellRendererWrapper extends ColoredListCellRenderer { @Override protected final void customizeCellRenderer(@NotNull JList list, T value, int index, boolean selected, boolean hasFocus) { diff --git a/platform/platform-api/src/com/intellij/ui/GuiUtils.java b/platform/platform-api/src/com/intellij/ui/GuiUtils.java index 3f37b183e1a6..7bb407f9314f 100644 --- a/platform/platform-api/src/com/intellij/ui/GuiUtils.java +++ b/platform/platform-api/src/com/intellij/ui/GuiUtils.java @@ -16,7 +16,6 @@ import com.intellij.util.Consumer; import com.intellij.util.ui.JBInsets; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.UIUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import sun.awt.AWTAccessor; @@ -211,8 +210,7 @@ public final class GuiUtils { * @deprecated Use {@link Application#invokeAndWait} */ @SuppressWarnings("RedundantThrows") - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static void runOrInvokeAndWait(@NotNull Runnable runnable) throws InvocationTargetException, InterruptedException { ApplicationManager.getApplication().invokeAndWait(runnable); } @@ -220,8 +218,7 @@ public final class GuiUtils { /** * @deprecated Use ModalityUiUtil instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") + @Deprecated(forRemoval = true) public static void invokeLaterIfNeeded(@NotNull Runnable runnable, @NotNull ModalityState modalityState) { Application app = ApplicationManager.getApplication(); if (app.isDispatchThread()) { @@ -235,8 +232,7 @@ public final class GuiUtils { /** * @deprecated Use ModalityUiUtil instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") + @Deprecated(forRemoval = true) public static void invokeLaterIfNeeded(@NotNull Runnable runnable, @NotNull ModalityState modalityState, @NotNull Condition expired) { Application app = ApplicationManager.getApplication(); if (app.isDispatchThread()) { diff --git a/platform/platform-api/src/com/intellij/ui/HtmlListCellRenderer.java b/platform/platform-api/src/com/intellij/ui/HtmlListCellRenderer.java index c91f8435ef19..e8714a592255 100644 --- a/platform/platform-api/src/com/intellij/ui/HtmlListCellRenderer.java +++ b/platform/platform-api/src/com/intellij/ui/HtmlListCellRenderer.java @@ -2,7 +2,6 @@ package com.intellij.ui; import com.intellij.openapi.util.text.HtmlChunk; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; @@ -12,8 +11,7 @@ import static com.intellij.ui.SimpleColoredComponent.formatLink; import static com.intellij.ui.SimpleColoredComponent.formatText; /** @deprecated the class is no longer used in API; use {@link SimpleColoredRenderer} instead */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public abstract class HtmlListCellRenderer extends ListCellRendererWrapper { private @Nls StringBuilder myText; diff --git a/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java b/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java index 78b259bd471b..9c04d5062188 100644 --- a/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java +++ b/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java @@ -6,7 +6,6 @@ import com.intellij.ui.border.IdeaTitledBorder; import com.intellij.util.ui.JBInsets; import com.intellij.util.ui.JBUI; import org.intellij.lang.annotations.MagicConstant; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import javax.swing.border.Border; @@ -73,8 +72,7 @@ public final class IdeBorderFactory { /** * @deprecated use {@link JBUI.Borders#empty(int)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static Border createEmptyBorder(int thickness) { return JBUI.Borders.empty(thickness); } diff --git a/platform/platform-api/src/com/intellij/ui/IdeUICustomization.java b/platform/platform-api/src/com/intellij/ui/IdeUICustomization.java index d061ca108cef..df758de35500 100644 --- a/platform/platform-api/src/com/intellij/ui/IdeUICustomization.java +++ b/platform/platform-api/src/com/intellij/ui/IdeUICustomization.java @@ -19,8 +19,7 @@ public class IdeUICustomization { * @deprecated it's hard to properly localize 'project' term in the middle of a sentence; if you need to use a 'project' term, * put the whole message to ProjectConceptBundle.properties and refer to it via {@link #projectMessage} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @NotNull public String getProjectConceptName() { return "project"; @@ -37,8 +36,7 @@ public class IdeUICustomization { /** * @deprecated use {@code projectMessage("tab.title.project")} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @Nls(capitalization = Nls.Capitalization.Title) public String getProjectDisplayName() { return projectMessage("tab.title.project"); @@ -55,8 +53,7 @@ public class IdeUICustomization { /** * @deprecated use {@code projectMessage("select.in.item.project.view")} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public String getProjectViewSelectInTitle() { return projectMessage("select.in.item.project.view"); } diff --git a/platform/platform-api/src/com/intellij/ui/JBDefaultTreeCellRenderer.java b/platform/platform-api/src/com/intellij/ui/JBDefaultTreeCellRenderer.java index f8c47608e1e6..c6c2f515a403 100644 --- a/platform/platform-api/src/com/intellij/ui/JBDefaultTreeCellRenderer.java +++ b/platform/platform-api/src/com/intellij/ui/JBDefaultTreeCellRenderer.java @@ -4,7 +4,6 @@ package com.intellij.ui; import com.intellij.util.ReflectionUtil; import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.tree.WideSelectionTreeUI; -import org.jetbrains.annotations.ApiStatus.ScheduledForRemoval; import org.jetbrains.annotations.NotNull; import javax.swing.JTree; @@ -15,8 +14,7 @@ import java.awt.Color; * Extend this class instead of DefaultTreeCellRenderer * @deprecated use {@link com.intellij.ui.render.LabelBasedRenderer.Tree} instead */ -@Deprecated -@ScheduledForRemoval(inVersion = "2022.2") +@Deprecated(forRemoval = true) public class JBDefaultTreeCellRenderer extends DefaultTreeCellRenderer { private final boolean myWideSelection; diff --git a/platform/platform-api/src/com/intellij/ui/ListCellRendererWrapper.java b/platform/platform-api/src/com/intellij/ui/ListCellRendererWrapper.java index 0add02eebca3..6ed9d059a504 100644 --- a/platform/platform-api/src/com/intellij/ui/ListCellRendererWrapper.java +++ b/platform/platform-api/src/com/intellij/ui/ListCellRendererWrapper.java @@ -7,7 +7,6 @@ import com.intellij.ui.components.JBLabel; import com.intellij.util.containers.FList; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.UIUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -74,8 +73,7 @@ public abstract class ListCellRendererWrapper implements ListCellRenderer /** * @deprecated Use plain {@link JSeparator} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @NotNull public static Component createSeparator(@Nullable @NlsContexts.Separator String text) { TitledSeparator separator = new TitledSeparator(text); diff --git a/platform/platform-api/src/com/intellij/ui/PopupHandler.java b/platform/platform-api/src/com/intellij/ui/PopupHandler.java index 8048d0a1f3d4..191734fa1bea 100644 --- a/platform/platform-api/src/com/intellij/ui/PopupHandler.java +++ b/platform/platform-api/src/com/intellij/ui/PopupHandler.java @@ -4,7 +4,6 @@ package com.intellij.ui; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -59,8 +58,7 @@ public abstract class PopupHandler extends MouseAdapter { } /** @deprecated use {@link #installPopupMenu(JComponent, String, String)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") + @Deprecated(forRemoval = true) public static void installPopupHandler(@NotNull JComponent component, @NotNull String groupId, @NotNull String place) { @@ -102,8 +100,7 @@ public abstract class PopupHandler extends MouseAdapter { } /** @deprecated use {@link #installPopupMenu(JComponent, ActionGroup, String)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") + @Deprecated(forRemoval = true) public static @NotNull MouseListener installPopupHandler(@NotNull JComponent component, @NotNull ActionGroup group, @NotNull String place, @@ -112,8 +109,7 @@ public abstract class PopupHandler extends MouseAdapter { } /** @deprecated use {@link #installPopupMenu(JComponent, ActionGroup, String)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval (inVersion = "2021.2") + @Deprecated(forRemoval = true) public static @NotNull MouseListener installPopupHandler(@NotNull JComponent component, @NotNull ActionGroup group, @NotNull String place, @@ -157,8 +153,7 @@ public abstract class PopupHandler extends MouseAdapter { } /** @deprecated use {@link #installFollowingSelectionTreePopup(JTree, ActionGroup, String)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static @NotNull MouseListener installFollowingSelectionTreePopup(@NotNull JTree tree, @NotNull ActionGroup group, @NotNull String place, diff --git a/platform/platform-api/src/com/intellij/ui/RowEditableTableModel.java b/platform/platform-api/src/com/intellij/ui/RowEditableTableModel.java index 67a9903d8659..d8915e39d620 100644 --- a/platform/platform-api/src/com/intellij/ui/RowEditableTableModel.java +++ b/platform/platform-api/src/com/intellij/ui/RowEditableTableModel.java @@ -15,8 +15,6 @@ */ package com.intellij.ui; -import org.jetbrains.annotations.ApiStatus; - import javax.swing.table.TableModel; /** @@ -24,8 +22,7 @@ import javax.swing.table.TableModel; * @author Konstantin Bulenkov * @deprecated use {@link com.intellij.util.ui.EditableModel} */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public interface RowEditableTableModel extends TableModel { void addRow(); diff --git a/platform/platform-api/src/com/intellij/ui/SearchTextField.java b/platform/platform-api/src/com/intellij/ui/SearchTextField.java index 5c498c099e66..70d2f8bcecbf 100644 --- a/platform/platform-api/src/com/intellij/ui/SearchTextField.java +++ b/platform/platform-api/src/com/intellij/ui/SearchTextField.java @@ -14,7 +14,6 @@ import com.intellij.openapi.wm.IdeFocusManager; import com.intellij.ui.components.JBList; import com.intellij.ui.components.JBTextField; import com.intellij.ui.scale.JBUIScale; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -428,8 +427,7 @@ public class SearchTextField extends JPanel { /** * @deprecated unused */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void setSearchIcon(final Icon icon) { } diff --git a/platform/platform-api/src/com/intellij/ui/components/JBTabbedPane.java b/platform/platform-api/src/com/intellij/ui/components/JBTabbedPane.java index db07f06c3046..140fb5869feb 100644 --- a/platform/platform-api/src/com/intellij/ui/components/JBTabbedPane.java +++ b/platform/platform-api/src/com/intellij/ui/components/JBTabbedPane.java @@ -7,7 +7,6 @@ import com.intellij.util.ui.JBSwingUtilities; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.UIUtil; import org.intellij.lang.annotations.JdkConstants; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -91,8 +90,7 @@ public class JBTabbedPane extends JTabbedPane implements HierarchyListener { } /** @deprecated Use {@link JBTabbedPane#setTabComponentInsets(Insets)} instead of overriding */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @NotNull protected Insets getInsetsForTabComponent() { return myTabComponentInsets; diff --git a/platform/platform-api/src/com/intellij/ui/components/labels/ActionLink.java b/platform/platform-api/src/com/intellij/ui/components/labels/ActionLink.java index 490e533604fc..1d7c51179289 100644 --- a/platform/platform-api/src/com/intellij/ui/components/labels/ActionLink.java +++ b/platform/platform-api/src/com/intellij/ui/components/labels/ActionLink.java @@ -21,8 +21,7 @@ import java.awt.event.InputEvent; * @see IJ Platform UI Guidelines | Link * @deprecated use {@link com.intellij.ui.components.AnActionLink} instead */ -@ApiStatus.ScheduledForRemoval(inVersion = "2022.2") -@Deprecated +@Deprecated(forRemoval = true) public class ActionLink extends LinkLabel implements DataProvider { private static final EmptyIcon ICON = JBUIScale.scaleIcon(EmptyIcon.create(0, 12)); private final AnAction myAction; diff --git a/platform/platform-api/src/com/intellij/ui/components/labels/DropDownLink.java b/platform/platform-api/src/com/intellij/ui/components/labels/DropDownLink.java index 7cbc7da353b1..16bd6425a60d 100644 --- a/platform/platform-api/src/com/intellij/ui/components/labels/DropDownLink.java +++ b/platform/platform-api/src/com/intellij/ui/components/labels/DropDownLink.java @@ -10,7 +10,6 @@ import com.intellij.ui.popup.PopupState; import com.intellij.ui.scale.JBUIScale; import com.intellij.util.Consumer; import com.intellij.util.ui.JBUI; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -24,8 +23,7 @@ import java.util.function.Function; * @deprecated use {@link com.intellij.ui.components.DropDownLink} instead */ @SuppressWarnings("HardCodedStringLiteral") -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2022.1") +@Deprecated(forRemoval = true) public class DropDownLink extends LinkLabel { private final PopupState myPopupState = PopupState.forPopup(); private T chosenItem; diff --git a/platform/platform-api/src/com/intellij/ui/components/labels/LinkLabel.java b/platform/platform-api/src/com/intellij/ui/components/labels/LinkLabel.java index 667901cbab05..05576f20f46e 100644 --- a/platform/platform-api/src/com/intellij/ui/components/labels/LinkLabel.java +++ b/platform/platform-api/src/com/intellij/ui/components/labels/LinkLabel.java @@ -14,7 +14,6 @@ import com.intellij.util.ui.JBRectangle; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.accessibility.ScreenReader; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -101,8 +100,7 @@ public class LinkLabel extends JLabel { * @see UI Guidelines * @deprecated use {@link com.intellij.ui.components.ActionLink} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) public LinkLabel(@NlsContexts.LinkLabel String text, @Nullable Icon icon, @Nullable LinkListener aListener, diff --git a/platform/platform-api/src/com/intellij/ui/components/labels/SwingActionLink.java b/platform/platform-api/src/com/intellij/ui/components/labels/SwingActionLink.java index f947561e978a..6c09fd43a292 100644 --- a/platform/platform-api/src/com/intellij/ui/components/labels/SwingActionLink.java +++ b/platform/platform-api/src/com/intellij/ui/components/labels/SwingActionLink.java @@ -1,7 +1,6 @@ // Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.ui.components.labels; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -13,8 +12,7 @@ import java.beans.PropertyChangeListener; * @see https://jetbrains.github.io/ui/controls/link/ * @deprecated use {@link com.intellij.ui.components.ActionLink} instead */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2022.1") +@Deprecated(forRemoval = true) public class SwingActionLink extends LinkLabel implements LinkListener { private final ActionEvent myEvent = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, Action.ACTION_COMMAND_KEY); diff --git a/platform/platform-api/src/com/intellij/ui/docking/DockManager.java b/platform/platform-api/src/com/intellij/ui/docking/DockManager.java index 72492423f69b..70c5480bc6a2 100644 --- a/platform/platform-api/src/com/intellij/ui/docking/DockManager.java +++ b/platform/platform-api/src/com/intellij/ui/docking/DockManager.java @@ -4,7 +4,6 @@ package com.intellij.ui.docking; import com.intellij.openapi.Disposable; import com.intellij.openapi.project.Project; import com.intellij.openapi.wm.IdeFrame; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -34,8 +33,7 @@ public abstract class DockManager { /** * @deprecated use {@link #getContainerFor(Component, Predicate)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") + @Deprecated(forRemoval = true) public abstract @Nullable DockContainer getContainerFor(Component c); public abstract @Nullable DockContainer getContainerFor(@Nullable Component c, @NotNull Predicate filter); diff --git a/platform/platform-api/src/com/intellij/ui/jcef/JBCefJSQuery.java b/platform/platform-api/src/com/intellij/ui/jcef/JBCefJSQuery.java index e9154704caac..4e4365104f6a 100644 --- a/platform/platform-api/src/com/intellij/ui/jcef/JBCefJSQuery.java +++ b/platform/platform-api/src/com/intellij/ui/jcef/JBCefJSQuery.java @@ -10,7 +10,6 @@ import org.cef.browser.CefMessageRouter; import org.cef.callback.CefQueryCallback; import org.cef.handler.CefMessageRouterHandler; import org.cef.handler.CefMessageRouterHandlerAdapter; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -73,8 +72,7 @@ public final class JBCefJSQuery implements JBCefDisposable { /** * @deprecated use {@link #create(JBCefBrowserBase)} */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.2") - @Deprecated + @Deprecated(forRemoval = true) public static JBCefJSQuery create(@NotNull JBCefBrowser browser) { return create((JBCefBrowserBase)browser); } diff --git a/platform/platform-api/src/com/intellij/ui/popup/util/PopupState.java b/platform/platform-api/src/com/intellij/ui/popup/util/PopupState.java index 255b0951b2e7..274ec8c19423 100644 --- a/platform/platform-api/src/com/intellij/ui/popup/util/PopupState.java +++ b/platform/platform-api/src/com/intellij/ui/popup/util/PopupState.java @@ -3,7 +3,6 @@ package com.intellij.ui.popup.util; import com.intellij.openapi.ui.popup.JBPopupListener; import com.intellij.openapi.ui.popup.LightweightWindowEvent; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import javax.swing.event.PopupMenuEvent; @@ -17,8 +16,7 @@ import static com.intellij.openapi.util.registry.Registry.intValue; * @see com.intellij.ui.popup.PopupState * @deprecated use another PopupState instead */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.2") +@Deprecated(forRemoval = true) public class PopupState implements JBPopupListener, PopupMenuListener { private boolean hidden = true; private long time; diff --git a/platform/platform-api/src/com/intellij/ui/speedSearch/NameFilteringListModel.java b/platform/platform-api/src/com/intellij/ui/speedSearch/NameFilteringListModel.java index 4596286d51af..ca1de20033fd 100644 --- a/platform/platform-api/src/com/intellij/ui/speedSearch/NameFilteringListModel.java +++ b/platform/platform-api/src/com/intellij/ui/speedSearch/NameFilteringListModel.java @@ -23,7 +23,6 @@ import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.Function; -import org.jetbrains.annotations.ApiStatus; import javax.swing.*; @@ -40,8 +39,7 @@ public class NameFilteringListModel extends FilteringListModel { private final Computable myPattern; /** @deprecated explicitly sets model for a list. Use other constructors instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public NameFilteringListModel(JList list, Function namer, Condition filter, diff --git a/platform/platform-api/src/com/intellij/ui/table/TableView.java b/platform/platform-api/src/com/intellij/ui/table/TableView.java index 03973f02f6ef..21dd77b66a27 100644 --- a/platform/platform-api/src/com/intellij/ui/table/TableView.java +++ b/platform/platform-api/src/com/intellij/ui/table/TableView.java @@ -24,7 +24,6 @@ import com.intellij.util.ui.ColumnInfo; import com.intellij.util.ui.ListTableModel; import com.intellij.util.ui.SortableColumnModel; import com.intellij.util.ui.TableViewModel; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -59,8 +58,7 @@ public class TableView extends BaseTableView implements SelectionProvider /** * @deprecated use {@link #setModelAndUpdateColumns(ListTableModel)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void setModel(final ListTableModel model) { setModelAndUpdateColumns(model); } diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBEditorTabs.java b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBEditorTabs.java index d9deaf9238f8..ac5738b27ba1 100644 --- a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBEditorTabs.java +++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBEditorTabs.java @@ -12,7 +12,6 @@ import com.intellij.ui.tabs.JBTabsPresentation; import com.intellij.ui.tabs.impl.singleRow.CompressibleSingleRowLayout; import com.intellij.ui.tabs.impl.singleRow.ScrollableSingleRowLayout; import com.intellij.ui.tabs.impl.singleRow.SingleRowLayout; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -26,8 +25,7 @@ public class JBEditorTabs extends JBTabsImpl implements JBEditorTabsBase { /** * @deprecated use {@link #myTabPainter}. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected JBEditorTabsPainter myDefaultPainter = new DefaultEditorTabsPainter(this); private boolean myAlphabeticalModeChanged = false; diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java index eab7c2ffae5e..e2be577de118 100644 --- a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java +++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java @@ -45,7 +45,6 @@ import com.intellij.util.containers.JBIterable; import com.intellij.util.ui.*; import com.intellij.util.ui.update.LazyUiDisposable; import org.intellij.lang.annotations.MagicConstant; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -3774,16 +3773,14 @@ public class JBTabsImpl extends JComponent /** * @deprecated Not used. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void dispose() { } /** * @deprecated unused in current realization. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected static class ShapeInfo { public ShapeInfo() { } diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/LayoutPassInfo.java b/platform/platform-api/src/com/intellij/ui/tabs/impl/LayoutPassInfo.java index d1291b55d683..f700724f5d7a 100644 --- a/platform/platform-api/src/com/intellij/ui/tabs/impl/LayoutPassInfo.java +++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/LayoutPassInfo.java @@ -30,8 +30,7 @@ public abstract class LayoutPassInfo { * @deprecated Will be removed in close future. If you suddenly need this, * then your code probably should be realized inside the {@link TabsLayout} implementation. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.2") + @Deprecated(forRemoval = true) public abstract int getRowCount(); public abstract Rectangle getHeaderRectangle(); diff --git a/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleNode.java b/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleNode.java index 9310328c92a7..c0a776046d95 100644 --- a/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleNode.java +++ b/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleNode.java @@ -12,7 +12,6 @@ import com.intellij.ui.tree.LeafState; import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.update.ComparableObject; import com.intellij.util.ui.update.ComparableObjectCheck; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -116,8 +115,7 @@ public abstract class SimpleNode extends PresentableNodeDescriptor implements Co * @deprecated use {@link #getTemplatePresentation()} to set constant presentation right in node's constructor * or update presentation dynamically by defining {@link #update(PresentationData)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public final void setNodeText(String text, String tooltip, boolean hasError) { clearColoredText(); SimpleTextAttributes attributes = hasError ? getErrorAttributes() : getPlainAttributes(); @@ -128,8 +126,7 @@ public abstract class SimpleNode extends PresentableNodeDescriptor implements Co * @deprecated use {@link #getTemplatePresentation()} to set constant presentation right in node's constructor * or update presentation dynamically by defining {@link #update(PresentationData)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public final void setPlainText(String aText) { clearColoredText(); addPlainText(aText); @@ -139,8 +136,7 @@ public abstract class SimpleNode extends PresentableNodeDescriptor implements Co * @deprecated use {@link #getTemplatePresentation()} to set constant presentation right in node's constructor * or update presentation dynamically by defining {@link #update(PresentationData)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public final void addPlainText(String aText) { getTemplatePresentation().addText(new ColoredFragment(aText, getPlainAttributes())); } @@ -149,8 +145,7 @@ public abstract class SimpleNode extends PresentableNodeDescriptor implements Co * @deprecated use {@link #getTemplatePresentation()} to set constant presentation right in node's constructor * or update presentation dynamically by defining {@link #update(PresentationData)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public final void clearColoredText() { getTemplatePresentation().clearText(); } @@ -159,8 +154,7 @@ public abstract class SimpleNode extends PresentableNodeDescriptor implements Co * @deprecated use {@link #getTemplatePresentation()} to set constant presentation right in node's constructor * or update presentation dynamically by defining {@link #update(PresentationData)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public final void addColoredFragment(String aText, SimpleTextAttributes aAttributes) { addColoredFragment(aText, null, aAttributes); } @@ -169,8 +163,7 @@ public abstract class SimpleNode extends PresentableNodeDescriptor implements Co * @deprecated use {@link #getTemplatePresentation()} to set constant presentation right in node's constructor * or update presentation dynamically by defining {@link #update(PresentationData)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public final void addColoredFragment(String aText, String toolTip, SimpleTextAttributes aAttributes) { getTemplatePresentation().addText(new ColoredFragment(aText, toolTip, aAttributes)); } @@ -237,8 +230,7 @@ public abstract class SimpleNode extends PresentableNodeDescriptor implements Co * @deprecated use {@link #getTemplatePresentation()} to set constant presentation right in node's constructor * or update presentation dynamically by defining {@link #update(PresentationData)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void setUniformIcon(Icon aIcon) { setIcon(aIcon); } diff --git a/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleTreeBuilder.java b/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleTreeBuilder.java index 920f4df5367d..1ec6f6fd5cb0 100644 --- a/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleTreeBuilder.java +++ b/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleTreeBuilder.java @@ -5,7 +5,6 @@ import com.intellij.ide.util.treeView.AbstractTreeBuilder; import com.intellij.ide.util.treeView.AbstractTreeStructure; import com.intellij.ide.util.treeView.NodeDescriptor; import com.intellij.openapi.application.ApplicationManager; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -17,8 +16,7 @@ import java.util.Comparator; /** * @deprecated use {@link com.intellij.ui.tree.AsyncTreeModel} and {@link com.intellij.ui.tree.StructureTreeModel} instead. */ -@ApiStatus.ScheduledForRemoval(inVersion = "2020.3") -@Deprecated +@Deprecated(forRemoval = true) public class SimpleTreeBuilder extends AbstractTreeBuilder { public SimpleTreeBuilder(JTree tree, DefaultTreeModel treeModel, AbstractTreeStructure treeStructure, @Nullable Comparator comparator) { //noinspection unchecked diff --git a/platform/platform-api/src/com/intellij/ui/treeStructure/filtered/FilteringTreeBuilder.java b/platform/platform-api/src/com/intellij/ui/treeStructure/filtered/FilteringTreeBuilder.java index f546081e7073..57dc3af7aaa3 100644 --- a/platform/platform-api/src/com/intellij/ui/treeStructure/filtered/FilteringTreeBuilder.java +++ b/platform/platform-api/src/com/intellij/ui/treeStructure/filtered/FilteringTreeBuilder.java @@ -14,7 +14,6 @@ import com.intellij.ui.treeStructure.Tree; import com.intellij.util.ui.tree.TreeUtil; import com.intellij.util.ui.update.MergingUpdateQueue; import com.intellij.util.ui.update.Update; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.concurrency.AsyncPromise; @@ -32,8 +31,7 @@ import java.util.Comparator; /** * @deprecated use {@link com.intellij.ui.tree.AsyncTreeModel} and {@link com.intellij.ui.tree.StructureTreeModel} instead. */ -@ApiStatus.ScheduledForRemoval(inVersion = "2020.3") -@Deprecated +@Deprecated(forRemoval = true) public class FilteringTreeBuilder extends AbstractTreeBuilder { private Object myLastSuccessfulSelect; @@ -117,8 +115,7 @@ public class FilteringTreeBuilder extends AbstractTreeBuilder { * @deprecated use {@link #refilter(Object, boolean, boolean)} */ @NotNull - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public ActionCallback refilter() { return Promises.toActionCallback(refilter(null, true, false)); } diff --git a/platform/platform-api/src/com/intellij/util/config/Storage.java b/platform/platform-api/src/com/intellij/util/config/Storage.java index 00ee7b45c222..c872fae6326a 100644 --- a/platform/platform-api/src/com/intellij/util/config/Storage.java +++ b/platform/platform-api/src/com/intellij/util/config/Storage.java @@ -4,7 +4,6 @@ package com.intellij.util.config; import com.intellij.ide.util.PropertiesComponent; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; -import org.jetbrains.annotations.ApiStatus; import java.util.Collections; import java.util.HashMap; @@ -15,8 +14,7 @@ import java.util.Map; * @deprecated Use {@link PropertiesComponent} directly. * @see com.intellij.ui.JBSplitter */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public interface Storage { void put(String key, String value); String get(String key); diff --git a/platform/platform-api/src/com/intellij/util/ui/ButtonlessScrollBarUI.java b/platform/platform-api/src/com/intellij/util/ui/ButtonlessScrollBarUI.java index 160c76a388aa..6b09bb052df5 100644 --- a/platform/platform-api/src/com/intellij/util/ui/ButtonlessScrollBarUI.java +++ b/platform/platform-api/src/com/intellij/util/ui/ButtonlessScrollBarUI.java @@ -14,7 +14,6 @@ import com.intellij.ui.components.JBScrollPane.Alignment; import com.intellij.ui.scale.JBUIScale; import com.intellij.util.Alarm; import com.intellij.util.ReflectionUtil; -import org.jetbrains.annotations.ApiStatus; import javax.swing.*; import javax.swing.event.ChangeEvent; @@ -32,8 +31,7 @@ import java.lang.reflect.Method; public class ButtonlessScrollBarUI extends BasicScrollBarUI { private static final Logger LOG = Logger.getInstance(ButtonlessScrollBarUI.class); - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static JBColor getTrackBackgroundDefault() { return new JBColor(LightColors.SLIGHTLY_GRAY, UIUtil.getListBackground()); } diff --git a/platform/platform-api/src/com/intellij/util/ui/Timer.java b/platform/platform-api/src/com/intellij/util/ui/Timer.java index 07cd59c406d8..c1837bb71508 100644 --- a/platform/platform-api/src/com/intellij/util/ui/Timer.java +++ b/platform/platform-api/src/com/intellij/util/ui/Timer.java @@ -4,7 +4,6 @@ package com.intellij.util.ui; import com.intellij.openapi.Disposable; import com.intellij.util.concurrency.AppExecutorUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import java.util.concurrent.ScheduledFuture; @@ -13,8 +12,7 @@ import java.util.concurrent.TimeUnit; /** * @deprecated use {@link AppExecutorUtil#getAppScheduledExecutorService()} instead */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public abstract class Timer implements Disposable, Runnable { private final int mySpan; diff --git a/platform/platform-api/src/com/intellij/util/ui/Tree.java b/platform/platform-api/src/com/intellij/util/ui/Tree.java index 3a7748f2758a..544ea909634a 100644 --- a/platform/platform-api/src/com/intellij/util/ui/Tree.java +++ b/platform/platform-api/src/com/intellij/util/ui/Tree.java @@ -15,16 +15,13 @@ */ package com.intellij.util.ui; -import org.jetbrains.annotations.ApiStatus; - import javax.swing.tree.TreeModel; import javax.swing.tree.TreeNode; /** * @deprecated use {@link com.intellij.ui.treeStructure.Tree} */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public class Tree extends com.intellij.ui.treeStructure.Tree { public Tree() { diff --git a/platform/platform-api/src/com/intellij/util/ui/tree/TreeUtil.java b/platform/platform-api/src/com/intellij/util/ui/tree/TreeUtil.java index a8fa0a4878cc..c1bcd445f363 100644 --- a/platform/platform-api/src/com/intellij/util/ui/tree/TreeUtil.java +++ b/platform/platform-api/src/com/intellij/util/ui/tree/TreeUtil.java @@ -395,8 +395,7 @@ public final class TreeUtil { /** * @deprecated use {@link #promiseSelectFirstLeaf} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @NotNull public static TreePath getFirstLeafNodePath(@NotNull JTree tree) { final TreeModel model = tree.getModel(); @@ -453,15 +452,13 @@ public final class TreeUtil { } /** @deprecated use TreeUtil#treeTraverser() or TreeUtil#treeNodeTraverser() directly */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static boolean traverse(@NotNull TreeNode node, @NotNull Traverse traverse) { return treeNodeTraverser(node).traverse(TreeTraversal.POST_ORDER_DFS).processEach(traverse::accept); } /** @deprecated use TreeUtil#treeTraverser() or TreeUtil#treeNodeTraverser() directly */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static boolean traverseDepth(@NotNull TreeNode node, @NotNull Traverse traverse) { return treeNodeTraverser(node).traverse(TreeTraversal.PRE_ORDER_DFS).processEach(traverse::accept); } @@ -1380,8 +1377,7 @@ public final class TreeUtil { } /** @deprecated use TreeUtil#treePathTraverser() */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @FunctionalInterface public interface Traverse{ boolean accept(Object node); diff --git a/platform/platform-api/src/com/intellij/xml/breadcrumbs/BreadcrumbsInfoProvider.java b/platform/platform-api/src/com/intellij/xml/breadcrumbs/BreadcrumbsInfoProvider.java index 362ea410ff05..4f35467c89ae 100644 --- a/platform/platform-api/src/com/intellij/xml/breadcrumbs/BreadcrumbsInfoProvider.java +++ b/platform/platform-api/src/com/intellij/xml/breadcrumbs/BreadcrumbsInfoProvider.java @@ -17,12 +17,10 @@ package com.intellij.xml.breadcrumbs; import com.intellij.ui.breadcrumbs.BreadcrumbsProvider; -import org.jetbrains.annotations.ApiStatus; /** * @deprecated use {@link BreadcrumbsProvider} */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public abstract class BreadcrumbsInfoProvider implements BreadcrumbsProvider { } \ No newline at end of file diff --git a/platform/platform-impl/src/com/intellij/codeInsight/hint/HintUtil.java b/platform/platform-impl/src/com/intellij/codeInsight/hint/HintUtil.java index ce3a129a6b88..84ce985438c0 100644 --- a/platform/platform-impl/src/com/intellij/codeInsight/hint/HintUtil.java +++ b/platform/platform-impl/src/com/intellij/codeInsight/hint/HintUtil.java @@ -34,11 +34,11 @@ import static com.intellij.util.ObjectUtils.notNull; public final class HintUtil { /** @deprecated use getInformationColor() */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static final Color INFORMATION_COLOR = new JBColor(0xF7F7F7, 0x4B4D4D); public static final Color INFORMATION_BORDER_COLOR = JBColor.namedColor("InformationHint.borderColor", new JBColor(0xE0E0E0, 0x5C5E61)); /** @deprecated use getErrorColor() */ - @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static final Color ERROR_COLOR = new JBColor(0xffdcdc, 0x781732); public static final ColorKey INFORMATION_COLOR_KEY = ColorKey.createColorKey("INFORMATION_HINT", INFORMATION_COLOR); diff --git a/platform/platform-impl/src/com/intellij/diagnostic/EditXmxVMOptionDialog.java b/platform/platform-impl/src/com/intellij/diagnostic/EditXmxVMOptionDialog.java index 4d3481be2387..54f76d024d13 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/EditXmxVMOptionDialog.java +++ b/platform/platform-impl/src/com/intellij/diagnostic/EditXmxVMOptionDialog.java @@ -1,9 +1,6 @@ // Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.diagnostic; -import org.jetbrains.annotations.ApiStatus; - /** @deprecated use {@link EditMemorySettingsDialog} */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2022.1") +@Deprecated(forRemoval = true) public class EditXmxVMOptionDialog extends EditMemorySettingsDialog { } diff --git a/platform/platform-impl/src/com/intellij/diagnostic/LogMessage.java b/platform/platform-impl/src/com/intellij/diagnostic/LogMessage.java index 2f6a8bd7db7f..b1511884474d 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/LogMessage.java +++ b/platform/platform-impl/src/com/intellij/diagnostic/LogMessage.java @@ -7,7 +7,6 @@ import com.intellij.openapi.diagnostic.IdeaLoggingEvent; import com.intellij.openapi.util.objectTree.ThrowableInterner; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -60,8 +59,7 @@ public class LogMessage extends AbstractMessage { } /** @deprecated pass all attachments to {@link #createEvent(Throwable, String, Attachment...)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2020.3") + @Deprecated(forRemoval = true) public synchronized void addAttachment(@NotNull Attachment attachment) { myAttachments.add(attachment); } diff --git a/platform/platform-impl/src/com/intellij/diagnostic/ReportMessages.java b/platform/platform-impl/src/com/intellij/diagnostic/ReportMessages.java index 24c315e67682..8aa9ffbefe48 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/ReportMessages.java +++ b/platform/platform-impl/src/com/intellij/diagnostic/ReportMessages.java @@ -1,16 +1,13 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.diagnostic; -import com.intellij.notification.NotificationDisplayType; import com.intellij.notification.NotificationGroup; import com.intellij.notification.NotificationGroupManager; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; public final class ReportMessages { /** @deprecated Please use {@code DiagnosticBundle.message("error.report.title")} instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static final String ERROR_REPORT = "Error Report"; /** @deprecated Please use {@code DiagnosticBundle.message("error.report.title")} instead. */ diff --git a/platform/platform-impl/src/com/intellij/execution/impl/EditorHyperlinkSupport.java b/platform/platform-impl/src/com/intellij/execution/impl/EditorHyperlinkSupport.java index 9241270f3ad9..338556f7285d 100644 --- a/platform/platform-impl/src/com/intellij/execution/impl/EditorHyperlinkSupport.java +++ b/platform/platform-impl/src/com/intellij/execution/impl/EditorHyperlinkSupport.java @@ -31,7 +31,6 @@ import com.intellij.util.Consumer; import com.intellij.util.FilteringProcessor; import com.intellij.util.SmartList; import com.intellij.util.containers.hash.LinkedHashMap; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -126,8 +125,7 @@ public class EditorHyperlinkSupport { /** * @deprecated use {@link #findAllHyperlinksOnLine(int)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public Map getHyperlinks() { LinkedHashMap result = new LinkedHashMap<>(); for (RangeHighlighter highlighter : getHyperlinks(0, myEditor.getDocument().getTextLength(), myEditor)) { diff --git a/platform/platform-impl/src/com/intellij/execution/wsl/WSLDistribution.java b/platform/platform-impl/src/com/intellij/execution/wsl/WSLDistribution.java index a89de5d42842..1acbbe2ab294 100644 --- a/platform/platform-impl/src/com/intellij/execution/wsl/WSLDistribution.java +++ b/platform/platform-impl/src/com/intellij/execution/wsl/WSLDistribution.java @@ -91,8 +91,7 @@ public class WSLDistribution implements AbstractWslDistribution { * @deprecated please don't use it, to be will be removed after we collect statistics and make sure versions before 1903 aren't used. * Check statistics and remove in the next version */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.2") - @Deprecated + @Deprecated(forRemoval = true) public @Nullable Path getExecutablePath() { return myExecutablePath; } @@ -211,8 +210,7 @@ public class WSLDistribution implements AbstractWslDistribution { /** * @deprecated use {@link #patchCommandLine(GeneralCommandLine, Project, WSLCommandLineOptions)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public @NotNull T patchCommandLine(@NotNull T commandLine, @Nullable Project project, @Nullable String remoteWorkingDir, @@ -563,8 +561,7 @@ public class WSLDistribution implements AbstractWslDistribution { /** * @deprecated use {@link WSLDistribution#getUNCRootPath()} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) public @NotNull File getUNCRoot() { return new File(WslConstants.UNC_PREFIX + myDescriptor.getMsId()); } diff --git a/platform/platform-impl/src/com/intellij/execution/wsl/WSLUtil.java b/platform/platform-impl/src/com/intellij/execution/wsl/WSLUtil.java index 2a6d31dc1e33..fd425a9cd17f 100644 --- a/platform/platform-impl/src/com/intellij/execution/wsl/WSLUtil.java +++ b/platform/platform-impl/src/com/intellij/execution/wsl/WSLUtil.java @@ -16,7 +16,6 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.impl.wsl.WslConstants; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -48,8 +47,7 @@ public final class WSLUtil { * @deprecated use {@link WslDistributionManager#getInstalledDistributions()} instead. * Method will be removed after we check statistics and make sure versions before 1903 aren't used. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2022.2") + @Deprecated(forRemoval = true) @NotNull public static List getAvailableDistributions() { if (!isSystemCompatible()) return Collections.emptyList(); @@ -231,8 +229,7 @@ public final class WSLUtil { * * @deprecated remove after everyone migrates to the new prefix */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) public static void fixWslPrefix(@NotNull Sdk sdk) { if (sdk instanceof ProjectJdkImpl) { var path = sdk.getHomePath(); diff --git a/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java b/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java index b01ea979c863..d0e3ee3ccce4 100644 --- a/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java +++ b/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java @@ -522,8 +522,7 @@ public class IdeTooltipManager implements Disposable, AWTEventListener { * @deprecated use {@link JBUI.CurrentTheme.Tooltip#borderColor()} instead. */ @SuppressWarnings("UnusedParameters") - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public Color getBorderColor(boolean awtTooltip) { return JBUI.CurrentTheme.Tooltip.borderColor(); } diff --git a/platform/platform-impl/src/com/intellij/ide/SaveAndSyncHandlerImpl.java b/platform/platform-impl/src/com/intellij/ide/SaveAndSyncHandlerImpl.java index 7ede40ed2cfc..3e7aab2bc7e0 100644 --- a/platform/platform-impl/src/com/intellij/ide/SaveAndSyncHandlerImpl.java +++ b/platform/platform-impl/src/com/intellij/ide/SaveAndSyncHandlerImpl.java @@ -1,13 +1,10 @@ // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.ide; -import org.jetbrains.annotations.ApiStatus; - /** * @deprecated Use {@link SaveAndSyncHandler} directly, do not use implementation class. */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public final class SaveAndSyncHandlerImpl { private SaveAndSyncHandlerImpl() { } diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ShowFilePathAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ShowFilePathAction.java index 3b187507823f..c2964529c99e 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/ShowFilePathAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/ShowFilePathAction.java @@ -18,7 +18,6 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.awt.RelativePoint; import com.intellij.util.Consumer; import com.intellij.util.ui.EmptyIcon; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -130,34 +129,29 @@ public class ShowFilePathAction extends DumbAwareAction { // /** @deprecated use {@link RevealFileAction#FILE_SELECTING_LISTENER} (to be removed in IDEA 2021.3) */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static final NotificationListener FILE_SELECTING_LISTENER = RevealFileAction.FILE_SELECTING_LISTENER; /** @deprecated use {@link RevealFileAction#getFileManagerName} (to be removed in IDEA 2021.3) */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static @NotNull String getFileManagerName() { return RevealFileAction.getFileManagerName(); } /** @deprecated use {@link RevealFileAction#openFile} (to be removed in IDEA 2021.3) */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static void openFile(@NotNull File file) { RevealFileAction.openFile(file); } /** @deprecated use {@link RevealFileAction#openDirectory} (to be removed in IDEA 2021.3) */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static void openDirectory(@NotNull File directory) { RevealFileAction.openDirectory(directory); } /** @deprecated use {@link RevealFileAction#findLocalFile} (to be removed in IDEA 2021.3) */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static @Nullable VirtualFile findLocalFile(@Nullable VirtualFile file) { return RevealFileAction.findLocalFile(file); } diff --git a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java index 35b928a85356..6075429d81a3 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java @@ -83,8 +83,7 @@ public final class Switcher extends BaseSwitcherAction { /** * @deprecated Please use {@link Switcher#createAndShowSwitcher(AnActionEvent, String, boolean, boolean)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @Nullable public static SwitcherPanel createAndShowSwitcher(@NotNull AnActionEvent e, @NotNull @Nls String title, boolean pinned, final VirtualFile @Nullable [] vFiles) { Project project = e.getProject(); diff --git a/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java b/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java index 9598ab3ec473..a4b0293cd6b8 100644 --- a/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java +++ b/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java @@ -73,8 +73,7 @@ public final class ProjectUtil extends ProjectUtilCore { private ProjectUtil() { } /** @deprecated Use {@link #updateLastProjectLocation(Path)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static void updateLastProjectLocation(@NotNull String projectFilePath) { updateLastProjectLocation(Path.of(projectFilePath)); } diff --git a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/memory/MemoryPasswordSafe.java b/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/memory/MemoryPasswordSafe.java index cad738c758aa..603a76a43b4d 100644 --- a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/memory/MemoryPasswordSafe.java +++ b/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/memory/MemoryPasswordSafe.java @@ -9,7 +9,6 @@ import com.intellij.ide.passwordSafe.impl.PasswordSafeTimed; import com.intellij.ide.passwordSafe.impl.providers.ByteArrayWrapper; import com.intellij.ide.passwordSafe.impl.providers.EncryptionUtil; import com.intellij.openapi.util.registry.Registry; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -26,8 +25,7 @@ import java.util.concurrent.atomic.AtomicReference; * * @deprecated potentially unsafe */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public class MemoryPasswordSafe implements PasswordStorage { /** * The key to use to encrypt data diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginInstallOperation.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginInstallOperation.java index 9eb0b73d0bfd..cccc5eb17e0c 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginInstallOperation.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginInstallOperation.java @@ -57,8 +57,7 @@ public final class PluginInstallOperation { /** * @deprecated use {@link #PluginInstallOperation(List, Collection, PluginEnabler, ProgressIndicator)} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2021.1") - @Deprecated + @Deprecated(forRemoval = true) public PluginInstallOperation(@NotNull List pluginsToInstall, @NotNull List customReposPlugins, @NotNull PluginManagerMain.PluginEnabler pluginEnabler, diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java index 966c1c61908f..d8aa21d902a3 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java @@ -143,8 +143,7 @@ public final class PluginManagerConfigurable /** * @deprecated use {@link PluginManagerConfigurable} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public PluginManagerConfigurable(PluginManagerUISettings uiSettings) { this(); } diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginNode.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginNode.java index 114e36f1152b..f25e371ab7c6 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginNode.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginNode.java @@ -4,7 +4,6 @@ package com.intellij.ide.plugins; import com.intellij.openapi.extensions.PluginId; import com.intellij.openapi.util.NlsSafe; import com.intellij.openapi.util.text.StringUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -335,8 +334,7 @@ public final class PluginNode implements IdeaPluginDescriptor { /** * @deprecated Use {@link #setDependencies(List)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.2") + @Deprecated(forRemoval = true) public void setDepends(@NotNull List depends, PluginId @Nullable [] optionalDependencies) { myDependencies = new ArrayList<>(); for (PluginId id : depends) { diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/RepositoryHelper.java b/platform/platform-impl/src/com/intellij/ide/plugins/RepositoryHelper.java index 083a48c6f6f6..23268f65e99c 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/RepositoryHelper.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/RepositoryHelper.java @@ -60,8 +60,7 @@ public final class RepositoryHelper { * * @deprecated Please use {@link #loadPlugins(String, BuildNumber, ProgressIndicator)} to get a list of {@link PluginNode}s. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static @NotNull List loadPlugins(@Nullable String repositoryUrl, @Nullable ProgressIndicator indicator) throws IOException { return new ArrayList<>(loadPlugins(repositoryUrl, null, indicator)); diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/IdeaBlueMetalTheme.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/IdeaBlueMetalTheme.java index afa1719693a5..534dd67d165b 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/IdeaBlueMetalTheme.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/IdeaBlueMetalTheme.java @@ -1,11 +1,8 @@ // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.ide.ui.laf; -import org.jetbrains.annotations.ApiStatus; - import javax.swing.plaf.metal.DefaultMetalTheme; /** @deprecated metal themes are obsolete, since everything's in JSON now */ @Deprecated(forRemoval = true) -@ApiStatus.ScheduledForRemoval(inVersion = "2022.1") public final class IdeaBlueMetalTheme extends DefaultMetalTheme { } diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLaf.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLaf.java index aad1f9729452..fb73f120502e 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLaf.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLaf.java @@ -237,8 +237,7 @@ public class DarculaLaf extends BasicLookAndFeel implements UserDataHolder { /** * @deprecated Use {@link UITheme#parseValue(String, String, ClassLoader)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2022.2") + @Deprecated(forRemoval = true) protected Object parseValue(String key, @NotNull String value) { return UITheme.parseValue(key, value, getClass().getClassLoader()); } diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java index f977f847d21e..e114ea0f89ca 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java @@ -17,7 +17,6 @@ import com.intellij.util.ui.JBInsets; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.StartupUiUtil; import com.intellij.util.ui.UIUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -199,8 +198,7 @@ public class DarculaComboBoxUI extends BasicComboBoxUI implements Border, ErrorB } @SuppressWarnings("unused") - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected Color getArrowButtonFillColor(Color defaultColor) { return JBUI.CurrentTheme.Arrow.backgroundColor(comboBox.isEnabled(), comboBox.isEditable()); } @@ -290,8 +288,7 @@ public class DarculaComboBoxUI extends BasicComboBoxUI implements Border, ErrorB /** * @deprecated Use {@link DarculaUIUtil#isTableCellEditor(Component)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected static boolean isTableCellEditor(JComponent c) { return DarculaUIUtil.isTableCellEditor(c); } diff --git a/platform/platform-impl/src/com/intellij/ide/util/TipAndTrickBean.java b/platform/platform-impl/src/com/intellij/ide/util/TipAndTrickBean.java index 658391c61b51..37a8e310d53d 100644 --- a/platform/platform-impl/src/com/intellij/ide/util/TipAndTrickBean.java +++ b/platform/platform-impl/src/com/intellij/ide/util/TipAndTrickBean.java @@ -6,7 +6,6 @@ import com.intellij.openapi.extensions.PluginAware; import com.intellij.openapi.extensions.PluginDescriptor; import com.intellij.util.xmlb.annotations.Attribute; import com.intellij.util.xmlb.annotations.Transient; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -28,8 +27,7 @@ public final class TipAndTrickBean implements PluginAware { /** * @deprecated unused */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2020.2") + @Deprecated(forRemoval = true) @Attribute("feature-id") public String featureId; diff --git a/platform/platform-impl/src/com/intellij/idea/StartupUtil.java b/platform/platform-impl/src/com/intellij/idea/StartupUtil.java index 10918c0db835..179bc9ffff05 100644 --- a/platform/platform-impl/src/com/intellij/idea/StartupUtil.java +++ b/platform/platform-impl/src/com/intellij/idea/StartupUtil.java @@ -347,8 +347,7 @@ public final class StartupUtil { // used externally by TeamCity plugin (as TeamCity cannot use modern API to support old IDE versions) @SuppressWarnings("MissingDeprecatedAnnotation") - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static synchronized @Nullable BuiltInServer getServer() { return socketLock == null ? null : socketLock.getServer(); } diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/fileTypes/FileTypeUsageSchemaDescriptor.java b/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/fileTypes/FileTypeUsageSchemaDescriptor.java index 4d145b314d34..4c482832b98c 100644 --- a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/fileTypes/FileTypeUsageSchemaDescriptor.java +++ b/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/fileTypes/FileTypeUsageSchemaDescriptor.java @@ -3,15 +3,13 @@ package com.intellij.internal.statistic.collectors.fus.fileTypes; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; public interface FileTypeUsageSchemaDescriptor { /** * @deprecated use {@link FileTypeUsageSchemaDescriptor#describes(Project, VirtualFile)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) default boolean describes(@NotNull VirtualFile file) { return false; } diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/ActionGroupUtil.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/ActionGroupUtil.java index 2b6e97e8fdb0..694650cc0f66 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/ActionGroupUtil.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/ActionGroupUtil.java @@ -11,8 +11,7 @@ import org.jetbrains.annotations.Nullable; public final class ActionGroupUtil { /** @deprecated use {@link #isGroupEmpty(ActionGroup, AnActionEvent)} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) public static boolean isGroupEmpty(@NotNull ActionGroup actionGroup, @NotNull AnActionEvent e, boolean unused) { return getActiveActions(actionGroup, e).isEmpty(); } diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarBorder.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarBorder.java index aa07657f1a3f..d990efbc7804 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarBorder.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarBorder.java @@ -4,7 +4,6 @@ package com.intellij.openapi.actionSystem.impl; import com.intellij.ide.ui.laf.darcula.DarculaUIUtil; import com.intellij.openapi.actionSystem.ActionToolbar; import com.intellij.util.ui.JBUI; -import org.jetbrains.annotations.ApiStatus; import javax.swing.border.Border; import java.awt.*; @@ -14,8 +13,7 @@ import java.awt.geom.RoundRectangle2D; /** * @deprecated Moved into private API */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2022.2") +@Deprecated(forRemoval = true) public class ActionToolbarBorder implements Border { private static final int WIDTH = 1; diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ButtonToolbarImpl.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ButtonToolbarImpl.java index bb4cfbe0d773..941151b8af72 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ButtonToolbarImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ButtonToolbarImpl.java @@ -6,7 +6,6 @@ import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.actionSystem.ex.ActionManagerEx; import com.intellij.openapi.actionSystem.ex.ActionUtil; import com.intellij.openapi.application.ModalityState; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -17,8 +16,7 @@ import java.util.ArrayList; import static com.intellij.util.IJSwingUtilities.getFocusedComponentInWindowOrSelf; -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) class ButtonToolbarImpl extends JPanel { private final String myPlace; private final PresentationFactory myPresentationFactory; diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/WeakTimerListener.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/WeakTimerListener.java index 70869b6a5f13..5e7ebb422ee1 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/WeakTimerListener.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/WeakTimerListener.java @@ -4,15 +4,13 @@ package com.intellij.openapi.actionSystem.impl; import com.intellij.openapi.actionSystem.TimerListener; import com.intellij.openapi.actionSystem.ex.ActionManagerEx; import com.intellij.openapi.application.ModalityState; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.lang.ref.Reference; import java.lang.ref.WeakReference; /** @deprecated use {@link com.intellij.openapi.actionSystem.ActionManager#removeTimerListener(TimerListener)} instead */ -@ApiStatus.ScheduledForRemoval(inVersion = "2022.2") -@Deprecated +@Deprecated(forRemoval = true) public class WeakTimerListener implements TimerListener { private final Reference myRef; diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorSettingsExternalizable.java b/platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorSettingsExternalizable.java index 1e5ee5159b4b..23c3e315a0d9 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorSettingsExternalizable.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorSettingsExternalizable.java @@ -15,7 +15,6 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.serviceContainer.NonInjectable; import com.intellij.ui.breadcrumbs.BreadcrumbsProvider; import org.intellij.lang.annotations.MagicConstant; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -699,8 +698,7 @@ public class EditorSettingsExternalizable implements PersistentStateComponent getEditorsWithProviders(@NotNull VirtualFile file); /** @deprecated use {@link FileEditor#getFile()} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) public abstract @Nullable VirtualFile getFile(@NotNull FileEditor editor); /** diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorComposite.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorComposite.java index bc40e46d4d19..663c12767a99 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorComposite.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorComposite.java @@ -36,7 +36,6 @@ import com.intellij.util.EventDispatcher; import com.intellij.util.ObjectUtils; import com.intellij.util.SmartList; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -479,8 +478,7 @@ public class EditorComposite extends UserDataHolderBase implements Disposable { /** * @deprecated use {@link #getSelectedWithProvider()} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @NotNull public Pair getSelectedEditorWithProvider() { FileEditorWithProvider info = getSelectedWithProvider(); diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java index 038f39653cbf..4e0cd9fc0d92 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java @@ -56,7 +56,6 @@ import com.intellij.util.messages.MessageBusConnection; import com.intellij.util.ui.StartupUiUtil; import com.intellij.util.ui.UIUtil; import org.jdom.Element; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -347,8 +346,7 @@ public class EditorsSplitters extends IdePanePanel implements UISettingsListener /** * @deprecated Use {@link #getOpenFileList()} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public @NotNull VirtualFile @NotNull [] getOpenFiles() { return VfsUtilCore.toVirtualFileArray(getOpenFileList()); } diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java index fcf46dd2072e..910428b24f10 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java @@ -59,7 +59,6 @@ import com.intellij.util.ExceptionUtil; import com.intellij.util.FileContentUtilCore; import com.intellij.util.Processor; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; @@ -871,9 +870,8 @@ public class FileDocumentManagerImpl extends FileDocumentManagerBase implements } /** @deprecated another dirty Rider hack; don't use */ - @Deprecated + @Deprecated(forRemoval = true) @SuppressWarnings("StaticNonFinalField") - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") public static boolean ourConflictsSolverEnabled = true; @Override diff --git a/platform/platform-impl/src/com/intellij/openapi/options/BeanConfigurable.java b/platform/platform-impl/src/com/intellij/openapi/options/BeanConfigurable.java index 46836cd4020c..d0a242b85104 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/BeanConfigurable.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/BeanConfigurable.java @@ -241,8 +241,7 @@ public abstract class BeanConfigurable implements UnnamedConfigurable, Config /** * @deprecated use {@link #checkBox(String, Getter, Setter)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected void checkBox(@NonNls String fieldName, @NlsContexts.Checkbox String title) { myFields.add(new CheckboxField(fieldName, title)); } diff --git a/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableVisitor.java b/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableVisitor.java index 1404060ab840..e2c68ea4f9c1 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableVisitor.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableVisitor.java @@ -97,8 +97,7 @@ public abstract class ConfigurableVisitor implements Predicate { /** * @deprecated Use {@link #findById} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static final class ByID extends ConfigurableVisitor { private final String id; diff --git a/platform/platform-impl/src/com/intellij/openapi/preview/PreviewProviderId.java b/platform/platform-impl/src/com/intellij/openapi/preview/PreviewProviderId.java index e5fad2fdfb23..75cc8e7dd743 100644 --- a/platform/platform-impl/src/com/intellij/openapi/preview/PreviewProviderId.java +++ b/platform/platform-impl/src/com/intellij/openapi/preview/PreviewProviderId.java @@ -1,13 +1,10 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.preview; -import org.jetbrains.annotations.ApiStatus; - /** * @deprecated this class isn't used by the platform anymore */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public final class PreviewProviderId { private PreviewProviderId() { } diff --git a/platform/platform-impl/src/com/intellij/openapi/roots/ui/configuration/actions/IconWithTextAction.java b/platform/platform-impl/src/com/intellij/openapi/roots/ui/configuration/actions/IconWithTextAction.java index 2c3cb2d54302..f1cb73c99fda 100644 --- a/platform/platform-impl/src/com/intellij/openapi/roots/ui/configuration/actions/IconWithTextAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/roots/ui/configuration/actions/IconWithTextAction.java @@ -8,7 +8,6 @@ import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.actionSystem.ex.CustomComponentAction; import com.intellij.openapi.actionSystem.impl.ActionButtonWithText; import com.intellij.util.ui.EmptyIcon; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -54,8 +53,7 @@ public abstract class IconWithTextAction extends AnAction implements CustomCompo } /** @deprecated use {@link IconWithTextAction#createCustomComponentImpl(AnAction, Presentation, String)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static JComponent createCustomComponentImpl(AnAction action, Presentation presentation) { return new ActionButtonWithText(action, presentation, ActionPlaces.UNKNOWN, ActionToolbar.DEFAULT_MINIMUM_BUTTON_SIZE); } diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/impl/AbstractDialog.java b/platform/platform-impl/src/com/intellij/openapi/ui/impl/AbstractDialog.java index 00b24f246587..86a8599aebb9 100644 --- a/platform/platform-impl/src/com/intellij/openapi/ui/impl/AbstractDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/ui/impl/AbstractDialog.java @@ -18,7 +18,6 @@ package com.intellij.openapi.ui.impl; import com.intellij.openapi.Disposable; import com.intellij.openapi.util.NlsContexts; import com.intellij.openapi.wm.IdeFocusManager; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -42,8 +41,7 @@ interface AbstractDialog extends Disposable { /** * @deprecated use {@link #setModalityType(Dialog.ModalityType)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) void setModal(boolean b); void toFront(); @@ -98,8 +96,7 @@ interface AbstractDialog extends Disposable { /** * @deprecated use {@link #getModalityType()} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) boolean isModal(); void setModalityType(Dialog.ModalityType modalityType); diff --git a/platform/platform-impl/src/com/intellij/openapi/vcs/readOnlyHandler/FileListRenderer.java b/platform/platform-impl/src/com/intellij/openapi/vcs/readOnlyHandler/FileListRenderer.java index cf9d181f09dd..baf3a20029c4 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vcs/readOnlyHandler/FileListRenderer.java +++ b/platform/platform-impl/src/com/intellij/openapi/vcs/readOnlyHandler/FileListRenderer.java @@ -6,7 +6,6 @@ import com.intellij.navigation.TargetPresentationBuilder; import com.intellij.openapi.fileTypes.FileTypeRegistry; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.list.TargetPopup; -import org.jetbrains.annotations.ApiStatus; import javax.swing.*; import java.awt.*; @@ -14,8 +13,7 @@ import java.awt.*; /** * @deprecated Please use {@link TargetPopup#createTargetPresentationRenderer} */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2022.2") +@Deprecated(forRemoval = true) public class FileListRenderer implements ListCellRenderer { private final ListCellRenderer myPresentationRenderer; diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/ex/VirtualFileManagerAdapter.java b/platform/platform-impl/src/com/intellij/openapi/vfs/ex/VirtualFileManagerAdapter.java index 8c891713c0a7..465e3b7979e0 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/ex/VirtualFileManagerAdapter.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/ex/VirtualFileManagerAdapter.java @@ -2,13 +2,11 @@ package com.intellij.openapi.vfs.ex; import com.intellij.openapi.vfs.VirtualFileManagerListener; -import org.jetbrains.annotations.ApiStatus; /** * @deprecated Use {@link VirtualFileManagerListener} directly. */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public abstract class VirtualFileManagerAdapter implements VirtualFileManagerListener { } \ No newline at end of file diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/ex/ToolWindowManagerListener.java b/platform/platform-impl/src/com/intellij/openapi/wm/ex/ToolWindowManagerListener.java index d1491a20ec30..2430f5c7eae0 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/ex/ToolWindowManagerListener.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/ex/ToolWindowManagerListener.java @@ -4,7 +4,6 @@ package com.intellij.openapi.wm.ex; import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindowManager; import com.intellij.util.messages.Topic; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.EventListener; @@ -51,8 +50,7 @@ public interface ToolWindowManagerListener extends EventListener { * @deprecated use {@link #toolWindowShown(ToolWindow)} instead */ @SuppressWarnings("unused") - @ApiStatus.ScheduledForRemoval(inVersion = "2021.2") - @Deprecated + @Deprecated(forRemoval = true) default void toolWindowShown(@NotNull String id, @NotNull ToolWindow toolWindow) { } diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java index e3f93bea5854..3370c9a5a829 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java @@ -185,8 +185,7 @@ public final class IdeFrameImpl extends JFrame implements IdeFrame, DataProvider * @deprecated Use {@link ProjectFrameHelper#getProject()} instead. */ @Override - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2020.1") + @Deprecated(forRemoval = true) public Project getProject() { return myFrameHelper == null ? null : myFrameHelper.getProject(); } diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/TextPanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/TextPanel.java index c2854daba51f..a0eefff951ec 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/TextPanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/TextPanel.java @@ -15,7 +15,6 @@ import com.intellij.util.ui.GraphicsUtil; import com.intellij.util.ui.JBFont; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.UIUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -60,8 +59,7 @@ public class TextPanel extends NonOpaquePanel implements Accessible { /** * @deprecated no effect */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void resetColor() { } @@ -207,8 +205,7 @@ public class TextPanel extends NonOpaquePanel implements Accessible { /** * @deprecated arrows are not painted anymore */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected boolean shouldPaintArrows() { return false; } diff --git a/platform/platform-impl/src/com/intellij/platform/DirectoryProjectGenerator.java b/platform/platform-impl/src/com/intellij/platform/DirectoryProjectGenerator.java index 2d4950aacd61..80fe9404e9af 100644 --- a/platform/platform-impl/src/com/intellij/platform/DirectoryProjectGenerator.java +++ b/platform/platform-impl/src/com/intellij/platform/DirectoryProjectGenerator.java @@ -7,7 +7,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.NlsContexts; import com.intellij.openapi.util.NotNullLazyValue; import com.intellij.openapi.vfs.VirtualFile; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -35,8 +34,7 @@ public interface DirectoryProjectGenerator { } // to be removed in 2017.3 - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2017.3") + @Deprecated(forRemoval = true) default boolean isPrimaryGenerator() { return true; } diff --git a/platform/platform-impl/src/com/intellij/platform/ProjectBaseDirectory.java b/platform/platform-impl/src/com/intellij/platform/ProjectBaseDirectory.java index 8050b7e23f72..23f98bae9421 100644 --- a/platform/platform-impl/src/com/intellij/platform/ProjectBaseDirectory.java +++ b/platform/platform-impl/src/com/intellij/platform/ProjectBaseDirectory.java @@ -5,7 +5,6 @@ import com.intellij.openapi.components.Service; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.ObjectUtils; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -15,8 +14,7 @@ import java.nio.file.Paths; /** * @deprecated Do not use. */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) @Service public final class ProjectBaseDirectory { public static ProjectBaseDirectory getInstance(@NotNull Project project) { diff --git a/platform/platform-impl/src/com/intellij/ui/EditorTextFieldCellRenderer.java b/platform/platform-impl/src/com/intellij/ui/EditorTextFieldCellRenderer.java index a79cf4810aa6..b0a23b295f05 100644 --- a/platform/platform-impl/src/com/intellij/ui/EditorTextFieldCellRenderer.java +++ b/platform/platform-impl/src/com/intellij/ui/EditorTextFieldCellRenderer.java @@ -35,7 +35,6 @@ import com.intellij.util.text.CharSequenceSubSequence; import com.intellij.util.ui.StartupUiUtil; import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.accessibility.AccessibleContextDelegate; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -56,8 +55,7 @@ public abstract class EditorTextFieldCellRenderer implements TableCellRenderer, private final boolean myInheritFontFromLaF; /** @deprecated Use {@link EditorTextFieldCellRenderer#EditorTextFieldCellRenderer(Project, Language, Disposable)}*/ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") + @Deprecated(forRemoval = true) protected EditorTextFieldCellRenderer(@Nullable Project project, @Nullable FileType fileType, @NotNull Disposable parent) { this(project, fileType == null ? null : LanguageUtil.getFileTypeLanguage(fileType), true, parent); } diff --git a/platform/platform-impl/src/com/intellij/ui/JBProgressBar.java b/platform/platform-impl/src/com/intellij/ui/JBProgressBar.java index ec925bbe35bd..3079ec28c753 100644 --- a/platform/platform-impl/src/com/intellij/ui/JBProgressBar.java +++ b/platform/platform-impl/src/com/intellij/ui/JBProgressBar.java @@ -15,14 +15,11 @@ */ package com.intellij.ui; -import org.jetbrains.annotations.ApiStatus; - import javax.swing.*; /** * @deprecated use {@link JProgressBar} */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.2") +@Deprecated(forRemoval = true) public class JBProgressBar extends JProgressBar { } diff --git a/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java b/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java index da368dd097c0..2d0d91b6f435 100644 --- a/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java +++ b/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java @@ -192,8 +192,7 @@ public abstract class SpeedSearchBase extends SpeedSear protected abstract int getSelectedIndex(); /** @deprecated Please implement {@link #getElementCount()} and {@link #getElementAt(int)} instead. */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.2") - @Deprecated + @Deprecated(forRemoval = true) protected Object @NotNull [] getAllElements() { throw new UnsupportedOperationException("See `SpeedSearchBase.getElementIterator(int)` javadoc"); } @@ -211,8 +210,7 @@ public abstract class SpeedSearchBase extends SpeedSear } /** @deprecated Please implement {@link #getElementCount()} and {@link #getElementAt(int)} instead. */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) protected int convertIndexToModel(final int viewIndex) { return viewIndex; } diff --git a/platform/platform-impl/src/com/intellij/ui/content/impl/TabbedContentImpl.java b/platform/platform-impl/src/com/intellij/ui/content/impl/TabbedContentImpl.java index b8802112da28..4bc03b406ad2 100644 --- a/platform/platform-impl/src/com/intellij/ui/content/impl/TabbedContentImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/content/impl/TabbedContentImpl.java @@ -31,8 +31,7 @@ public final class TabbedContentImpl extends ContentImpl implements TabbedConten * @deprecated use {@link TabbedContentImpl#TabbedContentImpl(TabGroupId, TabDescriptor, boolean)} instead * as it allows to set tab group id separately from display name. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public TabbedContentImpl(JComponent component, @NotNull @NlsContexts.TabTitle String displayName, boolean isPinnable, @NotNull @NonNls String titlePrefix) { this(new TabGroupId(titlePrefix, titlePrefix), new TabDescriptor(component, displayName), isPinnable); //NON-NLS } diff --git a/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java b/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java index 107826514a58..d478d72c3445 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java @@ -23,7 +23,6 @@ import com.intellij.ui.speedSearch.SpeedSearch; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.TimerUtil; import org.intellij.lang.annotations.JdkConstants; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -63,8 +62,7 @@ public abstract class WizardPopup extends AbstractPopup implements ActionListene /** * @deprecated use {@link #WizardPopup(Project, JBPopup, PopupStep)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public WizardPopup(@NotNull PopupStep aStep) { this(CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()), null, aStep); } diff --git a/platform/platform-impl/src/com/intellij/ui/tree/Searchable.java b/platform/platform-impl/src/com/intellij/ui/tree/Searchable.java index a89eb3005136..dd753fab85dc 100644 --- a/platform/platform-impl/src/com/intellij/ui/tree/Searchable.java +++ b/platform/platform-impl/src/com/intellij/ui/tree/Searchable.java @@ -2,7 +2,6 @@ package com.intellij.ui.tree; import com.intellij.util.ui.tree.TreeUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.concurrency.Promise; @@ -12,8 +11,7 @@ import javax.swing.tree.TreePath; /** * @deprecated use {@link TreeUtil#promiseVisit(JTree, TreeVisitor)} instead */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2022.2") +@Deprecated(forRemoval = true) public interface Searchable { /** * Starts searching by the specified object. diff --git a/platform/platform-impl/src/com/intellij/util/concurrency/Invoker.java b/platform/platform-impl/src/com/intellij/util/concurrency/Invoker.java index bb475ef068fe..4d711b86b88e 100644 --- a/platform/platform-impl/src/com/intellij/util/concurrency/Invoker.java +++ b/platform/platform-impl/src/com/intellij/util/concurrency/Invoker.java @@ -11,7 +11,6 @@ import com.intellij.openapi.project.IndexNotReadyException; import com.intellij.openapi.util.Disposer; import com.intellij.util.ThreeState; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.ApiStatus.ScheduledForRemoval; import org.jetbrains.annotations.NotNull; import org.jetbrains.concurrency.AsyncPromise; import org.jetbrains.concurrency.CancellablePromise; @@ -155,8 +154,7 @@ public abstract class Invoker implements Disposable { * @deprecated use {@link #invoke(Runnable)} or {@link #compute(Supplier)} instead */ @NotNull - @Deprecated - @ScheduledForRemoval(inVersion = "2021.1") + @Deprecated(forRemoval = true) public final CancellablePromise runOrInvokeLater(@NotNull Runnable task) { return invoke(task); } @@ -374,8 +372,7 @@ public abstract class Invoker implements Disposable { * @param parent a disposable parent object * @deprecated use {@link #forEventDispatchThread} instead */ - @Deprecated - @ScheduledForRemoval(inVersion = "2021.1") + @Deprecated(forRemoval = true) public EDT(@NotNull Disposable parent) { super("EDT", parent, ThreeState.UNSURE); } @@ -402,8 +399,7 @@ public abstract class Invoker implements Disposable { * * @deprecated use {@link Invoker#forBackgroundThreadWithReadAction(Disposable)} instead */ - @Deprecated - @ScheduledForRemoval(inVersion = "2021.1") + @Deprecated(forRemoval = true) public static final class BackgroundThread extends Invoker { private final ScheduledExecutorService executor; private volatile Thread thread; @@ -452,8 +448,7 @@ public abstract class Invoker implements Disposable { * which allows not to use additional synchronization * @deprecated use {@link #forBackgroundPoolWithReadAction} instead */ - @Deprecated - @ScheduledForRemoval(inVersion = "2021.1") + @Deprecated(forRemoval = true) public Background(@NotNull Disposable parent, int maxThreads) { this(parent, ThreeState.YES, maxThreads); } diff --git a/platform/platform-impl/src/com/intellij/util/ui/SwingHelper.java b/platform/platform-impl/src/com/intellij/util/ui/SwingHelper.java index 3e597424ed7b..75a6739c83cd 100644 --- a/platform/platform-impl/src/com/intellij/util/ui/SwingHelper.java +++ b/platform/platform-impl/src/com/intellij/util/ui/SwingHelper.java @@ -36,7 +36,6 @@ import com.intellij.util.PlatformIcons; import com.intellij.util.containers.ComparatorUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.update.UiNotifyConnector; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -430,8 +429,7 @@ public class SwingHelper { /** * @deprecated use {@link com.intellij.ui.components.BrowserLink} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) @NotNull public static HyperlinkLabel createWebHyperlink(@NlsSafe @NotNull String url) { return createWebHyperlink(url, url); @@ -440,8 +438,7 @@ public class SwingHelper { /** * @deprecated use {@link com.intellij.ui.components.BrowserLink} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) @NotNull public static HyperlinkLabel createWebHyperlink(@NlsContexts.LinkLabel @NotNull String text, @NotNull String url) { HyperlinkLabel hyperlink = new HyperlinkLabel(text); diff --git a/platform/platform-impl/src/com/intellij/util/ui/table/EditorTextFieldJBTableRowRenderer.java b/platform/platform-impl/src/com/intellij/util/ui/table/EditorTextFieldJBTableRowRenderer.java index c059a49ba0f6..c8d172848c66 100644 --- a/platform/platform-impl/src/com/intellij/util/ui/table/EditorTextFieldJBTableRowRenderer.java +++ b/platform/platform-impl/src/com/intellij/util/ui/table/EditorTextFieldJBTableRowRenderer.java @@ -21,7 +21,6 @@ import com.intellij.openapi.editor.markup.TextAttributes; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.project.Project; import com.intellij.ui.EditorTextFieldCellRenderer; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -29,8 +28,7 @@ import javax.swing.*; public abstract class EditorTextFieldJBTableRowRenderer extends EditorTextFieldCellRenderer implements JBTableRowRenderer { /** @deprecated Use {@link EditorTextFieldJBTableRowRenderer#EditorTextFieldJBTableRowRenderer(Project, Language, Disposable)}*/ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") + @Deprecated(forRemoval = true) protected EditorTextFieldJBTableRowRenderer(@Nullable Project project, @Nullable FileType fileType, @NotNull Disposable parent) { super(project, fileType, parent); } diff --git a/platform/platform-util-io/src/com/intellij/execution/configurations/GeneralCommandLine.java b/platform/platform-util-io/src/com/intellij/execution/configurations/GeneralCommandLine.java index 2a4022fcb2b4..762b6382874a 100644 --- a/platform/platform-util-io/src/com/intellij/execution/configurations/GeneralCommandLine.java +++ b/platform/platform-util-io/src/com/intellij/execution/configurations/GeneralCommandLine.java @@ -19,7 +19,6 @@ import com.intellij.util.containers.FastUtilHashingStrategies; import com.intellij.util.execution.ParametersListUtil; import com.intellij.util.io.IdeUtilIoBundle; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenCustomHashMap; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -182,8 +181,7 @@ public class GeneralCommandLine implements UserDataHolder { } /** @deprecated use {@link #withParentEnvironmentType(ParentEnvironmentType)} */ - @ApiStatus.ScheduledForRemoval(inVersion = "2021.1") - @Deprecated + @Deprecated(forRemoval = true) public void setPassParentEnvironment(boolean passParentEnvironment) { withParentEnvironmentType(passParentEnvironment ? ParentEnvironmentType.CONSOLE : ParentEnvironmentType.NONE); } diff --git a/platform/platform-util-io/src/com/intellij/execution/process/AnsiEscapeDecoder.java b/platform/platform-util-io/src/com/intellij/execution/process/AnsiEscapeDecoder.java index d4216330049a..8128dc769719 100644 --- a/platform/platform-util-io/src/com/intellij/execution/process/AnsiEscapeDecoder.java +++ b/platform/platform-util-io/src/com/intellij/execution/process/AnsiEscapeDecoder.java @@ -4,16 +4,12 @@ package com.intellij.execution.process; import com.intellij.execution.process.AnsiStreamingLexer.AnsiElementType; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.Pair; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.List; -import static com.intellij.execution.process.AnsiStreamingLexer.SGR; -import static com.intellij.execution.process.AnsiStreamingLexer.TEXT; - /** * See ANSI escape code. */ @@ -116,8 +112,7 @@ public class AnsiEscapeDecoder { /** * @deprecated use {@link ColoredTextAcceptor} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") + @Deprecated(forRemoval = true) public interface ColoredChunksAcceptor extends ColoredTextAcceptor { void coloredChunksAvailable(@NotNull List> chunks); } diff --git a/platform/platform-util-io/src/com/intellij/execution/process/KillableColoredProcessHandler.java b/platform/platform-util-io/src/com/intellij/execution/process/KillableColoredProcessHandler.java index 1b58f8b315ca..ea8bbcde1b57 100644 --- a/platform/platform-util-io/src/com/intellij/execution/process/KillableColoredProcessHandler.java +++ b/platform/platform-util-io/src/com/intellij/execution/process/KillableColoredProcessHandler.java @@ -5,7 +5,6 @@ import com.intellij.execution.ExecutionException; import com.intellij.execution.KillableProcess; import com.intellij.execution.configurations.GeneralCommandLine; import com.intellij.util.io.BaseOutputReader; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -25,8 +24,7 @@ public class KillableColoredProcessHandler extends ColoredProcessHandler impleme /** * @deprecated please use {@link KillableColoredProcessHandler#KillableColoredProcessHandler(GeneralCommandLine commandLine)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") + @Deprecated(forRemoval = true) public KillableColoredProcessHandler(@NotNull GeneralCommandLine commandLine, boolean withMediator) throws ExecutionException { super(KillableProcessHandler.mediate(commandLine, withMediator, false)); setShouldKillProcessSoftly(true); diff --git a/platform/platform-util-io/src/com/intellij/execution/process/KillableProcessHandler.java b/platform/platform-util-io/src/com/intellij/execution/process/KillableProcessHandler.java index 64c58b0d0687..eda70cf14261 100644 --- a/platform/platform-util-io/src/com/intellij/execution/process/KillableProcessHandler.java +++ b/platform/platform-util-io/src/com/intellij/execution/process/KillableProcessHandler.java @@ -50,8 +50,7 @@ public class KillableProcessHandler extends OSProcessHandler implements Killable /** * @deprecated please use {@link KillableProcessHandler#KillableProcessHandler(GeneralCommandLine)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") + @Deprecated(forRemoval = true) public KillableProcessHandler(@NotNull GeneralCommandLine commandLine, boolean withMediator) throws ExecutionException { this(mediate(commandLine, withMediator, false)); } @@ -82,8 +81,7 @@ public class KillableProcessHandler extends OSProcessHandler implements Killable /** * @deprecated just don't use this method */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") + @Deprecated(forRemoval = true) @NotNull protected static GeneralCommandLine mediate(@NotNull GeneralCommandLine commandLine, boolean withMediator, boolean showConsole) { if (withMediator && SystemInfo.isWindows) { @@ -166,8 +164,7 @@ public class KillableProcessHandler extends OSProcessHandler implements Killable * @deprecated graceful termination with WinP is enabled by default; please don't use this method */ @ApiStatus.Experimental - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") + @Deprecated(forRemoval = true) public void setShouldKillProcessSoftlyWithWinP(boolean shouldKillProcessSoftlyWithWinP) { myShouldKillProcessSoftlyWithWinP = shouldKillProcessSoftlyWithWinP; } diff --git a/platform/platform-util-io/src/com/intellij/execution/process/OSProcessHandler.java b/platform/platform-util-io/src/com/intellij/execution/process/OSProcessHandler.java index fdca536b11b0..684eabbefdbc 100644 --- a/platform/platform-util-io/src/com/intellij/execution/process/OSProcessHandler.java +++ b/platform/platform-util-io/src/com/intellij/execution/process/OSProcessHandler.java @@ -19,7 +19,6 @@ import com.intellij.util.ExceptionUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.io.BaseDataReader; import com.intellij.util.io.BaseOutputReader; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -59,7 +58,6 @@ public class OSProcessHandler extends BaseOSProcessHandler { /** @deprecated use {@link #OSProcessHandler(Process, String)} (or any other constructor) */ @Deprecated(forRemoval = true) - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") public OSProcessHandler(@NotNull Process process) { this(process, null); PluginException.reportDeprecatedUsage("OSProcessHandler#OSProcessHandler(Process)", "Use `#OSProcessHandler(Process, String)` instead"); diff --git a/platform/platform-util-io/src/com/intellij/execution/process/OSProcessUtil.java b/platform/platform-util-io/src/com/intellij/execution/process/OSProcessUtil.java index a13214c5c3ae..a663b7187a18 100644 --- a/platform/platform-util-io/src/com/intellij/execution/process/OSProcessUtil.java +++ b/platform/platform-util-io/src/com/intellij/execution/process/OSProcessUtil.java @@ -5,7 +5,6 @@ import com.intellij.execution.process.impl.ProcessListUtil; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.registry.Registry; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -112,8 +111,7 @@ public final class OSProcessUtil { * * @deprecated use {@link #terminateProcessGracefully(Process)} */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) public static void terminateProcessGracefully(int pid) throws RuntimeException { if (SystemInfo.isWindows) { if (Registry.is("disable.winp")) { @@ -156,8 +154,7 @@ public final class OSProcessUtil { /** * @deprecated use {@link #getProcessID(Process)} */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) public static int getProcessID(@NotNull Process process, Boolean disableWinp) { return (int)process.pid(); } diff --git a/platform/platform-util-io/src/com/intellij/execution/process/ProcessService.java b/platform/platform-util-io/src/com/intellij/execution/process/ProcessService.java index a8df7d738f02..45d112e92443 100644 --- a/platform/platform-util-io/src/com/intellij/execution/process/ProcessService.java +++ b/platform/platform-util-io/src/com/intellij/execution/process/ProcessService.java @@ -3,7 +3,6 @@ package com.intellij.execution.process; import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -28,8 +27,7 @@ public interface ProcessService { * * @deprecated use {@link #sendWinProcessCtrlC(Process)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") + @Deprecated(forRemoval = true) boolean sendWinProcessCtrlC(int pid); void killWinProcessRecursively(@NotNull Process process); diff --git a/platform/platform-util-io/src/com/intellij/execution/process/WinRunnerMediator.java b/platform/platform-util-io/src/com/intellij/execution/process/WinRunnerMediator.java index a205dd43a499..0e91e6204252 100644 --- a/platform/platform-util-io/src/com/intellij/execution/process/WinRunnerMediator.java +++ b/platform/platform-util-io/src/com/intellij/execution/process/WinRunnerMediator.java @@ -6,7 +6,6 @@ import com.intellij.openapi.application.PathManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.SystemInfo; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -22,8 +21,7 @@ import java.nio.file.Path; * * @deprecated processes are killed softly on Windows be default now, see {@link KillableProcessHandler#canTerminateGracefullyWithWinP()} */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2022.1") +@Deprecated(forRemoval = true) public final class WinRunnerMediator { private static final Logger LOG = Logger.getInstance(WinRunnerMediator.class); diff --git a/platform/platform-util-io/src/com/intellij/util/net/NetUtils.java b/platform/platform-util-io/src/com/intellij/util/net/NetUtils.java index 094d150bdb16..94080465ec73 100644 --- a/platform/platform-util-io/src/com/intellij/util/net/NetUtils.java +++ b/platform/platform-util-io/src/com/intellij/util/net/NetUtils.java @@ -13,7 +13,6 @@ import com.intellij.openapi.util.io.StreamUtil; import com.intellij.util.SystemProperties; import com.intellij.util.io.CountingGZIPInputStream; import com.intellij.util.io.IoService; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -37,8 +36,7 @@ public final class NetUtils { } /** @deprecated use {@link InetAddress#getLoopbackAddress()} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static InetAddress getLoopbackAddress() { return InetAddress.getLoopbackAddress(); } diff --git a/platform/projectModel-api/src/com/intellij/openapi/components/State.java b/platform/projectModel-api/src/com/intellij/openapi/components/State.java index 44f2acf4ddb1..8db68622ad89 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/components/State.java +++ b/platform/projectModel-api/src/com/intellij/openapi/components/State.java @@ -50,8 +50,7 @@ public @interface State { /** * @deprecated Use {@link #additionalExportDirectory()}. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) String additionalExportFile() default ""; Class presentableName() default NameGetter.class; diff --git a/platform/projectModel-api/src/com/intellij/openapi/components/Storage.java b/platform/projectModel-api/src/com/intellij/openapi/components/Storage.java index 4b8b7dcd0a06..ba6b6d3f1bb0 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/components/Storage.java +++ b/platform/projectModel-api/src/com/intellij/openapi/components/Storage.java @@ -18,8 +18,7 @@ public @interface Storage { /** * @deprecated Use {@link #value()}. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) String file() default ""; /** diff --git a/platform/projectModel-api/src/com/intellij/openapi/project/ModuleAdapter.java b/platform/projectModel-api/src/com/intellij/openapi/project/ModuleAdapter.java index d09274f36155..9f155a4f71d7 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/project/ModuleAdapter.java +++ b/platform/projectModel-api/src/com/intellij/openapi/project/ModuleAdapter.java @@ -15,12 +15,9 @@ */ package com.intellij.openapi.project; -import org.jetbrains.annotations.ApiStatus; - /** * @deprecated Please use {@link ModuleListener} directly. */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public abstract class ModuleAdapter implements ModuleListener { } diff --git a/platform/projectModel-api/src/com/intellij/openapi/project/ProjectManager.java b/platform/projectModel-api/src/com/intellij/openapi/project/ProjectManager.java index 3adca4583190..77616d356065 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/project/ProjectManager.java +++ b/platform/projectModel-api/src/com/intellij/openapi/project/ProjectManager.java @@ -114,8 +114,7 @@ public abstract class ProjectManager { /** * @deprecated Use {@link com.intellij.openapi.project.ex.ProjectManagerEx#newProject(Path, com.intellij.ide.impl.OpenProjectTask)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public abstract @Nullable Project createProject(@Nullable String name, @NotNull String path); public @Nullable Project findOpenProjectByHash(@Nullable String locationHash) { diff --git a/platform/projectModel-api/src/com/intellij/openapi/roots/FileIndex.java b/platform/projectModel-api/src/com/intellij/openapi/roots/FileIndex.java index 0451ba93cb67..445124c8c9d9 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/roots/FileIndex.java +++ b/platform/projectModel-api/src/com/intellij/openapi/roots/FileIndex.java @@ -84,8 +84,7 @@ public interface FileIndex { * @deprecated name of this method is unclear, use {@link #isInSourceContent(VirtualFile)} instead and add {@code !file.isDirectory()} check * if you want to accept files only. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) boolean isContentSourceFile(@NotNull VirtualFile file); /** diff --git a/platform/projectModel-api/src/com/intellij/openapi/roots/ModuleExtension.java b/platform/projectModel-api/src/com/intellij/openapi/roots/ModuleExtension.java index 02e42d9e9396..758d53f019f6 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/roots/ModuleExtension.java +++ b/platform/projectModel-api/src/com/intellij/openapi/roots/ModuleExtension.java @@ -33,8 +33,7 @@ public abstract class ModuleExtension implements Disposable { /** * @deprecated don't enumerate extensions in the plugin, use {@link ModuleRootModel#getModuleExtension(Class)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.moduleExtension"); /** @@ -68,8 +67,7 @@ public abstract class ModuleExtension implements Disposable { /** * @deprecated Please implement PersistentStateComponent instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void readExternal(@NotNull Element element) { throw new UnsupportedOperationException("Implement PersistentStateComponent"); } @@ -77,8 +75,7 @@ public abstract class ModuleExtension implements Disposable { /** * @deprecated Please implement PersistentStateComponent instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void writeExternal(@NotNull Element element) { throw new UnsupportedOperationException("Implement PersistentStateComponent"); } diff --git a/platform/projectModel-api/src/com/intellij/openapi/roots/ProjectFileIndex.java b/platform/projectModel-api/src/com/intellij/openapi/roots/ProjectFileIndex.java index d805fbbaee3a..645cf5c2935f 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/roots/ProjectFileIndex.java +++ b/platform/projectModel-api/src/com/intellij/openapi/roots/ProjectFileIndex.java @@ -124,8 +124,7 @@ public interface ProjectFileIndex extends FileIndex { * If you want to check if the file is ignored use {@link FileTypeRegistry#isFileIgnored(VirtualFile)}. * If you want to check if the file or one of its parents is ignored use {@link #isUnderIgnored(VirtualFile)}. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) boolean isIgnored(@NotNull VirtualFile file); /** diff --git a/platform/projectModel-api/src/com/intellij/openapi/roots/SyntheticLibrary.java b/platform/projectModel-api/src/com/intellij/openapi/roots/SyntheticLibrary.java index ce852fd6ac3d..6d672e29155f 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/roots/SyntheticLibrary.java +++ b/platform/projectModel-api/src/com/intellij/openapi/roots/SyntheticLibrary.java @@ -8,7 +8,6 @@ import com.intellij.openapi.util.Condition; import com.intellij.openapi.vfs.VfsUtilCore; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -105,8 +104,7 @@ public abstract class SyntheticLibrary { /** * @deprecated use {@link #newImmutableLibrary(List)} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2020.2") - @Deprecated + @Deprecated(forRemoval = true) @NotNull public static SyntheticLibrary newImmutableLibrary(@NotNull Collection sourceRoots) { return newImmutableLibrary(asList(sourceRoots), Collections.emptySet(), null); diff --git a/platform/projectModel-api/src/com/intellij/openapi/roots/impl/FilePropertyPusher.java b/platform/projectModel-api/src/com/intellij/openapi/roots/impl/FilePropertyPusher.java index 1d2b185ef2dd..f8348bfb8c6a 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/roots/impl/FilePropertyPusher.java +++ b/platform/projectModel-api/src/com/intellij/openapi/roots/impl/FilePropertyPusher.java @@ -7,7 +7,6 @@ import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; import com.intellij.openapi.vfs.VirtualFile; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -93,8 +92,7 @@ public interface FilePropertyPusher { /** * @deprecated Please override {@link FilePropertyPusher#acceptsFile(VirtualFile, Project)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @SuppressWarnings("DeprecatedIsStillUsed") default boolean acceptsFile(@NotNull VirtualFile file) { return false; diff --git a/platform/projectModel-api/src/com/intellij/openapi/roots/libraries/LibraryUtil.java b/platform/projectModel-api/src/com/intellij/openapi/roots/libraries/LibraryUtil.java index 94397750f365..e413afad47df 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/roots/libraries/LibraryUtil.java +++ b/platform/projectModel-api/src/com/intellij/openapi/roots/libraries/LibraryUtil.java @@ -144,8 +144,7 @@ public final class LibraryUtil { /** * @deprecated use {@link Library#getPresentableName()} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @NotNull public static @Nls(capitalization = Nls.Capitalization.Title) String getPresentableName(@NotNull Library library) { return library.getPresentableName(); diff --git a/platform/projectModel-impl/src/com/intellij/openapi/components/impl/stores/IProjectStore.java b/platform/projectModel-impl/src/com/intellij/openapi/components/impl/stores/IProjectStore.java index 6e85dfa66a2d..46ed2bc59f10 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/components/impl/stores/IProjectStore.java +++ b/platform/projectModel-impl/src/com/intellij/openapi/components/impl/stores/IProjectStore.java @@ -41,8 +41,7 @@ public interface IProjectStore extends IComponentStore { * @deprecated Use {@link #getDirectoryStorePath()} or {@link Path#getParent()} of {@link #getProjectFilePath()}. */ @SystemIndependent - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @Nullable String getDirectoryStorePath(boolean ignoreProjectStorageScheme); /** diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexExcludePolicy.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexExcludePolicy.java index e0c1292ede87..8cd244b99178 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexExcludePolicy.java +++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexExcludePolicy.java @@ -10,7 +10,6 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.pointers.VirtualFilePointer; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -29,8 +28,7 @@ public interface DirectoryIndexExcludePolicy { /** * @deprecated Override {@link #getExcludeUrlsForProject()} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) default VirtualFile @NotNull [] getExcludeRootsForProject() { return VirtualFile.EMPTY_ARRAY; } diff --git a/platform/refactoring/src/com/intellij/codeInsight/highlighting/HighlightManager.java b/platform/refactoring/src/com/intellij/codeInsight/highlighting/HighlightManager.java index 6483b8fbd15d..1b54d03f8eac 100644 --- a/platform/refactoring/src/com/intellij/codeInsight/highlighting/HighlightManager.java +++ b/platform/refactoring/src/com/intellij/codeInsight/highlighting/HighlightManager.java @@ -9,7 +9,6 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiReference; import org.intellij.lang.annotations.MagicConstant; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -145,8 +144,7 @@ public abstract class HighlightManager { /** * @deprecated Use the overload with TextAttributesKey */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public abstract void addRangeHighlight(@NotNull Editor editor, int startOffset, int endOffset, @@ -157,8 +155,7 @@ public abstract class HighlightManager { /** * @deprecated Use the overload with TextAttributesKey */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public abstract void addRangeHighlight(@NotNull Editor editor, int startOffset, int endOffset, @@ -170,8 +167,7 @@ public abstract class HighlightManager { /** * @deprecated Use the overload with TextAttributesKey */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public abstract void addOccurrenceHighlights(@NotNull Editor editor, PsiElement @NotNull [] elements, @NotNull TextAttributes attributes, @@ -181,8 +177,7 @@ public abstract class HighlightManager { /** * @deprecated Use the overload with TextAttributesKey */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public abstract void addOccurrenceHighlight(@NotNull Editor editor, int start, int end, diff --git a/platform/refactoring/src/com/intellij/find/findUsages/PsiElement2UsageTargetAdapter.java b/platform/refactoring/src/com/intellij/find/findUsages/PsiElement2UsageTargetAdapter.java index c25e4e1e4f2f..835c5585def1 100644 --- a/platform/refactoring/src/com/intellij/find/findUsages/PsiElement2UsageTargetAdapter.java +++ b/platform/refactoring/src/com/intellij/find/findUsages/PsiElement2UsageTargetAdapter.java @@ -32,7 +32,6 @@ import com.intellij.usageView.UsageViewUtil; import com.intellij.usages.ConfigurableUsageTarget; import com.intellij.usages.PsiElementUsageTarget; import com.intellij.usages.UsageView; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -70,8 +69,7 @@ public class PsiElement2UsageTargetAdapter * * @param element */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) public PsiElement2UsageTargetAdapter(@NotNull PsiElement element, @NotNull FindUsagesOptions options) { this(element, options, true); } @@ -82,8 +80,7 @@ public class PsiElement2UsageTargetAdapter * * @param element */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.2") - @Deprecated + @Deprecated(forRemoval = true) public PsiElement2UsageTargetAdapter(@NotNull PsiElement element) { this(element, true); } @@ -180,8 +177,7 @@ public class PsiElement2UsageTargetAdapter /** * @deprecated use {@link #convert(PsiElement[], boolean)} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) public static PsiElement2UsageTargetAdapter @NotNull [] convert(PsiElement @NotNull [] psiElements) { return convert(psiElements, true); } diff --git a/platform/refactoring/src/com/intellij/refactoring/changeSignature/ChangeSignatureHandler.java b/platform/refactoring/src/com/intellij/refactoring/changeSignature/ChangeSignatureHandler.java index 6db2d2ae67a0..84f678a471e2 100644 --- a/platform/refactoring/src/com/intellij/refactoring/changeSignature/ChangeSignatureHandler.java +++ b/platform/refactoring/src/com/intellij/refactoring/changeSignature/ChangeSignatureHandler.java @@ -9,7 +9,6 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.RefactoringBundle; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -20,8 +19,7 @@ public interface ChangeSignatureHandler extends RefactoringActionHandler { /** * @deprecated inline this field for proper localization */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) String REFACTORING_NAME = RefactoringBundle.message("changeSignature.refactoring.name"); @Nullable diff --git a/platform/remote-core/src/remote/RemoteSdkProperties.java b/platform/remote-core/src/remote/RemoteSdkProperties.java index 4935aed32552..64f28c0db64a 100644 --- a/platform/remote-core/src/remote/RemoteSdkProperties.java +++ b/platform/remote-core/src/remote/RemoteSdkProperties.java @@ -2,7 +2,6 @@ package com.intellij.remote; import com.intellij.util.PathMappingSettings; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -33,8 +32,7 @@ public interface RemoteSdkProperties extends RemoteSdkPropertiesPaths { * * @deprecated */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2015") + @Deprecated(forRemoval = true) boolean isInitialized(); @Deprecated diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ServerConnectionImpl.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ServerConnectionImpl.java index c48ef7187184..0fab0ba15be7 100644 --- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ServerConnectionImpl.java +++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ServerConnectionImpl.java @@ -80,8 +80,7 @@ public class ServerConnectionImpl implements * @deprecated Workaround fpr CWM-3308, in general, the runtime instance is internal and should not be exposed */ @ApiStatus.Internal - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") - @Deprecated + @Deprecated(forRemoval = true) @Nullable public ServerRuntimeInstance getServerRuntimeInstance() { return myRuntimeInstance; diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/SMTestRunnerConnectionUtil.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/SMTestRunnerConnectionUtil.java index b8a1e9c12e20..7747515e9d1f 100644 --- a/platform/smRunner/src/com/intellij/execution/testframework/sm/SMTestRunnerConnectionUtil.java +++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/SMTestRunnerConnectionUtil.java @@ -23,7 +23,6 @@ import com.intellij.openapi.util.ModificationTracker; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.testIntegration.TestLocationProvider; import com.intellij.util.io.URLUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -266,8 +265,7 @@ public final class SMTestRunnerConnectionUtil { // /** @deprecated use {@link #createConsole(String, TestConsoleProperties)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.1") + @Deprecated(forRemoval = true) @SuppressWarnings("unused") public static SMTRunnerConsoleView createConsoleWithCustomLocator(@NotNull String testFrameworkName, @NotNull TestConsoleProperties consoleProperties, @@ -308,8 +306,7 @@ public final class SMTestRunnerConnectionUtil { * @deprecated should be removed with createConsoleWithCustomLocator() */ @SuppressWarnings("rawtypes") - @ApiStatus.ScheduledForRemoval() - @Deprecated + @Deprecated(forRemoval = true) private static final class CompositeTestLocationProvider implements SMTestLocator { private final TestLocationProvider myPrimaryLocator; diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/OutputLineSplitter.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/OutputLineSplitter.java index 3399c09ca68e..ddeba96aaf19 100644 --- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/OutputLineSplitter.java +++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/OutputLineSplitter.java @@ -8,7 +8,6 @@ import com.intellij.openapi.util.Key; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.containers.ContainerUtil; import jetbrains.buildServer.messages.serviceMessages.ServiceMessage; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; @@ -18,8 +17,7 @@ import java.util.List; /** * @deprecated Use {@link OutputEventSplitter}, remove in 2020 */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public abstract class OutputLineSplitter { public static final int SM_MESSAGE_PREFIX = 105; diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/OutputToGeneralTestEventsConverter.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/OutputToGeneralTestEventsConverter.java index 9c2087c25404..d07a732ae074 100644 --- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/OutputToGeneralTestEventsConverter.java +++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/OutputToGeneralTestEventsConverter.java @@ -11,7 +11,6 @@ import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.text.StringUtil; import jetbrains.buildServer.messages.serviceMessages.*; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -100,8 +99,7 @@ public class OutputToGeneralTestEventsConverter implements ProcessOutputConsumer * * @deprecated use {@link #processConsistentText(String, Key)} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2020.2") - @Deprecated + @Deprecated(forRemoval = true) protected void processConsistentText(@NotNull final String text, final Key outputType, @SuppressWarnings("unused") final boolean tcLikeFakeOutput) { diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleProperties.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleProperties.java index e1d10fa5b213..c7a23f5d03ab 100644 --- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleProperties.java +++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleProperties.java @@ -26,7 +26,6 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.pom.Navigatable; import com.intellij.util.config.Storage; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -66,8 +65,7 @@ public class SMTRunnerConsoleProperties extends TestConsoleProperties implements * If enabled, runner must add new line char (\n) before each TC message. This char is not reported to user. * @deprecated Fix your runner and stop adding "\n" before TC message. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public boolean serviceMessageHasNewLinePrefix() { return false; } diff --git a/platform/statistics/src/com/intellij/internal/statistic/eventLog/EventLogEndpointSubstitutor.java b/platform/statistics/src/com/intellij/internal/statistic/eventLog/EventLogEndpointSubstitutor.java index fe72ed7e2918..16cf0f9a2e0a 100644 --- a/platform/statistics/src/com/intellij/internal/statistic/eventLog/EventLogEndpointSubstitutor.java +++ b/platform/statistics/src/com/intellij/internal/statistic/eventLog/EventLogEndpointSubstitutor.java @@ -9,8 +9,7 @@ import org.jetbrains.annotations.Nullable; /** * @deprecated use {@link ExternalEventLogSettings} instead */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2022.2") +@Deprecated(forRemoval = true) @ApiStatus.Internal public interface EventLogEndpointSubstitutor { ExtensionPointName EP_NAME = new ExtensionPointName<>("com.intellij.statistic.eventLog.eventLogEndpointSubstitutor"); diff --git a/platform/statistics/src/com/intellij/internal/statistic/service/fus/collectors/FUCounterUsageLogger.java b/platform/statistics/src/com/intellij/internal/statistic/service/fus/collectors/FUCounterUsageLogger.java index 3be1fad28cec..b2e6979bb3c1 100644 --- a/platform/statistics/src/com/intellij/internal/statistic/service/fus/collectors/FUCounterUsageLogger.java +++ b/platform/statistics/src/com/intellij/internal/statistic/service/fus/collectors/FUCounterUsageLogger.java @@ -194,8 +194,7 @@ public final class FUCounterUsageLogger { * @see FUCounterUsageLogger#logEvent(Project, String, String, FeatureUsageData) * @deprecated Please use {@link EventLogGroup#registerEvent} and {@link EventId#log} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void logEvent(@NonNls @NotNull String groupId, @NonNls @NotNull String eventId) { final EventLogGroup group = findRegisteredGroupById(groupId); diff --git a/platform/statistics/src/com/intellij/internal/statistic/service/fus/collectors/FeatureUsagesCollector.java b/platform/statistics/src/com/intellij/internal/statistic/service/fus/collectors/FeatureUsagesCollector.java index db43c7e7fb84..16ab0f75d05e 100644 --- a/platform/statistics/src/com/intellij/internal/statistic/service/fus/collectors/FeatureUsagesCollector.java +++ b/platform/statistics/src/com/intellij/internal/statistic/service/fus/collectors/FeatureUsagesCollector.java @@ -43,8 +43,7 @@ public abstract class FeatureUsagesCollector { */ @NonNls @NotNull - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) public String getGroupId() { EventLogGroup group = getGroup(); if (group == null) { @@ -57,8 +56,7 @@ public abstract class FeatureUsagesCollector { * Increment collector version if any changes in collector logic were implemented. * @deprecated Please use {@link FeatureUsagesCollector#getGroup()} instead. */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) public int getVersion() { EventLogGroup group = getGroup(); if (group != null) { diff --git a/platform/tasks-platform-api/src/com/intellij/tasks/TaskManager.java b/platform/tasks-platform-api/src/com/intellij/tasks/TaskManager.java index 72e662353469..568975749d1b 100644 --- a/platform/tasks-platform-api/src/com/intellij/tasks/TaskManager.java +++ b/platform/tasks-platform-api/src/com/intellij/tasks/TaskManager.java @@ -6,7 +6,6 @@ import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.AbstractVcs; import com.intellij.openapi.vcs.changes.LocalChangeList; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -107,8 +106,7 @@ public abstract class TaskManager { /** * @deprecated use {@link TaskManager#addTaskListener(TaskListener, Disposable)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public abstract void addTaskListener(TaskListener listener); public abstract void addTaskListener(@NotNull TaskListener listener, @NotNull Disposable parentDisposable); diff --git a/platform/tasks-platform-api/src/com/intellij/tasks/TaskRepository.java b/platform/tasks-platform-api/src/com/intellij/tasks/TaskRepository.java index a3056c789a12..2d14031f2bea 100644 --- a/platform/tasks-platform-api/src/com/intellij/tasks/TaskRepository.java +++ b/platform/tasks-platform-api/src/com/intellij/tasks/TaskRepository.java @@ -26,7 +26,6 @@ import com.intellij.util.xmlb.annotations.Attribute; import com.intellij.util.xmlb.annotations.Tag; import com.intellij.util.xmlb.annotations.Transient; import org.intellij.lang.annotations.MagicConstant; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -109,8 +108,7 @@ public abstract class TaskRepository { /** * @deprecated use #createCancellableConnection() */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void testConnection() throws Exception { } @@ -136,8 +134,7 @@ public abstract class TaskRepository { * @throws Exception * @deprecated To be removed in IDEA 14. Use {@link #getIssues(String, int, int, boolean)} instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2014") + @Deprecated(forRemoval = true) public Task[] getIssues(@Nullable String query, int max, long since) throws Exception { throw new UnsupportedOperationException("Deprecated: should not be called"); } @@ -230,8 +227,7 @@ public abstract class TaskRepository { /** * @deprecated Use {@link #setTaskState(Task, CustomTaskState)} instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void setTaskState(@NotNull Task task, @NotNull TaskState state) throws Exception { throw new UnsupportedOperationException("Setting task to state " + state + " is not supported"); } diff --git a/platform/tasks-platform-api/src/com/intellij/tasks/TaskRepositoryType.java b/platform/tasks-platform-api/src/com/intellij/tasks/TaskRepositoryType.java index 724a53e2dcfe..c7b12d36d083 100644 --- a/platform/tasks-platform-api/src/com/intellij/tasks/TaskRepositoryType.java +++ b/platform/tasks-platform-api/src/com/intellij/tasks/TaskRepositoryType.java @@ -7,7 +7,6 @@ import com.intellij.openapi.project.Project; import com.intellij.tasks.config.TaskRepositoryEditor; import com.intellij.util.Consumer; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -70,8 +69,7 @@ public abstract class TaskRepositoryType implements Ta * @return states that can be set by {@link TaskRepository#setTaskState(Task, CustomTaskState)} * @deprecated Use {@link TaskRepository#getAvailableTaskStates(Task)} instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public EnumSet getPossibleTaskStates() { return EnumSet.noneOf(TaskState.class); } diff --git a/platform/testFramework/src/com/intellij/testFramework/exceptionCases/AbstractExceptionCase.java b/platform/testFramework/src/com/intellij/testFramework/exceptionCases/AbstractExceptionCase.java index 6d4d4a643643..1df5a01ea1ca 100644 --- a/platform/testFramework/src/com/intellij/testFramework/exceptionCases/AbstractExceptionCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/exceptionCases/AbstractExceptionCase.java @@ -2,7 +2,6 @@ package com.intellij.testFramework.exceptionCases; import com.intellij.util.ThrowableRunnable; -import org.jetbrains.annotations.ApiStatus; /** * Base class of block, annotated with exception. Inheritors of this @@ -10,8 +9,7 @@ import org.jetbrains.annotations.ApiStatus; * @deprecated Use {@link com.intellij.testFramework.UsefulTestCase#assertThrows(Class, ThrowableRunnable)} * or {@link com.intellij.testFramework.UsefulTestCase#assertNoException(Class, ThrowableRunnable)} instead */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2022.1") +@Deprecated(forRemoval = true) public abstract class AbstractExceptionCase { public abstract Class getExpectedExceptionClass(); diff --git a/platform/testRunner/src/com/intellij/execution/testframework/TrackRunningTestUtil.java b/platform/testRunner/src/com/intellij/execution/testframework/TrackRunningTestUtil.java index 95b21f576997..682c02ea577f 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/TrackRunningTestUtil.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/TrackRunningTestUtil.java @@ -6,7 +6,6 @@ import com.intellij.openapi.Disposable; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.Pass; import com.intellij.ui.ClickListener; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -22,8 +21,7 @@ public final class TrackRunningTestUtil { private TrackRunningTestUtil() { } /** @deprecated use {@link #installStopListeners(JTree, Disposable, Consumer)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static void installStopListeners(JTree tree, Disposable parentDisposable, Pass setSelection) { installStopListeners(tree, parentDisposable, (Consumer)setSelection); } diff --git a/platform/testRunner/src/com/intellij/execution/testframework/autotest/DelayedDocumentWatcher.java b/platform/testRunner/src/com/intellij/execution/testframework/autotest/DelayedDocumentWatcher.java index ff596a96fa6f..0ca9e3a45104 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/autotest/DelayedDocumentWatcher.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/autotest/DelayedDocumentWatcher.java @@ -24,7 +24,6 @@ import com.intellij.util.PsiErrorElementUtil; import com.intellij.util.SingleAlarm; import com.intellij.util.containers.CollectionFactory; import com.intellij.util.messages.MessageBusConnection; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -54,8 +53,7 @@ public final class DelayedDocumentWatcher implements AutoTestWatcher { /** * @deprecated Use {@link #DelayedDocumentWatcher(Project, int, IntConsumer, Predicate)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public DelayedDocumentWatcher(@NotNull Project project, int delayMillis, @NotNull Consumer modificationStampConsumer, diff --git a/platform/testRunner/src/com/intellij/execution/testframework/ui/TestStatusLine.java b/platform/testRunner/src/com/intellij/execution/testframework/ui/TestStatusLine.java index a701dfe839a6..a03c198ddcf9 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/ui/TestStatusLine.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/ui/TestStatusLine.java @@ -163,8 +163,7 @@ public class TestStatusLine extends NonOpaquePanel { /** * @deprecated Usages should be deleted as progress is now incorporated into console */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void setPreferredSize(boolean orientation) { final Dimension size = new JBDimension(orientation ? 150 : 450 , -1); myProgressPanel.setMaximumSize(size); diff --git a/platform/testRunner/src/com/intellij/execution/testframework/ui/TestsProgressAnimator.java b/platform/testRunner/src/com/intellij/execution/testframework/ui/TestsProgressAnimator.java index ea8a0a687a03..62d4ac846fe2 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/ui/TestsProgressAnimator.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/ui/TestsProgressAnimator.java @@ -21,7 +21,6 @@ import com.intellij.openapi.Disposable; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.util.Disposer; import com.intellij.util.Alarm; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -43,8 +42,7 @@ public class TestsProgressAnimator implements Runnable, Disposable { /** * @deprecated To be deleted when AbstractTreeBuilder would be completely eliminated */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public TestsProgressAnimator(AbstractTestTreeBuilder builder) { this((AbstractTestTreeBuilderBase)builder); } diff --git a/platform/usageView/src/com/intellij/usages/UsageGroup.java b/platform/usageView/src/com/intellij/usages/UsageGroup.java index 89a7c409f5ac..6498ff1a8ccd 100644 --- a/platform/usageView/src/com/intellij/usages/UsageGroup.java +++ b/platform/usageView/src/com/intellij/usages/UsageGroup.java @@ -5,7 +5,6 @@ import com.intellij.openapi.util.NlsContexts.ListItem; import com.intellij.openapi.vcs.FileStatus; import com.intellij.pom.Navigatable; import com.intellij.util.ReflectionUtil; -import org.jetbrains.annotations.ApiStatus.ScheduledForRemoval; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -16,8 +15,7 @@ public interface UsageGroup extends Comparable, Navigatable { /** * @deprecated implement {@link #getIcon()} instead */ - @ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) default @Nullable Icon getIcon(boolean isOpen) { if (ReflectionUtil.getMethodDeclaringClass(getClass(), "getIcon") == UsageGroup.class) { return null; @@ -32,8 +30,7 @@ public interface UsageGroup extends Comparable, Navigatable { /** * @deprecated implement {@link #getPresentableGroupText()} instead */ - @ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) default @ListItem @NotNull String getText(@Nullable UsageView view) { if (ReflectionUtil.getMethodDeclaringClass(getClass(), "getPresentableGroupText") == UsageGroup.class) { throw new AbstractMethodError("getPresentableGroupText() must be implemented"); diff --git a/platform/usageView/src/com/intellij/usages/UsageView.java b/platform/usageView/src/com/intellij/usages/UsageView.java index 767ff5a427fc..a11a2dfaae87 100644 --- a/platform/usageView/src/com/intellij/usages/UsageView.java +++ b/platform/usageView/src/com/intellij/usages/UsageView.java @@ -6,7 +6,6 @@ import com.intellij.openapi.actionSystem.DataKey; import com.intellij.openapi.util.NlsContexts; import com.intellij.psi.search.SearchScope; import com.intellij.usageView.UsageInfo; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -46,8 +45,7 @@ public interface UsageView extends Disposable { /** * @deprecated please specify mnemonic by prefixing the mnemonic character with an ampersand (&& for Mac-specific ampersands) */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) void addButtonToLowerPane(@NotNull Runnable runnable, @NlsContexts.Button @NotNull String text, char mnemonic); void addButtonToLowerPane(@NotNull Runnable runnable, @NlsContexts.Button @NotNull String text); void addButtonToLowerPane(@NotNull Action action); @@ -55,8 +53,7 @@ public interface UsageView extends Disposable { /** * @deprecated see {@link UsageView#setRerunAction(Action)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) default void setReRunActivity(@NotNull Runnable runnable) {} /** diff --git a/platform/usageView/src/com/intellij/usages/UsageViewPresentation.java b/platform/usageView/src/com/intellij/usages/UsageViewPresentation.java index f761ec546725..58f3133e3102 100644 --- a/platform/usageView/src/com/intellij/usages/UsageViewPresentation.java +++ b/platform/usageView/src/com/intellij/usages/UsageViewPresentation.java @@ -6,7 +6,6 @@ import com.intellij.openapi.util.NlsContexts; import com.intellij.openapi.util.NlsSafe; import com.intellij.openapi.util.text.StringUtil; import com.intellij.usageView.UsageViewBundle; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -160,8 +159,7 @@ public class UsageViewPresentation { /** * @deprecated please avoid using this method, because it leads to string concatenations that are shown in UI */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @NotNull public @Nls String getUsagesWord() { return UsageViewBundle.message("usage.name", 1); @@ -170,8 +168,7 @@ public class UsageViewPresentation { /** * @deprecated no-op */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void setUsagesWord(@NotNull @Nls String usagesWord) {} public @NlsContexts.TabTitle String getTabName() { diff --git a/platform/util-ex/src/com/intellij/util/ResourceUtil.java b/platform/util-ex/src/com/intellij/util/ResourceUtil.java index f116bc70ef14..9d9f4ac4f2f9 100644 --- a/platform/util-ex/src/com/intellij/util/ResourceUtil.java +++ b/platform/util-ex/src/com/intellij/util/ResourceUtil.java @@ -4,7 +4,6 @@ package com.intellij.util; import com.intellij.openapi.util.text.Strings; import com.intellij.util.io.URLUtil; import com.intellij.util.lang.UrlClassLoader; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -45,8 +44,7 @@ public final class ResourceUtil { /** * @deprecated Use {@link #getResourceAsStream(ClassLoader, String, String)} */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.2") - @Deprecated + @Deprecated(forRemoval = true) public static URL getResource(@NotNull Class loaderClass, @NonNls @NotNull String basePath, @NonNls @NotNull String fileName) { return getResource(loaderClass.getClassLoader(), basePath, fileName); } @@ -141,8 +139,7 @@ public final class ResourceUtil { /** * @deprecated Use {@link #loadText(InputStream)} */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.2") - @Deprecated + @Deprecated(forRemoval = true) public static @NotNull String loadText(@NotNull URL url) throws IOException { return loadText(URLUtil.openStream(url)); } diff --git a/platform/util/ui/src/com/intellij/ui/BooleanTableCellEditor.java b/platform/util/ui/src/com/intellij/ui/BooleanTableCellEditor.java index ab8641056fb8..3b6508a13f8c 100644 --- a/platform/util/ui/src/com/intellij/ui/BooleanTableCellEditor.java +++ b/platform/util/ui/src/com/intellij/ui/BooleanTableCellEditor.java @@ -1,8 +1,6 @@ // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.ui; -import org.jetbrains.annotations.ApiStatus; - import javax.swing.*; import java.awt.*; @@ -21,8 +19,7 @@ public class BooleanTableCellEditor extends DefaultCellEditor { /** * @deprecated there seems to be no need to change default options, use {@link #BooleanTableCellEditor()} instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public BooleanTableCellEditor(boolean isStringEditor, int horizontalAlignment) { super(new JCheckBox()); myStringEditor = isStringEditor; diff --git a/platform/util/ui/src/com/intellij/ui/JBColor.java b/platform/util/ui/src/com/intellij/ui/JBColor.java index 157d1070e47d..f7f1037780e5 100644 --- a/platform/util/ui/src/com/intellij/ui/JBColor.java +++ b/platform/util/ui/src/com/intellij/ui/JBColor.java @@ -184,8 +184,7 @@ public class JBColor extends Color { /** * @deprecated use {@link CurrentTheme.Link.Foreground#ENABLED} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static @NotNull Color link() { return CurrentTheme.Link.Foreground.ENABLED; } diff --git a/platform/util/ui/src/com/intellij/util/RetinaImage.java b/platform/util/ui/src/com/intellij/util/RetinaImage.java index 595b7171094a..fd6303a8b7cf 100644 --- a/platform/util/ui/src/com/intellij/util/RetinaImage.java +++ b/platform/util/ui/src/com/intellij/util/RetinaImage.java @@ -3,7 +3,6 @@ package com.intellij.util; import com.intellij.ui.paint.PaintUtil.RoundingMode; import com.intellij.ui.scale.ScaleContext; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.awt.*; @@ -32,8 +31,7 @@ public final class RetinaImage { // [tav] todo: create HiDPIImage class /** * @deprecated use {@link #createFrom(Image, double, ImageObserver)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static @NotNull Image createFrom(@NotNull Image image, int scale, ImageObserver observer) { return createFrom(image, (float)scale, observer); } diff --git a/platform/util/ui/src/com/intellij/util/ui/BlockBorder.java b/platform/util/ui/src/com/intellij/util/ui/BlockBorder.java index f0d744a0e0c2..eee86f2ac098 100644 --- a/platform/util/ui/src/com/intellij/util/ui/BlockBorder.java +++ b/platform/util/ui/src/com/intellij/util/ui/BlockBorder.java @@ -2,14 +2,12 @@ package com.intellij.util.ui; import com.intellij.ui.Gray; -import org.jetbrains.annotations.ApiStatus; import javax.swing.border.Border; import java.awt.*; /** @deprecated ancient HiDPI-unfriendly component */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.1") +@Deprecated(forRemoval = true) @SuppressWarnings({"UseDPIAwareInsets", "UseJBColor", "unused", "SpellCheckingInspection"}) public class BlockBorder implements Border { private static final Insets DEFAULT_INSETS = new Insets(1, 1, 3, 3); diff --git a/platform/util/ui/src/com/intellij/util/ui/EmptyIcon.java b/platform/util/ui/src/com/intellij/util/ui/EmptyIcon.java index 668cb07d4ccb..135041b94683 100644 --- a/platform/util/ui/src/com/intellij/util/ui/EmptyIcon.java +++ b/platform/util/ui/src/com/intellij/util/ui/EmptyIcon.java @@ -4,7 +4,6 @@ package com.intellij.util.ui; import com.intellij.openapi.util.Pair; import com.intellij.ui.scale.DerivedScaleType; import com.intellij.ui.scale.JBUIScale; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -65,8 +64,7 @@ import java.util.Map; /** * @deprecated use {@linkplain #create(int)} for caching. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public EmptyIcon(int size) { this(size, size, false); } diff --git a/platform/util/ui/src/com/intellij/util/ui/JBSwingUtilities.java b/platform/util/ui/src/com/intellij/util/ui/JBSwingUtilities.java index 4e3919162221..69a4be06dcd4 100644 --- a/platform/util/ui/src/com/intellij/util/ui/JBSwingUtilities.java +++ b/platform/util/ui/src/com/intellij/util/ui/JBSwingUtilities.java @@ -2,7 +2,6 @@ package com.intellij.util.ui; import com.intellij.openapi.Disposable; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -23,8 +22,7 @@ public final class JBSwingUtilities { /** * @deprecated Use {@link SwingUtilities#isLeftMouseButton} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static boolean isLeftMouseButton(MouseEvent anEvent) { return SwingUtilities.isLeftMouseButton(anEvent); } @@ -32,8 +30,7 @@ public final class JBSwingUtilities { /** * @deprecated Use {@link SwingUtilities#isRightMouseButton} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static boolean isRightMouseButton(MouseEvent anEvent) { return SwingUtilities.isRightMouseButton(anEvent); } diff --git a/platform/util/ui/src/com/intellij/util/ui/JBUI.java b/platform/util/ui/src/com/intellij/util/ui/JBUI.java index d84c1e095b84..8492e6e94c6c 100644 --- a/platform/util/ui/src/com/intellij/util/ui/JBUI.java +++ b/platform/util/ui/src/com/intellij/util/ui/JBUI.java @@ -12,7 +12,6 @@ import com.intellij.ui.border.CustomLineBorder; import com.intellij.ui.scale.DerivedScaleType; import com.intellij.ui.scale.JBUIScale; import com.intellij.util.ui.components.BorderLayoutPanel; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -146,8 +145,7 @@ public final class JBUI { /** * @deprecated Use {@link JBUIScale#scaleIcon(JBScalableIcon)}. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static @NotNull T scale(@NotNull T icon) { return JBUIScale.scaleIcon(icon); } @@ -163,8 +161,7 @@ public final class JBUI { /** * @deprecated use {@link JBUIScale#isUsrHiDPI()} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static boolean isUsrHiDPI() { return JBUIScale.isUsrHiDPI(); } @@ -767,8 +764,7 @@ public final class JBUI { /** * @deprecated obsolete UI */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static int tabVerticalPadding() { return getInt("ToolWindow.HeaderTab.verticalPadding", JBUIScale.scale(6)); } @@ -1076,8 +1072,7 @@ public final class JBUI { /** * @deprecated use {@link Foreground#ENABLED} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) public static @NotNull Color linkColor() { return Foreground.ENABLED; } @@ -1085,8 +1080,7 @@ public final class JBUI { /** * @deprecated use {@link Foreground#HOVERED} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) public static @NotNull Color linkHoverColor() { return Foreground.HOVERED; } @@ -1094,8 +1088,7 @@ public final class JBUI { /** * @deprecated use {@link Foreground#PRESSED} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) public static @NotNull Color linkPressedColor() { return Foreground.PRESSED; } @@ -1103,8 +1096,7 @@ public final class JBUI { /** * @deprecated use {@link Foreground#VISITED} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2022.1") - @Deprecated + @Deprecated(forRemoval = true) public static @NotNull Color linkVisitedColor() { return Foreground.VISITED; } diff --git a/platform/util/ui/src/com/intellij/util/ui/TwoColorsIcon.java b/platform/util/ui/src/com/intellij/util/ui/TwoColorsIcon.java index 6027749c6dd8..eff0320e5464 100644 --- a/platform/util/ui/src/com/intellij/util/ui/TwoColorsIcon.java +++ b/platform/util/ui/src/com/intellij/util/ui/TwoColorsIcon.java @@ -1,7 +1,6 @@ // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.util.ui; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -13,8 +12,7 @@ import java.awt.*; * * @deprecated use {@link ColorsIcon} instead */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public class TwoColorsIcon extends ColorsIcon { public TwoColorsIcon(int size, @Nullable Color color1, @Nullable Color secondColor) { super(size, color1, secondColor); diff --git a/platform/util/ui/src/com/intellij/util/ui/UIUtil.java b/platform/util/ui/src/com/intellij/util/ui/UIUtil.java index d701323171aa..da4deae854a2 100644 --- a/platform/util/ui/src/com/intellij/util/ui/UIUtil.java +++ b/platform/util/ui/src/com/intellij/util/ui/UIUtil.java @@ -684,8 +684,7 @@ public final class UIUtil { /** * @deprecated Use {@link LinePainter2D#paint(Graphics2D, double, double, double, double)} instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static void drawLine(@NotNull Graphics g, int x1, int y1, int x2, int y2) { LinePainter2D.paint((Graphics2D)g, x1, y1, x2, y2); } @@ -884,8 +883,7 @@ public final class UIUtil { /** * @deprecated use {@link #getTreeForeground()} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static @NotNull Color getTreeTextForeground() { return getTreeForeground(); } @@ -1029,8 +1027,7 @@ public final class UIUtil { /** * @deprecated use {@link JBUI.CurrentTheme.CustomFrameDecorations#separatorForeground()} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static @NotNull Color getSeparatorColor() { return JBUI.CurrentTheme.CustomFrameDecorations.separatorForeground(); } @@ -1136,8 +1133,7 @@ public final class UIUtil { /** * @deprecated Aqua Look-n-Feel is not supported anymore */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.1") + @Deprecated(forRemoval = true) public static boolean isUnderAquaLookAndFeel() { return SystemInfoRt.isMac && UIManager.getLookAndFeel().getName().contains("Mac OS X"); } @@ -1145,8 +1141,7 @@ public final class UIUtil { /** * @deprecated Nimbus Look-n-Feel is deprecated and not supported anymore */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.1") + @Deprecated(forRemoval = true) public static boolean isUnderNimbusLookAndFeel() { return false; } @@ -1185,8 +1180,7 @@ public final class UIUtil { return UIManager.getLookAndFeel().getName().contains("IntelliJ") || isUnderDefaultMacTheme() || isUnderWin10LookAndFeel(); } - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.1") + @Deprecated(forRemoval = true) public static boolean isUnderGTKLookAndFeel() { return SystemInfoRt.isXWindow && UIManager.getLookAndFeel().getName().contains("GTK"); } @@ -1810,8 +1804,7 @@ public final class UIUtil { /** * @deprecated use {@link ComponentUtil#findParentByCondition(Component, java.util.function.Predicate)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static Component findParentByCondition(@Nullable Component c, @NotNull Condition condition) { return ComponentUtil.findParentByCondition(c, it -> condition.value(it)); } @@ -3117,8 +3110,7 @@ public final class UIUtil { /** * @deprecated use {@link #getListSelectionBackground(boolean)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static @NotNull Color getListUnfocusedSelectionBackground() { return getListSelectionBackground(false); } @@ -3149,8 +3141,7 @@ public final class UIUtil { /** * @deprecated use {@link #getListForeground(boolean, boolean)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static @NotNull Color getListForeground(boolean selected) { return getListForeground(selected, true); } @@ -3303,8 +3294,7 @@ public final class UIUtil { /** * @deprecated use {@link #getTableForeground(boolean, boolean)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static @NotNull Color getTableForeground(boolean selected) { return getTableForeground(selected, true); } diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcs.java b/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcs.java index 22f8bebf59e6..17d4ce9a0586 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcs.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcs.java @@ -505,8 +505,7 @@ public abstract class AbstractVcs extends StartedActivated { } @NotNull - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public List filterUniqueRoots(@NotNull List in, @NotNull Function convertor) { if (!allowsNestedRoots()) { new FilterDescendantVirtualFileConvertible<>(convertor, FilePathComparator.getInstance()).doFilter(in); diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/CommittedChangesProvider.java b/platform/vcs-api/src/com/intellij/openapi/vcs/CommittedChangesProvider.java index f5ed6fa24707..94058e9d6b79 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/CommittedChangesProvider.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/CommittedChangesProvider.java @@ -11,7 +11,6 @@ import com.intellij.openapi.vcs.versionBrowser.ChangesBrowserSettingsEditor; import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.AsynchConsumer; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -34,8 +33,7 @@ public interface CommittedChangesProvider getDirectoryMappings(); @@ -195,8 +193,7 @@ public abstract class ProjectLevelVcsManager { /** * This method can be used only when initially loading the project configuration! */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public abstract void setDirectoryMapping(@NonNls String path, @NonNls String activeVcsName); public abstract void setDirectoryMappings(final List items); diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsDirectoryMapping.java b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsDirectoryMapping.java index ec7ab88a15bc..75dcd893c1c4 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsDirectoryMapping.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsDirectoryMapping.java @@ -68,8 +68,7 @@ public class VcsDirectoryMapping { * @param rootSettings the VCS-specific settings * @deprecated Use constructor parameter */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void setRootSettings(final VcsRootSettings rootSettings) { myRootSettings = rootSettings; } diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/actions/VcsContext.java b/platform/vcs-api/src/com/intellij/openapi/vcs/actions/VcsContext.java index b6fc85a51233..50753dacf81d 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/actions/VcsContext.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/actions/VcsContext.java @@ -24,7 +24,6 @@ import com.intellij.openapi.vcs.changes.ChangeList; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.PlaceProvider; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -41,8 +40,7 @@ import static java.util.Collections.emptyList; * @see com.intellij.openapi.vcs.actions.VcsContextUtil * @deprecated Prefer explicit {@link com.intellij.openapi.actionSystem.DataContext} state caching when needed. */ -@ApiStatus.ScheduledForRemoval(inVersion = "2022.2") -@Deprecated +@Deprecated(forRemoval = true) public interface VcsContext extends PlaceProvider { @Nullable Project getProject(); @@ -59,8 +57,7 @@ public interface VcsContext extends PlaceProvider { /** * @deprecated use {@link #getSelectedUnversionedFilePaths} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @NotNull default List getSelectedUnversionedFiles() { return ContainerUtil.mapNotNull(getSelectedUnversionedFilePaths(), FilePath::getVirtualFile); diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/annotate/LineAnnotationAspectAdapter.java b/platform/vcs-api/src/com/intellij/openapi/vcs/annotate/LineAnnotationAspectAdapter.java index 8177bdb7a31f..ab6780d9fa4b 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/annotate/LineAnnotationAspectAdapter.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/annotate/LineAnnotationAspectAdapter.java @@ -3,7 +3,6 @@ package com.intellij.openapi.vcs.annotate; import com.intellij.openapi.editor.EditorGutterAction; import com.intellij.openapi.util.NlsContexts; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; @@ -20,8 +19,7 @@ public abstract class LineAnnotationAspectAdapter implements LineAnnotationAspec /** * @deprecated use {@link LineAnnotationAspectAdapter#LineAnnotationAspectAdapter(String, String, boolean)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected LineAnnotationAspectAdapter() { this(null, null, false); } diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/BackgroundFromStartOption.java b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/BackgroundFromStartOption.java index ddd6025f5a04..b83e738ae3c8 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/BackgroundFromStartOption.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/BackgroundFromStartOption.java @@ -2,13 +2,11 @@ package com.intellij.openapi.vcs.changes; import com.intellij.openapi.progress.PerformInBackgroundOption; -import org.jetbrains.annotations.ApiStatus; /** * @deprecated use nothing or {@link PerformInBackgroundOption#ALWAYS_BACKGROUND} instead */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public class BackgroundFromStartOption { public static PerformInBackgroundOption getInstance() { diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangeListManager.java b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangeListManager.java index 14af42ee54e9..c9a18f953878 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangeListManager.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangeListManager.java @@ -171,8 +171,7 @@ public abstract class ChangeListManager implements ChangeListModification { * @deprecated Use {@link com.intellij.openapi.vcs.ProjectLevelVcsManager#getVcsFor} */ @Nullable - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public abstract AbstractVcs getVcsFor(@NotNull Change change); @@ -192,8 +191,7 @@ public abstract class ChangeListManager implements ChangeListModification { /** * @deprecated use {@link LocalCommitExecutor#LOCAL_COMMIT_EXECUTOR} extension point */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2020.3") + @Deprecated(forRemoval = true) public abstract void registerCommitExecutor(@NotNull CommitExecutor executor); @NotNull @@ -209,8 +207,7 @@ public abstract class ChangeListManager implements ChangeListModification { /** * @deprecated All potential ignores should be contributed to VCS native ignores by corresponding {@link IgnoredFileProvider}. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public abstract IgnoredFileBean @NotNull [] getFilesToIgnore(); public abstract boolean isIgnoredFile(@NotNull VirtualFile file); @@ -223,22 +220,19 @@ public abstract class ChangeListManager implements ChangeListModification { /** * @deprecated All potential ignores should be contributed to VCS native ignores by corresponding {@link IgnoredFileProvider}. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public abstract void setFilesToIgnore(IgnoredFileBean @NotNull ... ignoredFiles); /** * @deprecated All potential ignores should be contributed to VCS native ignores by corresponding {@link IgnoredFileProvider}. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public abstract void addFilesToIgnore(IgnoredFileBean @NotNull ... ignoredFiles); /** * @deprecated All potential ignores should be contributed to VCS native ignores by corresponding {@link IgnoredFileProvider}. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public abstract void addDirectoryToIgnoreImplicitly(@NotNull @NlsSafe String path); diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangelistBuilder.java b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangelistBuilder.java index a74babdfec90..45d756f4344a 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangelistBuilder.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangelistBuilder.java @@ -9,7 +9,6 @@ import com.intellij.openapi.vcs.FilePath; import com.intellij.openapi.vcs.VcsKey; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.vcsUtil.VcsUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -85,8 +84,7 @@ public interface ChangelistBuilder { * @param file an ignored file * @deprecated use {@link #processIgnoredFile(FilePath)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) default void processIgnoredFile(VirtualFile file) { if (file != null) { processIgnoredFile(VcsUtil.getFilePath(file)); diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/IgnoredFileDescriptor.java b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/IgnoredFileDescriptor.java index e09109be5709..717a9580b954 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/IgnoredFileDescriptor.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/IgnoredFileDescriptor.java @@ -4,7 +4,6 @@ package com.intellij.openapi.vcs.changes; import com.intellij.openapi.util.NlsSafe; import com.intellij.openapi.vcs.FilePath; import com.intellij.openapi.vfs.VirtualFile; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -34,8 +33,7 @@ public interface IgnoredFileDescriptor { /** * @deprecated use {@link #matchesFile(FilePath)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) boolean matchesFile(@NotNull VirtualFile file); boolean matchesFile(@NotNull FilePath filePath); diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/LocalChangeList.java b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/LocalChangeList.java index 7756d5ff75db..165f23fd661a 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/LocalChangeList.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/LocalChangeList.java @@ -67,15 +67,13 @@ public abstract class LocalChangeList implements Cloneable, ChangeList { /** * @deprecated use {@link ChangeListManager#editComment} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public abstract void setComment(@Nullable String comment); /** * @deprecated use {@link ChangeListManager#setReadOnly} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public abstract void setReadOnly(boolean isReadOnly); public static @NotNull @NlsSafe String getDefaultName() { diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/history/VcsAppendableHistorySessionPartner.java b/platform/vcs-api/src/com/intellij/openapi/vcs/history/VcsAppendableHistorySessionPartner.java index 2c21161e1561..054860b48df0 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/history/VcsAppendableHistorySessionPartner.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/history/VcsAppendableHistorySessionPartner.java @@ -16,7 +16,6 @@ package com.intellij.openapi.vcs.history; import com.intellij.openapi.vcs.VcsException; -import org.jetbrains.annotations.ApiStatus; public interface VcsAppendableHistorySessionPartner { void reportCreatedEmptySession(VcsAbstractHistorySession session); @@ -26,7 +25,6 @@ public interface VcsAppendableHistorySessionPartner { /** * @deprecated plugins do not need to and should not call this method. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) default void finished() {} } diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/history/VcsCacheableHistorySessionFactory.java b/platform/vcs-api/src/com/intellij/openapi/vcs/history/VcsCacheableHistorySessionFactory.java index d2c57d91abc8..32cba334f9f7 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/history/VcsCacheableHistorySessionFactory.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/history/VcsCacheableHistorySessionFactory.java @@ -2,7 +2,6 @@ package com.intellij.openapi.vcs.history; import com.intellij.openapi.vcs.FilePath; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -36,8 +35,7 @@ public interface VcsCacheableHistorySessionFactory { if (project.isOpen()) { @@ -347,8 +345,7 @@ public class VcsUtil { * @deprecated Use {@link ProgressManager#runProcessWithProgressSynchronously(ThrowableComputable, String, boolean, Project)} * and other run methods from the ProgressManager. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static boolean runVcsProcessWithProgress(@NotNull VcsRunnable runnable, @NotNull @NlsContexts.ProgressTitle String progressTitle, boolean canBeCanceled, diff --git a/platform/vcs-api/vcs-api-core/src/com/intellij/lifecycle/PeriodicalTasksCloser.java b/platform/vcs-api/vcs-api-core/src/com/intellij/lifecycle/PeriodicalTasksCloser.java index 522fc2fee09c..ea372ffa0301 100644 --- a/platform/vcs-api/vcs-api-core/src/com/intellij/lifecycle/PeriodicalTasksCloser.java +++ b/platform/vcs-api/vcs-api-core/src/com/intellij/lifecycle/PeriodicalTasksCloser.java @@ -10,7 +10,6 @@ import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.progress.Task; import com.intellij.openapi.project.Project; import com.intellij.util.ExceptionUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -20,8 +19,7 @@ import org.jetbrains.annotations.NotNull; * with a dispose check, or from a background task with a proper dispose-aware ProgressIndicator, * e.g. via {@link ProgressManager#run(Task)} or {@code BackgroundTaskUtil#executeOnPooledThread}. */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) @Service public final class PeriodicalTasksCloser { private static final Logger LOG = Logger.getInstance(PeriodicalTasksCloser.class); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/FilePathImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/FilePathImpl.java index c94134bf4fd4..f25a1eb81462 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/FilePathImpl.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/FilePathImpl.java @@ -14,7 +14,6 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.encoding.EncodingManager; import com.intellij.openapi.vfs.encoding.EncodingProjectManager; import com.intellij.util.PathUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -40,8 +39,7 @@ public final class FilePathImpl implements FilePath { /** * @deprecated Use {@link LocalFilePath}. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public FilePathImpl(@NotNull VirtualFile file) { this(file.getPath(), file.isDirectory()); } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsNotifier.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsNotifier.java index e5e613e25e7a..edb0b575535a 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsNotifier.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsNotifier.java @@ -42,8 +42,7 @@ public class VcsNotifier { /** * @deprecated use {@link #notifyError(String, String, String)} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2020.4") - @Deprecated + @Deprecated(forRemoval = true) @NotNull public Notification notifyError(@NotificationTitle @NotNull String title, @NotificationContent @NotNull String message) { @@ -71,8 +70,7 @@ public class VcsNotifier { /** * @deprecated use {@link #notifyError(String, String, String, NotificationListener)} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2020.4") - @Deprecated + @Deprecated(forRemoval = true) @NotNull public Notification notifyError(@NotificationTitle @NotNull String title, @NotificationContent @NotNull String message, @@ -107,8 +105,7 @@ public class VcsNotifier { /** * @deprecated use {@link #notifyWeakError(String, String)} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2020.4") - @Deprecated + @Deprecated(forRemoval = true) @NotNull public Notification notifyWeakError(@NotificationContent @NotNull String message) { return notify(NOTIFICATION_GROUP_ID, null, "", message, NotificationType.ERROR); @@ -131,8 +128,7 @@ public class VcsNotifier { /** * @deprecated use {@link #notifySuccess(String, String, String)} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2020.4") - @Deprecated + @Deprecated(forRemoval = true) @NotNull public Notification notifySuccess(@NotificationContent @NotNull String message) { return notify(NOTIFICATION_GROUP_ID, null, "", message, NotificationType.INFORMATION); @@ -141,8 +137,7 @@ public class VcsNotifier { /** * @deprecated use {@link #notifySuccess(String, String, String)} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2020.4") - @Deprecated + @Deprecated(forRemoval = true) @NotNull public Notification notifySuccess(@NotificationTitle @NotNull String title, @NotificationContent @NotNull String message) { @@ -159,8 +154,7 @@ public class VcsNotifier { /** * @deprecated use {@link #notifySuccess(String, String, String, NotificationListener)} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2020.4") - @Deprecated + @Deprecated(forRemoval = true) @NotNull public Notification notifySuccess(@NotificationTitle @NotNull String title, @NotificationContent @NotNull String message, @@ -179,8 +173,7 @@ public class VcsNotifier { /** * @deprecated use {@link #notifyImportantInfo(String, String, String)} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2020.4") - @Deprecated + @Deprecated(forRemoval = true) @NotNull public Notification notifyImportantInfo(@NotificationTitle @NotNull String title, @NotificationContent @NotNull String message) { @@ -190,8 +183,7 @@ public class VcsNotifier { /** * @deprecated use {@link #notifyImportantInfo(String, String, String, NotificationListener)} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2020.4") - @Deprecated + @Deprecated(forRemoval = true) @NotNull public Notification notifyImportantInfo(@NotificationTitle @NotNull String title, @NotificationContent @NotNull String message, @@ -217,8 +209,7 @@ public class VcsNotifier { /** * @deprecated use {@link #notifyInfo(String, String, String)} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2020.4") - @Deprecated + @Deprecated(forRemoval = true) @NotNull public Notification notifyInfo(@NotificationTitle @NotNull String title, @NotificationContent @NotNull String message) { @@ -264,8 +255,7 @@ public class VcsNotifier { /** * @deprecated use {@link #notifyWarning(String, String, String)} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2020.4") - @Deprecated + @Deprecated(forRemoval = true) @NotNull public Notification notifyWarning(@NotificationTitle @NotNull String title, @NotificationContent @NotNull String message) { @@ -283,8 +273,7 @@ public class VcsNotifier { /** * @deprecated use {@link #notifyImportantWarning(String, String, String)} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2020.4") - @Deprecated + @Deprecated(forRemoval = true) @NotNull public Notification notifyImportantWarning(@NotificationTitle @NotNull String title, @NotificationContent @NotNull String message) { @@ -309,8 +298,7 @@ public class VcsNotifier { /** * @deprecated use {@link #notifyImportantWarning(String, String, String, NotificationListener)} instead */ - @ApiStatus.ScheduledForRemoval(inVersion = "2020.4") - @Deprecated + @Deprecated(forRemoval = true) @NotNull public Notification notifyImportantWarning(@NotificationTitle @NotNull String title, @NotificationContent @NotNull String message, diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsShowConfirmationOptionImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsShowConfirmationOptionImpl.java index 2e5c7109193c..5b002d62fb9c 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsShowConfirmationOptionImpl.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsShowConfirmationOptionImpl.java @@ -15,13 +15,10 @@ */ package com.intellij.openapi.vcs; -import org.jetbrains.annotations.ApiStatus; - /** * @deprecated Use {@link VcsShowConfirmationOption#STATIC_SHOW_CONFIRMATION} */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public class VcsShowConfirmationOptionImpl implements VcsShowConfirmationOption { private Value myValue = Value.SHOW_CONFIRMATION; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsVFSListener.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsVFSListener.java index 4aa42e44c6b4..26ef9e5ed260 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsVFSListener.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsVFSListener.java @@ -29,7 +29,6 @@ import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.SmartHashSet; import com.intellij.vcsUtil.VcsUtil; import kotlin.Unit; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -385,8 +384,7 @@ public abstract class VcsVFSListener implements Disposable { /** * @deprecated Use {@link #VcsVFSListener(AbstractVcs)} followed by {@link #installListeners()} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected VcsVFSListener(@NotNull Project project, @NotNull AbstractVcs vcs) { this(vcs); installListeners(); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AbstractVcsAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AbstractVcsAction.java index 306f69282110..0094e09235f5 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AbstractVcsAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AbstractVcsAction.java @@ -7,7 +7,6 @@ import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.AbstractVcs; import com.intellij.openapi.vcs.ProjectLevelVcsManager; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -18,8 +17,7 @@ import static java.util.Collections.emptySet; /** * @deprecated Use {@link DumbAwareAction} instead. */ -@ApiStatus.ScheduledForRemoval(inVersion = "2022.1") -@Deprecated +@Deprecated(forRemoval = true) public abstract class AbstractVcsAction extends DumbAwareAction { @SuppressWarnings("unused") // Required for compatibility with external plugins. @@ -48,8 +46,7 @@ public abstract class AbstractVcsAction extends DumbAwareAction { * @deprecated Only sync update is currently supported by {@link AbstractVcsAction}. */ @SuppressWarnings("unused") // Required for compatibility with external plugins. - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected boolean forceSyncUpdate(@NotNull AnActionEvent e) { return true; } @@ -58,8 +55,7 @@ public abstract class AbstractVcsAction extends DumbAwareAction { /** * @deprecated Use {@link AbstractVcsAction#update(VcsContext, Presentation)}. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected void performUpdate(@NotNull Presentation presentation, @NotNull VcsContext vcsContext) { update(vcsContext, presentation); } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java index cf164d8da365..dfe635faa10c 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java @@ -783,8 +783,7 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Persis /** * @deprecated use {@link #getUnversionedFilesPaths} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @NotNull public List getUnversionedFiles() { return mapNotNull(getUnversionedFilesPaths(), FilePath::getVirtualFile); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesAdapter.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesAdapter.java index 2e52997368f5..dff3ce18c011 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesAdapter.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesAdapter.java @@ -1,12 +1,9 @@ // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.vcs.changes.committed; -import org.jetbrains.annotations.ApiStatus; - /** * @deprecated Use {@link CommittedChangesListener} */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public class CommittedChangesAdapter implements CommittedChangesListener { } \ No newline at end of file diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/PatchWriter.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/PatchWriter.java index 3ecb016c255e..420b8cc552ba 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/PatchWriter.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/PatchWriter.java @@ -16,7 +16,6 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.project.ProjectKt; import com.intellij.util.containers.ContainerUtil; import com.intellij.vcsUtil.VcsUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -92,8 +91,7 @@ public final class PatchWriter { /** * @deprecated Use {@link #calculateBaseDirForWritingPatch} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static @NotNull VirtualFile calculateBaseForWritingPatch(@NotNull Project project, @NotNull Collection changes) { File commonAncestor = ChangesUtil.findCommonAncestor(changes); if (commonAncestor == null || ChangesUtil.getAffectedVcses(changes, project).size() != 1) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowser.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowser.java index bf2fdd8b963a..3ef3b4b6a468 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowser.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowser.java @@ -25,7 +25,6 @@ import com.intellij.openapi.vcs.changes.actions.diff.ShowDiffContext; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.ScrollPaneFactory; import one.util.streamex.StreamEx; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -47,8 +46,7 @@ import static com.intellij.openapi.vcs.changes.ui.ChangesListView.getVirtualFile /** * @deprecated Use {@link SimpleChangesBrowser} */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.1") +@Deprecated(forRemoval = true) public class ChangesBrowser extends JPanel implements DataProvider, TypeSafeDataProvider, Disposable { protected final ChangesTreeList myViewer; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTree.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTree.java index 217b3241420b..e12c1dc641ed 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTree.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTree.java @@ -563,8 +563,7 @@ public abstract class ChangesTree extends Tree implements DataProvider { /** * @deprecated See {@link ChangesTree#GROUP_BY_ACTION_GROUP}, {@link TreeActionsToolbarPanel} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public AnAction[] getTreeActions() { return new AnAction[]{ ActionManager.getInstance().getAction(GROUP_BY_ACTION_GROUP), diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java index 4eea5d58fdfc..4f65d8a09bc0 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java @@ -5,7 +5,6 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -54,8 +53,7 @@ public abstract class ChangesTreeList extends ChangesTree { * @deprecated to remove in 2017. */ @SuppressWarnings("unused") - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.2") + @Deprecated(forRemoval = true) public void setScrollPaneBorder(Border border) { } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java index 9d01754a9a2b..2e6bf549112a 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java @@ -545,12 +545,10 @@ public abstract class CommitChangeListDialog extends DialogWrapper implements Si } @SuppressWarnings("unused") - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void setCommitMessage(@Nullable String commitMessage) {} - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @NotNull public String getCommitMessage() { return myCommitMessageArea.getText(); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java index 96aaff20bc3d..41340817c07d 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java @@ -7,7 +7,6 @@ import com.intellij.openapi.vcs.changes.*; import com.intellij.openapi.vcs.checkin.CheckinHandler; import com.intellij.util.NullableFunction; import com.intellij.vcs.commit.*; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -19,8 +18,7 @@ import static com.intellij.util.ObjectUtils.notNull; /** * @deprecated use Committer directly */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public class CommitHelper { private final @Nls @NotNull String myActionName; private final boolean myForceSyncCommit; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/SelectFilesDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/SelectFilesDialog.java index 41f43ae7df61..4c471ecba0f8 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/SelectFilesDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/SelectFilesDialog.java @@ -12,7 +12,6 @@ import com.intellij.openapi.vcs.VcsShowConfirmationOption; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.IconUtil; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -27,8 +26,7 @@ public class SelectFilesDialog extends AbstractSelectFilesDialog { @NotNull private final VirtualFileList myFileList; private final boolean myDeletableFiles; - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) protected SelectFilesDialog(Project project, @NotNull List files, @Nullable @NlsContexts.Label String prompt, diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/vfs/VcsFileSystem.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/vfs/VcsFileSystem.java index a0400573abef..812f08e91f84 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/vfs/VcsFileSystem.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/vfs/VcsFileSystem.java @@ -20,7 +20,6 @@ import com.intellij.openapi.vfs.DeprecatedVirtualFileSystem; import com.intellij.openapi.vfs.NonPhysicalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileManager; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; @@ -29,8 +28,7 @@ public class VcsFileSystem extends DeprecatedVirtualFileSystem implements NonPhy /** * @deprecated Use {@link #getCouldNotImplementMessage()} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public static final String COULD_NOT_IMPLEMENT_MESSAGE = "Could not implement"; //NON-NLS private static final String PROTOCOL = "vcs"; //NON-NLS diff --git a/platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogProvider.java b/platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogProvider.java index 31ad495625ab..f85aa6ceb0da 100644 --- a/platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogProvider.java +++ b/platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogProvider.java @@ -11,7 +11,6 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.CollectConsumer; import com.intellij.util.Consumer; import com.intellij.util.messages.MessageBus; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -202,8 +201,7 @@ public interface VcsLogProvider { * @deprecated replaced by {@link VcsLogProvider#readMetadata(VirtualFile, List, Consumer)}. */ @NotNull - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) default List readShortDetails(@NotNull VirtualFile root, @NotNull List hashes) throws VcsException { CollectConsumer collectConsumer = new CollectConsumer<>(); @@ -215,8 +213,7 @@ public interface VcsLogProvider { * @deprecated replaced by {@link VcsLogProvider#readFullDetails(VirtualFile, List, Consumer)}. */ @NotNull - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) default List readFullDetails(@NotNull VirtualFile root, @NotNull List hashes) throws VcsException { List result = new ArrayList<>(); diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogManager.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogManager.java index af058068cc24..f8192737a39b 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogManager.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogManager.java @@ -155,8 +155,7 @@ public class VcsLogManager implements Disposable { /** * @deprecated Use {@link VcsLogManager#createLogUi(VcsLogUiFactory, VcsLogTabLocation)} method instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2022.2") + @Deprecated(forRemoval = true) @NotNull public U createLogUi(@NotNull VcsLogUiFactory factory, @NotNull LogWindowKind kind) { return createLogUi(factory, kind.getLocation(), true); @@ -381,8 +380,7 @@ public class VcsLogManager implements Disposable { /** * @deprecated Use {@link VcsLogTabLocation} instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2022.2") + @Deprecated(forRemoval = true) public enum LogWindowKind { TOOL_WINDOW(VcsLogTabLocation.TOOL_WINDOW), EDITOR(VcsLogTabLocation.EDITOR), diff --git a/platform/xdebugger-api/src/com/intellij/xdebugger/XDebugSession.java b/platform/xdebugger-api/src/com/intellij/xdebugger/XDebugSession.java index 6e5042a6a13c..87ef21884141 100644 --- a/platform/xdebugger-api/src/com/intellij/xdebugger/XDebugSession.java +++ b/platform/xdebugger-api/src/com/intellij/xdebugger/XDebugSession.java @@ -18,7 +18,6 @@ import com.intellij.xdebugger.frame.XStackFrame; import com.intellij.xdebugger.frame.XSuspendContext; import com.intellij.xdebugger.stepping.XSmartStepIntoHandler; import com.intellij.xdebugger.stepping.XSmartStepIntoVariant; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -122,8 +121,7 @@ public interface XDebugSession extends AbstractDebuggerSession { /** * @deprecated use {@link #breakpointReached(XBreakpoint, String, XSuspendContext)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) boolean breakpointReached(@NotNull XBreakpoint breakpoint, @NotNull XSuspendContext suspendContext); /** diff --git a/platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/XBreakpointManager.java b/platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/XBreakpointManager.java index 921f69bb6be1..64e2f99c33de 100644 --- a/platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/XBreakpointManager.java +++ b/platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/XBreakpointManager.java @@ -4,7 +4,6 @@ package com.intellij.xdebugger.breakpoints; import com.intellij.openapi.Disposable; import com.intellij.openapi.vfs.VirtualFile; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -52,8 +51,7 @@ public interface XBreakpointManager { /** * @deprecated There could be more than one default breakpoint per type. Use {@link XBreakpointManager#getDefaultBreakpoints} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) @Nullable > B getDefaultBreakpoint(@NotNull XBreakpointType type); @@ -76,15 +74,13 @@ public interface XBreakpointManager { /** * @deprecated Use {@link XBreakpointListener#TOPIC} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) void addBreakpointListener(@NotNull XBreakpointListener> listener); /** * @deprecated Use {@link XBreakpointListener#TOPIC} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) void removeBreakpointListener(@NotNull XBreakpointListener> listener); void updateBreakpointPresentation(@NotNull XLineBreakpoint breakpoint, @Nullable Icon icon, @Nullable String errorMessage); diff --git a/platform/xdebugger-api/src/com/intellij/xdebugger/frame/XValueModifier.java b/platform/xdebugger-api/src/com/intellij/xdebugger/frame/XValueModifier.java index dd0f5504bcd7..d654116a309d 100644 --- a/platform/xdebugger-api/src/com/intellij/xdebugger/frame/XValueModifier.java +++ b/platform/xdebugger-api/src/com/intellij/xdebugger/frame/XValueModifier.java @@ -2,7 +2,6 @@ package com.intellij.xdebugger.frame; import com.intellij.xdebugger.XExpression; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -11,8 +10,7 @@ public abstract class XValueModifier { /** * @deprecated Use {@link #setValue(XExpression, XModificationCallback)} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) public void setValue(@NotNull String expression, @NotNull XModificationCallback callback) { throw new AbstractMethodError(); } diff --git a/platform/xdebugger-api/src/com/intellij/xdebugger/frame/XValueNode.java b/platform/xdebugger-api/src/com/intellij/xdebugger/frame/XValueNode.java index 2cb9a3f5429a..19c39e2178cf 100644 --- a/platform/xdebugger-api/src/com/intellij/xdebugger/frame/XValueNode.java +++ b/platform/xdebugger-api/src/com/intellij/xdebugger/frame/XValueNode.java @@ -17,7 +17,6 @@ package com.intellij.xdebugger.frame; import com.intellij.xdebugger.Obsolescent; import com.intellij.xdebugger.frame.presentation.XValuePresentation; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -56,8 +55,7 @@ public interface XValueNode extends Obsolescent { /** * @deprecated use {@link #setPresentation(Icon, XValuePresentation, boolean)} */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") + @Deprecated(forRemoval = true) void setPresentation(@Nullable Icon icon, @NonNls @Nullable String type, @NonNls @NotNull String separator, @NonNls @Nullable String value, boolean hasChildren); /** diff --git a/platform/xdebugger-api/src/com/intellij/xdebugger/settings/XDebuggerSettings.java b/platform/xdebugger-api/src/com/intellij/xdebugger/settings/XDebuggerSettings.java index 64dc05f127b1..9c8f75b938c1 100644 --- a/platform/xdebugger-api/src/com/intellij/xdebugger/settings/XDebuggerSettings.java +++ b/platform/xdebugger-api/src/com/intellij/xdebugger/settings/XDebuggerSettings.java @@ -19,7 +19,6 @@ import com.intellij.openapi.components.PersistentStateComponent; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.options.Configurable; import com.intellij.xdebugger.XDebuggerUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -56,8 +55,7 @@ public abstract class XDebuggerSettings implements PersistentStateComponent getAttachDebuggerProviders() { return ContainerUtil.concat(new ArrayList<>(EP.getExtensionList()), diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/attach/XAttachPresentationGroup.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/attach/XAttachPresentationGroup.java index 1bf8f129d8f6..d47c0a5543c9 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/attach/XAttachPresentationGroup.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/attach/XAttachPresentationGroup.java @@ -4,7 +4,6 @@ package com.intellij.xdebugger.attach; import com.intellij.execution.process.ProcessInfo; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.UserDataHolder; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -29,9 +28,8 @@ public interface XAttachPresentationGroup extends Comparator { /** * @deprecated Use {@link #getItemIcon(Project, Object, UserDataHolder)} (will be removed in 2020.1) */ - @Deprecated + @Deprecated(forRemoval = true) @NotNull - @ApiStatus.ScheduledForRemoval(inVersion = "2020.1") Icon getProcessIcon(@NotNull Project project, @NotNull T info, @NotNull UserDataHolder dataHolder); /** @@ -47,10 +45,9 @@ public interface XAttachPresentationGroup extends Comparator { /** * @deprecated Use {@link #getItemDisplayText(Project, Object, UserDataHolder)} (will be removed in 2020.1) */ - @Deprecated + @Deprecated(forRemoval = true) @NotNull @Nls - @ApiStatus.ScheduledForRemoval(inVersion = "2020.1") String getProcessDisplayText(@NotNull Project project, @NotNull T info, @NotNull UserDataHolder dataHolder); /** diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/attach/XLocalAttachDebuggerProvider.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/attach/XLocalAttachDebuggerProvider.java index 236a2788196b..ae3baf6b8772 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/attach/XLocalAttachDebuggerProvider.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/attach/XLocalAttachDebuggerProvider.java @@ -5,7 +5,6 @@ import com.intellij.execution.process.ProcessInfo; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.UserDataHolder; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; @@ -14,8 +13,7 @@ import java.util.List; /** * @deprecated use {@link XAttachDebuggerProvider} instead */ -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@Deprecated(forRemoval = true) public interface XLocalAttachDebuggerProvider extends XAttachDebuggerProvider { ExtensionPointName EP = ExtensionPointName.create("com.intellij.xdebugger.localAttachDebuggerProvider"); diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/attach/XLocalAttachGroup.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/attach/XLocalAttachGroup.java index 7b870e838754..f341cbbe231d 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/attach/XLocalAttachGroup.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/attach/XLocalAttachGroup.java @@ -15,19 +15,16 @@ */ package com.intellij.xdebugger.attach; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** * @deprecated Use {@link XAttachProcessPresentationGroup} (will be removed in 2020.1) */ -@ApiStatus.ScheduledForRemoval(inVersion = "2020.1") -@Deprecated +@Deprecated(forRemoval = true) public interface XLocalAttachGroup extends XAttachProcessPresentationGroup { /** * @deprecated will be removed in 2020.1 */ - @ApiStatus.ScheduledForRemoval(inVersion = "2020.1") - @Deprecated @NotNull + @Deprecated(forRemoval = true) @NotNull XLocalAttachGroup DEFAULT = new XDefaultLocalAttachGroup(); } diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerManagerImpl.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerManagerImpl.java index 265bb963cc7b..1bce987e63ad 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerManagerImpl.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerManagerImpl.java @@ -68,7 +68,6 @@ import com.intellij.xdebugger.impl.ui.ExecutionPointHighlighter; import com.intellij.xdebugger.impl.ui.XDebugSessionTab; import com.intellij.xdebugger.ui.DebuggerColors; import one.util.streamex.StreamEx; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -84,8 +83,7 @@ public final class XDebuggerManagerImpl extends XDebuggerManager implements Pers /** * @deprecated Use {@link #getNotificationGroup()} */ - @Deprecated - @ApiStatus.ScheduledForRemoval + @Deprecated(forRemoval = true) public static final NotificationGroup NOTIFICATION_GROUP = getNotificationGroup(); private final Project myProject;