diff --git a/java/compiler/openapi/src/com/intellij/openapi/compiler/IntermediateOutputCompiler.java b/java/compiler/openapi/src/com/intellij/openapi/compiler/IntermediateOutputCompiler.java deleted file mode 100644 index 86caf649d6ac..000000000000 --- a/java/compiler/openapi/src/com/intellij/openapi/compiler/IntermediateOutputCompiler.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.openapi.compiler; - -/** - * @deprecated this interface is part of the obsolete build system which runs as part of the IDE process. Since IDEA 15 implementations of - * this class aren't used by the IDE, you should integrate into 'external build system' instead - * (http://www.jetbrains.org/intellij/sdk/docs/reference_guide/frameworks_and_external_apis/external_builder_api.html). - */ -@Deprecated(forRemoval = true) -public interface IntermediateOutputCompiler extends Compiler{ -} diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/EvaluationContextImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/EvaluationContextImpl.java index 41a34dc708f1..543b9b051f55 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/EvaluationContextImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/EvaluationContextImpl.java @@ -47,19 +47,6 @@ public final class EvaluationContextImpl implements EvaluationContext { this(suspendContext, frameProxy, () -> frameProxy != null ? frameProxy.thisObject() : null); } - @Nullable - @Override - @Deprecated - public Value getThisObject() { - try { - return computeThisObject(); - } - catch (EvaluateException e) { - LOG.info(e); - } - return null; - } - @Nullable @Override public Value computeThisObject() throws EvaluateException { diff --git a/java/debugger/openapi/src/com/intellij/debugger/NoDataException.java b/java/debugger/openapi/src/com/intellij/debugger/NoDataException.java index 9d8045013c1a..7c1b8014caa2 100644 --- a/java/debugger/openapi/src/com/intellij/debugger/NoDataException.java +++ b/java/debugger/openapi/src/com/intellij/debugger/NoDataException.java @@ -6,9 +6,7 @@ import com.intellij.openapi.diagnostic.ControlFlowException; public class NoDataException extends Exception implements ControlFlowException { public static final NoDataException INSTANCE = new NoDataException(); - /** @deprecated Use shared {@link NoDataException#INSTANCE} instead */ - @Deprecated(forRemoval = true) - public NoDataException() { } + private NoDataException() { } @Override public synchronized Throwable fillInStackTrace() { diff --git a/java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/EvaluationContext.java b/java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/EvaluationContext.java index d379602c6ec9..f7b3c232ea9f 100644 --- a/java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/EvaluationContext.java +++ b/java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/EvaluationContext.java @@ -26,13 +26,6 @@ public interface EvaluationContext extends StackFrameContext { @Nullable ClassLoaderReference getClassLoader() throws EvaluateException; - /** - * @deprecated Use {@link #computeThisObject()} instead, EvaluationContext now may lazily compute this object - */ - @Deprecated(forRemoval = true) - @Nullable - Value getThisObject(); - @Nullable Value computeThisObject() throws EvaluateException; diff --git a/java/execution/impl/src/com/intellij/execution/testframework/AbstractInClassConfigurationProducer.java b/java/execution/impl/src/com/intellij/execution/testframework/AbstractInClassConfigurationProducer.java index c00ca7914970..bbdaa7a80070 100644 --- a/java/execution/impl/src/com/intellij/execution/testframework/AbstractInClassConfigurationProducer.java +++ b/java/execution/impl/src/com/intellij/execution/testframework/AbstractInClassConfigurationProducer.java @@ -8,7 +8,6 @@ import com.intellij.execution.PsiLocation; import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.actions.ConfigurationContext; import com.intellij.execution.actions.ConfigurationFromContext; -import com.intellij.execution.configurations.ConfigurationType; import com.intellij.execution.junit.InheritorChooser; import com.intellij.execution.junit2.PsiMemberParameterizedLocation; import com.intellij.execution.junit2.info.MethodLocation; @@ -40,14 +39,6 @@ import static com.siyeh.ig.junit.JUnitCommonClassNames.SOURCE_ANNOTATIONS; public abstract class AbstractInClassConfigurationProducer extends AbstractJavaTestConfigurationProducer { private static final Logger LOG = Logger.getInstance(AbstractInClassConfigurationProducer.class); - /** - * @deprecated Override {@link #getConfigurationFactory()}. - */ - @Deprecated(forRemoval = true) - protected AbstractInClassConfigurationProducer(ConfigurationType configurationType) { - super(configurationType); - } - protected AbstractInClassConfigurationProducer() { } diff --git a/java/execution/impl/src/com/intellij/execution/testframework/AbstractJavaTestConfigurationProducer.java b/java/execution/impl/src/com/intellij/execution/testframework/AbstractJavaTestConfigurationProducer.java index 7105cd7014a0..5008c3e62b30 100644 --- a/java/execution/impl/src/com/intellij/execution/testframework/AbstractJavaTestConfigurationProducer.java +++ b/java/execution/impl/src/com/intellij/execution/testframework/AbstractJavaTestConfigurationProducer.java @@ -37,14 +37,6 @@ import org.jetbrains.annotations.Nullable; import java.util.*; public abstract class AbstractJavaTestConfigurationProducer extends JavaRunConfigurationProducerBase { - /** - * @deprecated Override {@link #getConfigurationFactory()}. - */ - @Deprecated(forRemoval = true) - protected AbstractJavaTestConfigurationProducer(ConfigurationType configurationType) { - super(configurationType); - } - protected AbstractJavaTestConfigurationProducer() { } diff --git a/java/idea-ui/src/com/intellij/framework/library/DownloadableLibraryType.java b/java/idea-ui/src/com/intellij/framework/library/DownloadableLibraryType.java index afbdc0910e83..d5c555b036cd 100644 --- a/java/idea-ui/src/com/intellij/framework/library/DownloadableLibraryType.java +++ b/java/idea-ui/src/com/intellij/framework/library/DownloadableLibraryType.java @@ -34,18 +34,6 @@ public abstract class DownloadableLibraryType extends LibraryType myLibraryCategoryName; private final DownloadableLibraryDescription myLibraryDescription; - /** - * @deprecated The constructor is meant to maintain the binary compatibility with external plugins. - * Please use the constructors with a messagePointer for {@link DownloadableLibraryType#myLibraryCategoryName} - */ - @Deprecated(forRemoval = true) - protected DownloadableLibraryType(@NotNull @Nls(capitalization = Nls.Capitalization.Title) String libraryCategoryName, - @NotNull String libraryTypeId, - @NotNull String groupId, - URL @NotNull ... localUrls) { - this(() -> libraryCategoryName, libraryTypeId, groupId, localUrls); - } - /** * Creates instance of library type. You also must override {@link #getLibraryTypeIcon()} method and return non-null value * from it. diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java index b9c62bb790c1..d9e0cd1e1c16 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java @@ -15,7 +15,6 @@ import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.project.DumbAware; -import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ui.configuration.ProjectStructureConfigurable; import com.intellij.openapi.roots.ui.configuration.projectRoot.daemon.FacetProjectStructureElement; import com.intellij.openapi.roots.ui.configuration.projectRoot.daemon.ProjectStructureElement; @@ -48,14 +47,6 @@ public class FacetStructureConfigurable extends BaseStructureConfigurable { return "FacetStructureConfigurable.UI"; } - /** - * @deprecated use {@link ProjectStructureConfigurable#getFacetStructureConfigurable()} instead - */ - @Deprecated(forRemoval = true) - public static FacetStructureConfigurable getInstance(final @NotNull Project project) { - return ProjectStructureConfigurable.getInstance(project).getFacetStructureConfigurable(); - } - public boolean isVisible() { return FacetTypeRegistry.getInstance().getFacetTypes().length > 0 || !InvalidFacetManager.getInstance(myProject).getInvalidFacets().isEmpty(); } diff --git a/java/idea-ui/testSrc/com/intellij/openapi/roots/ui/configuration/projectRoot/CloneOrderEntriesTest.kt b/java/idea-ui/testSrc/com/intellij/openapi/roots/ui/configuration/projectRoot/CloneOrderEntriesTest.kt index de88c147ee4d..cbebe6f79051 100644 --- a/java/idea-ui/testSrc/com/intellij/openapi/roots/ui/configuration/projectRoot/CloneOrderEntriesTest.kt +++ b/java/idea-ui/testSrc/com/intellij/openapi/roots/ui/configuration/projectRoot/CloneOrderEntriesTest.kt @@ -11,8 +11,6 @@ import junit.framework.TestCase import org.assertj.core.api.Assertions.assertThat class CloneOrderEntriesTest : JavaModuleTestCase() { - override fun isRunInWriteAction(): Boolean = true - fun `test copied jdk and module source`() { WriteAction.run { val copyToModifiableModel = ModuleRootManager.getInstance(createModule("Copy To Module")).modifiableModel diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java b/java/java-impl-refactorings/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java index a5dec16c0ac8..350d699a086d 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java @@ -203,16 +203,6 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase { } } - /** - * @deprecated use CommonJavaRefactoringUtil.collectExpressions - */ - @Deprecated(forRemoval = true) - public static List collectExpressions(final PsiFile file, - final Editor editor, - final int offset) { - return CommonJavaRefactoringUtil.collectExpressions(file, editor, offset); - } - private boolean invoke(final Project project, final Editor editor, PsiFile file, int startOffset, int endOffset) { FeatureUsageTracker.getInstance().triggerFeatureUsed(ProductivityFeatureNames.REFACTORING_INTRODUCE_VARIABLE); PsiDocumentManager.getInstance(project).commitAllDocuments(); diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaReferenceImporter.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaReferenceImporter.java index 8ffac48844ee..faa873dc1a56 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaReferenceImporter.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaReferenceImporter.java @@ -12,7 +12,6 @@ import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiJavaCodeReferenceElement; -import com.intellij.util.concurrency.ThreadingAssertions; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -20,15 +19,6 @@ import java.util.function.BooleanSupplier; public class JavaReferenceImporter implements ReferenceImporter { - /** - * @deprecated use {@link JavaReferenceImporter#computeAutoImportAtOffset(Editor, PsiFile, int, boolean)} - */ - @Deprecated(forRemoval = true) - public static boolean autoImportReferenceAtCursor(@NotNull Editor editor, @NotNull PsiFile file, boolean allowCaretNearRef) { - ThreadingAssertions.assertEventDispatchThread(); - return new JavaReferenceImporter().autoImportReferenceAtCursor(editor, file); - } - @Override public BooleanSupplier computeAutoImportAtOffset(@NotNull Editor editor, @NotNull PsiFile file, int offset, boolean allowCaretNearReference) { ApplicationManager.getApplication().assertIsNonDispatchThread(); 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 900a36182b96..f5e519b62703 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 @@ -71,15 +71,6 @@ public final class MethodReferencesSearch extends ExtensibleQueryFactory