diff --git a/java/execution/openapi/src/com/intellij/execution/configurations/CommandLineBuilder.java b/java/execution/openapi/src/com/intellij/execution/configurations/CommandLineBuilder.java index 78552cd628c4..57c4934024e8 100644 --- a/java/execution/openapi/src/com/intellij/execution/configurations/CommandLineBuilder.java +++ b/java/execution/openapi/src/com/intellij/execution/configurations/CommandLineBuilder.java @@ -1,31 +1,14 @@ -/* - * 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. - */ - -/* - * @author max - */ +// 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.execution.configurations; import com.intellij.execution.CantRunException; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.ApiStatus; -/** @deprecated use {@link SimpleJavaParameters#toCommandLine()} (to be removed in IDEA 2019) */ -@ApiStatus.ScheduledForRemoval(inVersion = "2019") +/** @deprecated use {@link SimpleJavaParameters#toCommandLine()} */ @Deprecated +@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") +@SuppressWarnings("unused") public class CommandLineBuilder { private CommandLineBuilder() { } diff --git a/java/java-analysis-api/src/com/intellij/codeInspection/BaseJavaBatchLocalInspectionTool.java b/java/java-analysis-api/src/com/intellij/codeInspection/BaseJavaBatchLocalInspectionTool.java index 46e68a1beb44..d8261132b0d9 100644 --- a/java/java-analysis-api/src/com/intellij/codeInspection/BaseJavaBatchLocalInspectionTool.java +++ b/java/java-analysis-api/src/com/intellij/codeInspection/BaseJavaBatchLocalInspectionTool.java @@ -1,11 +1,9 @@ -// 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. +// 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.codeInspection; import org.jetbrains.annotations.ApiStatus; -/** - * @deprecated superfluous, extend {@link AbstractBaseJavaLocalInspectionTool} instead (to be removed in IDEA 2019). - */ -@ApiStatus.ScheduledForRemoval(inVersion = "2019") +/** @deprecated superfluous, extend {@link AbstractBaseJavaLocalInspectionTool} instead */ @Deprecated +@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") public abstract class BaseJavaBatchLocalInspectionTool extends AbstractBaseJavaLocalInspectionTool { } \ No newline at end of file diff --git a/java/java-analysis-api/src/com/intellij/codeInspection/BaseJavaLocalInspectionTool.java b/java/java-analysis-api/src/com/intellij/codeInspection/BaseJavaLocalInspectionTool.java index bafad43159e4..894a7e458ee8 100644 --- a/java/java-analysis-api/src/com/intellij/codeInspection/BaseJavaLocalInspectionTool.java +++ b/java/java-analysis-api/src/com/intellij/codeInspection/BaseJavaLocalInspectionTool.java @@ -1,4 +1,4 @@ -// 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. +// 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.codeInspection; import com.intellij.codeInsight.daemon.HighlightDisplayKey; @@ -6,12 +6,9 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; -/** - * @deprecated superfluous, extend {@link AbstractBaseJavaLocalInspectionTool} / {@link CustomSuppressableInspectionTool} instead - * (to be removed in IDEA 2019). - */ -@ApiStatus.ScheduledForRemoval(inVersion = "2019") +/** @deprecated superfluous, extend {@link AbstractBaseJavaLocalInspectionTool} / {@link CustomSuppressableInspectionTool} */ @Deprecated +@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") public abstract class BaseJavaLocalInspectionTool extends AbstractBaseJavaLocalInspectionTool implements CustomSuppressableInspectionTool { @NotNull @Override diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/compiler/RemoveElementQuickFix.java b/java/java-analysis-impl/src/com/intellij/codeInspection/compiler/RemoveElementQuickFix.java index d1aabce64ceb..f202bfa86aa6 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/compiler/RemoveElementQuickFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/compiler/RemoveElementQuickFix.java @@ -1,18 +1,4 @@ -/* - * Copyright 2000-2017 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. - */ +// 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.codeInspection.compiler; import com.intellij.codeInspection.LocalQuickFix; @@ -23,9 +9,9 @@ import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; -/** @deprecated use {@link com.intellij.codeInsight.intention.QuickFixFactory#createDeleteFix} (to be removed in IDEA 2018) */ -@ApiStatus.ScheduledForRemoval(inVersion = "2018") +/** @deprecated use {@link com.intellij.codeInsight.intention.QuickFixFactory#createDeleteFix} */ @Deprecated +@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") public class RemoveElementQuickFix implements LocalQuickFix { private final String myName; diff --git a/java/java-psi-api/src/com/intellij/psi/PsiType.java b/java/java-psi-api/src/com/intellij/psi/PsiType.java index c7409ddd4b52..0c246203f2ce 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiType.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiType.java @@ -1,4 +1,4 @@ -// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.psi; import com.intellij.lang.jvm.types.JvmPrimitiveTypeKind; @@ -73,10 +73,10 @@ public abstract class PsiType implements PsiAnnotationOwner, Cloneable, JvmType return new PsiArrayType(this); } - /** @deprecated use {@link #annotate(TypeAnnotationProvider)} (to be removed in IDEA 18) */ + /** @deprecated use {@link #annotate(TypeAnnotationProvider)} */ @Deprecated @NotNull - @ApiStatus.ScheduledForRemoval(inVersion = "2018") + @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") public PsiArrayType createArrayType(@NotNull PsiAnnotation... annotations) { return new PsiArrayType(this, annotations); } diff --git a/java/java-psi-api/src/com/intellij/psi/PsiWildcardType.java b/java/java-psi-api/src/com/intellij/psi/PsiWildcardType.java index 49971d48c635..9f5b963ca431 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiWildcardType.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiWildcardType.java @@ -1,18 +1,4 @@ -/* - * Copyright 2000-2017 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. - */ +// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.psi; import com.intellij.lang.jvm.types.JvmType; @@ -21,7 +7,6 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Key; import com.intellij.psi.search.GlobalSearchScope; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -48,13 +33,6 @@ public class PsiWildcardType extends PsiType.Stub implements JvmWildcardType { myBound = bound; } - private PsiWildcardType(@NotNull PsiWildcardType type, @NotNull TypeAnnotationProvider provider) { - super(provider); - myManager = type.myManager; - myIsExtending = type.myIsExtending; - myBound = type.myBound; - } - @NotNull public static PsiWildcardType createUnbounded(@NotNull PsiManager manager) { PsiWildcardType unboundedWildcard = manager.getUserData(UNBOUNDED_WILDCARD); @@ -77,15 +55,6 @@ public class PsiWildcardType extends PsiType.Stub implements JvmWildcardType { return new PsiWildcardType(manager, false, bound); } - /** - * @deprecated use {@link #annotate(TypeAnnotationProvider)} (to be removed in IDEA 18) - */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2018") - public PsiWildcardType annotate(@NotNull final PsiAnnotation[] annotations) { - return annotations.length == 0 ? this : new PsiWildcardType(this, TypeAnnotationProvider.Static.create(annotations)); - } - @NotNull @Override public String getPresentableText(boolean annotated) { diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsCustomNavigationPolicyEx.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsCustomNavigationPolicyEx.java index ac9ea0fdac38..04cbee162e24 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsCustomNavigationPolicyEx.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsCustomNavigationPolicyEx.java @@ -1,4 +1,4 @@ -// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.psi.impl.compiled; import com.intellij.psi.PsiFile; @@ -7,8 +7,8 @@ import org.jetbrains.annotations.NotNull; /** @deprecated use {@link ClsCustomNavigationPolicy} directly */ @Deprecated +@ApiStatus.ScheduledForRemoval(inVersion = "2021.3") @SuppressWarnings("DeprecatedIsStillUsed") -@ApiStatus.ScheduledForRemoval(inVersion = "2019") public abstract class ClsCustomNavigationPolicyEx implements ClsCustomNavigationPolicy { public PsiFile getFileNavigationElement(@NotNull ClsFileImpl file) { return (PsiFile)getNavigationElement(file); diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiClassStub.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiClassStub.java index d6ca62729924..7ee5a29e0f1e 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiClassStub.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiClassStub.java @@ -1,22 +1,4 @@ -/* - * 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. - */ - -/* - * @author max - */ +// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.psi.impl.java.stubs; import com.intellij.pom.java.LanguageLevel; @@ -24,12 +6,13 @@ import com.intellij.psi.PsiClass; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; +/** + * @author max + */ public interface PsiClassStub extends PsiMemberStub { - @Nullable - String getQualifiedName(); + @Nullable String getQualifiedName(); - @Nullable - String getBaseClassReferenceText(); + @Nullable String getBaseClassReferenceText(); boolean isInterface(); @@ -43,13 +26,10 @@ public interface PsiClassStub extends PsiMemberStub { boolean isAnnotationType(); - @Nullable - String getSourceFileName(); + @Nullable String getSourceFileName(); - /** - * @deprecated use {@link PsiJavaFileStub#getLanguageLevel()} (to be removed in IDEA 18) - */ + /** @deprecated use {@link PsiJavaFileStub#getLanguageLevel()} */ @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2018") + @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") LanguageLevel getLanguageLevel(); } \ No newline at end of file diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiJavaFileStub.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiJavaFileStub.java index b6da33c3f480..b91e9ab1d764 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiJavaFileStub.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiJavaFileStub.java @@ -1,22 +1,4 @@ -/* - * 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. - */ - -/* - * @author max - */ +// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.psi.impl.java.stubs; import com.intellij.pom.java.LanguageLevel; @@ -25,6 +7,9 @@ import com.intellij.psi.PsiJavaModule; import com.intellij.psi.stubs.PsiClassHolderFileStub; import org.jetbrains.annotations.ApiStatus; +/** + * @author max + */ public interface PsiJavaFileStub extends PsiClassHolderFileStub { PsiJavaModule getModule(); @@ -34,8 +19,8 @@ public interface PsiJavaFileStub extends PsiClassHolderFileStub { StubPsiFactory getPsiFactory(); - /** @deprecated override {@link #getPsiFactory()} instead (to be removed in IDEA 18) */ + /** @deprecated override {@link #getPsiFactory()} instead */ @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2018") + @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") void setPsiFactory(StubPsiFactory factory); } \ No newline at end of file