From 78806a3d9f5ba9125ff1d9cc52fa1e3254b7fdf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9bron?= Date: Mon, 1 Jul 2019 13:16:33 +0200 Subject: [PATCH] [java-*] fix deprecation problems GitOrigin-RevId: 364e50eb9cb63be1c1ac68998c3df977691e9af4 --- .../compiler/CompilerSettingsFactory.java | 2 +- .../expression/ExpressionEvaluator.java | 5 ++++- .../com/intellij/execution/JavaExecutionUtil.java | 2 +- .../codeInsight/intention/QuickFixFactory.java | 2 +- .../impl/analysis/HighlightVisitorImpl.java | 3 +++ .../completion/DefaultInsertHandler.java | 2 +- .../daemon/impl/JavaLineMarkerProvider.java | 3 +++ .../generation/ConstructorBodyGenerator.java | 3 +++ .../GenerateAccessorProviderRegistrar.java | 2 +- .../generation/GenerateMembersUtil.java | 2 +- .../OverrideImplementsAnnotationsHandler.java | 4 +++- .../codeInsight/lookup/LookupItemUtil.java | 15 +++++++-------- .../templates/ForIndexedPostfixTemplate.java | 3 ++- .../postfix/util/JavaPostfixTemplatesUtils.java | 8 ++++---- .../DefaultFileTemplateUsageInspection.java | 13 ++++++++++++- .../unusedSymbol/UnusedSymbolLocalInspection.java | 2 +- .../src/com/intellij/ide/util/PackageUtil.java | 2 +- .../refactoring/inline/InlineMethodProcessor.java | 3 +++ .../moveInner/MoveInnerClassUsagesHandler.java | 2 +- .../refactoring/util/RefactoringUtil.java | 3 +++ .../intellij/psi/search/PsiShortNamesCache.java | 6 +++--- .../search/searches/MethodReferencesSearch.java | 4 ++-- .../openapi/projectRoots/JdkVersionUtil.java | 1 + .../src/com/intellij/util/VisibilityIcons.java | 6 ++++++ .../com/intellij/psi/NonClasspathClassFinder.java | 3 +++ .../psi/impl/ElementPresentationUtil.java | 6 ++++++ .../intellij/psi/impl/PsiElementFinderImpl.java | 3 +++ .../impl/java/JavaClassTreeElement.java | 5 ++++- .../UnnecessaryLocalVariableInspection.java | 1 + ...SafeStaticFieldFromInstanceInspectionBase.java | 2 +- 30 files changed, 86 insertions(+), 32 deletions(-) diff --git a/java/compiler/openapi/src/com/intellij/compiler/CompilerSettingsFactory.java b/java/compiler/openapi/src/com/intellij/compiler/CompilerSettingsFactory.java index a4057c60e91d..5c303ebb1116 100644 --- a/java/compiler/openapi/src/com/intellij/compiler/CompilerSettingsFactory.java +++ b/java/compiler/openapi/src/com/intellij/compiler/CompilerSettingsFactory.java @@ -20,7 +20,7 @@ import com.intellij.openapi.options.Configurable; import com.intellij.openapi.project.Project; /** - * Please use {@link com.intellij.openapi.options.ConfigurableEP#parentId} to put your configurable under Compiler Settings + * @deprecated Please use {@link com.intellij.openapi.options.ConfigurableEP#parentId} to put your configurable under Compiler Settings * @author Eugene Zhuravlev */ @Deprecated diff --git a/java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/expression/ExpressionEvaluator.java b/java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/expression/ExpressionEvaluator.java index 33159507bc49..f017da085393 100644 --- a/java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/expression/ExpressionEvaluator.java +++ b/java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/expression/ExpressionEvaluator.java @@ -20,7 +20,10 @@ import com.intellij.debugger.engine.evaluation.EvaluationContext; import com.sun.jdi.Value; public interface ExpressionEvaluator { - //call evaluate before + + /** + * @deprecated obsolete API, use {@link #evaluate(EvaluationContext)} + */ @Deprecated default Value getValue() { return null; diff --git a/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java b/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java index dbcb4f4c8ecf..0d2cb0f9b896 100644 --- a/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java +++ b/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java @@ -74,7 +74,7 @@ public class JavaExecutionUtil { } /** - * {@link JavaExecutionUtil#getPresentableClassName(java.lang.String)} + * @deprecated use {@link JavaExecutionUtil#getPresentableClassName(String)} */ @Deprecated @Nullable diff --git a/java/java-analysis-api/src/com/intellij/codeInsight/intention/QuickFixFactory.java b/java/java-analysis-api/src/com/intellij/codeInsight/intention/QuickFixFactory.java index 448cc142e87f..063a36891036 100644 --- a/java/java-analysis-api/src/com/intellij/codeInsight/intention/QuickFixFactory.java +++ b/java/java-analysis-api/src/com/intellij/codeInsight/intention/QuickFixFactory.java @@ -433,7 +433,7 @@ public abstract class QuickFixFactory { public abstract void registerFixesForUnusedParameter(@NotNull PsiParameter parameter, @NotNull Object highlightInfo); /** - * Use {@link #createAddToDependencyInjectionAnnotationsFix(Project, String)} instead + * @deprecated Use {@link #createAddToDependencyInjectionAnnotationsFix(Project, String)} instead */ @Deprecated @NotNull diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java index 338929a91765..08440aee94cb 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java @@ -98,6 +98,9 @@ public class HighlightVisitorImpl extends JavaElementVisitor implements Highligh protected HighlightVisitorImpl() { } + /** + * @deprecated use {@link #HighlightVisitorImpl()} and {@link #getResolveHelper(Project)} + */ @Deprecated protected HighlightVisitorImpl(@SuppressWarnings("unused") @NotNull PsiResolveHelper psiResolveHelper) { } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/DefaultInsertHandler.java b/java/java-impl/src/com/intellij/codeInsight/completion/DefaultInsertHandler.java index e3e0d62eabdb..2a7b43b25553 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/DefaultInsertHandler.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/DefaultInsertHandler.java @@ -10,7 +10,7 @@ import com.intellij.openapi.editor.Editor; import org.jetbrains.annotations.NotNull; /** - * Please implement InsertHandler instead. + * @deprecated Please implement InsertHandler instead. * To remove after IDEA 16 */ @Deprecated diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java index ee149a7789f8..50e92bf13aaf 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java @@ -50,6 +50,9 @@ public class JavaLineMarkerProvider extends LineMarkerProviderDescriptor { public JavaLineMarkerProvider() { } + /** + * @deprecated use {@link #JavaLineMarkerProvider()} + */ @Deprecated public JavaLineMarkerProvider(DaemonCodeAnalyzerSettings daemonSettings, EditorColorsManager colorsManager) { } diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/ConstructorBodyGenerator.java b/java/java-impl/src/com/intellij/codeInsight/generation/ConstructorBodyGenerator.java index 3a964c43b8a3..1daefbcb1eb2 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/ConstructorBodyGenerator.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/ConstructorBodyGenerator.java @@ -46,6 +46,9 @@ public interface ConstructorBodyGenerator { } } + /** + * @deprecated use {@link #generateFieldInitialization(StringBuilder, PsiField[], PsiParameter[], Collection)} + */ @Deprecated default void generateFieldInitialization(@NotNull StringBuilder buffer, @NotNull PsiField[] fields, @NotNull PsiParameter[] parameters) {} diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateAccessorProviderRegistrar.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateAccessorProviderRegistrar.java index 0c8365f7dfeb..f6c413c3b1a1 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateAccessorProviderRegistrar.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateAccessorProviderRegistrar.java @@ -23,7 +23,7 @@ public class GenerateAccessorProviderRegistrar { ourProviders.addAll(EP_NAME.getExtensionList()); } - /** @see #EP_NAME */ + /** @deprecated use extension point {@link #EP_NAME} */ @Deprecated synchronized static void registerProvider(NotNullFunction> function) { ourProviders.add(function); diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersUtil.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersUtil.java index 9b4dce11e93d..229c50941baf 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersUtil.java @@ -583,7 +583,7 @@ public class GenerateMembersUtil { } /** - * to be deleted in 2017.2 + * @deprecated use {@link #copyOrReplaceModifierList(PsiModifierListOwner, PsiElement, PsiModifierListOwner)}. to be deleted in 2017.2 */ @Deprecated public static void copyOrReplaceModifierList(@NotNull PsiModifierListOwner sourceParam, @NotNull PsiModifierListOwner targetParam) { diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementsAnnotationsHandler.java b/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementsAnnotationsHandler.java index c4f40b7ee88b..4599782b9e1c 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementsAnnotationsHandler.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementsAnnotationsHandler.java @@ -26,7 +26,6 @@ public interface OverrideImplementsAnnotationsHandler { * Returns annotations which should be copied from a source to an implementation (by default, no annotations are copied). */ default String[] getAnnotations(@NotNull PsiFile file) { - //noinspection deprecation return getAnnotations(file.getProject()); } @@ -36,6 +35,9 @@ public interface OverrideImplementsAnnotationsHandler { @Deprecated String[] getAnnotations(Project project); + /** + * @deprecated Use {@link #getAnnotations(PsiFile)} + */ @Deprecated @NotNull default String[] annotationsToRemove(Project project, @NotNull String fqName) { diff --git a/java/java-impl/src/com/intellij/codeInsight/lookup/LookupItemUtil.java b/java/java-impl/src/com/intellij/codeInsight/lookup/LookupItemUtil.java index 626df671d822..7f6272ba04ad 100644 --- a/java/java-impl/src/com/intellij/codeInsight/lookup/LookupItemUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/lookup/LookupItemUtil.java @@ -25,13 +25,12 @@ import com.intellij.psi.meta.PsiMetaData; import com.intellij.psi.util.PsiUtilCore; import org.jetbrains.annotations.NotNull; -public class LookupItemUtil{ +public class LookupItemUtil { private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.lookup.LookupItemUtil"); /** - * @deprecated - * @see LookupElementBuilder - */ + * @deprecated use {@link LookupElementBuilder} + */ @Deprecated @NotNull public static LookupElement objectToLookupItem(Object object) { @@ -46,7 +45,7 @@ public class LookupItemUtil{ return new VariableLookupItem((PsiVariable)object); } if (object instanceof PsiExpression) { - return new ExpressionLookupItem((PsiExpression) object); + return new ExpressionLookupItem((PsiExpression)object); } if (object instanceof PsiType) { return PsiTypeLookupItem.createLookupItem((PsiType)object, null); @@ -57,7 +56,7 @@ public class LookupItemUtil{ String s = null; LookupItem item = new LookupItem(object, ""); - if (object instanceof PsiElement){ + if (object instanceof PsiElement) { s = PsiUtilCore.getName((PsiElement)object); } TailType tailType = TailType.NONE; @@ -68,13 +67,13 @@ public class LookupItemUtil{ s = (String)object; } else if (object instanceof Template) { - s = ((Template) object).getKey(); + s = ((Template)object).getKey(); } else if (object instanceof PresentableLookupValue) { s = ((PresentableLookupValue)object).getPresentation(); } - if (object instanceof LookupValueWithUIHint && ((LookupValueWithUIHint) object).isBold()) { + if (object instanceof LookupValueWithUIHint && ((LookupValueWithUIHint)object).isBold()) { item.setBold(); } diff --git a/java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/ForIndexedPostfixTemplate.java b/java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/ForIndexedPostfixTemplate.java index 31a7e066a8b3..e8dfb9a0c54a 100644 --- a/java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/ForIndexedPostfixTemplate.java +++ b/java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/ForIndexedPostfixTemplate.java @@ -7,6 +7,7 @@ import com.intellij.codeInsight.template.impl.TextExpression; import com.intellij.codeInsight.template.macro.SuggestVariableNameMacro; import com.intellij.codeInsight.template.postfix.templates.editable.JavaEditablePostfixTemplate; import com.intellij.codeInsight.template.postfix.templates.editable.JavaPostfixTemplateExpressionCondition; +import com.intellij.codeInsight.template.postfix.util.JavaPostfixTemplatesUtils; import com.intellij.openapi.util.Condition; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.CommonClassNames; @@ -21,7 +22,7 @@ import static com.intellij.codeInsight.template.postfix.util.JavaPostfixTemplate public abstract class ForIndexedPostfixTemplate extends JavaEditablePostfixTemplate { /** - * @deprecated + * @deprecated use {@link JavaPostfixTemplatesUtils} */ @Deprecated public static final Condition IS_NUMBER_OR_ARRAY_OR_ITERABLE = element -> IS_ITERABLE_OR_ARRAY.value(element) || IS_NUMBER.value(element); diff --git a/java/java-impl/src/com/intellij/codeInsight/template/postfix/util/JavaPostfixTemplatesUtils.java b/java/java-impl/src/com/intellij/codeInsight/template/postfix/util/JavaPostfixTemplatesUtils.java index 485f7dbdcbdf..204642780943 100644 --- a/java/java-impl/src/com/intellij/codeInsight/template/postfix/util/JavaPostfixTemplatesUtils.java +++ b/java/java-impl/src/com/intellij/codeInsight/template/postfix/util/JavaPostfixTemplatesUtils.java @@ -61,7 +61,7 @@ public abstract class JavaPostfixTemplatesUtils { } /** - * @deprecated + * @deprecated use {@link #selectorTopmost(Condition)} */ @Deprecated public static PostfixTemplateExpressionSelector selectorTopmost() { @@ -142,7 +142,7 @@ public abstract class JavaPostfixTemplatesUtils { element -> element instanceof PsiExpression && isBoolean(((PsiExpression)element).getType()); /** - * @deprecated + * @deprecated use {@link #isThrowable(PsiType)} */ @Deprecated public static final Condition IS_THROWABLE = element -> element instanceof PsiExpression && isThrowable(((PsiExpression)element).getType()); @@ -154,7 +154,7 @@ public abstract class JavaPostfixTemplatesUtils { element -> element instanceof PsiExpression && isNotPrimitiveTypeExpression((PsiExpression)element); /** - * @deprecated + * @deprecated use {@link #isArray(PsiType)} */ @Deprecated public static final Condition IS_ARRAY = element -> { if (!(element instanceof PsiExpression)) return false; @@ -164,7 +164,7 @@ public abstract class JavaPostfixTemplatesUtils { }; /** - * @deprecated + * @deprecated use {@link #isIterable(PsiType)} / {@link #isArray(PsiType)} */ @Deprecated public static final Condition IS_ITERABLE_OR_ARRAY = element -> { if (!(element instanceof PsiExpression)) return false; diff --git a/java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/DefaultFileTemplateUsageInspection.java b/java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/DefaultFileTemplateUsageInspection.java index 3d54ea7c2cb9..a41ef76f5e2d 100644 --- a/java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/DefaultFileTemplateUsageInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/DefaultFileTemplateUsageInspection.java @@ -17,11 +17,22 @@ import org.jetbrains.annotations.Nullable; * @author cdr */ public class DefaultFileTemplateUsageInspection extends AbstractBaseJavaLocalInspectionTool { - // Fields are left for the compatibility + + /** + * @deprecated unused, left for compatibility + */ @Deprecated public boolean CHECK_FILE_HEADER = true; + + /** + * @deprecated unused, left for compatibility + */ @Deprecated public boolean CHECK_TRY_CATCH_SECTION = true; + + /** + * @deprecated unused, left for compatibility + */ @Deprecated public boolean CHECK_METHOD_BODY = true; diff --git a/java/java-impl/src/com/intellij/codeInspection/unusedSymbol/UnusedSymbolLocalInspection.java b/java/java-impl/src/com/intellij/codeInspection/unusedSymbol/UnusedSymbolLocalInspection.java index d738c2475cde..1f9f5206ad7f 100644 --- a/java/java-impl/src/com/intellij/codeInspection/unusedSymbol/UnusedSymbolLocalInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/unusedSymbol/UnusedSymbolLocalInspection.java @@ -27,7 +27,7 @@ import java.awt.event.ActionListener; public class UnusedSymbolLocalInspection extends UnusedSymbolLocalInspectionBase { /** - * use {@link com.intellij.codeInspection.deadCode.UnusedDeclarationInspection} instead + * @deprecated use {@link com.intellij.codeInspection.deadCode.UnusedDeclarationInspection} instead */ @Deprecated public UnusedSymbolLocalInspection() { diff --git a/java/java-impl/src/com/intellij/ide/util/PackageUtil.java b/java/java-impl/src/com/intellij/ide/util/PackageUtil.java index 873e731b5a00..5d4d6ed7185a 100644 --- a/java/java-impl/src/com/intellij/ide/util/PackageUtil.java +++ b/java/java-impl/src/com/intellij/ide/util/PackageUtil.java @@ -78,7 +78,7 @@ public class PackageUtil { } /** - * @deprecated + * @deprecated use {@link #findOrCreateDirectoryForPackage(Module, String, PsiDirectory, boolean)} */ @Deprecated @Nullable diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java index 5a57420d1005..f114225d3aa3 100644 --- a/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java @@ -1509,6 +1509,9 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor { return ((PsiAssignmentExpression)expression).getRExpression(); } + /** + * @deprecated use {@link #checkUnableToInsertCodeBlock(PsiCodeBlock, PsiElement)} + */ @Deprecated public static String checkCalledInSuperOrThisExpr(PsiCodeBlock methodBody, final PsiElement element) { return checkUnableToInsertCodeBlock(methodBody, element, diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveInner/MoveInnerClassUsagesHandler.java b/java/java-impl/src/com/intellij/refactoring/move/moveInner/MoveInnerClassUsagesHandler.java index 8d14ebdd8220..2de5421e287a 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveInner/MoveInnerClassUsagesHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveInner/MoveInnerClassUsagesHandler.java @@ -26,7 +26,7 @@ public interface MoveInnerClassUsagesHandler { new LanguageExtension<>("com.intellij.refactoring.moveInnerClassUsagesHandler"); /** - * Override {@link #correctInnerClassUsage(UsageInfo, PsiClass, String)} instead + * @deprecated Override {@link #correctInnerClassUsage(UsageInfo, PsiClass, String)} instead * * to be deleted in 2018.2 */ diff --git a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java index bef8f668b181..e6947a417648 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java +++ b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java @@ -67,6 +67,9 @@ public class RefactoringUtil { return PsiUtil.getEnclosingStaticElement(element, aClass) != null; } + /** + * @deprecated use {@link PsiTypesUtil#hasUnresolvedComponents(PsiType)} + */ @Deprecated public static boolean isResolvableType(PsiType type) { return !PsiTypesUtil.hasUnresolvedComponents(type); diff --git a/java/java-indexing-api/src/com/intellij/psi/search/PsiShortNamesCache.java b/java/java-indexing-api/src/com/intellij/psi/search/PsiShortNamesCache.java index 7d7c86df6d55..3f00a980f25e 100644 --- a/java/java-indexing-api/src/com/intellij/psi/search/PsiShortNamesCache.java +++ b/java/java-indexing-api/src/com/intellij/psi/search/PsiShortNamesCache.java @@ -89,7 +89,7 @@ public abstract class PsiShortNamesCache { * to the specified set. * * @param dest the set to add the names to. - * @see #processAllClassNames + * @deprecated use {@link #processAllClassNames} */ @Deprecated public void getAllClassNames(@NotNull HashSet dest) { @@ -140,7 +140,7 @@ public abstract class PsiShortNamesCache { * to the specified set. * * @param set the set to add the names to. - * @see #processAllMethodNames + * @deprecated use {@link #processAllMethodNames(Processor, GlobalSearchScope, IdFilter)} */ @Deprecated public void getAllMethodNames(@NotNull HashSet set) { @@ -171,7 +171,7 @@ public abstract class PsiShortNamesCache { * to the specified set. * * @param set the set to add the names to. - * @see #processAllFieldNames + * @deprecated use {@link #processAllFieldNames(Processor, GlobalSearchScope, IdFilter)} */ @Deprecated public void getAllFieldNames(@NotNull HashSet set) { diff --git a/java/java-indexing-api/src/com/intellij/psi/search/searches/MethodReferencesSearch.java b/java/java-indexing-api/src/com/intellij/psi/search/searches/MethodReferencesSearch.java index 3b3729f286a6..6951b3353bce 100644 --- a/java/java-indexing-api/src/com/intellij/psi/search/searches/MethodReferencesSearch.java +++ b/java/java-indexing-api/src/com/intellij/psi/search/searches/MethodReferencesSearch.java @@ -1,4 +1,4 @@ -// 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. +// 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.psi.search.searches; import com.intellij.openapi.application.DumbAwareSearchParameters; @@ -76,7 +76,7 @@ public class MethodReferencesSearch extends ExtensibleQueryFactory roots) { diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/ElementPresentationUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/ElementPresentationUtil.java index 04a7df962e3f..e4db6d622d18 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/ElementPresentationUtil.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/ElementPresentationUtil.java @@ -46,6 +46,9 @@ public final class ElementPresentationUtil implements PlatformIcons { return flags; } + /** + * @deprecated obsolete API, to be removed + */ @Deprecated @ApiStatus.ScheduledForRemoval public static com.intellij.ui.RowIcon createLayeredIcon(Icon baseIcon, PsiModifierListOwner element, boolean isLocked) { @@ -215,6 +218,9 @@ public final class ElementPresentationUtil implements PlatformIcons { iconManager.registerIconLayer(FLAGS_RUNNABLE, AllIcons.Nodes.RunnableMark); } + /** + * @deprecated use {@link #addVisibilityIcon(PsiModifierListOwner, int, RowIcon)} + */ @Deprecated @ApiStatus.ScheduledForRemoval public static Icon addVisibilityIcon(PsiModifierListOwner element, final int flags, com.intellij.ui.RowIcon baseIcon) { diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFinderImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFinderImpl.java index 990b6d7791b6..4de0958cdca9 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFinderImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFinderImpl.java @@ -30,6 +30,9 @@ public final class PsiElementFinderImpl extends PsiElementFinder implements Dumb myFileManager = JavaFileManager.getInstance(project); } + /** + * @deprecated use {@link #PsiElementFinderImpl(Project)} + */ @Deprecated public PsiElementFinderImpl(Project project, JavaFileManager javaFileManager) { myProject = project; diff --git a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaClassTreeElement.java b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaClassTreeElement.java index a4a724035474..abf2c3783b96 100644 --- a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaClassTreeElement.java +++ b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaClassTreeElement.java @@ -32,7 +32,10 @@ public class JavaClassTreeElement extends JavaClassTreeElementBase { super(inherited, cls); } - /** @noinspection unused*/ + /** + * @deprecated use {@link #JavaClassTreeElement(PsiClass, boolean)} + * @noinspection unused + */ @Deprecated public JavaClassTreeElement(PsiClass cls, boolean inherited, Set parents) { this(cls, inherited); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/UnnecessaryLocalVariableInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/UnnecessaryLocalVariableInspection.java index 4d241474cb3e..0a1ec85140e8 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/UnnecessaryLocalVariableInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/UnnecessaryLocalVariableInspection.java @@ -42,6 +42,7 @@ public class UnnecessaryLocalVariableInspection extends BaseInspection { */ public boolean m_ignoreImmediatelyReturnedVariables; /** + * @deprecated unused, left for compatibility * @noinspection PublicField */ @Deprecated diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AccessToNonThreadSafeStaticFieldFromInstanceInspectionBase.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AccessToNonThreadSafeStaticFieldFromInstanceInspectionBase.java index 75e826931418..7d9861d9657c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AccessToNonThreadSafeStaticFieldFromInstanceInspectionBase.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AccessToNonThreadSafeStaticFieldFromInstanceInspectionBase.java @@ -4,7 +4,7 @@ package com.siyeh.ig.threading; import org.jetbrains.annotations.ApiStatus; /** - * To be removed in 2019.1. Please use {@link AccessToNonThreadSafeStaticFieldFromInstanceInspection} directly + * @deprecated To be removed in 2019.1. Please use {@link AccessToNonThreadSafeStaticFieldFromInstanceInspection} directly */ @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2019.1")