From 8f8474b64cc4496358b083ec0e569c81a1f4c0a8 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Tue, 12 Jun 2018 17:18:52 +0300 Subject: [PATCH] removed unnecessary deprecation suppressions, added back necessary ones --- .../codeInspection/reference/RefParameter.java | 3 +-- .../intellij/codeHighlighting/RainbowHighlighter.java | 11 +++++------ .../codeInspection/ex/InspectionToolRegistrar.java | 1 - .../codeInspection/InspectionProfileLoadUtil.java | 1 - .../intellij/openapi/command/WriteCommandAction.java | 1 - .../runners/ExecutionEnvironmentBuilder.java | 1 - .../com/intellij/openapi/projectRoots/SdkType.java | 4 ++-- .../com/intellij/psi/codeStyle/CodeStyleSettings.java | 1 - .../intellij/refactoring/ui/VisibilityPanelBase.java | 3 ++- .../src/com/intellij/ide/browsers/UrlOpener.java | 1 - .../openapi/diagnostic/ErrorReportSubmitter.java | 2 +- .../openapi/fileTypes/ex/FileTypeManagerEx.java | 9 ++++++++- .../intellij/openapi/keymap/ex/KeymapManagerEx.java | 1 - .../openapi/vfs/impl/jar/JarFileSystemImpl.java | 1 - .../openapi/wm/impl/ToolWindowManagerImpl.java | 1 - .../com/intellij/testFramework/UsefulTestCase.java | 1 - .../testFramework/propertyBased/InvokeCompletion.java | 1 - .../actions/AbstractRerunFailedTestsAction.java | 1 - .../execution/process/BaseOSProcessHandler.java | 2 +- .../intellij/util/containers/ConcurrentHashSet.java | 1 - .../lang/psi/typeEnhancers/GrTypeConverter.java | 4 ++-- .../com/jetbrains/python/psi/impl/PyElementImpl.java | 1 - 22 files changed, 22 insertions(+), 30 deletions(-) diff --git a/java/java-analysis-api/src/com/intellij/codeInspection/reference/RefParameter.java b/java/java-analysis-api/src/com/intellij/codeInspection/reference/RefParameter.java index 33c9e5f4dc46..7db8c53466c2 100644 --- a/java/java-analysis-api/src/com/intellij/codeInspection/reference/RefParameter.java +++ b/java/java-analysis-api/src/com/intellij/codeInspection/reference/RefParameter.java @@ -37,7 +37,6 @@ public interface RefParameter extends RefJavaElement { /** * @see RefParameter#getActualConstValue() - * @return */ @Deprecated @Nullable @@ -53,9 +52,9 @@ public interface RefParameter extends RefJavaElement { * * @return the parameter value or null if it's different or impossible to determine. */ - @SuppressWarnings("deprecation") @Nullable default Object getActualConstValue() { + //noinspection deprecation return getActualValueIfSame(); } diff --git a/platform/analysis-impl/src/com/intellij/codeHighlighting/RainbowHighlighter.java b/platform/analysis-impl/src/com/intellij/codeHighlighting/RainbowHighlighter.java index 6ec4fe74c029..397a2d5a366d 100644 --- a/platform/analysis-impl/src/com/intellij/codeHighlighting/RainbowHighlighter.java +++ b/platform/analysis-impl/src/com/intellij/codeHighlighting/RainbowHighlighter.java @@ -78,14 +78,14 @@ public class RainbowHighlighter { RAINBOW_COLOR_KEYS[i] = TextAttributesKey.createTextAttributesKey("RAINBOW_COLOR" + i, createRainbowAttribute(RAINBOW_JB_COLORS_DEFAULT[i])); } } - public final static String RAINBOW_TYPE = "rainbow"; - private final static String RAINBOW_TEMP_PREF = "RAINBOW_TEMP_"; + public static final String RAINBOW_TYPE = "rainbow"; + private static final String RAINBOW_TEMP_PREF = "RAINBOW_TEMP_"; @SuppressWarnings("deprecation") - public final static TextAttributesKey RAINBOW_ANCHOR = TextAttributesKey.createTextAttributesKey(RAINBOW_TYPE, new TextAttributes()); + public static final TextAttributesKey RAINBOW_ANCHOR = TextAttributesKey.createTextAttributesKey(RAINBOW_TYPE, new TextAttributes()); @SuppressWarnings("deprecation") - public final static TextAttributesKey RAINBOW_GRADIENT_DEMO = TextAttributesKey.createTextAttributesKey("rainbow_demo", new TextAttributes()); - public final static Boolean DEFAULT_RAINBOW_ON = Boolean.FALSE; + public static final TextAttributesKey RAINBOW_GRADIENT_DEMO = TextAttributesKey.createTextAttributesKey("rainbow_demo", new TextAttributes()); + public static final Boolean DEFAULT_RAINBOW_ON = Boolean.FALSE; @NotNull private final TextAttributesScheme myColorsScheme; @NotNull private final Color[] myRainbowColors; @@ -329,7 +329,6 @@ public class RainbowHighlighter { @NotNull private static TextAttributesKey createRainbowKey(int i, Color rainbowColor) { - //noinspection deprecation TextAttributesKey key = TextAttributesKey.createTempTextAttributesKey( RAINBOW_TEMP_PREF + i, new TextAttributes()); diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/ex/InspectionToolRegistrar.java b/platform/analysis-impl/src/com/intellij/codeInspection/ex/InspectionToolRegistrar.java index b853dcaefca6..d9c87854ae5c 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/ex/InspectionToolRegistrar.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/ex/InspectionToolRegistrar.java @@ -49,7 +49,6 @@ public class InspectionToolRegistrar implements Supplier providers = new THashSet<>(); - //noinspection deprecation providers.addAll((((ComponentManagerImpl)ApplicationManager.getApplication()).getComponentInstancesOfType(InspectionToolProvider.class))); ContainerUtil.addAll(providers, InspectionToolProvider.EXTENSION_POINT_NAME.getExtensions()); List> factories = new ArrayList<>(); diff --git a/platform/analysis-impl/src/com/intellij/profile/codeInspection/InspectionProfileLoadUtil.java b/platform/analysis-impl/src/com/intellij/profile/codeInspection/InspectionProfileLoadUtil.java index 2ee901821817..ca5cc0e572d7 100644 --- a/platform/analysis-impl/src/com/intellij/profile/codeInspection/InspectionProfileLoadUtil.java +++ b/platform/analysis-impl/src/com/intellij/profile/codeInspection/InspectionProfileLoadUtil.java @@ -40,7 +40,6 @@ public class InspectionProfileLoadUtil { } } if (name == null) { - //noinspection deprecation name = element.getAttributeValue("profile_name"); } return name != null ? name : FileUtilRt.getNameWithoutExtension(file.getFileName().toString()); diff --git a/platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java b/platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java index 0e4475e89c6d..7c4ce6a62d29 100644 --- a/platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java +++ b/platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java @@ -260,7 +260,6 @@ public abstract class WriteCommandAction extends BaseActionRunnable { final RunResult[] results = {result}; doExecuteCommand(() -> { - //noinspection deprecation ApplicationManager.getApplication().runWriteAction(() -> { results[0].run(); results[0] = null; diff --git a/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironmentBuilder.java b/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironmentBuilder.java index b6eefcecda8d..ed6ae4e39237 100644 --- a/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironmentBuilder.java +++ b/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironmentBuilder.java @@ -103,7 +103,6 @@ public final class ExecutionEnvironmentBuilder { myRunProfile = copySource.getRunProfile(); myRunnerSettings = copySource.getRunnerSettings(); myConfigurationSettings = copySource.getConfigurationSettings(); - //noinspection deprecation myRunner = copySource.getRunner(); myContentToReuse = copySource.getContentToReuse(); myExecutor = copySource.getExecutor(); diff --git a/platform/lang-api/src/com/intellij/openapi/projectRoots/SdkType.java b/platform/lang-api/src/com/intellij/openapi/projectRoots/SdkType.java index e0abe72918b5..50ebd447a8d8 100644 --- a/platform/lang-api/src/com/intellij/openapi/projectRoots/SdkType.java +++ b/platform/lang-api/src/com/intellij/openapi/projectRoots/SdkType.java @@ -207,9 +207,9 @@ public abstract class SdkType implements SdkTypeId { } @NotNull - @SuppressWarnings("deprecation") public static SdkType[] getAllTypes() { List allTypes = new ArrayList<>(); + //noinspection deprecation Collections.addAll(allTypes, ApplicationManager.getApplication().getComponents(SdkType.class)); Collections.addAll(allTypes, Extensions.getExtensions(EP_NAME)); return allTypes.toArray(new SdkType[0]); @@ -259,11 +259,11 @@ public abstract class SdkType implements SdkTypeId { * @param sdkCreatedCallback the callback to which the created SDK is passed. * @since 2017.1 */ - @SuppressWarnings("deprecation") public void showCustomCreateUI(@NotNull SdkModel sdkModel, @NotNull JComponent parentComponent, @Nullable Sdk selectedSdk, @NotNull Consumer sdkCreatedCallback) { + //noinspection deprecation showCustomCreateUI(sdkModel, parentComponent, sdkCreatedCallback); } diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java index f24c879d55fc..0340edcfd7ca 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java @@ -1333,7 +1333,6 @@ public class CodeStyleSettings extends LegacyCodeStyleSettings } } } - //noinspection deprecation return WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN; } diff --git a/platform/lang-impl/src/com/intellij/refactoring/ui/VisibilityPanelBase.java b/platform/lang-impl/src/com/intellij/refactoring/ui/VisibilityPanelBase.java index 24e1217fc197..3a126f0e0294 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/ui/VisibilityPanelBase.java +++ b/platform/lang-impl/src/com/intellij/refactoring/ui/VisibilityPanelBase.java @@ -22,7 +22,6 @@ import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -@SuppressWarnings("deprecation") public abstract class VisibilityPanelBase extends JPanel { /** @@ -37,10 +36,12 @@ public abstract class VisibilityPanelBase extends JPanel { public abstract void setVisibility(V visibility); public void addListener(ChangeListener listener) { + //noinspection deprecation myEventDispatcher.addListener(listener); } protected void stateChanged(ChangeEvent e) { + //noinspection deprecation myEventDispatcher.getMulticaster().stateChanged(e); } } diff --git a/platform/platform-api/src/com/intellij/ide/browsers/UrlOpener.java b/platform/platform-api/src/com/intellij/ide/browsers/UrlOpener.java index aed04bd44731..1a7ba7b0eb00 100644 --- a/platform/platform-api/src/com/intellij/ide/browsers/UrlOpener.java +++ b/platform/platform-api/src/com/intellij/ide/browsers/UrlOpener.java @@ -20,7 +20,6 @@ import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -@SuppressWarnings("deprecation") public abstract class UrlOpener { public static final ExtensionPointName EP_NAME = ExtensionPointName.create("org.jetbrains.urlOpener"); diff --git a/platform/platform-api/src/com/intellij/openapi/diagnostic/ErrorReportSubmitter.java b/platform/platform-api/src/com/intellij/openapi/diagnostic/ErrorReportSubmitter.java index 6e29d2bd2a31..d8258309a4ca 100644 --- a/platform/platform-api/src/com/intellij/openapi/diagnostic/ErrorReportSubmitter.java +++ b/platform/platform-api/src/com/intellij/openapi/diagnostic/ErrorReportSubmitter.java @@ -53,11 +53,11 @@ public abstract class ErrorReportSubmitter implements PluginAware { * @param consumer a callback to be called after sending is finished (or failed). * @return {@code true} if reporting was started, {@code false} if a report can't be sent at the moment. */ - @SuppressWarnings("deprecation") public boolean submit(@NotNull IdeaLoggingEvent[] events, @Nullable String additionalInfo, @NotNull Component parentComponent, @NotNull Consumer consumer) { + //noinspection deprecation return trySubmitAsync(events, additionalInfo, parentComponent, consumer); } diff --git a/platform/platform-impl/src/com/intellij/openapi/fileTypes/ex/FileTypeManagerEx.java b/platform/platform-impl/src/com/intellij/openapi/fileTypes/ex/FileTypeManagerEx.java index d050fe760a7c..db80e61e832c 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileTypes/ex/FileTypeManagerEx.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileTypes/ex/FileTypeManagerEx.java @@ -16,6 +16,7 @@ package com.intellij.openapi.fileTypes.ex; import com.intellij.openapi.fileTypes.FileType; +import com.intellij.openapi.fileTypes.FileTypeFactory; import com.intellij.openapi.fileTypes.FileTypeManager; import org.jetbrains.annotations.NotNull; @@ -24,10 +25,16 @@ import org.jetbrains.annotations.NotNull; */ public abstract class FileTypeManagerEx extends FileTypeManager{ public static FileTypeManagerEx getInstanceEx(){ - return (FileTypeManagerEx) getInstance(); + return (FileTypeManagerEx)getInstance(); } + /** + * @deprecated use {@link FileTypeFactory} instead + */ public abstract void registerFileType(@NotNull FileType fileType); + /** + * @deprecated use {@link FileTypeFactory} instead + */ public abstract void unregisterFileType(@NotNull FileType fileType); public abstract boolean isIgnoredFilesListEqualToCurrent(@NotNull String list); diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/ex/KeymapManagerEx.java b/platform/platform-impl/src/com/intellij/openapi/keymap/ex/KeymapManagerEx.java index 186443e3d744..bbafb1b1a0b6 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/ex/KeymapManagerEx.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/ex/KeymapManagerEx.java @@ -60,7 +60,6 @@ public abstract class KeymapManagerEx extends KeymapManager { /** * @deprecated Please use {@link #getSchemeManager()} */ - @SuppressWarnings("deprecation") @Deprecated public final SchemesManager getSchemesManager() { return (SchemesManager)getSchemeManager(); diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarFileSystemImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarFileSystemImpl.java index 2c06053866d2..de52fde4284f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarFileSystemImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarFileSystemImpl.java @@ -39,7 +39,6 @@ public class JarFileSystemImpl extends JarFileSystem { public JarFileSystemImpl() { boolean noCopy = SystemProperties.getBooleanProperty("idea.jars.nocopy", !SystemInfo.isWindows); - //noinspection deprecation myNoCopyJarPaths = noCopy ? null : ConcurrentCollectionFactory.createConcurrentSet(FileUtil.PATH_HASHING_STRATEGY); // to prevent platform .jar files from copying diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java index 526374a4d03e..f9281d4cebac 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java @@ -2301,6 +2301,5 @@ public class ToolWindowManagerImpl extends ToolWindowManagerEx implements Persis } private static void triggerUsage(@NotNull String feature) { - //noinspection deprecation } } \ No newline at end of file diff --git a/platform/testFramework/src/com/intellij/testFramework/UsefulTestCase.java b/platform/testFramework/src/com/intellij/testFramework/UsefulTestCase.java index 79174f57a63a..9d0a158d38e7 100644 --- a/platform/testFramework/src/com/intellij/testFramework/UsefulTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/UsefulTestCase.java @@ -832,7 +832,6 @@ public abstract class UsefulTestCase extends TestCase { } } - @SuppressWarnings("deprecation") private static void checkSettingsEqual(CodeStyleSettings expected, CodeStyleSettings settings) { if (expected == null || settings == null) return; diff --git a/platform/testFramework/src/com/intellij/testFramework/propertyBased/InvokeCompletion.java b/platform/testFramework/src/com/intellij/testFramework/propertyBased/InvokeCompletion.java index 18d00bb77a92..9e72657f9830 100644 --- a/platform/testFramework/src/com/intellij/testFramework/propertyBased/InvokeCompletion.java +++ b/platform/testFramework/src/com/intellij/testFramework/propertyBased/InvokeCompletion.java @@ -84,7 +84,6 @@ public class InvokeCompletion extends ActionOnFile { Registry.get("ide.completion.variant.limit").setValue(100_000, raiseCompletionLimit); try { PsiTestUtil.checkPsiStructureWithCommit(getFile(), PsiTestUtil::checkStubsMatchText); - //noinspection deprecation Editor caretEditor = InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(editor, getFile()); performCompletion(caretEditor, Objects.requireNonNull(PsiUtilBase.getPsiFileInEditor(caretEditor, project)), completionChar, env); PsiTestUtil.checkPsiStructureWithCommit(getFile(), PsiTestUtil::checkStubsMatchText); diff --git a/platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java b/platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java index 8068bc83facc..8453798241b1 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java @@ -298,7 +298,6 @@ public class AbstractRerunFailedTestsAction extends AnAction implements AnAction @SuppressWarnings("deprecation") @Override public int getUniqueID() { - //noinspection deprecation return myConfiguration.getUniqueID(); } diff --git a/platform/util/src/com/intellij/execution/process/BaseOSProcessHandler.java b/platform/util/src/com/intellij/execution/process/BaseOSProcessHandler.java index 06b6b476f601..ad08c5852b9a 100644 --- a/platform/util/src/com/intellij/execution/process/BaseOSProcessHandler.java +++ b/platform/util/src/com/intellij/execution/process/BaseOSProcessHandler.java @@ -24,8 +24,8 @@ public class BaseOSProcessHandler extends BaseProcessHandler { private static final Options ADAPTIVE_NON_BLOCKING = new Options() { @Override - @SuppressWarnings("deprecation") public BaseDataReader.SleepingPolicy policy() { + //noinspection deprecation return new BaseDataReader.AdaptiveSleepingPolicy(); } }; diff --git a/platform/util/src/com/intellij/util/containers/ConcurrentHashSet.java b/platform/util/src/com/intellij/util/containers/ConcurrentHashSet.java index 8237ee89d09c..0aafdc3963f7 100644 --- a/platform/util/src/com/intellij/util/containers/ConcurrentHashSet.java +++ b/platform/util/src/com/intellij/util/containers/ConcurrentHashSet.java @@ -114,7 +114,6 @@ public final class ConcurrentHashSet implements Set { return map.keySet().toString(); } - @SuppressWarnings("deprecation") @Override public boolean equals(Object obj) { if (this == obj) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/typeEnhancers/GrTypeConverter.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/typeEnhancers/GrTypeConverter.java index f20488ad1151..d549de55c3fb 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/typeEnhancers/GrTypeConverter.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/typeEnhancers/GrTypeConverter.java @@ -69,7 +69,6 @@ public abstract class GrTypeConverter { return false; } - @SuppressWarnings("deprecation") public boolean isApplicableTo(@NotNull ApplicableTo position) { switch (position) { case EXPLICIT_CAST: @@ -77,6 +76,7 @@ public abstract class GrTypeConverter { case ASSIGNMENT: return true; case METHOD_PARAMETER: + //noinspection deprecation return isAllowedInMethodCall(); case RETURN_VALUE: return true; @@ -102,12 +102,12 @@ public abstract class GrTypeConverter { * @param context context * @return {@link ConversionResult conversion result } */ - @SuppressWarnings("deprecation") @Nullable public ConversionResult isConvertibleEx(@NotNull PsiType targetType, @NotNull PsiType actualType, @NotNull GroovyPsiElement context, @NotNull ApplicableTo currentPosition) { + //noinspection deprecation final Boolean result = isConvertible(targetType, actualType, context); return result == null ? null : result ? ConversionResult.OK diff --git a/python/src/com/jetbrains/python/psi/impl/PyElementImpl.java b/python/src/com/jetbrains/python/psi/impl/PyElementImpl.java index e3bc4c9b833c..650f8ef28203 100644 --- a/python/src/com/jetbrains/python/psi/impl/PyElementImpl.java +++ b/python/src/com/jetbrains/python/psi/impl/PyElementImpl.java @@ -21,7 +21,6 @@ import com.intellij.psi.stubs.StubElement; /** * @author yole */ -@SuppressWarnings("deprecation") public class PyElementImpl extends PyBaseElementImpl { public PyElementImpl(ASTNode astNode) { super(astNode);