From 645a720b58c96b8b1e08525e73fceff85dd4b1e4 Mon Sep 17 00:00:00 2001 From: Nikolay Chashnikov Date: Fri, 15 Jan 2021 19:22:29 +0300 Subject: [PATCH] [java] API cleanup: remove unused API which was deprecated for a long time (IDEA-259329) GitOrigin-RevId: b2f2c85514d360e8d716e6f136f7c11760086f0e --- .../compiler/CompilerManagerImpl.java | 7 ---- .../impl/BuildTargetScopeProvider.java | 13 +------ .../options/CompilerConfigurable.java | 24 ++---------- .../com/intellij/uiDesigner/ant/Javac2.java | 25 ------------ .../compiler/CompilerSettingsFactory.java | 30 --------------- .../CompilerWorkspaceConfiguration.java | 1 - .../openapi/compiler/CompilerManager.java | 15 -------- .../com/intellij/task/ArtifactBuildTask.java | 32 ---------------- .../debugger/actions/DebuggerActions.java | 4 -- .../debugger/engine/DebugProcessImpl.java | 8 ---- .../ui/tree/render/ChildrenBuilder.java | 8 ---- ...tractApplicationConfigurationProducer.java | 8 ---- .../com/intellij/execution/JUnitPatcher.java | 8 ---- .../intellij/execution/JavaExecutionUtil.java | 10 ----- .../impl/ui/ProjectConfigurableContext.java | 14 ------- .../library/DownloadableLibraryTypeBase.java | 38 ------------------- ...nderlyingFrameworkSupportProviderBase.java | 29 -------------- .../AbstractExternalProjectImportBuilder.java | 10 ----- .../roots/ui/configuration/PathUIUtils.java | 27 ------------- .../facet/mock/MockFacetEditorContext.java | 14 ------- .../codeInspection/reference/RefJavaUtil.java | 5 --- .../jvm/actions/CreateExecutableRequest.java | 8 ---- .../lang/jvm/actions/MemberRequest.kt | 25 ------------ java/java-impl/src/META-INF/JavaPlugin.xml | 1 - ...vaClassReferenceCompletionContributor.java | 11 ++++-- .../codeInsight/daemon/impl/MarkerType.java | 8 ---- .../generation/ConstructorBodyGenerator.java | 6 --- .../util/JavaPostfixTemplatesUtils.java | 10 ----- .../DefaultFileTemplateUsageInspection.java | 6 +-- .../javaDoc/JavaDocLocalInspection.java | 1 + .../CreateExecutableFromJavaUsageRequest.kt | 2 - .../CreateBeanPropertyRequest.kt | 3 -- .../codeStyle/javadoc/CommentFormatter.java | 10 ----- .../impl/providers/JavaClassReference.java | 11 +----- .../inline/InlineMethodProcessor.java | 11 ------ .../MoveClassesOrPackagesUtil.java | 11 ------ .../refactoring/util/RefactoringUtil.java | 8 ---- .../searches/DirectClassInheritorsSearch.java | 12 ------ .../com/intellij/psi/PsiElementFinder.java | 7 ---- .../psi/util/PsiConcatenationUtil.java | 13 ------- .../com/intellij/psi/util/PsiTypesUtil.java | 8 ---- .../intellij/psi/NonClasspathClassFinder.java | 9 ----- .../com/intellij/psi/impl/PsiImplUtil.java | 18 --------- .../psi/impl/compiled/ClsFileImpl.java | 12 ------ .../unscramble/UnscrambleSupport.java | 13 +------ .../AbstractMethodResolveConverter.java | 2 +- .../codeInsight/CodeInsightTestCase.java | 13 ------- .../completion/CompletionTestCase.java | 13 ------- .../intellij/testFramework/IdeaTestCase.java | 9 ----- .../testFramework/InspectionTestCase.java | 15 -------- .../LightCodeInsightTestCase.java | 10 ----- .../testFramework/LightTestMigration.java | 2 +- .../testFramework/ModuleTestCase.java | 12 ------ .../intellij/testFramework/PsiTestCase.java | 12 ------ .../com/siyeh/ig/LightInspectionTestCase.java | 12 ------ .../impl/module/content/JpsSourceFolder.java | 5 +-- ...ewExceptionWithoutArgumentsInspection.java | 4 -- .../UnnecessaryLocalVariableInspection.java | 2 +- .../com/siyeh/ig/psiutils/HighlightUtils.java | 8 ---- .../com/siyeh/ipp/psiutils/HighlightUtil.java | 21 ---------- .../CreateExecutableFromGroovyUsageRequest.kt | 2 - .../main/decompiler/BaseDecompiler.java | 11 ------ ...FxEventHandlerReferenceQuickFixProvider.kt | 3 -- 63 files changed, 22 insertions(+), 688 deletions(-) delete mode 100644 java/compiler/javac2/src/com/intellij/uiDesigner/ant/Javac2.java delete mode 100644 java/compiler/openapi/src/com/intellij/compiler/CompilerSettingsFactory.java delete mode 100644 java/compiler/openapi/src/com/intellij/task/ArtifactBuildTask.java delete mode 100644 java/idea-ui/src/com/intellij/framework/library/DownloadableLibraryTypeBase.java delete mode 100644 java/idea-ui/src/com/intellij/framework/library/UnderlyingFrameworkSupportProviderBase.java delete mode 100644 java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/PathUIUtils.java delete mode 100644 java/java-analysis-api/src/com/intellij/lang/jvm/actions/MemberRequest.kt delete mode 100644 java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java delete mode 100644 java/testFramework/src/com/intellij/codeInsight/completion/CompletionTestCase.java delete mode 100644 java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java delete mode 100644 java/testFramework/src/com/intellij/testFramework/InspectionTestCase.java delete mode 100644 java/testFramework/src/com/intellij/testFramework/LightCodeInsightTestCase.java delete mode 100644 java/testFramework/src/com/intellij/testFramework/ModuleTestCase.java delete mode 100644 java/testFramework/src/com/intellij/testFramework/PsiTestCase.java delete mode 100644 java/testFramework/src/com/siyeh/ig/LightInspectionTestCase.java delete mode 100644 plugins/IntentionPowerPak/src/com/siyeh/ipp/psiutils/HighlightUtil.java diff --git a/java/compiler/impl/src/com/intellij/compiler/CompilerManagerImpl.java b/java/compiler/impl/src/com/intellij/compiler/CompilerManagerImpl.java index e8b41ae9c56e..c5e98e6f6753 100644 --- a/java/compiler/impl/src/com/intellij/compiler/CompilerManagerImpl.java +++ b/java/compiler/impl/src/com/intellij/compiler/CompilerManagerImpl.java @@ -6,7 +6,6 @@ import com.intellij.compiler.impl.javaCompiler.BackendCompiler; import com.intellij.compiler.server.BuildManager; import com.intellij.execution.process.ProcessIOExecutorService; import com.intellij.ide.IdeEventQueue; -import com.intellij.openapi.Disposable; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.compiler.Compiler; import com.intellij.openapi.compiler.*; @@ -348,12 +347,6 @@ public class CompilerManagerImpl extends CompilerManager { connection.subscribe(CompilerTopics.COMPILATION_STATUS, listener); } - @Override - public void addCompilationStatusListener(@NotNull CompilationStatusListener listener, @NotNull Disposable parentDisposable) { - final MessageBusConnection connection = myProject.getMessageBus().connect(parentDisposable); - connection.subscribe(CompilerTopics.COMPILATION_STATUS, listener); - } - @Override public void removeCompilationStatusListener(final @NotNull CompilationStatusListener listener) { final MessageBusConnection connection = myListenerAdapters.remove(listener); diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/BuildTargetScopeProvider.java b/java/compiler/impl/src/com/intellij/compiler/impl/BuildTargetScopeProvider.java index b1083a8bd382..f7125b5ce1e3 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/BuildTargetScopeProvider.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/BuildTargetScopeProvider.java @@ -33,17 +33,6 @@ import static org.jetbrains.jps.api.CmdlineRemoteProto.Message.ControllerMessage public abstract class BuildTargetScopeProvider { public static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.compiler.buildTargetScopeProvider"); - /** - * @deprecated override {@link #getBuildTargetScopes(CompileScope, Project, boolean)} instead - */ - @Deprecated - @NotNull - @Contract(pure = true) - public List getBuildTargetScopes(@NotNull CompileScope baseScope, @NotNull CompilerFilter filter, - @NotNull Project project) { - return Collections.emptyList(); - } - /** * @deprecated override {@link #getBuildTargetScopes(CompileScope, Project, boolean)} instead */ @@ -53,7 +42,7 @@ public abstract class BuildTargetScopeProvider { @Contract(pure = true) public List getBuildTargetScopes(@NotNull CompileScope baseScope, @NotNull CompilerFilter filter, @NotNull Project project, boolean forceBuild) { - return getBuildTargetScopes(baseScope, filter, project); + return Collections.emptyList(); } @NotNull diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java index b46b1f40354e..12bdcbee83ef 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java @@ -1,9 +1,7 @@ // 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.compiler.options; -import com.intellij.compiler.CompilerSettingsFactory; import com.intellij.openapi.compiler.JavaCompilerBundle; -import com.intellij.openapi.extensions.BaseExtensionPointName; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; @@ -11,19 +9,12 @@ import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import javax.swing.*; -import java.util.Collection; -import java.util.Collections; -import java.util.Objects; -public class CompilerConfigurable implements SearchableConfigurable.Parent, Configurable.NoScroll, Configurable.WithEpDependencies { - - private final Project myProject; +public class CompilerConfigurable implements SearchableConfigurable.Parent, Configurable.NoScroll { private final CompilerUIConfigurable myCompilerUIConfigurable; - private Configurable[] myKids; public CompilerConfigurable(Project project) { - myProject = project; - myCompilerUIConfigurable = new CompilerUIConfigurable(myProject); + myCompilerUIConfigurable = new CompilerUIConfigurable(project); } @Override @@ -72,17 +63,8 @@ public class CompilerConfigurable implements SearchableConfigurable.Parent, Conf myCompilerUIConfigurable.disposeUIResources(); } - @Override - public @NotNull Collection> getDependencies() { - return Collections.singleton(CompilerSettingsFactory.EP_NAME); - } - @Override public Configurable @NotNull [] getConfigurables() { - Configurable[] kids = myKids; - if (kids == null) { - myKids = kids = CompilerSettingsFactory.EP_NAME.extensions(myProject).map(f -> f.create(myProject)).filter(Objects::nonNull).toArray(Configurable[]::new); - } - return kids; + return new Configurable[0]; } } diff --git a/java/compiler/javac2/src/com/intellij/uiDesigner/ant/Javac2.java b/java/compiler/javac2/src/com/intellij/uiDesigner/ant/Javac2.java deleted file mode 100644 index 2ae6242bd95d..000000000000 --- a/java/compiler/javac2/src/com/intellij/uiDesigner/ant/Javac2.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2000-2009 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.intellij.uiDesigner.ant; - -/** - * @noinspection ClassNameSameAsAncestorName - * @deprecated - */ -@Deprecated -public class Javac2 extends com.intellij.ant.Javac2 { -} diff --git a/java/compiler/openapi/src/com/intellij/compiler/CompilerSettingsFactory.java b/java/compiler/openapi/src/com/intellij/compiler/CompilerSettingsFactory.java deleted file mode 100644 index 06132696fc09..000000000000 --- a/java/compiler/openapi/src/com/intellij/compiler/CompilerSettingsFactory.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2000-2009 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.intellij.compiler; - -import com.intellij.openapi.extensions.ProjectExtensionPointName; -import com.intellij.openapi.options.Configurable; -import com.intellij.openapi.project.Project; - -/** - * @deprecated Please use {@link com.intellij.openapi.options.ConfigurableEP#parentId} to put your configurable under Compiler Settings - */ -@Deprecated -public interface CompilerSettingsFactory { - ProjectExtensionPointName EP_NAME = new ProjectExtensionPointName<>("com.intellij.compilerSettingsFactory"); - - Configurable create(Project project); -} diff --git a/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java b/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java index 15ba18c8acb5..bb7d3431fdb6 100644 --- a/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java +++ b/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java @@ -25,7 +25,6 @@ public final class CompilerWorkspaceConfiguration implements PersistentStateComp public boolean AUTO_SHOW_ERRORS_IN_EDITOR = true; public boolean DISPLAY_NOTIFICATION_POPUP = true; - @Deprecated public boolean CLOSE_MESSAGE_VIEW_IF_SUCCESS = true; public boolean CLEAR_OUTPUT_DIRECTORY = true; public boolean MAKE_PROJECT_ON_SAVE = false; // until we fix problems with several open projects (IDEA-104064), daemon slowness (IDEA-104666) diff --git a/java/compiler/openapi/src/com/intellij/openapi/compiler/CompilerManager.java b/java/compiler/openapi/src/com/intellij/openapi/compiler/CompilerManager.java index 14e5fd44c0fb..b4ae17ff58b8 100644 --- a/java/compiler/openapi/src/com/intellij/openapi/compiler/CompilerManager.java +++ b/java/compiler/openapi/src/com/intellij/openapi/compiler/CompilerManager.java @@ -3,7 +3,6 @@ package com.intellij.openapi.compiler; import com.intellij.execution.configurations.RunConfiguration; import com.intellij.notification.NotificationGroup; -import com.intellij.openapi.Disposable; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleType; @@ -131,14 +130,6 @@ public abstract class CompilerManager { @NotNull public abstract List getBeforeTasks(); - /** - * @deprecated Use {@link #getAfterTaskList} - */ - @Deprecated - public CompileTask @NotNull [] getAfterTasks() { - return getAfterTaskList().toArray(new CompileTask[0]); - } - /** * Returns the list of all tasks to be executed after compilation. * @@ -244,12 +235,6 @@ public abstract class CompilerManager { @Deprecated public abstract void addCompilationStatusListener(@NotNull CompilationStatusListener listener); - /** - * @deprecated Use {@link CompilerTopics#COMPILATION_STATUS} instead - */ - @Deprecated - public abstract void addCompilationStatusListener(@NotNull CompilationStatusListener listener, @NotNull Disposable parentDisposable); - /** * @deprecated Use {@link CompilerTopics#COMPILATION_STATUS} instead */ diff --git a/java/compiler/openapi/src/com/intellij/task/ArtifactBuildTask.java b/java/compiler/openapi/src/com/intellij/task/ArtifactBuildTask.java deleted file mode 100644 index d22c9605f984..000000000000 --- a/java/compiler/openapi/src/com/intellij/task/ArtifactBuildTask.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2000-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.intellij.task; - -import com.intellij.packaging.artifacts.Artifact; - -/** - * - * @deprecated tobe removed, use {@link ProjectModelBuildTask} - * - * @author Vladislav.Soroka - */ -@Deprecated -public interface ArtifactBuildTask extends ProjectModelBuildTask { - Artifact getArtifact(); - - @Override - default Artifact getBuildableElement() {return getArtifact();} -} diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/DebuggerActions.java b/java/debugger/impl/src/com/intellij/debugger/actions/DebuggerActions.java index 6b59d74697fb..6fa44c62017d 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/DebuggerActions.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/DebuggerActions.java @@ -20,8 +20,6 @@ */ package com.intellij.debugger.actions; -import com.intellij.debugger.ui.impl.DebuggerTreePanel; -import com.intellij.debugger.ui.impl.watch.DebuggerTree; import com.intellij.xdebugger.impl.actions.XDebuggerActions; import org.jetbrains.annotations.NonNls; @@ -33,8 +31,6 @@ public interface DebuggerActions extends XDebuggerActions { @NonNls String INSPECT_PANEL_POPUP = "Debugger.InspectPanelPopup"; @NonNls String THREADS_PANEL_POPUP = "Debugger.ThreadsPanelPopup"; @NonNls String WATCH_PANEL_POPUP = "Debugger.WatchesPanelPopup"; - @Deprecated @NonNls String DEBUGGER_TREE = DebuggerTree.DATA_KEY.getName(); - @Deprecated @NonNls String DEBUGGER_TREE_PANEL = DebuggerTreePanel.DATA_KEY.getName(); @NonNls String EDIT_FRAME_SOURCE = "Debugger.EditFrameSource"; @NonNls String EDIT_NODE_SOURCE = "Debugger.EditNodeSource"; @NonNls String REPRESENTATION_LIST = "Debugger.Representation"; diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java index 05539b29841d..e098ed397c9f 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java @@ -874,14 +874,6 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb mySteppingBreakpoint = breakpoint; } - /** - * @deprecated use {@link #setSteppingBreakpoint(SteppingBreakpoint)} - */ - @Deprecated - public void setRunToCursorBreakpoint(@Nullable RunToCursorBreakpoint breakpoint) { - mySteppingBreakpoint = breakpoint; - } - public void cancelRunToCursorBreakpoint() { DebuggerManagerThreadImpl.assertIsManagerThread(); final SteppingBreakpoint runToCursorBreakpoint = mySteppingBreakpoint; diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ChildrenBuilder.java b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ChildrenBuilder.java index 874bac9d2f3e..dfcc3fe81adc 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ChildrenBuilder.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ChildrenBuilder.java @@ -36,13 +36,5 @@ public interface ChildrenBuilder extends XCompositeNode { setChildren(children); } - /** - * @deprecated use {@link #tooManyChildren} - */ - @Deprecated - default void setRemaining(int remaining) { - tooManyChildren(remaining); - } - void initChildrenArrayRenderer(ArrayRenderer renderer, int arrayLength); } diff --git a/java/execution/impl/src/com/intellij/execution/application/AbstractApplicationConfigurationProducer.java b/java/execution/impl/src/com/intellij/execution/application/AbstractApplicationConfigurationProducer.java index 4a05b161cb77..8ce97bb1b531 100644 --- a/java/execution/impl/src/com/intellij/execution/application/AbstractApplicationConfigurationProducer.java +++ b/java/execution/impl/src/com/intellij/execution/application/AbstractApplicationConfigurationProducer.java @@ -25,14 +25,6 @@ public abstract class AbstractApplicationConfigurationProducer libraryCategoryName, - @NotNull String libraryTypeId, - @NotNull String groupId, - @Nullable Icon icon, - URL @NotNull ... localUrls) { - super(libraryCategoryName, libraryTypeId, groupId, icon, localUrls); - } -} diff --git a/java/idea-ui/src/com/intellij/framework/library/UnderlyingFrameworkSupportProviderBase.java b/java/idea-ui/src/com/intellij/framework/library/UnderlyingFrameworkSupportProviderBase.java deleted file mode 100644 index b295167d870f..000000000000 --- a/java/idea-ui/src/com/intellij/framework/library/UnderlyingFrameworkSupportProviderBase.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2000-2013 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.intellij.framework.library; - -import com.intellij.framework.FrameworkTypeEx; - -/** - * @deprecated use {@link #LibraryBasedFrameworkSupportProvider} instead - */ -@Deprecated -public class UnderlyingFrameworkSupportProviderBase extends LibraryBasedFrameworkSupportProvider { - public UnderlyingFrameworkSupportProviderBase(FrameworkTypeEx frameworkType, - Class libraryTypeClass) { - super(frameworkType, libraryTypeClass); - } -} diff --git a/java/idea-ui/src/com/intellij/openapi/externalSystem/service/project/wizard/AbstractExternalProjectImportBuilder.java b/java/idea-ui/src/com/intellij/openapi/externalSystem/service/project/wizard/AbstractExternalProjectImportBuilder.java index d97c71b42e61..7696379ba6d9 100644 --- a/java/idea-ui/src/com/intellij/openapi/externalSystem/service/project/wizard/AbstractExternalProjectImportBuilder.java +++ b/java/idea-ui/src/com/intellij/openapi/externalSystem/service/project/wizard/AbstractExternalProjectImportBuilder.java @@ -65,16 +65,6 @@ public abstract class AbstractExternalProjectImportBuilder myExternalProjectNode; - /** - * @deprecated use {@link AbstractExternalProjectImportBuilder#AbstractExternalProjectImportBuilder(ProjectDataManager, NotNullFactory, ProjectSystemId)} - */ - @Deprecated - public AbstractExternalProjectImportBuilder(@NotNull com.intellij.openapi.externalSystem.service.project.manage.ProjectDataManager projectDataManager, - @NotNull C control, - @NotNull ProjectSystemId externalSystemId) { - this((ProjectDataManager)projectDataManager, control, externalSystemId); - } - /** * @deprecated use {@link AbstractExternalProjectImportBuilder#AbstractExternalProjectImportBuilder(ProjectDataManager, NotNullFactory, ProjectSystemId)} */ diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/PathUIUtils.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/PathUIUtils.java deleted file mode 100644 index a164bdac60c0..000000000000 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/PathUIUtils.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2000-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.intellij.openapi.roots.ui.configuration; - -import com.intellij.openapi.roots.libraries.ui.RootDetector; - -/** - * @deprecated please use {@link LibrarySourceRootDetectorUtil} directly - */ -@Deprecated -public class PathUIUtils extends LibrarySourceRootDetectorUtil { - public static final RootDetector JAVA_SOURCE_ROOT_DETECTOR = new LibraryJavaSourceRootDetector(); - -} diff --git a/java/idea-ui/testSrc/com/intellij/facet/mock/MockFacetEditorContext.java b/java/idea-ui/testSrc/com/intellij/facet/mock/MockFacetEditorContext.java index 9d2c08446f45..af5a98f7dfd7 100644 --- a/java/idea-ui/testSrc/com/intellij/facet/mock/MockFacetEditorContext.java +++ b/java/idea-ui/testSrc/com/intellij/facet/mock/MockFacetEditorContext.java @@ -4,8 +4,6 @@ package com.intellij.facet.mock; import com.intellij.facet.Facet; import com.intellij.facet.impl.ui.FacetEditorContextBase; -import com.intellij.ide.util.projectWizard.ModuleBuilder; -import com.intellij.ide.util.projectWizard.WizardContext; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ModifiableRootModel; @@ -61,12 +59,6 @@ public class MockFacetEditorContext extends FacetEditorContextBase { return myProject; } - @Override - @Nullable - public ModuleBuilder getModuleBuilder() { - return null; - } - @Override public boolean isNewFacet() { return myNewFacet; @@ -96,12 +88,6 @@ public class MockFacetEditorContext extends FacetEditorContextBase { throw new UnsupportedOperationException(); } - @Override - @Nullable - public WizardContext getWizardContext() { - return null; - } - @Override public Library createProjectLibrary(final String name, final VirtualFile[] roots, final VirtualFile[] sources) { throw new UnsupportedOperationException(); diff --git a/java/java-analysis-api/src/com/intellij/codeInspection/reference/RefJavaUtil.java b/java/java-analysis-api/src/com/intellij/codeInspection/reference/RefJavaUtil.java index d50743c4d412..b94e51af465e 100644 --- a/java/java-analysis-api/src/com/intellij/codeInspection/reference/RefJavaUtil.java +++ b/java/java-analysis-api/src/com/intellij/codeInspection/reference/RefJavaUtil.java @@ -92,9 +92,4 @@ public abstract class RefJavaUtil { public void addTypeReference(PsiElement psiElement, PsiType psiType, RefManager refManager) { throw new UnsupportedOperationException(); } - - @Deprecated - public void addTypeReference(PsiElement psiElement, PsiType psiType, RefManager refManager, @Nullable RefJavaElement refElement) { - throw new UnsupportedOperationException(); - } } diff --git a/java/java-analysis-api/src/com/intellij/lang/jvm/actions/CreateExecutableRequest.java b/java/java-analysis-api/src/com/intellij/lang/jvm/actions/CreateExecutableRequest.java index d92c0e255360..6a8945d1816c 100644 --- a/java/java-analysis-api/src/com/intellij/lang/jvm/actions/CreateExecutableRequest.java +++ b/java/java-analysis-api/src/com/intellij/lang/jvm/actions/CreateExecutableRequest.java @@ -3,8 +3,6 @@ package com.intellij.lang.jvm.actions; import com.intellij.lang.jvm.JvmModifier; import com.intellij.lang.jvm.types.JvmSubstitutor; -import com.intellij.psi.codeStyle.SuggestedNameInfo; -import kotlin.Pair; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -21,12 +19,6 @@ public interface CreateExecutableRequest extends ActionRequest { @NotNull JvmSubstitutor getTargetSubstitutor(); - @Deprecated - @NotNull - default List>> getParameters() { - return CompatibilityUtil.getParameters(getExpectedParameters()); - } - @NotNull List getExpectedParameters(); } diff --git a/java/java-analysis-api/src/com/intellij/lang/jvm/actions/MemberRequest.kt b/java/java-analysis-api/src/com/intellij/lang/jvm/actions/MemberRequest.kt deleted file mode 100644 index 64d647816b5d..000000000000 --- a/java/java-analysis-api/src/com/intellij/lang/jvm/actions/MemberRequest.kt +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2000-2017 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.lang.jvm.actions - -import com.intellij.lang.jvm.JvmModifier -import com.intellij.lang.jvm.types.JvmType - -@Deprecated("use api based on ChangeModifierRequest or CreateMethodRequest") -sealed class MemberRequest { - - @Deprecated("use `com.intellij.lang.jvm.actions.CreateMethodRequest`") - class Property( - val propertyName: String, - val visibilityModifier: JvmModifier, - val propertyType: JvmType, - val setterRequired: Boolean, - val getterRequired: Boolean - ) : MemberRequest() - - @Deprecated("use `com.intellij.lang.jvm.actions.ChangeModifierRequest`") - class Modifier( - val modifier: JvmModifier, - val shouldPresent: Boolean - ) : MemberRequest() - -} diff --git a/java/java-impl/src/META-INF/JavaPlugin.xml b/java/java-impl/src/META-INF/JavaPlugin.xml index ae3d7edfe07e..9cfee7ec6613 100644 --- a/java/java-impl/src/META-INF/JavaPlugin.xml +++ b/java/java-impl/src/META-INF/JavaPlugin.xml @@ -165,7 +165,6 @@ - diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassReferenceCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassReferenceCompletionContributor.java index 71f09f845d6d..227d074af946 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassReferenceCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassReferenceCompletionContributor.java @@ -27,9 +27,12 @@ import com.intellij.psi.PsiReference; import com.intellij.psi.impl.source.resolve.reference.impl.PsiMultiReference; import com.intellij.psi.impl.source.resolve.reference.impl.providers.JavaClassReference; import com.intellij.psi.impl.source.resolve.reference.impl.providers.JavaClassReferenceSet; +import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.List; + /** * @author peter */ @@ -37,7 +40,7 @@ public class JavaClassReferenceCompletionContributor extends CompletionContribut @Override public void duringCompletion(@NotNull CompletionInitializationContext context) { JavaClassReference reference = findJavaClassReference(context.getFile(), context.getStartOffset()); - if (reference != null && reference.getExtendClassNames() != null) { + if (reference != null && !reference.getSuperClasses().isEmpty()) { JavaClassReferenceSet set = reference.getJavaClassReferenceSet(); context.setReplacementOffset(set.getRangeInElement().getEndOffset() + set.getElement().getTextRange().getStartOffset()); } @@ -51,14 +54,14 @@ public class JavaClassReferenceCompletionContributor extends CompletionContribut return; } - String[] extendClassNames = reference.getExtendClassNames(); + List extendClassNames = reference.getSuperClasses(); PsiElement context = reference.getCompletionContext(); - if (extendClassNames != null && context instanceof PsiPackage) { + if (!extendClassNames.isEmpty() && context instanceof PsiPackage) { if (parameters.getCompletionType() == CompletionType.SMART) { JavaClassReferenceSet set = reference.getJavaClassReferenceSet(); int setStart = set.getRangeInElement().getStartOffset() + set.getElement().getTextRange().getStartOffset(); String fullPrefix = parameters.getPosition().getContainingFile().getText().substring(setStart, parameters.getOffset()); - reference.processSubclassVariants((PsiPackage)context, extendClassNames, result.withPrefixMatcher(fullPrefix)); + reference.processSubclassVariants((PsiPackage)context, ArrayUtil.toStringArray(extendClassNames), result.withPrefixMatcher(fullPrefix)); return; } result.addLookupAdvertisement(JavaBundle.message("press.0.to.see.inheritors.of.1", diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/MarkerType.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/MarkerType.java index b65bf5b7e689..bd95b2f89821 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/MarkerType.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/MarkerType.java @@ -43,14 +43,6 @@ public class MarkerType { private final Function myTooltip; @NotNull private final String myDebugName; - /** - * @deprecated use {@link #MarkerType(String, Function, LineMarkerNavigator)} instead - */ - @Deprecated - public MarkerType(@NotNull Function tooltip, @NotNull final LineMarkerNavigator navigator) { - this("Unknown", tooltip, navigator); - } - public MarkerType(@NotNull String debugName, @NotNull Function tooltip, @NotNull final LineMarkerNavigator navigator) { myTooltip = tooltip; myDebugName = debugName; 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 79a83becb394..8c182c17af70 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/ConstructorBodyGenerator.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/ConstructorBodyGenerator.java @@ -46,12 +46,6 @@ public interface ConstructorBodyGenerator { } } - /** - * @deprecated use {@link #generateFieldInitialization(StringBuilder, PsiField[], PsiParameter[], Collection)} - */ - @Deprecated - default void generateFieldInitialization(@NotNull StringBuilder buffer, PsiField @NotNull [] fields, PsiParameter @NotNull [] parameters) {} - default void appendSemicolon(@NotNull StringBuilder buffer) {} default void generateSuperCallIfNeeded(@NotNull StringBuilder buffer, PsiParameter @NotNull [] parameters) { 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 6199d7ae8732..a5a3878e9cb3 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 @@ -153,16 +153,6 @@ public final class JavaPostfixTemplatesUtils { public static final Condition IS_NOT_PRIMITIVE = element -> element instanceof PsiExpression && isNotPrimitiveTypeExpression((PsiExpression)element); - /** - * @deprecated use {@link #isArray(PsiType)} - */ - @Deprecated public static final Condition IS_ARRAY = element -> { - if (!(element instanceof PsiExpression)) return false; - - PsiType type = ((PsiExpression)element).getType(); - return isArray(type); - }; - /** * @deprecated use {@link #isIterable(PsiType)} / {@link #isArray(PsiType)} */ 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 219ce4593f47..e094627d83e3 100644 --- a/java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/DefaultFileTemplateUsageInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/DefaultFileTemplateUsageInspection.java @@ -20,19 +20,19 @@ import org.jetbrains.annotations.Nullable; public class DefaultFileTemplateUsageInspection extends AbstractBaseJavaLocalInspectionTool { /** - * @deprecated unused, left for compatibility + * @deprecated unused, left to avoid modifications in config files */ @Deprecated public boolean CHECK_FILE_HEADER = true; /** - * @deprecated unused, left for compatibility + * @deprecated unused, left to avoid modifications in config files */ @Deprecated public boolean CHECK_TRY_CATCH_SECTION = true; /** - * @deprecated unused, left for compatibility + * @deprecated unused, left to avoid modifications in config files */ @Deprecated public boolean CHECK_METHOD_BODY = true; diff --git a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocLocalInspection.java b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocLocalInspection.java index 3c76059a72d2..c3c042a3810e 100644 --- a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocLocalInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocLocalInspection.java @@ -61,6 +61,7 @@ public class JavaDocLocalInspection extends LocalInspectionTool { public Options FIELD_OPTIONS = new Options("none", ""); public boolean IGNORE_DEPRECATED; public boolean IGNORE_JAVADOC_PERIOD = true; + /** @deprecated unused, left to avoid modifications in config files */ @Deprecated public boolean IGNORE_DUPLICATED_THROWS; public boolean IGNORE_POINT_TO_ITSELF; diff --git a/java/java-impl/src/com/intellij/lang/java/request/CreateExecutableFromJavaUsageRequest.kt b/java/java-impl/src/com/intellij/lang/java/request/CreateExecutableFromJavaUsageRequest.kt index 89ba71d1562e..226e7ebb8805 100644 --- a/java/java-impl/src/com/intellij/lang/java/request/CreateExecutableFromJavaUsageRequest.kt +++ b/java/java-impl/src/com/intellij/lang/java/request/CreateExecutableFromJavaUsageRequest.kt @@ -43,7 +43,5 @@ internal abstract class CreateExecutableFromJavaUsageRequest( } } - override fun getParameters() = getParameters(expectedParameters, project) - val context get() = call.parentOfTypes(PsiMethod::class, PsiClass::class) } diff --git a/java/java-impl/src/com/intellij/psi/impl/beanProperties/CreateBeanPropertyRequest.kt b/java/java-impl/src/com/intellij/psi/impl/beanProperties/CreateBeanPropertyRequest.kt index 6d13debbf144..05c517d44702 100644 --- a/java/java-impl/src/com/intellij/psi/impl/beanProperties/CreateBeanPropertyRequest.kt +++ b/java/java-impl/src/com/intellij/psi/impl/beanProperties/CreateBeanPropertyRequest.kt @@ -37,8 +37,5 @@ class CreateBeanPropertyRequest( private val myParameters = if (isSetter) listOf(expectedParameter(type, propertyName)) else emptyList() override fun getExpectedParameters() = myParameters - private val oldParameters = getParameters(myParameters, project) - override fun getParameters() = oldParameters - override fun isValid() = type.isValid } diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/javadoc/CommentFormatter.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/javadoc/CommentFormatter.java index e69bd35d8955..85bcbf70725a 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/javadoc/CommentFormatter.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/javadoc/CommentFormatter.java @@ -29,16 +29,6 @@ public class CommentFormatter { private final JDParser myParser; private final Project myProject; - /** - * @deprecated Use {@link ##CommentFormatter(PsiFile)} instead. - */ - @Deprecated - public CommentFormatter(@NotNull Project project) { - mySettings = CodeStyle.getSettings(project); - myParser = new JDParser(mySettings); - myProject = project; - } - public CommentFormatter(@NotNull PsiFile file) { mySettings = CodeStyle.getSettings(file); myParser = new JDParser(mySettings); diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java index 4bf7fd0b594a..fd66211dd675 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java @@ -37,7 +37,6 @@ import com.intellij.psi.search.searches.ClassInheritorsSearch; import com.intellij.psi.util.ClassKind; import com.intellij.psi.util.ClassUtil; import com.intellij.psi.util.PsiUtil; -import com.intellij.util.ArrayUtilRt; import com.intellij.util.Consumer; import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.ContainerUtil; @@ -261,13 +260,6 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer return contextRef.resolve(); } - /** @deprecated use {@link #getSuperClasses()} instead */ - @Deprecated - public String @Nullable [] getExtendClassNames() { - List result = getSuperClasses(); - return result.isEmpty() ? null : ArrayUtilRt.toStringArray(result); - } - @NotNull public List getSuperClasses() { List values = JavaClassReferenceProvider.SUPER_CLASSES.getValue(getOptions()); @@ -489,8 +481,7 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer private List registerFixes() { final List list = QuickFixFactory.getInstance().registerOrderEntryFixes(new QuickFixActionRegistrarImpl(null), this); - final String[] extendClasses = getExtendClassNames(); - final String extendClass = extendClasses != null && extendClasses.length > 0 ? extendClasses[0] : null; + final String extendClass = ContainerUtil.getFirstItem(getSuperClasses()); final JavaClassReference[] references = getJavaClassReferenceSet().getAllReferences(); PsiPackage contextPackage = null; 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 93eac1b6c4fd..465ac8553701 100644 --- a/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java @@ -1133,17 +1133,6 @@ 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, - expr -> JavaPsiConstructorUtil.isConstructorCall(expr) && expr.getMethodExpression() != element) - ? JavaRefactoringBundle.message("inline.method.multiline.method.in.ctor.call") - : null; - } - public static @NlsContexts.DialogMessage String checkUnableToInsertCodeBlock(PsiCodeBlock methodBody, final PsiElement element) { if (checkUnableToInsertCodeBlock(methodBody, element, expr -> JavaPsiConstructorUtil.isConstructorCall(expr) && expr.getMethodExpression() != element)) { diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesUtil.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesUtil.java index e0c474aebcad..837567ba59b1 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesUtil.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesUtil.java @@ -80,17 +80,6 @@ public final class MoveClassesOrPackagesUtil { } } - /** @deprecated Use {@link MoveClassesOrPackagesUtil#findNonCodeUsages(PsiElement, SearchScope, boolean, boolean, String, Collection)} */ - @Deprecated - public static void findNonCodeUsages(boolean searchInStringsAndComments, - boolean searchInNonJavaFiles, - final PsiElement element, - final String newQName, - ArrayList results) { - findNonCodeUsages(element, GlobalSearchScope.projectScope(element.getProject()), - searchInStringsAndComments, searchInNonJavaFiles, newQName, results); - } - public static void findNonCodeUsages(@NotNull PsiElement element, @NotNull SearchScope searchScope, boolean searchInStringsAndComments, 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 e613cf5996a7..38fd0920601b 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java +++ b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java @@ -69,14 +69,6 @@ public final 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); - } - public static PsiElement replaceOccurenceWithFieldRef(PsiExpression occurrence, PsiField newField, PsiClass destinationClass) throws IncorrectOperationException { final PsiManager manager = destinationClass.getManager(); diff --git a/java/java-indexing-api/src/com/intellij/psi/search/searches/DirectClassInheritorsSearch.java b/java/java-indexing-api/src/com/intellij/psi/search/searches/DirectClassInheritorsSearch.java index 1e7de78301e3..0b30d6f5867d 100644 --- a/java/java-indexing-api/src/com/intellij/psi/search/searches/DirectClassInheritorsSearch.java +++ b/java/java-indexing-api/src/com/intellij/psi/search/searches/DirectClassInheritorsSearch.java @@ -84,16 +84,4 @@ public final class DirectClassInheritorsSearch extends ExtensibleQueryFactory search(@NotNull SearchParameters parameters) { return INSTANCE.createUniqueResultsQuery(parameters); } - - /** - * @deprecated use {@link #search(PsiClass, SearchScope, boolean)} instead - */ - @NotNull - @Deprecated - public static Query search(@NotNull PsiClass aClass, - @NotNull SearchScope scope, - boolean includeAnonymous, - final boolean checkInheritance) { - return search(aClass, scope, includeAnonymous); - } } diff --git a/java/java-psi-api/src/com/intellij/psi/PsiElementFinder.java b/java/java-psi-api/src/com/intellij/psi/PsiElementFinder.java index 50646888dc2f..b23414dad60f 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiElementFinder.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiElementFinder.java @@ -1,7 +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.psi; -import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.extensions.ProjectExtensionPointName; import com.intellij.openapi.util.Condition; import com.intellij.psi.search.GlobalSearchScope; @@ -25,12 +24,6 @@ import java.util.function.Predicate; public abstract class PsiElementFinder { public static final ProjectExtensionPointName EP = new ProjectExtensionPointName<>("com.intellij.java.elementFinder"); - /** - * @deprecated use {@link #EP} - */ - @Deprecated - public static final ExtensionPointName EP_NAME = new ExtensionPointName<>("com.intellij.java.elementFinder"); - /** * Searches the specified scope within the project for a class with the specified full-qualified * name and returns one if it is found. diff --git a/java/java-psi-api/src/com/intellij/psi/util/PsiConcatenationUtil.java b/java/java-psi-api/src/com/intellij/psi/util/PsiConcatenationUtil.java index 4b9af4a18c1f..85ca39b3f559 100644 --- a/java/java-psi-api/src/com/intellij/psi/util/PsiConcatenationUtil.java +++ b/java/java-psi-api/src/com/intellij/psi/util/PsiConcatenationUtil.java @@ -27,19 +27,6 @@ public final class PsiConcatenationUtil { // externally used - /** - * @deprecated use {@code buildUnescapedFormatString} instead and use either - * {@link StringUtil#escapeStringCharacters(String)} - * or - * {@link PsiLiteralUtil#escapeTextBlockCharacters(String)} - * to escape the resulting string. - */ - @Deprecated - public static void buildFormatString(PsiExpression expression, StringBuilder formatString, - List formatParameters, boolean printfFormat) { - buildFormatString(expression, formatString, formatParameters, printfFormat, true); - } - private static void buildFormatString(PsiExpression expression, StringBuilder formatString, List formatParameters, boolean printfFormat, boolean escape) { if (expression instanceof PsiLiteralExpression) { diff --git a/java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java b/java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java index 3fdb27cf5dc4..8aeb64730d0f 100644 --- a/java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java +++ b/java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java @@ -312,14 +312,6 @@ public final class PsiTypesUtil { } /** - * @deprecated not compliant to specification, use {@link PsiTypesUtil#isDenotableType(PsiType, PsiElement)} instead - */ - @Deprecated - public static boolean isDenotableType(@Nullable PsiType type) { - return !(type instanceof PsiWildcardType || type instanceof PsiCapturedWildcardType); - } - - /** * @param context in which type should be checked * @return false if type is null or has no explicit canonical type representation (e. g. intersection type) */ diff --git a/java/java-psi-impl/src/com/intellij/psi/NonClasspathClassFinder.java b/java/java-psi-impl/src/com/intellij/psi/NonClasspathClassFinder.java index a113fc9fefb5..3dd7b80b455c 100644 --- a/java/java-psi-impl/src/com/intellij/psi/NonClasspathClassFinder.java +++ b/java/java-psi-impl/src/com/intellij/psi/NonClasspathClassFinder.java @@ -78,15 +78,6 @@ public abstract class NonClasspathClassFinder extends PsiElementFinder { return cache; } - /** - * @deprecated use {@link PackageDirectoryCache#createCache(List)} - */ - @NotNull - @Deprecated - protected static PackageDirectoryCache createCache(@NotNull final List roots) { - return PackageDirectoryCache.createCache(roots); - } - public void clearCache() { myCache = null; } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java index 0a855851f299..fa40df177ffe 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java @@ -300,24 +300,6 @@ public final class PsiImplUtil { return null; } - /** @deprecated use {@link AnnotationTargetUtil#findAnnotationTarget(PsiAnnotation, PsiAnnotation.TargetType...)} (to be removed ion IDEA 17) */ - @Deprecated - public static PsiAnnotation.TargetType findApplicableTarget(@NotNull PsiAnnotation annotation, PsiAnnotation.TargetType @NotNull ... types) { - return AnnotationTargetUtil.findAnnotationTarget(annotation, types); - } - - /** @deprecated use {@link AnnotationTargetUtil#findAnnotationTarget(PsiClass, PsiAnnotation.TargetType...)} (to be removed ion IDEA 17) */ - @Deprecated - public static PsiAnnotation.TargetType findApplicableTarget(@NotNull PsiClass annotationType, PsiAnnotation.TargetType @NotNull ... types) { - return AnnotationTargetUtil.findAnnotationTarget(annotationType, types); - } - - /** @deprecated use {@link AnnotationTargetUtil#getTargetsForLocation(PsiAnnotationOwner)} (to be removed ion IDEA 17) */ - @Deprecated - public static PsiAnnotation.TargetType @NotNull [] getTargetsForLocation(@Nullable PsiAnnotationOwner owner) { - return AnnotationTargetUtil.getTargetsForLocation(owner); - } - @Nullable public static ASTNode findDocComment(@NotNull CompositeElement element) { TreeElement node = element.getFirstChildNode(); diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java index 2951ef3b2def..9335780ea849 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java @@ -256,12 +256,6 @@ public class ClsFileImpl extends PsiBinaryFileImpl throw ClsElementImpl.cannotModifyException(this); } - /** @deprecated Shouldn't be called from outside or overridden */ - @Deprecated - public void appendMirrorText(@SuppressWarnings({"unused", "RedundantSuppression"}) int indentLevel, @NotNull StringBuilder buffer) { - appendMirrorText(buffer); - } - private void appendMirrorText(@NotNull StringBuilder buffer) { buffer.append(BANNER); @@ -279,12 +273,6 @@ public class ClsFileImpl extends PsiBinaryFileImpl } } - /** @deprecated Shouldn't be called from outside or overridden */ - @Deprecated - public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException { - setFileMirror(element); - } - private void setFileMirror(@NotNull TreeElement element) { PsiElement mirrorElement = SourceTreeToPsiMap.treeToPsiNotNull(element); if (!(mirrorElement instanceof PsiJavaFile)) { diff --git a/java/openapi/src/com/intellij/unscramble/UnscrambleSupport.java b/java/openapi/src/com/intellij/unscramble/UnscrambleSupport.java index daf49a48ccd0..e7475cb02c0b 100644 --- a/java/openapi/src/com/intellij/unscramble/UnscrambleSupport.java +++ b/java/openapi/src/com/intellij/unscramble/UnscrambleSupport.java @@ -27,9 +27,7 @@ public interface UnscrambleSupport { ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.unscrambleSupport"); @Nullable - default String unscramble(@NotNull Project project, @NotNull String text, @NotNull String logName, @Nullable T settings) { - return unscramble(project, text, logName); - } + String unscramble(@NotNull Project project, @NotNull String text, @NotNull String logName, @Nullable T settings); @NotNull @Contract(pure = true) @@ -39,13 +37,4 @@ public interface UnscrambleSupport { default T createSettingsComponent() { return null; } - - /** - * @deprecated override {@link #unscramble(Project, String, String, JComponent)} instead - */ - @Deprecated - @Nullable - default String unscramble(Project project, String text, String logName) { - return null; - } } \ No newline at end of file diff --git a/java/openapi/src/com/intellij/util/xml/converters/AbstractMethodResolveConverter.java b/java/openapi/src/com/intellij/util/xml/converters/AbstractMethodResolveConverter.java index c94ebbabf969..dc5f3eb3723f 100644 --- a/java/openapi/src/com/intellij/util/xml/converters/AbstractMethodResolveConverter.java +++ b/java/openapi/src/com/intellij/util/xml/converters/AbstractMethodResolveConverter.java @@ -137,7 +137,7 @@ public abstract class AbstractMethodResolveConverter getAdditionalVariants() { + public Set getAdditionalVariants(@NotNull ConvertContext context) { return Collections.singleton(ALL_METHODS); } diff --git a/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java b/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java deleted file mode 100644 index 2ea8fd45ac95..000000000000 --- a/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java +++ /dev/null @@ -1,13 +0,0 @@ -// 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.codeInsight; - -import com.intellij.testFramework.fixtures.BasePlatformTestCase; - -/** - * @deprecated Use {@link JavaCodeInsightTestCase} for Java-dependent tests, - * {@link BasePlatformTestCase} for non-Java-dependent - * tests - */ -@Deprecated -public abstract class CodeInsightTestCase extends JavaCodeInsightTestCase { -} diff --git a/java/testFramework/src/com/intellij/codeInsight/completion/CompletionTestCase.java b/java/testFramework/src/com/intellij/codeInsight/completion/CompletionTestCase.java deleted file mode 100644 index 10381c7908f2..000000000000 --- a/java/testFramework/src/com/intellij/codeInsight/completion/CompletionTestCase.java +++ /dev/null @@ -1,13 +0,0 @@ -// 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.codeInsight.completion; - -import com.intellij.testFramework.fixtures.BasePlatformTestCase; - -/** - * @deprecated Use {@link JavaCompletionTestCase} for Java-dependent completion tests and - * {@link BasePlatformTestCase} for non-Java-dependent - * completion tests - */ -@Deprecated -public abstract class CompletionTestCase extends JavaCompletionTestCase { -} diff --git a/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java b/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java deleted file mode 100644 index 714562eba836..000000000000 --- a/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java +++ /dev/null @@ -1,9 +0,0 @@ -// 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.testFramework; - -/** - * @deprecated name of this class may be confusing, extend {@link JavaProjectTestCase} instead - */ -@Deprecated -public abstract class IdeaTestCase extends JavaProjectTestCase { -} diff --git a/java/testFramework/src/com/intellij/testFramework/InspectionTestCase.java b/java/testFramework/src/com/intellij/testFramework/InspectionTestCase.java deleted file mode 100644 index 18821f141fc1..000000000000 --- a/java/testFramework/src/com/intellij/testFramework/InspectionTestCase.java +++ /dev/null @@ -1,15 +0,0 @@ -// 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.testFramework; - -import com.intellij.testFramework.fixtures.BasePlatformTestCase; - -/** - * NOTE: test was changed to light test in 2019.1 - use dedicated {@link ProjectDescriptor ProjectDescriptor} or - * rollback project setup changes in {@code tearDown()} to avoid side effects. - * - * @deprecated Use {@link JavaInspectionTestCase} for Java-dependent tests, - * {@link BasePlatformTestCase} for non-Java-dependent tests - */ -@Deprecated -public abstract class InspectionTestCase extends JavaInspectionTestCase { -} diff --git a/java/testFramework/src/com/intellij/testFramework/LightCodeInsightTestCase.java b/java/testFramework/src/com/intellij/testFramework/LightCodeInsightTestCase.java deleted file mode 100644 index 9b2eefdeea13..000000000000 --- a/java/testFramework/src/com/intellij/testFramework/LightCodeInsightTestCase.java +++ /dev/null @@ -1,10 +0,0 @@ -// 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.testFramework; - -/** - * @deprecated Use {@link LightJavaCodeInsightTestCase} for Java-dependent tests, - * {@link LightPlatformCodeInsightTestCase} for non-Java-dependent tests - */ -@Deprecated -public abstract class LightCodeInsightTestCase extends LightJavaCodeInsightTestCase { -} diff --git a/java/testFramework/src/com/intellij/testFramework/LightTestMigration.java b/java/testFramework/src/com/intellij/testFramework/LightTestMigration.java index 014137f116f6..9a433c3b2e74 100644 --- a/java/testFramework/src/com/intellij/testFramework/LightTestMigration.java +++ b/java/testFramework/src/com/intellij/testFramework/LightTestMigration.java @@ -128,7 +128,7 @@ class LightTestMigration { String pathText = '/' + relativePath.toString().replace('\\', '/'); if (pathText.startsWith(LightJavaInspectionTestCase.INSPECTION_GADGETS_TEST_DATA_PATH)) { importedClasses.add(LightJavaInspectionTestCase.class); - pathSpec = "LightInspectionTestCase.INSPECTION_GADGETS_TEST_DATA_PATH + \"" + + pathSpec = "LightJavaInspectionTestCase.INSPECTION_GADGETS_TEST_DATA_PATH + \"" + StringUtil.escapeStringCharacters( pathText.substring(LightJavaInspectionTestCase.INSPECTION_GADGETS_TEST_DATA_PATH.length())) + '"'; } diff --git a/java/testFramework/src/com/intellij/testFramework/ModuleTestCase.java b/java/testFramework/src/com/intellij/testFramework/ModuleTestCase.java deleted file mode 100644 index 49eaada363b4..000000000000 --- a/java/testFramework/src/com/intellij/testFramework/ModuleTestCase.java +++ /dev/null @@ -1,12 +0,0 @@ -// 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.testFramework; - -import com.intellij.testFramework.fixtures.BasePlatformTestCase; - -/** - * @deprecated Use {@link JavaModuleTestCase} for Java-dependent tests, - * {@link BasePlatformTestCase} for non-Java-dependent tess - */ -@Deprecated -public abstract class ModuleTestCase extends JavaModuleTestCase { -} diff --git a/java/testFramework/src/com/intellij/testFramework/PsiTestCase.java b/java/testFramework/src/com/intellij/testFramework/PsiTestCase.java deleted file mode 100644 index 47abe536ef75..000000000000 --- a/java/testFramework/src/com/intellij/testFramework/PsiTestCase.java +++ /dev/null @@ -1,12 +0,0 @@ -// 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.testFramework; - -import com.intellij.testFramework.fixtures.BasePlatformTestCase; - -/** - * @deprecated Use {@link JavaPsiTestCase} for Java-dependent tests, - * {@link BasePlatformTestCase} for non-Java-dependent tests - */ -@Deprecated -public abstract class PsiTestCase extends JavaPsiTestCase { -} diff --git a/java/testFramework/src/com/siyeh/ig/LightInspectionTestCase.java b/java/testFramework/src/com/siyeh/ig/LightInspectionTestCase.java deleted file mode 100644 index df694eb5ef8a..000000000000 --- a/java/testFramework/src/com/siyeh/ig/LightInspectionTestCase.java +++ /dev/null @@ -1,12 +0,0 @@ -// 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.siyeh.ig; - -import com.intellij.testFramework.fixtures.BasePlatformTestCase; - -/** - * @deprecated Use {@link LightJavaInspectionTestCase} for Java-dependent tests, - * {@link BasePlatformTestCase} for non-Java-dependent tests - */ -@Deprecated -public abstract class LightInspectionTestCase extends LightJavaInspectionTestCase { -} diff --git a/platform/projectModel-impl/src/com/intellij/project/model/impl/module/content/JpsSourceFolder.java b/platform/projectModel-impl/src/com/intellij/project/model/impl/module/content/JpsSourceFolder.java index 328d83e74ff5..3fbc844c99c1 100644 --- a/platform/projectModel-impl/src/com/intellij/project/model/impl/module/content/JpsSourceFolder.java +++ b/platform/projectModel-impl/src/com/intellij/project/model/impl/module/content/JpsSourceFolder.java @@ -20,7 +20,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jps.model.JpsElement; import org.jetbrains.jps.model.JpsElementFactory; -import org.jetbrains.jps.model.JpsSimpleElement; import org.jetbrains.jps.model.java.JavaSourceRootProperties; import org.jetbrains.jps.model.java.JavaSourceRootType; import org.jetbrains.jps.model.module.JpsModuleSourceRoot; @@ -48,8 +47,8 @@ public class JpsSourceFolder extends JpsContentFolderBase implements SourceFolde @NotNull @Override public String getPackagePrefix() { - final JpsSimpleElement properties = getJavaProperties(); - return properties != null ? properties.getData().getPackagePrefix() : ""; + final @Nullable JavaSourceRootProperties properties = getJavaProperties(); + return properties != null ? properties.getPackagePrefix() : ""; } @Nullable diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/NewExceptionWithoutArgumentsInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/NewExceptionWithoutArgumentsInspection.java index d54b7c752c9f..a58d3cca02c4 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/NewExceptionWithoutArgumentsInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/NewExceptionWithoutArgumentsInspection.java @@ -24,10 +24,6 @@ import org.jetbrains.annotations.NotNull; public class NewExceptionWithoutArgumentsInspection extends BaseInspection { - @Deprecated - @SuppressWarnings("PublicField") - public boolean ignoreWithoutParameters; - @NotNull @Override protected String buildErrorString(Object... infos) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/UnnecessaryLocalVariableInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/UnnecessaryLocalVariableInspection.java index 7bc7275116fa..4cf6f2f45c47 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/UnnecessaryLocalVariableInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/UnnecessaryLocalVariableInspection.java @@ -39,7 +39,7 @@ import static com.intellij.util.ObjectUtils.tryCast; public class UnnecessaryLocalVariableInspection extends BaseInspection { public boolean m_ignoreImmediatelyReturnedVariables; - /** @deprecated unused, left for compatibility */ + /** @deprecated unused, left to avoid modifications in config files */ @Deprecated public boolean m_ignoreAnnotatedVariables; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/HighlightUtils.java b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/HighlightUtils.java index 9ad162288d61..6c6256d19597 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/HighlightUtils.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/HighlightUtils.java @@ -53,14 +53,6 @@ public final class HighlightUtils { highlightElements(elementCollection, InspectionGadgetsBundle.message("press.escape.to.remove.highlighting.message"), editor); } - /** - * @deprecated Intention can be invoked on a non EDT thread with a mock editor, so usages highlighting in the selected editor is incorrect. - * Please use {@link #highlightElement(PsiElement, Editor)} instead. - */ - public static void highlightElement(@NotNull PsiElement element, @NlsContexts.StatusBarText String statusBarText) { - highlightElements(Collections.singleton(element), statusBarText); - } - /** * @deprecated Intention can be invoked on a non EDT thread with a mock editor, so usages highlighting in the selected editor is incorrect. * Please use {@link #highlightElements(Collection, Editor)} instead. diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/psiutils/HighlightUtil.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/psiutils/HighlightUtil.java deleted file mode 100644 index 115a472f41cd..000000000000 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/psiutils/HighlightUtil.java +++ /dev/null @@ -1,21 +0,0 @@ -// 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.siyeh.ipp.psiutils; - -import com.intellij.openapi.util.NlsContexts; -import com.intellij.psi.PsiElement; -import com.siyeh.ig.psiutils.HighlightUtils; -import org.jetbrains.annotations.NotNull; - -public final class HighlightUtil { - - private HighlightUtil() {} - - /** - * Used in an external plugin "Parameter Formatter Plugin 1.1". - * @deprecated Use {@link HighlightUtils#highlightElement(PsiElement, String)} instead - */ - @Deprecated - public static void highlightElement(@NotNull PsiElement element, @NotNull final @NlsContexts.StatusBarText String statusBarText) { - HighlightUtils.highlightElement(element, statusBarText); - } -} \ No newline at end of file diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/untypedUnresolvedAccess/requests/CreateExecutableFromGroovyUsageRequest.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/untypedUnresolvedAccess/requests/CreateExecutableFromGroovyUsageRequest.kt index 1b60800eb2b6..1230f40f67d2 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/untypedUnresolvedAccess/requests/CreateExecutableFromGroovyUsageRequest.kt +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/untypedUnresolvedAccess/requests/CreateExecutableFromGroovyUsageRequest.kt @@ -72,8 +72,6 @@ internal abstract class CreateExecutableFromGroovyUsageRequest( return if (resolved is GrAnonymousClassDefinition) resolved.baseClassType else type } - override fun getParameters() = getParameters(expectedParameters, project) - private class ParametersNameSupplier(suggested: List>>) { private val namesCount = suggested diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java index 57bae44ca217..7837939efab2 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java @@ -25,17 +25,6 @@ public class BaseDecompiler { engine.addLibrary(library); } - /** @deprecated use {@link #addSource(File)} / {@link #addLibrary(File)} instead */ - @Deprecated - public void addSpace(File file, boolean own) { - if (own) { - addSource(file); - } - else { - addLibrary(file); - } - } - public void decompileContext() { try { engine.decompileContext(); diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReferenceQuickFixProvider.kt b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReferenceQuickFixProvider.kt index 01f0217fb803..65bbad4d58f2 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReferenceQuickFixProvider.kt +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReferenceQuickFixProvider.kt @@ -10,7 +10,6 @@ import com.intellij.psi.PsiModifier import com.intellij.psi.PsiSubstitutor import com.intellij.psi.PsiType import com.intellij.psi.codeStyle.JavaCodeStyleSettings -import com.intellij.psi.codeStyle.SuggestedNameInfo import com.intellij.psi.util.createSmartPointer import com.intellij.psi.xml.XmlAttribute import com.intellij.psi.xml.XmlAttributeValue @@ -55,8 +54,6 @@ class CreateEventHandlerRequest(element: XmlAttributeValue) : CreateMethodReques return listOf(parameter) } - override fun getParameters(): List>> = getParameters(expectedParameters, myProject) - override fun getModifiers(): Set = setOf(myVisibility) override fun getAnnotations(): List = if (myVisibility != JvmModifier.PUBLIC) {