Cleanup (deprecated API; typos; formatting)

GitOrigin-RevId: 3a6f460ba5163f9d4049c47daa238ba7aefc0762
This commit is contained in:
Roman Shevchenko
2019-09-17 20:32:28 +00:00
committed by intellij-monorepo-bot
parent 725cfc7145
commit fb6dc94e3e
9 changed files with 34 additions and 136 deletions
@@ -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() { }
@@ -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 { }
@@ -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
@@ -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;
@@ -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);
}
@@ -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) {
@@ -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);
@@ -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<T extends PsiClass> extends PsiMemberStub<T> {
@Nullable
String getQualifiedName();
@Nullable String getQualifiedName();
@Nullable
String getBaseClassReferenceText();
@Nullable String getBaseClassReferenceText();
boolean isInterface();
@@ -43,13 +26,10 @@ public interface PsiClassStub<T extends PsiClass> extends PsiMemberStub<T> {
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();
}
@@ -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<PsiJavaFile> {
PsiJavaModule getModule();
@@ -34,8 +19,8 @@ public interface PsiJavaFileStub extends PsiClassHolderFileStub<PsiJavaFile> {
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);
}