MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

removed deprecated unused members

Browse Source
This commit is contained in:
Alexey Kudravtsev
2018-06-18 13:24:29 +03:00
parent 2faaf16e26
commit 64a465df12
89 changed files with 37 additions and 1502 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/CompilerManagerImpl.java
+1 -9
View File
@@ -172,9 +172,8 @@ public class CompilerManagerImpl extends CompilerManager {
return getCompilers(compilerClass, CompilerFilter.ALL);
}
@Override
@NotNull
public <T extends Compiler> T[] getCompilers(@NotNull Class<T> compilerClass, CompilerFilter filter) {
private <T extends Compiler> T[] getCompilers(@NotNull Class<T> compilerClass, CompilerFilter filter) {
final List<T> compilers = new ArrayList<>(myCompilers.size());
for (final Compiler item : myCompilers) {
if (compilerClass.isAssignableFrom(item.getClass()) && filter.acceptCompiler(item)) {
@@ -272,13 +271,6 @@ public class CompilerManagerImpl extends CompilerManager {
new CompileDriver(myProject).make(scope, true, new ListenerNotificator(callback));
}
@Override
public void make(@NotNull CompileScope scope, CompilerFilter filter, @Nullable CompileStatusNotification callback) {
final CompileDriver compileDriver = new CompileDriver(myProject);
compileDriver.setCompilerFilter(filter);
compileDriver.make(scope, new ListenerNotificator(callback));
}
@Override
public boolean isUpToDate(@NotNull final CompileScope scope) {
return new CompileDriver(myProject).isUpToDate(scope);
java/compiler/openapi/src/com/intellij/openapi/compiler/CompilerManager.java
+1 -11
View File
@@ -75,6 +75,7 @@ public abstract class CompilerManager {
* integrate into 'external build system' instead (https://confluence.jetbrains.com/display/IDEADEV/External+Builder+API+and+Plugins).
* Since IDEA 13 users cannot switch to the old build system via UI and it will be completely removed in IDEA 14.
*/
@Deprecated
public abstract void addTranslatingCompiler(@NotNull TranslatingCompiler compiler, Set<FileType> inputTypes, Set<FileType> outputTypes);
/**
@@ -93,12 +94,6 @@ public abstract class CompilerManager {
@NotNull
public abstract <T extends Compiler> T[] getCompilers(@NotNull Class<T> compilerClass);
/**
* @deprecated use {@link #getCompilers(Class)} instead
*/
@NotNull
public abstract <T extends Compiler> T[] getCompilers(@NotNull Class<T> compilerClass, CompilerFilter filter);
/**
* Registers the type as a compilable type so that Compile action will be enabled on files of this type.
*
@@ -220,11 +215,6 @@ public abstract class CompilerManager {
*/
public abstract void makeWithModalProgress(@NotNull CompileScope scope, @Nullable CompileStatusNotification callback);
/**
* @deprecated use {@link #make(CompileScope, CompileStatusNotification)} instead
*/
public abstract void make(@NotNull CompileScope scope, CompilerFilter filter, @Nullable CompileStatusNotification callback);
/**
* Checks if compile scope given is up-to-date
* @param scope
java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectWizardStepFactoryImpl.java
-37
View File
@@ -17,19 +17,14 @@ package com.intellij.ide.util.projectWizard;
import com.intellij.ide.util.newProjectWizard.AbstractProjectWizard;
import com.intellij.ide.util.newProjectWizard.SourcePathsStep;
import com.intellij.ide.util.newProjectWizard.SupportForFrameworksStep;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.projectRoots.SdkType;
import com.intellij.openapi.projectRoots.SdkTypeId;
import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
import com.intellij.openapi.roots.ui.configuration.projectRoot.LibrariesContainer;
import com.intellij.openapi.roots.ui.configuration.projectRoot.LibrariesContainerFactory;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.Key;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
@@ -43,25 +38,10 @@ public class ProjectWizardStepFactoryImpl extends ProjectWizardStepFactory {
return new ProjectNameStep(wizardContext);
}
public ModuleWizardStep createSourcePathsStep(ModuleWizardStep nameAndLocationStep, SourcePathsBuilder builder, Icon icon, String helpId) {
return null;
}
public ModuleWizardStep createSourcePathsStep(final WizardContext context, final SourcePathsBuilder builder, final Icon icon, @NonNls final String helpId) {
return new SourcePathsStep(builder, icon, helpId);
}
/**
* @deprecated
*/
public ModuleWizardStep createProjectJdkStep(WizardContext context,
final JavaModuleBuilder builder,
final Computable<Boolean> isVisible,
final Icon icon,
final String helpId) {
return createProjectJdkStep(context, null, builder, isVisible, icon, helpId);
}
public ModuleWizardStep createProjectJdkStep(WizardContext context,
SdkType type,
final JavaModuleBuilder builder,
@@ -110,23 +90,6 @@ public class ProjectWizardStepFactoryImpl extends ProjectWizardStepFactory {
return projectSdkStep;
}
@Nullable
@Override
public Sdk getNewProjectSdk(WizardContext wizardContext) {
return AbstractProjectWizard.getNewProjectJdk(wizardContext);
}
@Override
public ModuleWizardStep createSupportForFrameworksStep(WizardContext wizardContext, ModuleBuilder moduleBuilder) {
return createSupportForFrameworksStep(wizardContext, moduleBuilder, ModulesProvider.EMPTY_MODULES_PROVIDER);
}
@Override
public ModuleWizardStep createSupportForFrameworksStep(@NotNull WizardContext context, @NotNull ModuleBuilder builder, @NotNull ModulesProvider modulesProvider) {
final LibrariesContainer container = LibrariesContainerFactory.createContainer(context, modulesProvider);
return new SupportForFrameworksStep(context, builder, container);
}
@Override
public ModuleWizardStep createJavaSettingsStep(@NotNull SettingsStep settingsStep, @NotNull ModuleBuilder moduleBuilder, @NotNull Condition<SdkTypeId> sdkFilter) {
return new JavaSettingsStep(settingsStep, moduleBuilder, sdkFilter);
java/java-impl/src/com/intellij/codeInsight/hint/api/impls/AnnotationParameterInfoHandler.java
-15
View File
@@ -35,11 +35,6 @@ public class AnnotationParameterInfoHandler implements ParameterInfoHandler<PsiA
return null;
}
@Override
public Object[] getParametersForDocumentation(final PsiAnnotationMethod p, final ParameterInfoContext context) {
return new Object[] {p};
}
@Override
public boolean couldShowInLookup() {
return false;
@@ -99,16 +94,6 @@ public class AnnotationParameterInfoHandler implements ParameterInfoHandler<PsiA
context.setHighlightedParameter(findAnnotationMethod(context.getFile(), offset1));
}
@Override
public String getParameterCloseChars() {
return ParameterInfoUtils.DEFAULT_PARAMETER_CLOSE_CHARS;
}
@Override
public boolean tracksParameterIndex() {
return true;
}
@Override
public void updateUI(final PsiAnnotationMethod p, @NotNull final ParameterInfoUIContext context) {
updateUIText(p, context);
java/java-impl/src/com/intellij/codeInsight/hint/api/impls/ReferenceParameterInfoHandler.java
-17
View File
@@ -19,7 +19,6 @@ import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.lang.parameterInfo.*;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.util.Function;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -34,11 +33,6 @@ public class ReferenceParameterInfoHandler implements ParameterInfoHandler<PsiRe
return null;
}
@Override
public Object[] getParametersForDocumentation(final PsiTypeParameter p, final ParameterInfoContext context) {
return new Object[] {p};
}
@Override
public boolean couldShowInLookup() {
return false;
@@ -83,17 +77,6 @@ public class ReferenceParameterInfoHandler implements ParameterInfoHandler<PsiRe
context.setHighlightedParameter(index < objectsToView.length && index >= 0 ? (PsiElement)objectsToView[index]:null);
}
@Override
@NotNull
public String getParameterCloseChars() {
return ",>";
}
@Override
public boolean tracksParameterIndex() {
return true;
}
@Override
public void updateUI(PsiTypeParameter o, @NotNull ParameterInfoUIContext context) {
updateTypeParameter(o, context);
java/java-impl/src/com/intellij/ide/util/PackageUtil.java
-16
View File
@@ -86,19 +86,6 @@ public class PackageUtil {
String packageName,
PsiDirectory baseDir,
boolean askUserToCreate) throws IncorrectOperationException {
return findOrCreateDirectoryForPackage(project, packageName, baseDir, askUserToCreate, false);
}
/**
* @deprecated
*/
@Deprecated
@Nullable
public static PsiDirectory findOrCreateDirectoryForPackage(Project project,
String packageName,
PsiDirectory baseDir,
boolean askUserToCreate, boolean filterSourceDirsForTestBaseDir) throws IncorrectOperationException {
PsiDirectory psiDirectory = null;
if (!"".equals(packageName)) {
@@ -111,9 +98,6 @@ public class PackageUtil {
postfixToShow = File.separatorChar + postfixToShow;
}
PsiDirectory[] directories = rootPackage.getDirectories();
if (filterSourceDirsForTestBaseDir) {
directories = filterSourceDirectories(baseDir, project, directories);
}
psiDirectory = DirectoryChooserUtil.selectDirectory(project, directories, baseDir, postfixToShow);
if (psiDirectory == null) return null;
}
java/java-impl/src/com/intellij/testIntegration/JavaTestFinder.java
-7
View File
@@ -63,13 +63,6 @@ public class JavaTestFinder implements TestFinder {
return TestFinderHelper.getSortedElements(classesWithWeights, false);
}
/**
* @deprecated {@link JavaTestFinder#getSearchScope(com.intellij.psi.PsiElement, boolean)}
*/
protected GlobalSearchScope getSearchScope(PsiElement element) {
return getSearchScope(element, true);
}
protected GlobalSearchScope getSearchScope(PsiElement element, boolean dependencies) {
final Module module = getModule(element);
if (module != null) {
java/java-psi-api/src/com/intellij/codeInsight/AnnotationUtil.java
-10
View File
@@ -667,16 +667,6 @@ public class AnnotationUtil {
return isAnnotated(listOwner, annotationFQN, flags(checkHierarchy, skipExternal, skipExternal));
}
/** @deprecated use {@link #isAnnotated(PsiModifierListOwner, String, int)} (to be removed in IDEA 2019) */
@Deprecated
public static boolean isAnnotated(@NotNull PsiModifierListOwner listOwner,
@NotNull String annotationFQN,
boolean checkHierarchy,
boolean skipExternal,
boolean skipInferred) {
return isAnnotated(listOwner, annotationFQN, flags(checkHierarchy, skipExternal, skipInferred));
}
private static @Flags int flags(boolean checkHierarchy, boolean skipExternal, boolean skipInferred) {
int flags = CHECK_TYPE;
if (checkHierarchy) flags |= CHECK_HIERARCHY;
java/java-psi-api/src/com/intellij/psi/CommonReferenceProviderTypes.java
-9
View File
@@ -16,21 +16,12 @@
package com.intellij.psi;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.project.Project;
/**
* @author peter
*/
public abstract class CommonReferenceProviderTypes {
/**
* @deprecated
* @see #getInstance()
*/
public static CommonReferenceProviderTypes getInstance(final Project project) {
return getInstance();
}
public static CommonReferenceProviderTypes getInstance() {
return ServiceManager.getService(CommonReferenceProviderTypes.class);
}
java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsParsingUtil.java
-6
View File
@@ -175,10 +175,4 @@ public class ClsParsingUtil {
}
return null;
}
/** @deprecated use {@link #getJdkVersionByBytecode(int)} (to be removed in IDEA 2019) */
public static LanguageLevel getLanguageLevelByVersion(int major) {
JavaSdkVersion sdkVersion = getJdkVersionByBytecode(major);
return sdkVersion != null ? sdkVersion.getMaxLanguageLevel() : null;
}
}
java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsStubBuilderFactory.java
-43
View File
@@ -1,43 +0,0 @@
/*
* Copyright 2000-2015 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.psi.impl.compiled;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiFile;
import com.intellij.psi.stubs.PsiFileStub;
import com.intellij.util.cls.ClsFormatException;
/** @deprecated API no longer supported, use {@link com.intellij.psi.compiled.ClassFileDecompilers} instead (to remove in IDEA 14) */
@SuppressWarnings({"deprecation", "unused"})
public abstract class ClsStubBuilderFactory<T extends PsiFile> {
public static final ExtensionPointName<ClsStubBuilderFactory> EP_NAME = ExtensionPointName.create("com.intellij.clsStubBuilderFactory");
public abstract PsiFileStub<T> buildFileStub(final VirtualFile file, byte[] bytes) throws ClsFormatException;
public PsiFileStub<T> buildFileStub(final VirtualFile file, byte[] bytes, Project project) throws ClsFormatException {
return buildFileStub(file, bytes);
}
public abstract boolean canBeProcessed(final VirtualFile file, byte[] bytes);
public abstract boolean isInnerClass(final VirtualFile file);
public int getStubVersion() {
return 1;
}
}
java/java-tests/testSrc/com/intellij/java/execution/actions/ContextConfigurationTest.java
+4 -5
View File
@@ -6,6 +6,7 @@ import com.intellij.execution.RunManager;
import com.intellij.execution.RunnerAndConfigurationSettings;
import com.intellij.execution.actions.ConfigurationContext;
import com.intellij.execution.application.ApplicationConfiguration;
import com.intellij.execution.configurations.RunConfiguration;
import com.intellij.execution.junit.AllInPackageConfigurationProducer;
import com.intellij.execution.junit.JUnitConfiguration;
import com.intellij.execution.junit.JUnitUtil;
@@ -15,9 +16,7 @@ import com.intellij.execution.junit2.info.MethodLocation;
import com.intellij.execution.testframework.TestSearchScope;
import com.intellij.java.execution.BaseConfigurationTestCase;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.DataConstants;
import com.intellij.openapi.actionSystem.LangDataKeys;
import com.intellij.openapi.actionSystem.ex.DataConstantsEx;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtilCore;
import com.intellij.openapi.util.text.StringUtil;
@@ -136,7 +135,7 @@ public class ContextConfigurationTest extends BaseConfigurationTestCase {
configuration.getPersistentData().setScope(TestSearchScope.MODULE_WITH_DEPENDENCIES);
configuration.setModule(getModule2());
MapDataContext dataContext = new MapDataContext();
dataContext.put(DataConstantsEx.RUNTIME_CONFIGURATION, configuration);
dataContext.put(RunConfiguration.DATA_KEY, configuration);
configuration = createJUnitConfiguration(psiClass, TestInClassConfigurationProducer.class, dataContext);
checkClassName(psiClass.getQualifiedName(), configuration);
assertEquals(Collections.singleton(getModule2()), new HashSet(Arrays.asList(configuration.getModules())));
@@ -147,7 +146,7 @@ public class ContextConfigurationTest extends BaseConfigurationTestCase {
PsiPackage psiPackage = JUnitUtil.getContainingPackage(psiClass);
final MapDataContext dataContext = new MapDataContext();
final Module module = ModuleUtilCore.findModuleForPsiElement(psiClass);
dataContext.put(DataConstants.MODULE, module);
dataContext.put(LangDataKeys.MODULE.getName(), module);
JUnitConfiguration configuration = createJUnitConfiguration(psiPackage, AllInPackageConfigurationProducer.class, dataContext);
checkTestObject(JUnitConfiguration.TEST_PACKAGE, configuration);
checkPackage(PACKAGE_NAME, configuration);
@@ -160,7 +159,7 @@ public class ContextConfigurationTest extends BaseConfigurationTestCase {
PsiPackage defaultPackage = psiPackage.getParentPackage();
final Module module = ModuleUtilCore.findModuleForPsiElement(psiClass);
final MapDataContext dataContext = new MapDataContext();
dataContext.put(DataConstants.MODULE, module);
dataContext.put(LangDataKeys.MODULE.getName(), module);
JUnitConfiguration configuration = createJUnitConfiguration(defaultPackage, AllInPackageConfigurationProducer.class, dataContext);
checkTestObject(JUnitConfiguration.TEST_PACKAGE, configuration);
checkPackage("", configuration);
java/openapi/src/com/intellij/ide/util/projectWizard/ProjectWizardStepFactory.java
-29
View File
@@ -16,15 +16,12 @@
package com.intellij.ide.util.projectWizard;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.projectRoots.SdkType;
import com.intellij.openapi.projectRoots.SdkTypeId;
import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.Condition;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
@@ -39,37 +36,11 @@ public abstract class ProjectWizardStepFactory {
public abstract ModuleWizardStep createNameAndLocationStep(WizardContext wizardContext);
/**
* @deprecated Use another version of this method:
* @see com.intellij.ide.util.projectWizard.ProjectWizardStepFactory#createSourcePathsStep(WizardContext, SourcePathsBuilder, javax.swing.Icon, String)
*/
@Deprecated
public abstract ModuleWizardStep createSourcePathsStep(ModuleWizardStep nameAndLocationStep, SourcePathsBuilder builder, Icon icon, @NonNls String helpId);
public abstract ModuleWizardStep createSourcePathsStep(WizardContext context, SourcePathsBuilder builder, Icon icon, @NonNls String helpId);
/**
* @deprecated
*/
@Deprecated
public abstract ModuleWizardStep createProjectJdkStep(WizardContext context, JavaModuleBuilder builder, Computable<Boolean> isVisibile, Icon icon, @NonNls String helpId);
public abstract ModuleWizardStep createProjectJdkStep(WizardContext context, SdkType type, JavaModuleBuilder builder, Computable<Boolean> isVisibile, Icon icon, @NonNls String helpId);
public abstract ModuleWizardStep createProjectJdkStep(final WizardContext wizardContext);
@Nullable
public abstract Sdk getNewProjectSdk(WizardContext wizardContext);
/**
* @deprecated use {@link #createSupportForFrameworksStep(WizardContext, ModuleBuilder, com.intellij.openapi.roots.ui.configuration.ModulesProvider)} instead
*/
@Deprecated
@Nullable
public abstract ModuleWizardStep createSupportForFrameworksStep(WizardContext context, ModuleBuilder builder);
@Nullable
public abstract ModuleWizardStep createSupportForFrameworksStep(@NotNull WizardContext context, @NotNull ModuleBuilder builder, @NotNull ModulesProvider modulesProvider);
public abstract ModuleWizardStep createJavaSettingsStep(@NotNull SettingsStep settingsStep, @NotNull ModuleBuilder moduleBuilder, @NotNull Condition<SdkTypeId> sdkFilter);
}
java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java
-7
View File
@@ -59,13 +59,6 @@ public abstract class IdeaTestCase extends PlatformTestCase {
return StdModuleTypes.JAVA;
}
/**
* @deprecated calling this method is no longer necessary
*/
@Deprecated
public static void initPlatformPrefix() {
}
protected static void sortClassesByName(@NotNull PsiClass[] classes) {
Arrays.sort(classes, (o1, o2) -> o1.getName().compareTo(o2.getName()));
}
platform/analysis-api/src/com/intellij/codeInspection/GlobalInspectionContext.java
-11
View File
@@ -44,17 +44,6 @@ public interface GlobalInspectionContext extends UserDataHolder {
@NotNull
RefManager getRefManager();
/**
* Checks if the inspection with the specified ID is suppressed for the
* specified reference graph node. Should not be called manually in normal case.
* You need to check suppressions only when you use {@link GlobalInspectionTool#runInspection}
* @param entity the reference graph node to check.
* @param inspectionToolId the ID of the inspection to check.
* @return true if the inspection is suppressed, false otherwise.
* @deprecated use #shouldCheck instead
*/
boolean isSuppressed(@NotNull RefEntity entity, @NotNull String inspectionToolId);
/**
* Checks if the inspection is suppressed for the specified reference graph node. Should not be called manually in normal case.
* You need to check suppressions only when you use {@link GlobalInspectionTool#runInspection}
platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java
-5
View File
@@ -129,11 +129,6 @@ public class GlobalInspectionContextBase extends UserDataHolderBase implements G
return profile;
}
@Override
public boolean isSuppressed(@NotNull RefEntity entity, @NotNull String id) {
return entity instanceof RefElementImpl && ((RefElementImpl)entity).isSuppressed(id);
}
@Override
public boolean shouldCheck(@NotNull RefEntity entity, @NotNull GlobalInspectionTool tool) {
return !(entity instanceof RefElementImpl) || isToCheckMember((RefElementImpl)entity, tool);
platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java
-10
View File
@@ -32,7 +32,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Arrays;
import java.util.Collection;
public abstract class WriteCommandAction<T> extends BaseActionRunnable<T> {
private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.command.WriteCommandAction");
@@ -374,13 +373,4 @@ public abstract class WriteCommandAction<T> extends BaseActionRunnable<T> {
return writeCommandAction(project).compute(computable);
}
//<editor-fold desc="Deprecated stuff.">
/**
* @deprecated use {@link FileModificationService#preparePsiElementsForWrite(Collection)} (to be removed in IDEA 2018)
*/
@SuppressWarnings("unused")
public static boolean ensureFilesWritable(@NotNull Project project, @NotNull Collection<PsiFile> psiFiles) {
return FileModificationService.getInstance().preparePsiElementsForWrite(psiFiles);
}
//</editor-fold>}
}
platform/core-api/src/com/intellij/openapi/command/undo/UndoUtil.java
-9
View File
@@ -22,7 +22,6 @@ package com.intellij.openapi.command.undo;
import com.intellij.openapi.command.CommandProcessor;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiFile;
import org.jetbrains.annotations.NotNull;
@@ -43,14 +42,6 @@ public class UndoUtil {
CommandProcessor.getInstance().addAffectedDocuments(project, document);
}
/**
* @deprecated please use {@link CommandProcessor#addAffectedFiles} instead
*/
@Deprecated
public static void markVirtualFileForUndo(@NotNull Project project, @NotNull VirtualFile file) {
CommandProcessor.getInstance().addAffectedFiles(project, file);
}
public static void disableUndoFor(@NotNull Document document) {
document.putUserData(UndoConstants.DONT_RECORD_UNDO, Boolean.TRUE);
}
platform/core-api/src/com/intellij/psi/CommonClassNames.java
-5
View File
@@ -107,9 +107,4 @@ public interface CommonClassNames {
String CLASS_FILE_EXTENSION = ".class";
//<editor-fold desc="Deprecated stuff.">
/** @deprecated use {@link #JAVA_UTIL_FUNCTION_BI_FUNCTION} (to be removed in IDEA 2019) */
@SuppressWarnings("SpellCheckingInspection")
String JAVA_UTIL_FUNCTION_BIFUNCTION = JAVA_UTIL_FUNCTION_BI_FUNCTION;
//</editor-fold>
}
platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/PsiFileSystemItemUtil.java
-66
View File
@@ -4,7 +4,6 @@ package com.intellij.psi.impl.source.resolve.reference.impl.providers;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiFileSystemItem;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.Nullable;
import static com.intellij.openapi.vfs.VfsUtilCore.VFS_SEPARATOR_CHAR;
@@ -26,69 +25,4 @@ public class PsiFileSystemItemUtil {
VirtualFile ancestorVFile = ancestor != null ? ancestor.getVirtualFile() : null;
return vFile != null && ancestorVFile != null ? VfsUtilCore.getRelativePath(vFile, ancestorVFile, VFS_SEPARATOR_CHAR) : null;
}
//<editor-fold desc="Deprecated stuff.">
@Nullable
private static PsiFileSystemItem getCommonAncestor(PsiFileSystemItem file1, PsiFileSystemItem file2) {
if (file1 == file2) return file1;
int depth1 = getDepth(file1);
int depth2 = getDepth(file2);
PsiFileSystemItem parent1 = file1;
PsiFileSystemItem parent2 = file2;
while (depth1 > depth2 && parent1 != null) {
parent1 = parent1.getParent();
depth1--;
}
while (depth2 > depth1 && parent2 != null) {
parent2 = parent2.getParent();
depth2--;
}
while (parent1 != null && parent2 != null && !parent1.equals(parent2)) {
parent1 = parent1.getParent();
parent2 = parent2.getParent();
}
return parent1;
}
private static int getDepth(PsiFileSystemItem file) {
int depth = 0;
while (file != null) {
depth++;
file = file.getParent();
}
return depth;
}
/** @deprecated incorrect when {@code src} is a directory; use {@link #findRelativePath(PsiFileSystemItem, PsiFileSystemItem)} instead */
@Deprecated
public static String getNotNullRelativePath(PsiFileSystemItem src, PsiFileSystemItem dst) throws IncorrectOperationException {
final String s = getRelativePath(src, dst);
if (s == null) throw new IncorrectOperationException("No way from " + src.getVirtualFile() + " to " + dst.getVirtualFile());
return s;
}
/** @deprecated incorrect when {@code src} is a directory; use {@link #findRelativePath(PsiFileSystemItem, PsiFileSystemItem)} instead */
@Deprecated
@Nullable
public static String getRelativePath(PsiFileSystemItem src, PsiFileSystemItem dst) {
final PsiFileSystemItem commonAncestor = getCommonAncestor(src, dst);
if (commonAncestor != null) {
StringBuilder buffer = new StringBuilder();
if (!src.equals(commonAncestor)) {
while (!commonAncestor.equals(src.getParent())) {
buffer.append("..").append('/');
src = src.getParent();
assert src != null;
}
}
buffer.append(getRelativePathFromAncestor(dst, commonAncestor));
return buffer.toString();
}
return null;
}
//</editor-fold>
}
platform/external-system-api/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractProjectDataService.java
-7
View File
@@ -72,17 +72,10 @@ public abstract class AbstractProjectDataService<E, I> implements ProjectDataSer
@NotNull IdeModifiableModelsProvider modelsProvider) {
}
/**
* @deprecated use {@link #onSuccessImport(Collection, ProjectData, Project, IdeModelsProvider)}
*/
public void onSuccessImport(@NotNull Project project) {
}
public void onSuccessImport(@NotNull Collection<DataNode<E>> imported,
@Nullable ProjectData projectData,
@NotNull Project project,
@NotNull IdeModelsProvider modelsProvider) {
onSuccessImport(project);
}
@ApiStatus.Experimental
platform/external-system-api/src/com/intellij/openapi/externalSystem/util/ExternalSystemApiUtil.java
-159
View File
@@ -16,7 +16,6 @@
package com.intellij.openapi.externalSystem.util;
import com.intellij.execution.rmi.RemoteUtil;
import com.intellij.ide.util.PropertiesComponent;
import com.intellij.openapi.application.*;
import com.intellij.openapi.externalSystem.ExternalSystemAutoImportAware;
import com.intellij.openapi.externalSystem.ExternalSystemManager;
@@ -28,7 +27,6 @@ import com.intellij.openapi.externalSystem.model.ProjectSystemId;
import com.intellij.openapi.externalSystem.model.project.LibraryData;
import com.intellij.openapi.externalSystem.model.project.ProjectData;
import com.intellij.openapi.externalSystem.model.settings.ExternalSystemExecutionSettings;
import com.intellij.openapi.externalSystem.service.ParametersEnhancer;
import com.intellij.openapi.externalSystem.settings.AbstractExternalSystemLocalSettings;
import com.intellij.openapi.externalSystem.settings.AbstractExternalSystemSettings;
import com.intellij.openapi.externalSystem.settings.ExternalProjectSettings;
@@ -38,7 +36,6 @@ import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ExternalProjectSystemRegistry;
import com.intellij.openapi.roots.ModifiableRootModel;
import com.intellij.openapi.roots.OrderRootType;
import com.intellij.openapi.roots.ProjectModelExternalSource;
import com.intellij.openapi.roots.libraries.Library;
@@ -54,7 +51,6 @@ import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.*;
import com.intellij.util.containers.*;
import com.intellij.util.containers.Stack;
import com.intellij.util.lang.UrlClassLoader;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.Contract;
@@ -64,13 +60,8 @@ import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URL;
import java.util.*;
import java.util.Queue;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static com.intellij.util.PlatformUtils.*;
@@ -79,12 +70,9 @@ import static com.intellij.util.PlatformUtils.*;
* @since 4/1/13 1:31 PM
*/
public class ExternalSystemApiUtil {
private static final String LAST_USED_PROJECT_PATH_PREFIX = "LAST_EXTERNAL_PROJECT_PATH_";
@NotNull public static final String PATH_SEPARATOR = "/";
@NotNull private static final Pattern ARTIFACT_PATTERN = Pattern.compile("(?:.*/)?(.+?)(?:-([\\d+](?:\\.[\\d]+)*))?(?:\\.[^.]+?)?");
@NotNull public static final Comparator<Object> ORDER_AWARE_COMPARATOR = new Comparator<Object>() {
@Override
@@ -177,19 +165,6 @@ public class ExternalSystemApiUtil {
return library.getName() != null && StringUtil.startsWithIgnoreCase(library.getName(), externalSystemId.getId() + ": ");
}
/**
* @deprecated to be removed in 2018.2
*/
@Deprecated
@Nullable
public static ArtifactInfo parseArtifactInfo(@NotNull String fileName) {
Matcher matcher = ARTIFACT_PATTERN.matcher(fileName);
if (!matcher.matches()) {
return null;
}
return new ArtifactInfo(matcher.group(1), null, matcher.group(2));
}
public static void orderAwareSort(@NotNull List<?> data) {
Collections.sort(data, ORDER_AWARE_COMPARATOR);
}
@@ -405,68 +380,6 @@ public class ExternalSystemApiUtil {
return null;
}
/**
* @deprecated to be removed in 2018.2
*/
@Deprecated
public static void commitChangedModels(boolean synchronous, Project project, List<Library.ModifiableModel> models) {
final List<Library.ModifiableModel> changedModels = ContainerUtil.findAll(models, model -> model.isChanged());
if (!changedModels.isEmpty()) {
executeProjectChangeAction(synchronous, new DisposeAwareProjectChange(project) {
@Override
public void execute() {
for (Library.ModifiableModel modifiableModel : changedModels) {
modifiableModel.commit();
}
}
});
}
}
/**
* @deprecated to be removed in 2018.2
*/
@Deprecated
public static void disposeModels(@NotNull Collection<ModifiableRootModel> models) {
for (ModifiableRootModel model : models) {
if (!model.isDisposed()) {
model.dispose();
}
}
}
/**
* @deprecated to be removed in 2018.2
*/
@Deprecated
public static void commitModels(boolean synchronous, Project project, List<ModifiableRootModel> models) {
final List<ModifiableRootModel> changedModels = ContainerUtilRt.newArrayList();
for (ModifiableRootModel modifiableRootModel : models) {
if (modifiableRootModel.isDisposed()) {
continue;
}
if (modifiableRootModel.isChanged()) {
changedModels.add(modifiableRootModel);
} else {
modifiableRootModel.dispose();
}
}
// Commit only if there are changes. #executeProjectChangeAction acquires a write lock
if (!changedModels.isEmpty()) {
executeProjectChangeAction(synchronous, new DisposeAwareProjectChange(project) {
@Override
public void execute() {
for (ModifiableRootModel modifiableRootModel : changedModels) {
// double check
if (!modifiableRootModel.isDisposed()) {
modifiableRootModel.commit();
}
}
}
});
}
}
public static void executeProjectChangeAction(@NotNull final DisposeAwareProjectChange task) {
executeProjectChangeAction(true, task);
}
@@ -600,16 +513,6 @@ public class ExternalSystemApiUtil {
return true;
}
/**
* @deprecated to be removed in 2018.2
*/
@Deprecated
public static void storeLastUsedExternalProjectPath(@Nullable String path, @NotNull ProjectSystemId externalSystemId) {
if (path != null) {
PropertiesComponent.getInstance().setValue(LAST_USED_PROJECT_PATH_PREFIX + externalSystemId.getReadableName(), path);
}
}
@NotNull
public static String getProjectRepresentationName(@NotNull String targetProjectPath, @Nullable String rootProjectPath) {
if (rootProjectPath == null) {
@@ -758,68 +661,6 @@ public class ExternalSystemApiUtil {
return Registry.is(externalSystemId.getId() + ExternalSystemConstants.USE_IN_PROCESS_COMMUNICATION_REGISTRY_KEY_SUFFIX, false);
}
/**
* There is a possible case that methods of particular object should be executed with classpath different from the one implied
* by the current class' class loader. External system offers {@link ParametersEnhancer#enhanceLocalProcessing(List)} method
* for defining that custom classpath.
* <p/>
* It's also possible that particular implementation of {@link ParametersEnhancer} is compiled using dependency to classes
* which are provided by the {@link ParametersEnhancer#enhanceLocalProcessing(List) expanded classpath}. E.g. a class
* {@code 'A'} might use method of class {@code 'B'} and 'A' is located at the current (system/plugin) classpath but
* {@code 'B'} is not. We need to reload {@code 'A'} using its expanded classpath then, i.e. create new class loaded
* with that expanded classpath and load {@code 'A'} by it.
* <p/>
* This method allows to do that.
*
* @deprecated to be removed in 2018.2
*
* @param clazz custom classpath-aware class which instance should be created (is assumed to have a no-args constructor)
* @param <T> target type
* @return newly created instance of the given class loaded by custom classpath-aware loader
* @throws IllegalAccessException as defined by reflection processing
* @throws InstantiationException as defined by reflection processing
* @throws NoSuchMethodException as defined by reflection processing
* @throws InvocationTargetException as defined by reflection processing
* @throws ClassNotFoundException as defined by reflection processing
*/
@Deprecated
@NotNull
public static <T extends ParametersEnhancer> T reloadIfNecessary(@NotNull final Class<T> clazz)
throws IllegalAccessException, InstantiationException, NoSuchMethodException, InvocationTargetException, ClassNotFoundException
{
T instance = clazz.newInstance();
List<URL> urls = ContainerUtilRt.newArrayList();
instance.enhanceLocalProcessing(urls);
if (urls.isEmpty()) {
return instance;
}
final ClassLoader baseLoader = clazz.getClassLoader();
Method method = baseLoader.getClass().getMethod("getUrls");
if (method != null) {
//noinspection unchecked
urls.addAll((Collection<URL>)method.invoke(baseLoader));
}
UrlClassLoader loader = new UrlClassLoader(UrlClassLoader.build().urls(urls).parent(baseLoader.getParent())) {
@Override
protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
if (name.equals(clazz.getName())) {
return super.loadClass(name, resolve);
}
else {
try {
return baseLoader.loadClass(name);
}
catch (ClassNotFoundException e) {
return super.loadClass(name, resolve);
}
}
}
};
//noinspection unchecked
return (T)loader.loadClass(clazz.getName()).newInstance();
}
public static ProjectModelExternalSource toExternalSource(@NotNull ProjectSystemId systemId) {
return ExternalProjectSystemRegistry.getInstance().getSourceById(systemId.getId());
}
platform/external-system-impl/src/com/intellij/openapi/externalSystem/util/ExternalSystemUtil.java
-14
View File
@@ -717,20 +717,6 @@ public class ExternalSystemUtil {
return createFailureResult(exception, externalSystemId, project, notificationManager, notificationData);
}
/**
* @deprecated to be removed in 2018.2
*/
@Deprecated
@NotNull
public static FailureResultImpl createFailureResult(@NotNull Exception exception,
@NotNull String projectName,
@NotNull ProjectSystemId externalSystemId,
@NotNull Project project) {
ExternalSystemNotificationManager notificationManager = ExternalSystemNotificationManager.getInstance(project);
NotificationData notificationData = notificationManager.createNotification(exception, projectName, externalSystemId, project);
return createFailureResult(exception, externalSystemId, project, notificationManager, notificationData);
}
@NotNull
private static FailureResultImpl createFailureResult(@NotNull Exception exception,
@NotNull ProjectSystemId externalSystemId,
platform/lang-api/src/com/intellij/application/options/CodeStyleSettingsUtil.java
-33
View File
@@ -1,33 +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.application.options;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.project.Project;
public abstract class CodeStyleSettingsUtil {
public static CodeStyleSettingsUtil getInstance() {
return ServiceManager.getService(CodeStyleSettingsUtil.class);
}
/**
* @deprecated
* use CodeStyleSettingsUtil.showCodeStyleSettings (Project, String) instead
*/
@Deprecated
public abstract boolean showCodeStyleSettings(Project project, Class pageToSelect);
}
platform/lang-api/src/com/intellij/codeInsight/highlighting/HighlightManager.java
-10
View File
@@ -159,14 +159,4 @@ public abstract class HighlightManager {
@HideFlags int flags,
@Nullable Collection<RangeHighlighter> outHighlighters,
@Nullable Color scrollmarkColor);
/**
* @deprecated Use {@link #addOccurrenceHighlights(com.intellij.openapi.editor.Editor, com.intellij.psi.PsiElement[], com.intellij.openapi.editor.markup.TextAttributes, boolean, java.util.Collection)} instead (it does the same thing).
*/
@Deprecated
public abstract void addElementsOccurrenceHighlights(@NotNull Editor editor,
@NotNull PsiElement[] elements,
@NotNull TextAttributes attributes,
boolean hideByTextChange,
@Nullable Collection<RangeHighlighter> outHighlighters);
}
platform/lang-api/src/com/intellij/ide/util/gotoByName/ChooseByNameModel.java
+1 -1
View File
@@ -33,7 +33,7 @@ public interface ChooseByNameModel {
* @deprecated Mark mnemonic char with '&' ('&&' for mac if mnemonic char is 'N') in checkbox name instead
*/
@Deprecated
char getCheckBoxMnemonic();
default char getCheckBoxMnemonic() { return 0; }
boolean loadInitialCheckBoxState();
platform/lang-api/src/com/intellij/task/ProjectTaskManager.java
-8
View File
@@ -140,12 +140,4 @@ public abstract class ProjectTaskManager {
boolean includeRuntimeDependencies);
public abstract ProjectTask createBuildTask(boolean isIncrementalBuild, ProjectModelBuildableElement... artifacts);
/**
* @deprecated use {@link #createBuildTask(boolean, ProjectModelBuildableElement...)}
*/
@Deprecated
public ProjectTask createArtifactsBuildTask(boolean isIncrementalBuild, ProjectModelBuildableElement... artifacts) {
return createBuildTask(isIncrementalBuild, artifacts);
}
}
platform/lang-impl/src/com/intellij/application/options/CodeStyleSettingsUtilImpl.java
-37
View File
@@ -1,37 +0,0 @@
/*
* 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.
*/
package com.intellij.application.options;
import com.intellij.openapi.options.ShowSettingsUtil;
import com.intellij.openapi.project.Project;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
public class CodeStyleSettingsUtilImpl extends CodeStyleSettingsUtil {
/**
* Shows code style settings suitable for the project passed. I.e. it shows project code style page if one
* is configured to use own code style scheme or global one in other case.
* @param project
* @return Returns true if settings were modified during editing session.
*/
@Override
public boolean showCodeStyleSettings(Project project, final Class pageToSelect) {
CodeStyleSettingsManager settingsManager = CodeStyleSettingsManager.getInstance(project);
CodeStyleSettings savedSettings = settingsManager.getCurrentSettings().clone();
ShowSettingsUtil.getInstance().editConfigurable(project, new CodeStyleSchemesConfigurable(project));
return !savedSettings.equals(settingsManager.getCurrentSettings());
}
}
platform/lang-impl/src/com/intellij/codeInsight/TargetElementUtilBase.java
+1 -4
View File
@@ -29,11 +29,8 @@ import java.util.Collection;
/**
* @deprecated Use {@link TargetElementUtil} instead. To be removed in IntelliJ IDEA 16.
*/
@Deprecated
public abstract class TargetElementUtilBase {
public static final int REFERENCED_ELEMENT_ACCEPTED = 0x01;
public static final int ELEMENT_NAME_ACCEPTED = 0x02;
public static final int LOOKUP_ITEM_ACCEPTED = 0x08;
public static TargetElementUtilBase getInstance() {
return TargetElementUtil.getInstance();
}
platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightManagerImpl.java
-9
View File
@@ -150,15 +150,6 @@ public class HighlightManagerImpl extends HighlightManager {
editor.getScrollingModel().scrollVertically(verticalScrollOffset);
}
@Override
public void addElementsOccurrenceHighlights(@NotNull Editor editor,
@NotNull PsiElement[] elements,
@NotNull TextAttributes attributes,
boolean hideByTextChange,
Collection<RangeHighlighter> outHighlighters) {
addOccurrenceHighlights(editor, elements, attributes, hideByTextChange, outHighlighters);
}
@Override
public void addOccurrenceHighlight(@NotNull Editor editor,
int start,
platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupEx.java
-7
View File
@@ -15,8 +15,6 @@
*/
package com.intellij.codeInsight.lookup;
import com.intellij.openapi.ui.popup.JBPopup;
import java.awt.*;
/**
@@ -25,11 +23,6 @@ import java.awt.*;
public interface LookupEx extends Lookup {
void setCurrentItem(LookupElement item);
/**
* @deprecated use PopupPositionManager instead
*/
void showItemPopup(JBPopup hint);
Component getComponent();
boolean showElementActions();
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
+1 -2
View File
@@ -1092,8 +1092,7 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable,
}
}
@Override
public void showItemPopup(JBPopup hint) {
private void showItemPopup(JBPopup hint) {
final Rectangle bounds = getCurrentItemBounds();
hint.show(new RelativePoint(getComponent(), new Point(bounds.x + bounds.width, bounds.y)));
}
platform/lang-impl/src/com/intellij/execution/impl/RunConfigurationBeforeRunProvider.java
-8
View File
@@ -162,14 +162,6 @@ extends BeforeRunTaskProvider<RunConfigurationBeforeRunProvider.RunConfigurableB
return doExecuteTask(env, settings.first, settings.second);
}
/**
* @deprecated use {@link #doExecuteTask(ExecutionEnvironment, RunnerAndConfigurationSettings, ExecutionTarget)} instead
*/
public static boolean doExecuteTask(@NotNull final ExecutionEnvironment env,
@NotNull final RunnerAndConfigurationSettings settings) {
return doExecuteTask(env, settings, null);
}
public static boolean doExecuteTask(@NotNull final ExecutionEnvironment env,
@NotNull final RunnerAndConfigurationSettings settings,
@Nullable final ExecutionTarget target) {
platform/lang-impl/src/com/intellij/ide/actions/GotoRelatedFileAction.java
+2 -12
View File
@@ -17,11 +17,7 @@ package com.intellij.ide.actions;
import com.intellij.codeInsight.navigation.NavigationUtil;
import com.intellij.navigation.GotoRelatedItem;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.ui.popup.JBPopup;
import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.List;
@@ -30,21 +26,15 @@ import java.util.List;
* todo [neuro] REMOVE-ME when September Ends..
* @author gregsh
*/
@Deprecated
public class GotoRelatedFileAction {
/**
* @deprecated
* @see com.intellij.codeInsight.navigation.NavigationUtil#getRelatedItemsPopup(java.util.List, String)
*/
@Deprecated
public static JBPopup createPopup(List<? extends GotoRelatedItem> items, final String title) {
return NavigationUtil.getRelatedItemsPopup(items, title);
}
/**
* @deprecated
* @see com.intellij.codeInsight.navigation.NavigationUtil#collectRelatedItems(com.intellij.psi.PsiElement, com.intellij.openapi.actionSystem.DataContext)
*/
public static List<GotoRelatedItem> getItems(@NotNull PsiElement contextElement, @Nullable DataContext dataContext) {
return NavigationUtil.collectRelatedItems(contextElement, dataContext);
}
}
platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesManager.java
+1 -15
View File
@@ -125,31 +125,17 @@ public class FavoritesManager implements ProjectComponent, JDOMExternalizable {
}
}
/**
* @deprecated use {@link #addFavoritesListener(FavoritesListener, Disposable)} instead
*/
public void addFavoritesListener(FavoritesListener listener) {
myListeners.add(listener);
listener.rootsChanged();
}
public void addFavoritesListener(final FavoritesListener listener, @NotNull Disposable parent) {
myListeners.add(listener);
listener.rootsChanged();
Disposer.register(parent, new Disposable() {
@Override
public void dispose() {
removeFavoritesListener(listener);
myListeners.remove(listener);
}
});
}
/**
* @deprecated use {@link #addFavoritesListener(FavoritesListener, Disposable)} instead
*/
public void removeFavoritesListener(FavoritesListener listener) {
myListeners.remove(listener);
}
List<AbstractTreeNode> createRootNodes() {
List<AbstractTreeNode> result = new ArrayList<>();
for (String listName : myFavoritesRootsOrder) {
platform/lang-impl/src/com/intellij/ide/util/TreeFileChooserDialog.java
-4
View File
@@ -370,10 +370,6 @@ public final class TreeFileChooserDialog extends DialogWrapper implements TreeFi
return null;
}
@Override
public char getCheckBoxMnemonic() {
return 0;
}
@Override
public String getNotInMessage() {
platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java
-4
View File
@@ -137,10 +137,6 @@ public class GotoActionModel implements ChooseByNameModel, Comparator<Object>, D
return IdeBundle.message("checkbox.disabled.included");
}
@Override
public char getCheckBoxMnemonic() {
return 'd';
}
@Override
public String getNotInMessage() {
platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoClassModel2.java
-7
View File
@@ -24,7 +24,6 @@ import com.intellij.navigation.ChooseByNameRegistry;
import com.intellij.navigation.GotoClassContributor;
import com.intellij.navigation.NavigationItem;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiElement;
import com.intellij.ui.IdeUICustomization;
@@ -82,12 +81,6 @@ public class GotoClassModel2 extends FilteringGotoByModel<Language> {
return IdeBundle.message("label.no.matches.found");
}
@Override
public char getCheckBoxMnemonic() {
// Some combination like Alt+N, Ant+O, etc are a dead symbols, therefore
// we have to change mnemonics for Mac users.
return SystemInfo.isMac?'P':'n';
}
@Override
public boolean loadInitialCheckBoxState() {
platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoFileModel.java
-4
View File
@@ -98,10 +98,6 @@ public class GotoFileModel extends FilteringGotoByModel<FileType> implements Dum
return IdeBundle.message("checkbox.include.non.project.files", IdeUICustomization.getInstance().getProjectConceptName());
}
@Override
public char getCheckBoxMnemonic() {
return SystemInfo.isMac?'P':'n';
}
@Override
public String getNotInMessage() {
platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoSymbolModel2.java
-7
View File
@@ -23,7 +23,6 @@ import com.intellij.navigation.ChooseByNameRegistry;
import com.intellij.navigation.GotoClassContributor;
import com.intellij.navigation.NavigationItem;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.psi.PsiElement;
import com.intellij.psi.presentation.java.SymbolPresentationUtil;
import com.intellij.ui.IdeUICustomization;
@@ -80,12 +79,6 @@ public class GotoSymbolModel2 extends FilteringGotoByModel<Language> {
return IdeBundle.message("label.no.matches.found");
}
@Override
public char getCheckBoxMnemonic() {
// Some combination like Alt+N, Ant+O, etc are a dead symbols, therefore
// we have to change mnemonics for Mac users.
return SystemInfo.isMac?'P':'n';
}
@Override
public boolean loadInitialCheckBoxState() {
platform/lang-impl/src/com/intellij/ide/util/gotoByName/SimpleChooseByNameModel.java
-4
View File
@@ -64,10 +64,6 @@ public abstract class SimpleChooseByNameModel implements ChooseByNameModel {
return null;
}
@Override
public char getCheckBoxMnemonic() {
return 0;
}
@Override
public boolean loadInitialCheckBoxState() {
platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/TestEditorManagerImpl.java
-8
View File
@@ -429,14 +429,6 @@ final class TestEditorManagerImpl extends FileEditorManagerEx implements Disposa
return result;
}
@Override
public void showEditorAnnotation(@NotNull FileEditor editor, @NotNull JComponent annotationComponent) {
}
@Override
public void removeEditorAnnotation(@NotNull FileEditor editor, @NotNull JComponent annotationComponent) {
}
@Override
public Editor openTextEditor(@NotNull OpenFileDescriptor descriptor, boolean focusEditor) {
platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleFacadeImpl.java
-5
View File
@@ -92,11 +92,6 @@ public class CodeStyleFacadeImpl extends CodeStyleFacade {
return CodeStyle.getProjectOrDefaultSettings(myProject).getTabSize(fileType);
}
@Override
public boolean isSmartTabs(final FileType fileType) {
return CodeStyle.getProjectOrDefaultSettings(myProject).isSmartTabs(fileType);
}
@Override
public boolean useTabCharacter(final FileType fileType) {
return CodeStyle.getProjectOrDefaultSettings(myProject).useTabCharacter(fileType);
platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/lineIndent/IndentCalculator.java
-13
View File
@@ -31,12 +31,9 @@ import com.intellij.util.text.CharArrayUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Objects;
import static com.intellij.formatting.Indent.Type.CONTINUATION;
import static com.intellij.formatting.Indent.Type.NORMAL;
import static com.intellij.formatting.Indent.Type.SPACES;
import static com.intellij.psi.impl.source.codeStyle.lineIndent.JavaLikeLangLineIndentProvider.getDefaultIndentFromType;
public class IndentCalculator {
@@ -45,16 +42,6 @@ public class IndentCalculator {
private @NotNull final BaseLineOffsetCalculator myBaseLineOffsetCalculator;
private @NotNull final Indent myIndent;
/**
* @deprecated Please, use IndentCalculator(Project, Editor, BaseLineOffsetCalculator, Indent) instead.
*/
public IndentCalculator(@NotNull Project project,
@NotNull Editor editor,
@NotNull BaseLineOffsetCalculator baseLineOffsetCalculator,
@NotNull Indent.Type type) {
this(project, editor, baseLineOffsetCalculator, Objects.requireNonNull(getDefaultIndentFromType(type)));
}
public IndentCalculator(@NotNull Project project,
@NotNull Editor editor,
@NotNull BaseLineOffsetCalculator baseLineOffsetCalculator,
platform/lang-impl/src/com/intellij/refactoring/rename/RenameDialog.java
-7
View File
@@ -129,14 +129,7 @@ public class RenameDialog extends RefactoringDialog {
super.dispose();
}
@SuppressWarnings("deprecation")
protected boolean isToSearchForTextOccurrencesForRename() {
return isToSearchForTextOccurencesForRename();
}
/** @deprecated use/override {@link #isToSearchForTextOccurrencesForRename()} instead (to be deleted in IDEA 2018) */
@SuppressWarnings({"SpellCheckingInspection", "DeprecatedIsStillUsed"})
protected boolean isToSearchForTextOccurencesForRename() {
return RenamePsiElementProcessor.forElement(myPsiElement).isToSearchForTextOccurrences(myPsiElement);
}
platform/lang-impl/src/com/intellij/refactoring/rename/RenameHandlerRegistry.java
+1 -13
View File
@@ -31,16 +31,12 @@ import com.intellij.refactoring.RefactoringBundle;
import com.intellij.refactoring.rename.inplace.MemberInplaceRenameHandler;
import com.intellij.refactoring.util.RadioUpDownListener;
import com.intellij.util.ArrayUtil;
import java.util.HashSet;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import java.util.*;
/**
* @author dsl
@@ -109,14 +105,6 @@ public class RenameHandlerRegistry {
return renameHandler instanceof TitledHandler ? StringUtil.capitalize(((TitledHandler)renameHandler).getActionTitle().toLowerCase()) : renameHandler.toString();
}
/**
* @deprecated
* @see RenameHandler#EP_NAME
*/
public void registerHandler(RenameHandler handler) {
myHandlers.add(handler);
}
private static class HandlersChooser extends DialogWrapper {
private final String[] myRenamers;
private String mySelection;
platform/platform-api/src/com/intellij/codeStyle/CodeStyleFacade.java
-6
View File
@@ -80,12 +80,6 @@ public abstract class CodeStyleFacade {
@Deprecated
public abstract int getIndentSize(FileType fileType);
/**
* @deprecated
*/
@Deprecated
public abstract boolean isSmartTabs(final FileType fileType);
/**
* @deprecated Use {@code getRightMargin(Language)} method of {@code CodeStyle.getSettings(PsiFile)} or
* {@code CodeStyle.getSettings(Project)} if there is no {@code PsiFile}
platform/platform-api/src/com/intellij/execution/configurations/PathEnvironmentVariableUtil.java
-32
View File
@@ -64,19 +64,6 @@ public class PathEnvironmentVariableUtil {
return ContainerUtil.getFirstItem(exeFiles);
}
/**
* Finds an executable file with the specified base name, that is located in a directory
* listed in an original PATH environment variable.
* Original PATH environment variable value is a value returned by {@code System.getenv("PATH")}.
*
* @param fileBaseName file base name
* @return {@link File} instance or null if not found
*/
private static File findInOriginalPath(@NotNull String fileBaseName) {
List<File> exeFiles = findExeFilesInPath(true, null, System.getenv(PATH), fileBaseName);
return ContainerUtil.getFirstItem(exeFiles);
}
/**
* Finds all executable files with the specified base name, that are located in directories
* from PATH environment variable.
@@ -128,25 +115,6 @@ public class PathEnvironmentVariableUtil {
return StringUtil.split(pathEnvVarValue, File.pathSeparator, true, true);
}
/** @deprecated obsolete; the behavior is incorporated in {@link GeneralCommandLine#createProcess()} (to be removed in IDEA 2019) */
@Deprecated
@NotNull
public static String toLocatableExePath(@NotNull String exePath) {
if (SystemInfo.isMac) {
if (!StringUtil.containsChar(exePath, '/') && !StringUtil.containsChar(exePath, '\\')) {
File originalResolvedExeFile = findInOriginalPath(exePath);
// don't modify exePath if the absolute path can be found in the original PATH
if (originalResolvedExeFile == null) {
File resolvedExeFile = findInPath(exePath);
if (resolvedExeFile != null) {
exePath = resolvedExeFile.getAbsolutePath();
}
}
}
}
return exePath;
}
@NotNull
public static List<String> getWindowsExecutableFileExtensions() {
if (SystemInfo.isWindows) {
platform/platform-api/src/com/intellij/openapi/actionSystem/DataConstants.java
+7 -187
View File
@@ -23,6 +23,7 @@ import org.jetbrains.annotations.NonNls;
*
* @deprecated {@link DataKeys} and {@link DataKey#getData} should be used instead
*/
@Deprecated
@SuppressWarnings({"HardCodedStringLiteral", "JavadocReference"})
public interface DataConstants {
/**
@@ -30,221 +31,40 @@ public interface DataConstants {
*
* @deprecated use {@link PlatformDataKeys#PROJECT} instead
*/
String PROJECT = CommonDataKeys.PROJECT.getName();
@Deprecated String PROJECT = CommonDataKeys.PROJECT.getName();
/**
* Returns {@link com.intellij.openapi.module.Module}
*
* @deprecated use {@link com.intellij.openapi.actionSystem.LangDataKeys#MODULE} instead
*/
@NonNls String MODULE = "module";
@Deprecated @NonNls String MODULE = "module";
/**
* Returns {@link com.intellij.openapi.vfs.VirtualFile}
*
* @deprecated use {@link PlatformDataKeys#VIRTUAL_FILE} instead
*/
String VIRTUAL_FILE = CommonDataKeys.VIRTUAL_FILE.getName();
@Deprecated String VIRTUAL_FILE = CommonDataKeys.VIRTUAL_FILE.getName();
/**
* Returns array of {@link com.intellij.openapi.vfs.VirtualFile}
*
* @deprecated use {@link PlatformDataKeys#VIRTUAL_FILE_ARRAY} instead
*/
String VIRTUAL_FILE_ARRAY = CommonDataKeys.VIRTUAL_FILE_ARRAY.getName();
@Deprecated String VIRTUAL_FILE_ARRAY = CommonDataKeys.VIRTUAL_FILE_ARRAY.getName();
/**
* Returns {@link com.intellij.openapi.editor.Editor}
*
* @deprecated use {@link PlatformDataKeys#EDITOR} instead
*/
String EDITOR = CommonDataKeys.EDITOR.getName();
@Deprecated String EDITOR = CommonDataKeys.EDITOR.getName();
/**
* Returns {@link com.intellij.openapi.fileEditor.FileEditor}
*
* @deprecated use {@link PlatformDataKeys#FILE_EDITOR} instead
*/
String FILE_EDITOR = PlatformDataKeys.FILE_EDITOR.getName();
/**
* Returns {@link com.intellij.openapi.fileEditor.OpenFileDescriptor}
*
* @deprecated {@link PlatformDataKeys#NAVIGATABLE} should be used instead
*/
@NonNls String OPEN_FILE_DESCRIPTOR = "openFileDescriptor";
/**
* Returns the text of currently selected file/file revision
*
* @deprecated use {@link PlatformDataKeys#FILE_TEXT} instead
*/
String FILE_TEXT = PlatformDataKeys.FILE_TEXT.getName();
/**
* Returns Boolean.TRUE if action is executed in modal context and
* Boolean.FALSE if action is executed not in modal context. If context
* is unknown then the value of this data constant is {@code null}.
*
* @deprecated use {@link PlatformDataKeys#IS_MODAL_CONTEXT} instead
*/
String IS_MODAL_CONTEXT = PlatformDataKeys.IS_MODAL_CONTEXT.getName();
/**
* Returns {@link com.intellij.openapi.diff.DiffViewer}
*
* @deprecated use {@link PlatformDataKeys#DIFF_VIEWER} instead
*/
String DIFF_VIEWER = PlatformDataKeys.DIFF_VIEWER.getName();
/**
* Returns help id (String)
*
* @deprecated use {@link PlatformDataKeys#HELP_ID} instead
*/
String HELP_ID = PlatformDataKeys.HELP_ID.getName();
/**
* Returns project if project node is selected (in project view)
*
* @deprecated use {@link PlatformDataKeys#PROJECT_CONTEXT} instead
*/
String PROJECT_CONTEXT = PlatformDataKeys.PROJECT_CONTEXT.getName();
/**
* Returns module if module node is selected (in module view)
*
* @deprecated use {@link com.intellij.openapi.actionSystem.LangDataKeys#MODULE_CONTEXT} instead
*/
@NonNls String MODULE_CONTEXT = "context.Module";
/**
* @deprecated use {@link com.intellij.openapi.actionSystem.LangDataKeys#MODULE_CONTEXT_ARRAY} instead
*/
@NonNls String MODULE_CONTEXT_ARRAY = "context.Module.Array";
/**
* Returns {@link com.intellij.pom.Navigatable}
*
* @deprecated use {@link PlatformDataKeys#NAVIGATABLE} instead
*/
String NAVIGATABLE = CommonDataKeys.NAVIGATABLE.getName();
/**
* Returns an array of {@link com.intellij.pom.Navigatable}
*
* @deprecated use {@link PlatformDataKeys#NAVIGATABLE_ARRAY} instead
*/
String NAVIGATABLE_ARRAY = CommonDataKeys.NAVIGATABLE_ARRAY.getName();
/**
* Returns {@link com.intellij.ide.ExporterToTextFile}
*
* @deprecated use {@link PlatformDataKeys#EXPORTER_TO_TEXT_FILE} instead
*/
String EXPORTER_TO_TEXT_FILE = PlatformDataKeys.EXPORTER_TO_TEXT_FILE.getName();
/**
* Returns {@link com.intellij.psi.PsiElement}
*
* @deprecated use {@link CommonDataKeys#PSI_ELEMENT} instead
*/
@NonNls String PSI_ELEMENT = "psi.Element";
/**
* Returns {@link com.intellij.psi.PsiFile}
*
* @deprecated use {@link CommonDataKeys#PSI_FILE} instead
*/
@NonNls String PSI_FILE = "psi.File";
/**
* Returns {@link com.intellij.lang.Language}
*
* @deprecated use {@link com.intellij.openapi.actionSystem.LangDataKeys#LANGUAGE} instead
*/
@NonNls String LANGUAGE = "Language";
/**
* Returns java.awt.Component currently in focus, DataContext should be retrieved for
*
* @deprecated use {@link PlatformDataKeys#CONTEXT_COMPONENT} instead
*/
String CONTEXT_COMPONENT = PlatformDataKeys.CONTEXT_COMPONENT.getName();
/**
* Returns {@link com.intellij.ide.IdeView} (one of project, packages, commander or favorites view).
*
* @since 5.1
* @deprecated use {@link com.intellij.openapi.actionSystem.LangDataKeys#IDE_VIEW} instead
*/
@NonNls String IDE_VIEW = "IDEView";
/**
* Returns array of selected {@link com.intellij.openapi.vcs.changes.ChangeList}s.
*
* @since 6.0
* @deprecated use {@link com.intellij.openapi.vcs.VcsDataKeys#CHANGE_LISTS} instead
*/
@NonNls String CHANGE_LISTS = "vcs.ChangeList";
/**
* Returns array of selected {@link com.intellij.openapi.vcs.changes.Change}s.
*
* @since 6.0
* @deprecated use {@link com.intellij.openapi.vcs.VcsDataKeys#CHANGES} instead
*/
@NonNls String CHANGES = "vcs.Change";
/**
* Returns com.intellij.psi.PsiElement[]
*
* @deprecated use {@link com.intellij.openapi.actionSystem.LangDataKeys#PSI_ELEMENT_ARRAY} instead
*/
@NonNls String PSI_ELEMENT_ARRAY = "psi.Element.array";
/**
* Returns com.intellij.ide.CopyProvider
*
* @deprecated use {@link PlatformDataKeys#COPY_PROVIDER} instead
*/
String COPY_PROVIDER = PlatformDataKeys.COPY_PROVIDER.getName();
/**
* Returns com.intellij.ide.CutProvider
*
* @deprecated use {@link PlatformDataKeys#CUT_PROVIDER} instead
*/
String CUT_PROVIDER = PlatformDataKeys.CUT_PROVIDER.getName();
/**
* Returns com.intellij.ide.PasteProvider
*
* @deprecated use {@link PlatformDataKeys#PASTE_PROVIDER} instead
*/
String PASTE_PROVIDER = PlatformDataKeys.PASTE_PROVIDER.getName();
/**
* Returns com.intellij.ide.DeleteProvider
*
* @deprecated use {@link PlatformDataKeys#DELETE_ELEMENT_PROVIDER} instead
*/
String DELETE_ELEMENT_PROVIDER = PlatformDataKeys.DELETE_ELEMENT_PROVIDER.getName();
/**
* Returns com.intellij.openapi.editor.Editor even if focuses currently is in find bar
*
* @deprecated use {@link PlatformDataKeys#EDITOR} instead
*/
String EDITOR_EVEN_IF_INACTIVE = CommonDataKeys.EDITOR_EVEN_IF_INACTIVE.getName();
/**
* @deprecated use {@link PlatformDataKeys#SELECTED_ITEM} instead
*/
String SELECTED_ITEM = PlatformDataKeys.SELECTED_ITEM.getName();
/**
* @deprecated use {@link PlatformDataKeys#DOMINANT_HINT_AREA_RECTANGLE} instead
*/
String DOMINANT_HINT_AREA_RECTANGLE = PlatformDataKeys.DOMINANT_HINT_AREA_RECTANGLE.getName();
@Deprecated String FILE_EDITOR = PlatformDataKeys.FILE_EDITOR.getName();
}
platform/platform-api/src/com/intellij/openapi/actionSystem/ex/DataConstantsEx.java
-112
View File
@@ -1,112 +0,0 @@
/*
* Copyright 2000-2015 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.actionSystem.ex;
import org.jetbrains.annotations.NonNls;
/**
* Identifiers for data items which can be returned from {@link com.intellij.openapi.actionSystem.DataContext#getData(String)} and
* {@link com.intellij.openapi.actionSystem.DataProvider#getData(String)}.
* @deprecated {@link DataKeys} and {@link com.intellij.openapi.actionSystem.DataKey#getData} should be used instead
*/
@Deprecated
@SuppressWarnings({"HardCodedStringLiteral", "JavadocReference"})
public interface DataConstantsEx {
/**
* Returns {@link com.intellij.psi.PsiElement}
*/
@NonNls String TARGET_PSI_ELEMENT = "psi.TargetElement";
/**
* Returns {@link com.intellij.psi.PsiElement}
*/
@NonNls String PASTE_TARGET_PSI_ELEMENT = "psi.pasteTargetElement";
/**
* Returns {@link com.intellij.usages.UsageView}
*/
@NonNls String USAGE_VIEW = "usageView";
/**
* Returns {@link com.intellij.codeInspection.ui.InspectionResultsView}
*/
@NonNls String INSPECTION_VIEW = "inspectionView";
/**
* Returns {@link com.intellij.ide.TreeExpander}
*/
@NonNls String TREE_EXPANDER = "treeExpander";
/**
* Returns {@link com.intellij.ui.content.ContentManager}
*/
@NonNls String CONTENT_MANAGER = "contentManager";
@NonNls String NONEMPTY_CONTENT_MANAGER = "nonemptyContentManager";
/**
* Returns {@link com.intellij.execution.configurations.RuntimeConfiguration}
*/
@NonNls String RUNTIME_CONFIGURATION = "runtimeConfiguration";
/**
* Returns project file directory as {@link com.intellij.openapi.vfs.VirtualFile}
*/
@NonNls String PROJECT_FILE_DIRECTORY = "context.ProjectFileDirectory";
/**
* returns {@link com.intellij.openapi.application.ModalityState}
*/
@NonNls String MODALITY_STATE = "ModalityState";
/**
* returns Boolean
*/
@NonNls String SOURCE_NAVIGATION_LOCKED = "sourceNavigationLocked";
/**
* returns array of {@link com.intellij.ide.projectView.impl.ModuleGroup}
*/
@NonNls String MODULE_GROUP_ARRAY = "moduleGroup.array";
/**
* returns array of {@link com.intellij.ide.projectView.impl.nodes.LibraryGroupElement}
*/
@NonNls String LIBRARY_GROUP_ARRAY = "libraryGroup.array";
/**
* returns array of {@link com.intellij.ide.projectView.impl.nodes.NamedLibraryElement}
*/
@NonNls String NAMED_LIBRARY_ARRAY = "namedLibrary.array";
/**
* returns {@link com.intellij.openapi.fileEditor.impl.EditorWindow}
*/
@NonNls String EDITOR_WINDOW = "editorWindow";
/**
* returns array of {@link com.intellij.lang.properties.ResourceBundle}
*/
@NonNls String RESOURCE_BUNDLE_ARRAY = "resource.bundle.array";
/**
* returns {@link com.intellij.openapi.module.ModifiableModuleModel}
*/
@NonNls String MODIFIABLE_MODULE_MODEL = "modifiable.module.model";
/**
* returns {@link com.intellij.ide.projectView.impl.nodes.PackageElement}
*/
@NonNls String PACKAGE_ELEMENT = "package.element";
}
platform/platform-api/src/com/intellij/openapi/fileEditor/FileEditorManager.java
+2 -2
View File
@@ -146,12 +146,12 @@ public abstract class FileEditorManager {
* @deprecated use addTopComponent
*/
@Deprecated
public abstract void showEditorAnnotation(@NotNull FileEditor editor, @NotNull JComponent annotationComponent);
public void showEditorAnnotation(@NotNull FileEditor editor, @NotNull JComponent annotationComponent) {}
/**
* @deprecated use removeTopComponent
*/
@Deprecated
public abstract void removeEditorAnnotation(@NotNull FileEditor editor, @NotNull JComponent annotationComponent);
public void removeEditorAnnotation(@NotNull FileEditor editor, @NotNull JComponent annotationComponent) {}
/**
* Adds the specified component above the editor and paints a separator line below it.
platform/platform-api/src/com/intellij/openapi/vfs/LocalFileSystem.java
-5
View File
@@ -2,7 +2,6 @@
package com.intellij.openapi.vfs;
import com.intellij.openapi.vfs.newvfs.NewVirtualFileSystem;
import com.intellij.util.Processor;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -119,8 +118,4 @@ public abstract class LocalFileSystem extends NewVirtualFileSystem {
* @param handler the handler instance.
*/
public abstract void unregisterAuxiliaryFileOperationsHandler(@NotNull LocalFileOperationsHandler handler);
/** @deprecated use {@link VfsUtilCore#visitChildrenRecursively(VirtualFile, VirtualFileVisitor)} (to be removed in IDEA 2019) */
@Deprecated
public abstract boolean processCachedFilesInSubtree(@NotNull VirtualFile file, @NotNull Processor<VirtualFile> processor);
}
platform/platform-api/src/com/intellij/openapi/vfs/newvfs/FileAttribute.java
-9
View File
@@ -42,15 +42,6 @@ public class FileAttribute {
this(id, UNDEFINED_VERSION, false);
}
/**
* @deprecated
* @see #FileAttribute(String, int, boolean)
*/
@Deprecated
public FileAttribute(@NonNls @NotNull String id, int version) {
this(id, version, false);
}
public FileAttribute(@NonNls @NotNull String id, int version, boolean fixedSize) {
this(version, fixedSize, id);
boolean added = ourRegisteredIds.add(id);
platform/platform-api/src/com/intellij/openapi/wm/WindowManager.java
-17
View File
@@ -78,16 +78,6 @@ public abstract class WindowManager {
*/
public abstract StatusBar getStatusBar(Project project);
/**
* Get the status bar for the component, it may be either the main status bar or the status bar for an undocked window
*
* @param c a component
* @return status bar
* @deprecated use getStatusBar(Component, Project)
*/
@Deprecated
public abstract StatusBar getStatusBar(@NotNull Component c);
public StatusBar getStatusBar(@NotNull Component c, @Nullable Project project) {
return null;
}
@@ -105,13 +95,6 @@ public abstract class WindowManager {
*/
public abstract boolean isInsideScreenBounds(int x, int y, int width);
/**
* Tests whether the specified point is inside of screen bounds. Note, that
* all parameters are in screen coordinate system.
* The method properly works in multi-monitor configuration.
*/
public abstract boolean isInsideScreenBounds(int x, int y);
@NotNull
public abstract IdeFrame[] getAllProjectFrames();
platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java
-16
View File
@@ -103,16 +103,6 @@ public class IdeBorderFactory {
return createTitledBorder(s, true);
}
@Deprecated
public static IdeaTitledBorder createTitledBorder(String title, boolean hasBoldFont, boolean hasIndent, boolean hasSmallFont) {
return createTitledBorder(title, hasIndent);
}
@Deprecated
public static IdeaTitledBorder createTitledBorder(String title, boolean hasBoldFont, boolean hasIndent, boolean hasSmallFont, Insets insets) {
return createTitledBorder(title, hasIndent, insets);
}
public static IdeaTitledBorder createTitledBorder(String title, boolean hasIndent) {
Insets insets = new Insets(TITLED_BORDER_TOP_INSET, TITLED_BORDER_LEFT_INSET, TITLED_BORDER_BOTTOM_INSET, TITLED_BORDER_RIGHT_INSET);
return createTitledBorder(title, hasIndent, insets);
@@ -123,12 +113,6 @@ public class IdeBorderFactory {
return new IdeaTitledBorder(title, indent, insets);
}
@Deprecated
// Don't remove, used in TeamCity plugin.
public static TitledBorder createTitledHeaderBorder(String title) {
return new IdeaTitledBorder(title, 10, new Insets(5, 0, 10, 0));
}
private static Color getBorderColor() {
return JBColor.border();
}
platform/platform-api/src/com/intellij/ui/content/ContentManager.java
-5
View File
@@ -35,11 +35,6 @@ public interface ContentManager extends Disposable, BusyObject {
void addContent(@NotNull Content content);
void addContent(@NotNull Content content, final int order);
/**
* @deprecated use {@link #addContent(Content)} instead, {@code constraints} parameter isn't used anyway
*/
void addContent(@NotNull Content content, Object constraints);
boolean removeContent(@NotNull Content content, final boolean dispose);
@NotNull
ActionCallback removeContent(@NotNull Content content, final boolean dispose, boolean trackFocus, boolean forcedFocus);
platform/platform-api/src/com/intellij/ui/treeStructure/SimpleNodeRenderer.java
-26
View File
@@ -1,26 +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.ui.treeStructure;
import com.intellij.ide.util.treeView.NodeRenderer;
/**
* @deprecated Use {@link NodeRenderer} instead
*/
@Deprecated
public class SimpleNodeRenderer extends NodeRenderer {
}
platform/platform-api/src/com/intellij/util/ui/Timer.java
+3 -14
View File
@@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit;
/**
* @deprecated use {@link JobScheduler#getScheduler()} instead
*/
@Deprecated
public abstract class Timer implements Disposable, Runnable {
private final int mySpan;
@@ -126,14 +127,6 @@ public abstract class Timer implements Disposable, Runnable {
}
}
public final void delay(int length) {
synchronized (LOCK) {
if (isDisposed() || !isRunning()) return;
myState = TimerState.pausing;
queue(this, length);
}
}
public final void resume() {
synchronized (LOCK) {
if (isDisposed() || isRunning()) return;
@@ -156,7 +149,7 @@ public abstract class Timer implements Disposable, Runnable {
}
}
public boolean isRunning() {
private boolean isRunning() {
synchronized (LOCK) {
return myState == TimerState.running || myState == TimerState.initialSleep || myState == TimerState.restarting;
}
@@ -177,12 +170,8 @@ public abstract class Timer implements Disposable, Runnable {
myFuture = schedule;
}
public ScheduledFuture<?> getFuture() {
return myFuture;
}
private static void queue(Timer timer, int span) {
final ScheduledFuture<?> future = timer.getFuture();
final ScheduledFuture<?> future = timer.myFuture;
if (future != null) {
future.cancel(true);
}
platform/platform-api/src/com/intellij/util/ui/tree/TreeUtil.java
-9
View File
@@ -746,15 +746,6 @@ public final class TreeUtil {
selectNode(tree, treeNode);
}
/**
* @deprecated use {@link #listChildren(TreeNode)} instead
*/
@Deprecated
@NotNull
public static ArrayList<TreeNode> childrenToArray(@NotNull TreeNode node) {
return (ArrayList<TreeNode>)listChildren(node);
}
@NotNull
public static List<TreeNode> listChildren(@NotNull final TreeNode node) {
//ApplicationManager.getApplication().assertIsDispatchThread();
platform/platform-impl/src/com/intellij/execution/impl/EditorHyperlinkSupport.java
-11
View File
@@ -188,17 +188,6 @@ public class EditorHyperlinkSupport {
return getHyperlinkAt(myEditor.logicalPositionToOffset(new LogicalPosition(line, col)));
}
/**
* @deprecated for binary compatibility with older plugins
* @see #createHyperlink(int, int, TextAttributes, HyperlinkInfo)
*/
public void addHyperlink(final int highlightStartOffset,
final int highlightEndOffset,
@Nullable final TextAttributes highlightAttributes,
@NotNull final HyperlinkInfo hyperlinkInfo) {
createHyperlink(highlightStartOffset, highlightEndOffset, highlightAttributes, hyperlinkInfo);
}
@NotNull
public RangeHighlighter createHyperlink(int highlightStartOffset,
int highlightEndOffset,
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java
-9
View File
@@ -1390,15 +1390,6 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Persis
return result.toArray(new FileEditor[0]);
}
@Override
public void showEditorAnnotation(@NotNull FileEditor editor, @NotNull JComponent annotationComponent) {
addTopComponent(editor, annotationComponent);
}
@Override
public void removeEditorAnnotation(@NotNull FileEditor editor, @NotNull JComponent annotationComponent) {
removeTopComponent(editor, annotationComponent);
}
@NotNull
public List<JComponent> getTopComponents(@NotNull FileEditor editor) {
platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemBase.java
-6
View File
@@ -265,12 +265,6 @@ public abstract class LocalFileSystemBase extends LocalFileSystem {
}
}
@Override
public boolean processCachedFilesInSubtree(@NotNull VirtualFile file, @NotNull Processor<VirtualFile> processor) {
return file.getFileSystem() != this
|| processFile((NewVirtualFile)file, processor);
}
private static boolean processFile(@NotNull NewVirtualFile file, @NotNull Processor<VirtualFile> processor) {
if (!processor.process(file)) return false;
if (file.isDirectory()) {
platform/platform-impl/src/com/intellij/openapi/wm/impl/TestWindowManager.java
-10
View File
@@ -57,11 +57,6 @@ public final class TestWindowManager extends WindowManagerEx {
@Override
public final void doNotSuggestAsParent(final Window window) { }
@Override
public StatusBar getStatusBar(@NotNull Component c) {
return null;
}
@Override
public final Window suggestParentWindow(@Nullable final Project project) {
return null;
@@ -174,11 +169,6 @@ public final class TestWindowManager extends WindowManagerEx {
throw new UnsupportedOperationException();
}
@Override
public final boolean isInsideScreenBounds(final int x, final int y) {
throw new UnsupportedOperationException();
}
@Override
public final boolean isAlphaModeSupported() {
return false;
platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeadlessManagerImpl.java
-5
View File
@@ -482,11 +482,6 @@ public class ToolWindowHeadlessManagerImpl extends ToolWindowManagerEx {
if (mySelected == null) setSelectedContent(content);
}
@Override
public void addContent(@NotNull final Content content, final Object constraints) {
addContent(content);
}
@Override
public void addSelectedContent(@NotNull final Content content) {
addContent(content);
platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.java
-10
View File
@@ -178,11 +178,6 @@ public final class WindowManagerImpl extends WindowManagerEx implements NamedCom
return ScreenUtil.getAllScreensShape().contains(x, y, width, 1);
}
@Override
public final boolean isInsideScreenBounds(final int x, final int y) {
return ScreenUtil.getAllScreensShape().contains(x, y);
}
@Override
public final boolean isAlphaModeSupported() {
if (myAlphaModeSupported == null) {
@@ -353,11 +348,6 @@ public final class WindowManagerImpl extends WindowManagerEx implements NamedCom
return frame == null ? null : frame.getStatusBar();
}
@Override
public StatusBar getStatusBar(@NotNull Component c) {
return getStatusBar(c, null);
}
@Override
public StatusBar getStatusBar(@NotNull Component c, @Nullable Project project) {
Component parent = UIUtil.findUltimateParent(c);
platform/platform-impl/src/com/intellij/ui/content/impl/ContentManagerImpl.java
-5
View File
@@ -150,11 +150,6 @@ public class ContentManagerImpl implements ContentManager, PropertyChangeListene
doAddContent(content, -1);
}
@Override
public void addContent(@NotNull final Content content, final Object constraints) {
doAddContent(content, -1);
}
private void doAddContent(@NotNull final Content content, final int index) {
ApplicationManager.getApplication().assertIsDispatchThread();
if (myContents.contains(content)) {
platform/platform-resources/src/META-INF/LangExtensions.xml
-2
View File
@@ -60,8 +60,6 @@
<applicationService serviceImplementation="com.intellij.navigation.ChooseByNameRegistry"/>
<applicationService serviceInterface="com.intellij.application.options.CodeStyleSettingsUtil"
serviceImplementation="com.intellij.application.options.CodeStyleSettingsUtilImpl"/>
<applicationService serviceInterface="com.intellij.ide.PsiActionSupportFactory"
serviceImplementation="com.intellij.ide.PsiActionSupportFactoryImpl"/>
platform/projectModel-api/src/com/intellij/openapi/module/ModuleWithNameAlreadyExists.java
-9
View File
@@ -18,15 +18,6 @@ package com.intellij.openapi.module;
public class ModuleWithNameAlreadyExists extends Exception {
private final String myModuleName;
/**
* @deprecated use constructor which allows passing of localized message
*/
public ModuleWithNameAlreadyExists(String moduleName) {
//noinspection HardCodedStringLiteral
super("Module \'" + moduleName + "\' already exists in the project.");
myModuleName = moduleName;
}
public ModuleWithNameAlreadyExists(final String message, final String moduleName) {
super(message);
myModuleName = moduleName;
platform/projectModel-api/src/com/intellij/openapi/roots/ExcludedOutputFolder.java
-25
View File
@@ -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.roots;
/**
* @author dsl
*
* @deprecated {@link ContentEntry#getExcludeFolders()} don't return synthetic entries for excluded outputs any more.
* Use {@link ContentEntry#getExcludeFolderFiles()} to get all excluded roots
*/
public interface ExcludedOutputFolder extends ExcludeFolder {
}
platform/testFramework/src/com/intellij/mock/Mock.java
-6
View File
@@ -376,13 +376,7 @@ public class Mock {
return new FileEditor[0];
}
@Override
public void removeEditorAnnotation(@NotNull FileEditor editor, @NotNull JComponent annotationComponent) {
}
@Override
public void showEditorAnnotation(@NotNull FileEditor editor, @NotNull JComponent annotationComponent) {
}
@Override
public void addFileEditorManagerListener(@NotNull FileEditorManagerListener listener) {
platform/testFramework/src/com/intellij/mock/MockLocalFileSystem.java
-6
View File
@@ -21,7 +21,6 @@ import com.intellij.openapi.vfs.LocalFileOperationsHandler;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Processor;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -84,11 +83,6 @@ public class MockLocalFileSystem extends LocalFileSystem {
}
@Override
public boolean processCachedFilesInSubtree(@NotNull final VirtualFile file, @NotNull final Processor<VirtualFile> processor) {
throw new UnsupportedOperationException("'processCachedFilesInSubtree' not implemented in " + getClass().getName());
}
@Override
@NotNull
public String getProtocol() {
platform/usageView/src/com/intellij/usages/rules/UsageFilteringRuleEx.java
-27
View File
@@ -1,27 +0,0 @@
/*
* Copyright 2000-2011 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.usages.rules;
import com.intellij.usages.Usage;
import com.intellij.usages.UsageTarget;
import org.jetbrains.annotations.NotNull;
/**
* @deprecated implement {@link UsageFilteringRule#isVisible(Usage, UsageTarget[])} instead
*/
public interface UsageFilteringRuleEx extends UsageFilteringRule {
boolean isVisible(@NotNull Usage usage, @NotNull UsageTarget[] targets);
}
platform/usageView/src/com/intellij/usages/rules/UsageGroupingRuleEx.java
-39
View File
@@ -1,39 +0,0 @@
/*
* Copyright 2000-2011 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.usages.rules;
import com.intellij.usages.Usage;
import com.intellij.usages.UsageGroup;
import com.intellij.usages.UsageTarget;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.List;
/**
* @deprecated override {@link UsageGroupingRule#getParentGroupsFor(Usage, UsageTarget[])} instead.
*/
public interface UsageGroupingRuleEx extends UsageGroupingRule {
@Nullable
UsageGroup groupUsage(@NotNull Usage usage, @NotNull UsageTarget[] targets);
@NotNull
@Override
default List<UsageGroup> getParentGroupsFor(@NotNull Usage usage, @NotNull UsageTarget[] targets) {
return ContainerUtil.createMaybeSingletonList(groupUsage(usage, targets));
}
}
platform/util/src/com/intellij/openapi/util/MultiValuesMap.java
-14
View File
@@ -105,20 +105,6 @@ public class MultiValuesMap<K, V>{
return myBaseMap.containsKey(key);
}
/**
* @deprecated this method will return unordered set for ordered map, use {@link #values()} instead
*/
@Deprecated
@NotNull
public Collection<V> collectValues() {
Collection<V> result = new HashSet<V>();
for (Collection<V> v : myBaseMap.values()) {
result.addAll(v);
}
return result;
}
@Nullable
public V getFirst(final K key) {
Collection<V> values = myBaseMap.get(key);
platform/util/src/com/intellij/util/containers/ByteArrayList.java
-4
View File
@@ -14,8 +14,4 @@ public class ByteArrayList extends TByteArrayList {
public ByteArrayList(int capacity) {
super(capacity);
}
public ByteArrayList(byte[] values) {
super(values);
}
}
platform/util/src/com/intellij/util/io/ZipUtil.java
-13
View File
@@ -236,18 +236,5 @@ public class ZipUtil {
}
}
/** @deprecated trivial */
@Deprecated
@ApiStatus.ScheduledForRemoval(inVersion = "2019")
public static boolean isZipContainsEntry(File zip, String relativePath) throws IOException {
ZipFile zipFile = new ZipFile(zip);
try {
return zipFile.getEntry(relativePath) != null;
}
finally {
zipFile.close();
}
}
//</editor-fold>
}
platform/util/src/com/intellij/util/text/CharArrayUtil.java
-9
View File
@@ -101,15 +101,6 @@ public class CharArrayUtil {
}
}
/**
* @deprecated use {@link #fromSequence(CharSequence)}
*/
@Deprecated
@NotNull
public static char[] fromSequenceStrict(@NotNull CharSequence seq) {
return fromSequence(seq);
}
@Nullable
public static char[] fromSequenceWithoutCopying(@Nullable CharSequence seq) {
if (seq instanceof CharSequenceBackedByArray) {
platform/util/src/com/intellij/util/text/SemVer.java
-11
View File
@@ -121,15 +121,4 @@ public final class SemVer implements Comparable<SemVer> {
return null;
}
//<editor-fold desc="Deprecated stuff.">
/** @deprecated use {@code ObjectUtils.notNull(SemVer.parseFromText(...), SemVer.UNKNOWN)} (to be removed in IDEA 2019) */
@Deprecated
@SuppressWarnings("SpellCheckingInspection")
public static SemVer parseFromTextNonNullize(@Nullable final String text) {
if (text == null) return UNKNOWN;
final SemVer ver = parseFromText(text);
return ver == null ? UNKNOWN : ver;
}
//</editor-fold>
}
platform/util/src/com/intellij/util/text/StringSearcher.java
-9
View File
@@ -214,15 +214,6 @@ public class StringSearcher {
return sameChar;
}
/**
* @deprecated Use {@link #scan(CharSequence)} instead
*/
@Deprecated
public int scan(char[] text, int startOffset, int endOffset){
final int res = scan(new CharArrayCharSequence(text),text, startOffset, endOffset);
return res >= 0 ? res: -1;
}
@Override
public String toString() {
return "pattern " + myPattern;
platform/util/src/com/intellij/util/ui/JBUI.java
-9
View File
@@ -555,15 +555,6 @@ public class JBUI {
return insets(0, 0, 0, r);
}
/**
* @deprecated use JBUI.scale(EmptyIcon.create(size)) instead
*/
@Deprecated
@NotNull
public static EmptyIcon emptyIcon(int size) {
return scale(EmptyIcon.create(size));
}
@NotNull
@SuppressWarnings("unchecked")
public static <T extends JBIcon> T scale(@NotNull T icon) {
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitOptionsPanel.kt
+1 -2
View File
@@ -14,7 +14,6 @@ import com.intellij.openapi.vcs.checkin.CheckinChangeListSpecificComponent
import com.intellij.openapi.vcs.checkin.CheckinHandler
import com.intellij.openapi.vcs.ui.RefreshableOnComponent
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.ui.IdeBorderFactory.createTitledBorder
import com.intellij.ui.ScrollPaneFactory.createScrollPane
import com.intellij.util.ui.JBUI
import com.intellij.util.ui.JBUI.Panels.simplePanel
@@ -126,7 +125,7 @@ class CommitOptionsPanel(private val myCommitPanel: CheckinProjectPanel,
companion object {
fun verticalPanel(title: String) = JPanel(VerticalFlowLayout(0, 5)).apply {
border = createTitledBorder(title)
border = com.intellij.ui.IdeBorderFactory.createTitledBorder(title)
}
}
}
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parameterInfo/GroovyAnnotationAttributeInfoHandler.java
-16
View File
@@ -104,12 +104,6 @@ public class GroovyAnnotationAttributeInfoHandler implements ParameterInfoHandle
return PsiAnnotationMethod.EMPTY_ARRAY;
}
@Nullable
@Override
public Object[] getParametersForDocumentation(PsiAnnotationMethod method, ParameterInfoContext context) {
return new PsiAnnotationMethod[]{method};
}
@Override
public GrAnnotationArgumentList findElementForParameterInfo(@NotNull CreateParameterInfoContext context) {
return findAnchor(context.getEditor(), context.getFile());
@@ -168,16 +162,6 @@ public class GroovyAnnotationAttributeInfoHandler implements ParameterInfoHandle
return offset1;
}
@Override
public String getParameterCloseChars() {
return ParameterInfoUtils.DEFAULT_PARAMETER_CLOSE_CHARS;
}
@Override
public boolean tracksParameterIndex() {
return true;
}
@Override
public void updateUI(@NotNull PsiAnnotationMethod p, @NotNull ParameterInfoUIContext context) {
@NonNls StringBuilder buffer = new StringBuilder();
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parameterInfo/GroovyParameterInfoHandler.java
-22
View File
@@ -78,18 +78,6 @@ public class GroovyParameterInfoHandler implements ParameterInfoHandlerWithTabAc
return null;
}
@Override
public Object[] getParametersForDocumentation(Object resolveResult, ParameterInfoContext context) {
if (resolveResult instanceof GroovyResolveResult) {
final PsiElement element = ((GroovyResolveResult)resolveResult).getElement();
if (element instanceof PsiMethod) {
return ((PsiMethod)element).getParameterList().getParameters();
}
}
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}
@Override
public GroovyPsiElement findElementForParameterInfo(@NotNull CreateParameterInfoContext context) {
return findAnchorElement(context.getEditor().getCaretModel().getOffset(), context.getFile());
@@ -302,16 +290,6 @@ public class GroovyParameterInfoHandler implements ParameterInfoHandlerWithTabAc
return element != null && element.getNode().getElementType() == GroovyTokenTypes.mCOMMA;
}
@Override
public String getParameterCloseChars() {
return ",){}";
}
@Override
public boolean tracksParameterIndex() {
return true;
}
@Override
public void updateUI(Object o, @NotNull ParameterInfoUIContext context) {
CodeInsightSettings settings = CodeInsightSettings.getInstance();
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parameterInfo/GroovyTypeParameterInfoHandler.java
-12
View File
@@ -75,12 +75,6 @@ public class GroovyTypeParameterInfoHandler implements ParameterInfoHandlerWithT
return null;
}
@Nullable
@Override
public Object[] getParametersForDocumentation(PsiTypeParameter p, ParameterInfoContext context) {
return new Object[]{p};
}
@Nullable
@Override
public GrTypeArgumentList findElementForParameterInfo(@NotNull CreateParameterInfoContext context) {
@@ -122,12 +116,6 @@ public class GroovyTypeParameterInfoHandler implements ParameterInfoHandlerWithT
context.setHighlightedParameter(index < objectsToView.length && index >= 0 ? (PsiElement)objectsToView[index] : null);
}
@Nullable
@Override
public String getParameterCloseChars() {
return ",>";
}
@Override
public void updateUI(PsiTypeParameter p, @NotNull ParameterInfoUIContext context) {
@NonNls StringBuilder buffer = new StringBuilder();
plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/projectView/MvcProjectViewPane.java
+10 -10
View File
@@ -238,43 +238,43 @@ public class MvcProjectViewPane extends AbstractProjectViewPSIPane implements Id
@Override
public Object getData(String dataId) {
if (DataConstants.PSI_ELEMENT.equals(dataId)) {
if (CommonDataKeys.PSI_ELEMENT.getName().equals(dataId)) {
final PsiElement[] elements = getSelectedPSIElements();
return elements.length == 1 ? elements[0] : null;
}
if (DataConstants.PSI_ELEMENT_ARRAY.equals(dataId)) {
if (LangDataKeys.PSI_ELEMENT_ARRAY.getName().equals(dataId)) {
return getSelectedPSIElements();
}
if (DataConstants.MODULE_CONTEXT.equals(dataId)) {
if (LangDataKeys.MODULE_CONTEXT.getName().equals(dataId)) {
final Object element = getSelectedElement();
if (element instanceof Module) {
return element;
}
return null;
}
if (DataConstants.MODULE_CONTEXT_ARRAY.equals(dataId)) {
if (LangDataKeys.MODULE_CONTEXT_ARRAY.getName().equals(dataId)) {
final List<Module> moduleList = ContainerUtil.findAll(getSelectedElements(), Module.class);
if (!moduleList.isEmpty()) {
return moduleList.toArray(Module.EMPTY_ARRAY);
}
return null;
}
if (dataId.equals(DataConstants.IDE_VIEW)) {
if (dataId.equals(LangDataKeys.IDE_VIEW.getName())) {
return this;
}
if (dataId.equals(DataConstants.HELP_ID)) {
if (dataId.equals(PlatformDataKeys.HELP_ID.getName())) {
return "reference.toolwindows." + myId.toLowerCase();
}
if (DataConstants.CUT_PROVIDER.equals(dataId)) {
if (PlatformDataKeys.CUT_PROVIDER.getName().equals(dataId)) {
return myCopyPasteDelegator.getCutProvider();
}
if (DataConstants.COPY_PROVIDER.equals(dataId)) {
if (PlatformDataKeys.COPY_PROVIDER.getName().equals(dataId)) {
return myCopyPasteDelegator.getCopyProvider();
}
if (DataConstants.PASTE_PROVIDER.equals(dataId)) {
if (PlatformDataKeys.PASTE_PROVIDER.getName().equals(dataId)) {
return myCopyPasteDelegator.getPasteProvider();
}
if (DataConstants.DELETE_ELEMENT_PROVIDER.equals(dataId)) {
if (PlatformDataKeys.DELETE_ELEMENT_PROVIDER.getName().equals(dataId)) {
for (final Object element : getSelectedElements()) {
if (element instanceof Module) {
return myDeleteModuleProvider;
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/XPathParameterInfoHandler.java
-12
View File
@@ -39,10 +39,6 @@ public class XPathParameterInfoHandler implements ParameterInfoHandler<XPathFunc
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}
public Object[] getParametersForDocumentation(XPathFunction xPathFunction, ParameterInfoContext parameterInfoContext) {
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}
public XPathFunctionCall findElementForParameterInfo(@NotNull CreateParameterInfoContext context) {
final XPathFunctionCall call = findFunctionCall(context.getFile(), context.getOffset());
if (call != null) {
@@ -85,14 +81,6 @@ public class XPathParameterInfoHandler implements ParameterInfoHandler<XPathFunc
context.setCurrentParameter(currentParameterIndex);
}
public String getParameterCloseChars() {
return "(,)";
}
public boolean tracksParameterIndex() {
return true;
}
public void updateUI(XPathFunction function, @NotNull ParameterInfoUIContext context) {
final Function declaration = function.getDeclaration();
if (declaration != null) {
uast/uast-tests/src/org/jetbrains/uast/test/env/TestCoreEnvironment.java
Vendored
-3
View File
@@ -41,7 +41,6 @@ import com.intellij.psi.compiled.ClassFileDecompilers;
import com.intellij.psi.impl.JavaClassSupersImpl;
import com.intellij.psi.impl.PsiElementFinderImpl;
import com.intellij.psi.impl.PsiTreeChangePreprocessor;
import com.intellij.psi.impl.compiled.ClsCustomNavigationPolicy;
import com.intellij.psi.impl.file.impl.JavaFileManager;
import com.intellij.psi.meta.MetaDataContributor;
import com.intellij.psi.stubs.BinaryFileStubBuilders;
@@ -166,8 +165,6 @@ public class TestCoreEnvironment extends AbstractCoreEnvironment {
//
CoreApplicationEnvironment.registerExtensionPoint(
Extensions.getRootArea(), ContainerProvider.EP_NAME, ContainerProvider.class);
CoreApplicationEnvironment.registerExtensionPoint(
Extensions.getRootArea(), ClsCustomNavigationPolicy.EP_NAME, ClsCustomNavigationPolicy.class);
CoreApplicationEnvironment.registerExtensionPoint(
Extensions.getRootArea(), ClassFileDecompilers.EP_NAME, ClassFileDecompilers.Decompiler.class);
CoreApplicationEnvironment.registerExtensionPoint(
xml/impl/src/com/intellij/codeInsight/hint/api/impls/XmlParameterInfoHandler.java
-10
View File
@@ -51,11 +51,6 @@ public class XmlParameterInfoHandler implements ParameterInfoHandler<XmlTag,XmlE
return null;
}
@Override
public Object[] getParametersForDocumentation(final XmlElementDescriptor p, final ParameterInfoContext context) {
return getSortedDescriptors(p);
}
public static XmlAttributeDescriptor[] getSortedDescriptors(final XmlElementDescriptor p) {
final XmlAttributeDescriptor[] xmlAttributeDescriptors = p.getAttributesDescriptors(null);
Arrays.sort(xmlAttributeDescriptors, COMPARATOR);
@@ -106,11 +101,6 @@ public class XmlParameterInfoHandler implements ParameterInfoHandler<XmlTag,XmlE
}
}
@Override
public String getParameterCloseChars() {
return null;
}
@Nullable
private static XmlTag findXmlTag(PsiFile file, int offset){
if (!(file instanceof XmlFile)) return null;
xml/xml-analysis-impl/src/com/intellij/application/options/editor/WebEditorOptions.java
+1 -7
View File
@@ -49,17 +49,11 @@ public class WebEditorOptions implements PersistentStateComponent<WebEditorOptio
/**
* @deprecated use LineMarkerSettings.getSettings().isEnabled(new ColorLineMarkerProvider())
*/
@Deprecated
public boolean isShowCssColorPreviewInGutter() {
return myShowCssColorPreviewInGutter;
}
/**
* @deprecated use LineMarkerSettings.getSettings().isEnabled(new ColorLineMarkerProvider())
*/
public void setShowCssColorPreviewInGutter(final boolean showCssColorPreviewInGutter) {
myShowCssColorPreviewInGutter = showCssColorPreviewInGutter;
}
public boolean isAutomaticallyInsertClosingTag() {
return myAutomaticallyInsertClosingTag;
}