From 465d7dfbc7c3401369d512c1bc41a7aabbb51c91 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Tue, 1 Oct 2013 22:30:41 +0200 Subject: [PATCH] fix yellow code producing by CommonDataKeys --- .../src/org/intellij/images/editor/impl/ImageEditorUI.java | 2 +- .../org/intellij/images/thumbnail/impl/ThumbnailViewUI.java | 2 +- .../com/intellij/compiler/actions/CompileActionBase.java | 2 +- .../src/com/intellij/analysis/AnalysisScopeRule.java | 2 +- .../codeInsight/hint/actions/ShowSiblingsAction.java | 2 +- .../src/com/intellij/ide/macro/FileClassMacro.java | 3 ++- .../src/com/intellij/ide/macro/FilePackageMacro.java | 3 ++- .../src/com/intellij/javadoc/JavadocNavigationDelegate.java | 2 +- .../com/intellij/refactoring/actions/RenameFileAction.java | 4 ++-- .../refactoring/extractMethod/ExtractMethodHandler.java | 2 +- .../intellij/refactoring/rename/RenameWrongRefHandler.java | 2 +- .../refactoring/tempWithQuery/TempWithQueryHandler.java | 2 +- .../BaseGenerateTestSupportMethodAction.java | 2 +- .../src/com/intellij/analysis/BaseAnalysisAction.java | 2 +- .../codeStyle/arrangement/action/RearrangeCodeAction.java | 2 +- .../intellij/codeEditor/printing/ExportToHTMLAction.java | 2 +- .../intellij/codeEditor/printing/ExportToHTMLManager.java | 2 +- .../src/com/intellij/codeEditor/printing/PrintAction.java | 2 +- .../src/com/intellij/codeEditor/printing/PrintManager.java | 2 +- .../intellij/codeInsight/daemon/impl/PopupHectorAction.java | 5 +++-- .../codeInsight/editorActions/FixDocCommentAction.java | 2 +- .../codeInsight/hint/actions/ShowImplementationsAction.java | 4 ++-- .../codeInsight/template/actions/SaveAsTemplateAction.java | 4 ++-- .../actions/CodeInspectionOnEditorAction.java | 4 ++-- .../codeInspection/actions/RunInspectionAction.java | 2 +- .../src/com/intellij/ide/actions/ExternalJavaDocAction.java | 4 ++-- .../src/com/intellij/ide/actions/GotoActionBase.java | 2 +- .../src/com/intellij/ide/actions/GotoRelatedFileAction.java | 4 ++-- .../com/intellij/ide/actions/NewElementToolbarAction.java | 4 ++-- .../com/intellij/ide/actions/SaveFileAsTemplateAction.java | 2 +- .../ide/favoritesTreeView/actions/AddToFavoritesAction.java | 2 +- .../ide/hierarchy/actions/BrowseHierarchyActionBase.java | 2 +- .../intellij/ide/impl/dataRules/VirtualFileArrayRule.java | 2 +- .../com/intellij/ide/impl/dataRules/VirtualFileRule.java | 2 +- .../src/com/intellij/ide/navigationToolbar/NavBarModel.java | 2 +- .../lang-impl/src/com/intellij/ide/util/DeleteHandler.java | 2 +- .../intellij/ide/util/scopeChooser/ScopeChooserCombo.java | 2 +- .../internal/SelectionBasedPsiElementInternalAction.java | 2 +- .../internal/psiView/PsiViewerForContextAction.java | 4 ++-- .../moduleDependencies/ShowModuleDependenciesAction.java | 2 +- .../openapi/editor/actions/LangIndentSelectionAction.java | 3 ++- .../editor/actions/ToggleShowImportPopupsAction.java | 2 +- .../intellij/refactoring/ClassRefactoringHandlerBase.java | 2 +- .../refactoring/actions/BasePlatformRefactoringAction.java | 2 +- .../intellij/refactoring/actions/BaseRefactoringAction.java | 2 +- .../intellij/refactoring/actions/ExtractIncludeAction.java | 3 ++- .../rename/inplace/VariableInplaceRenameHandler.java | 2 +- .../intellij/testIntegration/GotoTestRelatedProvider.java | 3 ++- .../com/intellij/openapi/actionSystem/DataConstants.java | 2 +- .../testFramework/LightPlatformCodeInsightTestCase.java | 6 +++--- .../usageView/src/com/intellij/usages/UsageTargetUtil.java | 2 +- .../com/intellij/lang/ant/refactoring/AntRenameHandler.java | 3 ++- .../idea/copyright/actions/GenerateCopyrightAction.java | 2 +- .../src/actions/GenerateComponentExternalizationAction.java | 2 +- plugins/devkit/src/actions/ShowSerializedXmlAction.java | 4 ++-- plugins/devkit/src/actions/ShuffleNamesAction.java | 4 ++-- .../devkit/src/actions/ToggleHighlightingMarkupAction.java | 4 ++-- .../tostring/GenerateToStringActionHandlerImpl.java | 2 +- .../intentions/dynamic/DynamicToolWindowWrapper.java | 2 +- .../src/com/intellij/codeInspection/i18n/I18nizeAction.java | 4 ++-- .../maven/dom/refactorings/MavenPropertyRenameHandler.java | 2 +- .../java/org/jetbrains/idea/maven/dom/MavenDomTestCase.java | 2 +- .../configuration/TestNGPatternConfigurationProducer.java | 3 ++- .../com/intellij/uiDesigner/palette/AddComponentAction.java | 4 ++-- .../propertyInspector/PropertyInspectorTable.java | 2 +- .../xpath/xslt/associations/impl/AssociationsGroup.java | 2 +- .../xslt/associations/impl/ConfigureAssociationsAction.java | 2 +- .../spellchecker/actions/SpellingPopupActionGroup.java | 4 ++-- .../ide/browsers/OpenFileInDefaultBrowserAction.java | 4 ++-- .../intellij/xml/actions/validate/ValidateXmlAction.java | 4 ++-- .../com/intellij/xml/refactoring/XmlTagRenameHandler.java | 2 +- .../intellij/plugins/relaxNG/validation/ValidateAction.java | 2 +- 72 files changed, 99 insertions(+), 91 deletions(-) diff --git a/images/src/org/intellij/images/editor/impl/ImageEditorUI.java b/images/src/org/intellij/images/editor/impl/ImageEditorUI.java index a469171ff711..8fe408edc9c2 100644 --- a/images/src/org/intellij/images/editor/impl/ImageEditorUI.java +++ b/images/src/org/intellij/images/editor/impl/ImageEditorUI.java @@ -365,7 +365,7 @@ final class ImageEditorUI extends JPanel implements DataProvider { return editor.getFile(); } else if (PlatformDataKeys.VIRTUAL_FILE_ARRAY.is(dataId)) { return new VirtualFile[]{editor.getFile()}; - } else if (LangDataKeys.PSI_FILE.is(dataId)) { + } else if (CommonDataKeys.PSI_FILE.is(dataId)) { return getData(CommonDataKeys.PSI_ELEMENT.getName()); } else if (CommonDataKeys.PSI_ELEMENT.is(dataId)) { VirtualFile file = editor.getFile(); diff --git a/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java b/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java index 61e187782508..3f17747561be 100644 --- a/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java +++ b/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java @@ -420,7 +420,7 @@ final class ThumbnailViewUI extends JPanel implements DataProvider, Disposable { return selectedFiles.length > 0 ? selectedFiles[0] : null; } else if (PlatformDataKeys.VIRTUAL_FILE_ARRAY.is(dataId)) { return getSelectedFiles(); - } else if (LangDataKeys.PSI_FILE.is(dataId)) { + } else if (CommonDataKeys.PSI_FILE.is(dataId)) { return getData(CommonDataKeys.PSI_ELEMENT.getName()); } else if (CommonDataKeys.PSI_ELEMENT.is(dataId)) { VirtualFile[] selectedFiles = getSelectedFiles(); diff --git a/java/compiler/impl/src/com/intellij/compiler/actions/CompileActionBase.java b/java/compiler/impl/src/com/intellij/compiler/actions/CompileActionBase.java index 7c021d08dff2..f7f320df8342 100644 --- a/java/compiler/impl/src/com/intellij/compiler/actions/CompileActionBase.java +++ b/java/compiler/impl/src/com/intellij/compiler/actions/CompileActionBase.java @@ -32,7 +32,7 @@ public abstract class CompileActionBase extends AnAction implements DumbAware { return; } Editor editor = e.getData(CommonDataKeys.EDITOR); - PsiFile file = e.getData(LangDataKeys.PSI_FILE); + PsiFile file = e.getData(CommonDataKeys.PSI_FILE); if (file != null && editor != null && !DumbService.getInstance(project).isDumb()) { DaemonCodeAnalyzer.getInstance(project).autoImportReferenceAtCursor(editor, file); //let autoimport complete } diff --git a/java/java-impl/src/com/intellij/analysis/AnalysisScopeRule.java b/java/java-impl/src/com/intellij/analysis/AnalysisScopeRule.java index a1aa71e24902..2b48659aefe1 100644 --- a/java/java-impl/src/com/intellij/analysis/AnalysisScopeRule.java +++ b/java/java-impl/src/com/intellij/analysis/AnalysisScopeRule.java @@ -34,7 +34,7 @@ import com.intellij.psi.search.GlobalSearchScope; public class AnalysisScopeRule implements GetDataRule { @Override public Object getData(final DataProvider dataProvider) { - final Object psiFile = dataProvider.getData(LangDataKeys.PSI_FILE.getName()); + final Object psiFile = dataProvider.getData(CommonDataKeys.PSI_FILE.getName()); if (psiFile instanceof PsiJavaFile) { return new JavaAnalysisScope((PsiJavaFile)psiFile); } diff --git a/java/java-impl/src/com/intellij/codeInsight/hint/actions/ShowSiblingsAction.java b/java/java-impl/src/com/intellij/codeInsight/hint/actions/ShowSiblingsAction.java index 7d5179496602..8b839e522c24 100644 --- a/java/java-impl/src/com/intellij/codeInsight/hint/actions/ShowSiblingsAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/hint/actions/ShowSiblingsAction.java @@ -45,7 +45,7 @@ public class ShowSiblingsAction extends ShowImplementationsAction { @Override public void performForContext(DataContext dataContext, final boolean invokedByShortcut) { final Project project = CommonDataKeys.PROJECT.getData(dataContext); - final PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); + final PsiFile file = CommonDataKeys.PSI_FILE.getData(dataContext); if (project == null) return; diff --git a/java/java-impl/src/com/intellij/ide/macro/FileClassMacro.java b/java/java-impl/src/com/intellij/ide/macro/FileClassMacro.java index 3bcf55015e28..a962082e56ab 100644 --- a/java/java-impl/src/com/intellij/ide/macro/FileClassMacro.java +++ b/java/java-impl/src/com/intellij/ide/macro/FileClassMacro.java @@ -16,6 +16,7 @@ package com.intellij.ide.macro; import com.intellij.ide.IdeBundle; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.psi.PsiClass; @@ -44,7 +45,7 @@ public final class FileClassMacro extends Macro { //if (!(psiFile instanceof PsiJavaFile)) { // return null; //} - final PsiFile javaFile = LangDataKeys.PSI_FILE.getData(dataContext); + final PsiFile javaFile = CommonDataKeys.PSI_FILE.getData(dataContext); if (!(javaFile instanceof PsiJavaFile)) return null; PsiClass[] classes = ((PsiJavaFile) javaFile).getClasses(); if (classes.length == 1) { diff --git a/java/java-impl/src/com/intellij/ide/macro/FilePackageMacro.java b/java/java-impl/src/com/intellij/ide/macro/FilePackageMacro.java index e744e7cbed8e..b007c51796c4 100644 --- a/java/java-impl/src/com/intellij/ide/macro/FilePackageMacro.java +++ b/java/java-impl/src/com/intellij/ide/macro/FilePackageMacro.java @@ -16,6 +16,7 @@ package com.intellij.ide.macro; import com.intellij.ide.IdeBundle; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.psi.JavaDirectoryService; @@ -41,7 +42,7 @@ public final class FilePackageMacro extends Macro { @Nullable static PsiPackage getFilePackage(DataContext dataContext) { - PsiFile psiFile = LangDataKeys.PSI_FILE.getData(dataContext); + PsiFile psiFile = CommonDataKeys.PSI_FILE.getData(dataContext); if (psiFile == null) return null; PsiDirectory containingDirectory = psiFile.getContainingDirectory(); if (containingDirectory == null || !containingDirectory.isValid()) return null; diff --git a/java/java-impl/src/com/intellij/javadoc/JavadocNavigationDelegate.java b/java/java-impl/src/com/intellij/javadoc/JavadocNavigationDelegate.java index 6f9cb2263528..0162d212825e 100644 --- a/java/java-impl/src/com/intellij/javadoc/JavadocNavigationDelegate.java +++ b/java/java-impl/src/com/intellij/javadoc/JavadocNavigationDelegate.java @@ -87,7 +87,7 @@ public class JavadocNavigationDelegate extends EditorNavigationDelegateAdapter { } final Document document = editor.getDocument(); - PsiFile psiFile = LangDataKeys.PSI_FILE.getData(dataContext); + PsiFile psiFile = CommonDataKeys.PSI_FILE.getData(dataContext); if (psiFile == null) { psiFile = PsiDocumentManager.getInstance(project).getPsiFile(document); } diff --git a/java/java-impl/src/com/intellij/refactoring/actions/RenameFileAction.java b/java/java-impl/src/com/intellij/refactoring/actions/RenameFileAction.java index d90eb35168ee..d4a8d8398045 100644 --- a/java/java-impl/src/com/intellij/refactoring/actions/RenameFileAction.java +++ b/java/java-impl/src/com/intellij/refactoring/actions/RenameFileAction.java @@ -30,7 +30,7 @@ public class RenameFileAction extends AnAction implements DumbAware { public static final String RENAME_FILE = "Rename File..."; public void actionPerformed(final AnActionEvent e) { - final PsiFile file = e.getData(LangDataKeys.PSI_FILE); + final PsiFile file = e.getData(CommonDataKeys.PSI_FILE); assert file != null; final VirtualFile virtualFile = file.getVirtualFile(); assert virtualFile != null; @@ -40,7 +40,7 @@ public class RenameFileAction extends AnAction implements DumbAware { } public void update(AnActionEvent e) { - PsiFile file = e.getData(LangDataKeys.PSI_FILE); + PsiFile file = e.getData(CommonDataKeys.PSI_FILE); Presentation presentation = e.getPresentation(); boolean enabled = file instanceof PsiClassOwner && e.getPlace() != ActionPlaces.EDITOR_POPUP && e.getData(CommonDataKeys.PROJECT) != null; presentation.setEnabled(enabled); diff --git a/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodHandler.java b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodHandler.java index d6780fc41871..f3f7c854eb65 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodHandler.java @@ -61,7 +61,7 @@ public class ExtractMethodHandler implements RefactoringActionHandler { public void invoke(@NotNull Project project, @NotNull PsiElement[] elements, DataContext dataContext) { if (dataContext != null) { - final PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); + final PsiFile file = CommonDataKeys.PSI_FILE.getData(dataContext); final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (file != null && editor != null) { invokeOnElements(project, editor, file, elements); diff --git a/java/java-impl/src/com/intellij/refactoring/rename/RenameWrongRefHandler.java b/java/java-impl/src/com/intellij/refactoring/rename/RenameWrongRefHandler.java index 8cf94a48ee21..7f80314d37d9 100644 --- a/java/java-impl/src/com/intellij/refactoring/rename/RenameWrongRefHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/rename/RenameWrongRefHandler.java @@ -33,7 +33,7 @@ public class RenameWrongRefHandler implements RenameHandler { public final boolean isAvailableOnDataContext(final DataContext dataContext) { final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); - final PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); + final PsiFile file = CommonDataKeys.PSI_FILE.getData(dataContext); final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (editor == null || file == null || project == null) return false; return isAvailable(project, editor, file); diff --git a/java/java-impl/src/com/intellij/refactoring/tempWithQuery/TempWithQueryHandler.java b/java/java-impl/src/com/intellij/refactoring/tempWithQuery/TempWithQueryHandler.java index 939a63bfb899..8d9b4f7fe1f0 100644 --- a/java/java-impl/src/com/intellij/refactoring/tempWithQuery/TempWithQueryHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/tempWithQuery/TempWithQueryHandler.java @@ -176,7 +176,7 @@ public class TempWithQueryHandler implements RefactoringActionHandler { public void invoke(@NotNull Project project, @NotNull PsiElement[] elements, DataContext dataContext) { if (elements.length == 1 && elements[0] instanceof PsiLocalVariable) { if (dataContext != null) { - final PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); + final PsiFile file = CommonDataKeys.PSI_FILE.getData(dataContext); final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (file != null && editor != null) { invokeOnVariable(file, project, (PsiLocalVariable)elements[0], editor); diff --git a/java/java-impl/src/com/intellij/testIntegration/BaseGenerateTestSupportMethodAction.java b/java/java-impl/src/com/intellij/testIntegration/BaseGenerateTestSupportMethodAction.java index 533c51bcc935..bb70ddcf6ca2 100644 --- a/java/java-impl/src/com/intellij/testIntegration/BaseGenerateTestSupportMethodAction.java +++ b/java/java-impl/src/com/intellij/testIntegration/BaseGenerateTestSupportMethodAction.java @@ -61,7 +61,7 @@ public class BaseGenerateTestSupportMethodAction extends BaseGenerateAction { public AnAction createEditTemplateAction(DataContext dataContext) { final Project project = CommonDataKeys.PROJECT.getData(dataContext); final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); - final PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); + final PsiFile file = CommonDataKeys.PSI_FILE.getData(dataContext); final PsiClass targetClass = editor == null || file == null ? null : getTargetClass(editor, file); if (targetClass != null) { final List frameworks = TestIntegrationUtils.findSuitableFrameworks(targetClass); diff --git a/platform/lang-impl/src/com/intellij/analysis/BaseAnalysisAction.java b/platform/lang-impl/src/com/intellij/analysis/BaseAnalysisAction.java index 94e2bce0c442..22ca613bdfe5 100644 --- a/platform/lang-impl/src/com/intellij/analysis/BaseAnalysisAction.java +++ b/platform/lang-impl/src/com/intellij/analysis/BaseAnalysisAction.java @@ -149,7 +149,7 @@ public abstract class BaseAnalysisAction extends AnAction { return analysisScope; } - final PsiFile psiFile = LangDataKeys.PSI_FILE.getData(dataContext); + final PsiFile psiFile = CommonDataKeys.PSI_FILE.getData(dataContext); if (psiFile != null && psiFile.getManager().isInProject(psiFile)) { final VirtualFile file = psiFile.getVirtualFile(); if (file != null && file.isValid() && file.getFileType() instanceof ArchiveFileType && acceptNonProjectDirectories()) { diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/RearrangeCodeAction.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/RearrangeCodeAction.java index 3d330e5bcaf5..9d7b7a55d0ea 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/RearrangeCodeAction.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/RearrangeCodeAction.java @@ -45,7 +45,7 @@ public class RearrangeCodeAction extends AnAction { @Override public void update(AnActionEvent e) { - PsiFile file = LangDataKeys.PSI_FILE.getData(e.getDataContext()); + PsiFile file = CommonDataKeys.PSI_FILE.getData(e.getDataContext()); boolean enabled = file != null && Rearranger.EXTENSION.forLanguage(file.getLanguage()) != null; e.getPresentation().setEnabled(enabled); } diff --git a/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLAction.java b/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLAction.java index a59ff63c1ffa..12d5fce8d2d8 100644 --- a/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLAction.java +++ b/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLAction.java @@ -53,7 +53,7 @@ public class ExportToHTMLAction extends AnAction { presentation.setEnabled(true); return; } - PsiFile psiFile = LangDataKeys.PSI_FILE.getData(dataContext); + PsiFile psiFile = CommonDataKeys.PSI_FILE.getData(dataContext); presentation.setEnabled(psiFile != null && psiFile.getContainingDirectory() != null); } diff --git a/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLManager.java b/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLManager.java index 7c6a9be37703..d293a79471c8 100644 --- a/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLManager.java +++ b/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLManager.java @@ -57,7 +57,7 @@ class ExportToHTMLManager { if(psiElement instanceof PsiDirectory) { psiDirectory = (PsiDirectory)psiElement; } - final PsiFile psiFile = LangDataKeys.PSI_FILE.getData(dataContext); + final PsiFile psiFile = CommonDataKeys.PSI_FILE.getData(dataContext); Project project = CommonDataKeys.PROJECT.getData(dataContext); String shortFileName = null; String directoryName = null; diff --git a/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintAction.java b/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintAction.java index 0afebfee9740..fc4427618975 100644 --- a/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintAction.java +++ b/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintAction.java @@ -49,7 +49,7 @@ public class PrintAction extends AnAction implements DumbAware { return; } Editor editor = CommonDataKeys.EDITOR.getData(dataContext); - PsiFile psiFile = LangDataKeys.PSI_FILE.getData(dataContext); + PsiFile psiFile = CommonDataKeys.PSI_FILE.getData(dataContext); presentation.setEnabled(psiFile != null || editor != null); } diff --git a/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintManager.java b/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintManager.java index fd2d845f6a62..7cc3b4ae4ccc 100644 --- a/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintManager.java +++ b/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintManager.java @@ -59,7 +59,7 @@ class PrintManager { psiDirectory[0] = (PsiDirectory)psiElement; } - PsiFile psiFile = LangDataKeys.PSI_FILE.getData(dataContext); + PsiFile psiFile = CommonDataKeys.PSI_FILE.getData(dataContext); String[] shortFileName = new String[1]; String[] directoryName = new String[1]; if (psiFile != null || psiDirectory[0] != null) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PopupHectorAction.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PopupHectorAction.java index 6c776c991a3b..f0756aedb150 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PopupHectorAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PopupHectorAction.java @@ -22,6 +22,7 @@ package com.intellij.codeInsight.daemon.impl; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.ui.popup.JBPopupFactory; @@ -32,12 +33,12 @@ public class PopupHectorAction extends AnAction { @Override public void actionPerformed(final AnActionEvent e) { final DataContext dataContext = e.getDataContext(); - final PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); + final PsiFile file = CommonDataKeys.PSI_FILE.getData(dataContext); new HectorComponent(file).showComponent(JBPopupFactory.getInstance().guessBestPopupLocation(dataContext)); } @Override public void update(final AnActionEvent e) { - e.getPresentation().setEnabled(LangDataKeys.PSI_FILE.getData(e.getDataContext()) != null); + e.getPresentation().setEnabled(CommonDataKeys.PSI_FILE.getData(e.getDataContext()) != null); } } \ No newline at end of file diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/FixDocCommentAction.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/FixDocCommentAction.java index 0c1e1ccd9659..c12a0dde63e9 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/FixDocCommentAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/FixDocCommentAction.java @@ -64,7 +64,7 @@ public class FixDocCommentAction extends EditorAction { return; } - PsiFile psiFile = LangDataKeys.PSI_FILE.getData(dataContext); + PsiFile psiFile = CommonDataKeys.PSI_FILE.getData(dataContext); if (psiFile == null) { return; } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowImplementationsAction.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowImplementationsAction.java index 1f7d2fa7c593..f9f37713e138 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowImplementationsAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowImplementationsAction.java @@ -84,7 +84,7 @@ public class ShowImplementationsAction extends AnAction implements PopupAction { Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (editor == null) { - final PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); + final PsiFile file = CommonDataKeys.PSI_FILE.getData(dataContext); if (file != null) { final FileEditor fileEditor = FileEditorManager.getInstance(file.getProject()).getSelectedEditor(file.getVirtualFile()); if (fileEditor instanceof TextEditor) { @@ -97,7 +97,7 @@ public class ShowImplementationsAction extends AnAction implements PopupAction { public void performForContext(DataContext dataContext, boolean invokedByShortcut) { final Project project = CommonDataKeys.PROJECT.getData(dataContext); - PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); + PsiFile file = CommonDataKeys.PSI_FILE.getData(dataContext); if (project == null) return; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/actions/SaveAsTemplateAction.java b/platform/lang-impl/src/com/intellij/codeInsight/template/actions/SaveAsTemplateAction.java index d25f3a920a48..5048a0849695 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/actions/SaveAsTemplateAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/actions/SaveAsTemplateAction.java @@ -55,7 +55,7 @@ public class SaveAsTemplateAction extends AnAction { public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); - PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); + PsiFile file = CommonDataKeys.PSI_FILE.getData(dataContext); final Project project = file.getProject(); PsiDocumentManager.getInstance(project).commitAllDocuments(); @@ -154,7 +154,7 @@ public class SaveAsTemplateAction extends AnAction { public void update(AnActionEvent e) { DataContext dataContext = e.getDataContext(); Editor editor = CommonDataKeys.EDITOR.getData(dataContext); - PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); + PsiFile file = CommonDataKeys.PSI_FILE.getData(dataContext); if (file == null || editor == null) { e.getPresentation().setEnabled(false); diff --git a/platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionOnEditorAction.java b/platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionOnEditorAction.java index b04077fd6eb9..d34be144b7a6 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionOnEditorAction.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionOnEditorAction.java @@ -36,7 +36,7 @@ public class CodeInspectionOnEditorAction extends AnAction { if (project == null){ return; } - PsiFile psiFile = LangDataKeys.PSI_FILE.getData(dataContext); + PsiFile psiFile = CommonDataKeys.PSI_FILE.getData(dataContext); if (psiFile != null){ analyze(project, psiFile); } @@ -58,7 +58,7 @@ public class CodeInspectionOnEditorAction extends AnAction { public void update(AnActionEvent e) { final DataContext dataContext = e.getDataContext(); final Project project = CommonDataKeys.PROJECT.getData(dataContext); - final PsiFile psiFile = LangDataKeys.PSI_FILE.getData(dataContext); + final PsiFile psiFile = CommonDataKeys.PSI_FILE.getData(dataContext); e.getPresentation().setEnabled(project != null && psiFile != null && DaemonCodeAnalyzer.getInstance(project).isHighlightingAvailable(psiFile)); } } diff --git a/platform/lang-impl/src/com/intellij/codeInspection/actions/RunInspectionAction.java b/platform/lang-impl/src/com/intellij/codeInspection/actions/RunInspectionAction.java index b6a8a29b6864..03f38baf4c84 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/actions/RunInspectionAction.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/actions/RunInspectionAction.java @@ -62,7 +62,7 @@ public class RunInspectionAction extends GotoActionBase { PsiDocumentManager.getInstance(project).commitAllDocuments(); final PsiElement psiElement = CommonDataKeys.PSI_ELEMENT.getData(e.getDataContext()); - final PsiFile psiFile = LangDataKeys.PSI_FILE.getData(e.getDataContext()); + final PsiFile psiFile = CommonDataKeys.PSI_FILE.getData(e.getDataContext()); final VirtualFile virtualFile = PlatformDataKeys.VIRTUAL_FILE.getData(e.getDataContext()); FeatureUsageTracker.getInstance().triggerFeatureUsed("navigation.goto.inspection"); diff --git a/platform/lang-impl/src/com/intellij/ide/actions/ExternalJavaDocAction.java b/platform/lang-impl/src/com/intellij/ide/actions/ExternalJavaDocAction.java index 488738ed5757..b8bf7a62e14e 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/ExternalJavaDocAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/ExternalJavaDocAction.java @@ -64,7 +64,7 @@ public class ExternalJavaDocAction extends AnAction { } - PsiFile context = LangDataKeys.PSI_FILE.getData(dataContext); + PsiFile context = CommonDataKeys.PSI_FILE.getData(dataContext); Editor editor = CommonDataKeys.EDITOR.getData(dataContext); PsiElement originalElement = getOriginalElement(context, editor); DocumentationManager.storeOriginalElement(project, originalElement, element); @@ -113,7 +113,7 @@ public class ExternalJavaDocAction extends AnAction { DataContext dataContext = event.getDataContext(); Editor editor = CommonDataKeys.EDITOR.getData(dataContext); final PsiElement element = CommonDataKeys.PSI_ELEMENT.getData(dataContext); - final PsiElement originalElement = getOriginalElement(LangDataKeys.PSI_FILE.getData(dataContext), editor); + final PsiElement originalElement = getOriginalElement(CommonDataKeys.PSI_FILE.getData(dataContext), editor); DocumentationManager.storeOriginalElement(CommonDataKeys.PROJECT.getData(dataContext), originalElement, element); final DocumentationProvider provider = DocumentationManager.getProviderFromElement(element); boolean enabled; diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java index b85d1c61064e..f457d60cc799 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java @@ -87,7 +87,7 @@ public abstract class GotoActionBase extends AnAction { @Nullable public static PsiElement getPsiContext(final AnActionEvent e) { - PsiFile file = e.getData(LangDataKeys.PSI_FILE); + PsiFile file = e.getData(CommonDataKeys.PSI_FILE); if (file != null) return file; Project project = e.getData(PlatformDataKeys.PROJECT); return getPsiContext(project); diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoRelatedFileAction.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoRelatedFileAction.java index eda883f86226..f594b6bcb100 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/GotoRelatedFileAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoRelatedFileAction.java @@ -56,7 +56,7 @@ public class GotoRelatedFileAction extends AnAction { DataContext context = e.getDataContext(); Editor editor = CommonDataKeys.EDITOR.getData(context); - PsiFile psiFile = LangDataKeys.PSI_FILE.getData(context); + PsiFile psiFile = CommonDataKeys.PSI_FILE.getData(context); if (psiFile == null) return; List items = getItems(psiFile, editor, context); @@ -310,7 +310,7 @@ public class GotoRelatedFileAction extends AnAction { @Override public void update(AnActionEvent e) { - e.getPresentation().setEnabled(LangDataKeys.PSI_FILE.getData(e.getDataContext()) != null); + e.getPresentation().setEnabled(CommonDataKeys.PSI_FILE.getData(e.getDataContext()) != null); } private static Action createNumberAction(final int mnemonic, diff --git a/platform/lang-impl/src/com/intellij/ide/actions/NewElementToolbarAction.java b/platform/lang-impl/src/com/intellij/ide/actions/NewElementToolbarAction.java index 53d5f8dc6a46..93a03da0b8cc 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/NewElementToolbarAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/NewElementToolbarAction.java @@ -37,7 +37,7 @@ public class NewElementToolbarAction extends NewElementAction { public void actionPerformed(AnActionEvent e) { if (e.getData(LangDataKeys.IDE_VIEW) == null) { final Project project = e.getData(CommonDataKeys.PROJECT); - final PsiFileSystemItem psiFile = e.getData(LangDataKeys.PSI_FILE).getParent(); + final PsiFileSystemItem psiFile = e.getData(CommonDataKeys.PSI_FILE).getParent(); ProjectViewImpl.getInstance(project).selectCB(psiFile, psiFile.getVirtualFile(), true).doWhenDone(new Runnable() { @Override public void run() { @@ -55,7 +55,7 @@ public class NewElementToolbarAction extends NewElementAction { super.update(event); if (event.getData(LangDataKeys.IDE_VIEW) == null) { Project project = event.getData(CommonDataKeys.PROJECT); - PsiFile psiFile = event.getData(LangDataKeys.PSI_FILE); + PsiFile psiFile = event.getData(CommonDataKeys.PSI_FILE); if (project != null && psiFile != null) { final ToolWindow projectViewWindow = ToolWindowManager.getInstance(project).getToolWindow(ToolWindowId.PROJECT_VIEW); if (projectViewWindow.isVisible()) { diff --git a/platform/lang-impl/src/com/intellij/ide/actions/SaveFileAsTemplateAction.java b/platform/lang-impl/src/com/intellij/ide/actions/SaveFileAsTemplateAction.java index 939745f5332d..226a5eb37c83 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/SaveFileAsTemplateAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/SaveFileAsTemplateAction.java @@ -38,7 +38,7 @@ public class SaveFileAsTemplateAction extends AnAction{ String nameWithoutExtension = file.getNameWithoutExtension(); AllFileTemplatesConfigurable fileTemplateOptions = new AllFileTemplatesConfigurable(); ConfigureTemplatesDialog dialog = new ConfigureTemplatesDialog(project, fileTemplateOptions); - PsiFile psiFile = e.getData(LangDataKeys.PSI_FILE); + PsiFile psiFile = e.getData(CommonDataKeys.PSI_FILE); for(SaveFileAsTemplateHandler handler: Extensions.getExtensions(SaveFileAsTemplateHandler.EP_NAME)) { String textFromHandler = handler.getTemplateText(psiFile, fileText, nameWithoutExtension); if (textFromHandler != null) { diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToFavoritesAction.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToFavoritesAction.java index 6f8eb6158cf5..1737fba50039 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToFavoritesAction.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToFavoritesAction.java @@ -121,7 +121,7 @@ public class AddToFavoritesAction extends AnAction { private static Object collectSelectedElements(final DataContext dataContext) { Object elements = retrieveData(null, CommonDataKeys.PSI_ELEMENT.getData(dataContext)); elements = retrieveData(elements, LangDataKeys.PSI_ELEMENT_ARRAY.getData(dataContext)); - elements = retrieveData(elements, LangDataKeys.PSI_FILE.getData(dataContext)); + elements = retrieveData(elements, CommonDataKeys.PSI_FILE.getData(dataContext)); elements = retrieveData(elements, ModuleGroup.ARRAY_DATA_KEY.getData(dataContext)); elements = retrieveData(elements, LangDataKeys.MODULE_CONTEXT_ARRAY.getData(dataContext)); elements = retrieveData(elements, LibraryGroupElement.ARRAY_DATA_KEY.getData(dataContext)); diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseHierarchyActionBase.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseHierarchyActionBase.java index ee0a67f6644b..7a300861b081 100644 --- a/platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseHierarchyActionBase.java +++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseHierarchyActionBase.java @@ -115,7 +115,7 @@ public abstract class BrowseHierarchyActionBase extends AnAction { @Nullable private HierarchyProvider getProvider(final AnActionEvent e) { - return findBestHierarchyProvider(myExtension, e.getData(LangDataKeys.PSI_FILE), e.getDataContext()); + return findBestHierarchyProvider(myExtension, e.getData(CommonDataKeys.PSI_FILE), e.getDataContext()); } @Nullable diff --git a/platform/lang-impl/src/com/intellij/ide/impl/dataRules/VirtualFileArrayRule.java b/platform/lang-impl/src/com/intellij/ide/impl/dataRules/VirtualFileArrayRule.java index 3de03ce039da..a3232215d279 100644 --- a/platform/lang-impl/src/com/intellij/ide/impl/dataRules/VirtualFileArrayRule.java +++ b/platform/lang-impl/src/com/intellij/ide/impl/dataRules/VirtualFileArrayRule.java @@ -87,7 +87,7 @@ public class VirtualFileArrayRule implements GetDataRule { result = addFile(result, PlatformDataKeys.VIRTUAL_FILE.getData(dataProvider)); - PsiFile psiFile = LangDataKeys.PSI_FILE.getData(dataProvider); + PsiFile psiFile = CommonDataKeys.PSI_FILE.getData(dataProvider); if (psiFile != null) { result = addFile(result, psiFile.getVirtualFile()); } diff --git a/platform/lang-impl/src/com/intellij/ide/impl/dataRules/VirtualFileRule.java b/platform/lang-impl/src/com/intellij/ide/impl/dataRules/VirtualFileRule.java index ffb6fe2749a3..283a749771a7 100644 --- a/platform/lang-impl/src/com/intellij/ide/impl/dataRules/VirtualFileRule.java +++ b/platform/lang-impl/src/com/intellij/ide/impl/dataRules/VirtualFileRule.java @@ -42,7 +42,7 @@ public class VirtualFileRule implements GetDataRule { return virtualFiles[0]; } - PsiFile psiFile = LangDataKeys.PSI_FILE.getData(dataProvider); + PsiFile psiFile = CommonDataKeys.PSI_FILE.getData(dataProvider); if (psiFile != null) { return psiFile.getVirtualFile(); } diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarModel.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarModel.java index 385acac22255..162be75dc2b2 100644 --- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarModel.java +++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarModel.java @@ -99,7 +99,7 @@ public class NavBarModel { if (PlatformDataKeys.CONTEXT_COMPONENT.getData(dataContext) instanceof NavBarPanel) return; - PsiElement psiElement = LangDataKeys.PSI_FILE.getData(dataContext); + PsiElement psiElement = CommonDataKeys.PSI_FILE.getData(dataContext); if (psiElement == null) { psiElement = CommonDataKeys.PSI_ELEMENT.getData(dataContext); } diff --git a/platform/lang-impl/src/com/intellij/ide/util/DeleteHandler.java b/platform/lang-impl/src/com/intellij/ide/util/DeleteHandler.java index 3545cdb6fc18..0df807c2557e 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/DeleteHandler.java +++ b/platform/lang-impl/src/com/intellij/ide/util/DeleteHandler.java @@ -82,7 +82,7 @@ public class DeleteHandler { elements = new PsiElement[]{(PsiElement)data}; } else { - final Object data1 = LangDataKeys.PSI_FILE.getData(dataContext); + final Object data1 = CommonDataKeys.PSI_FILE.getData(dataContext); if (data1 != null) { elements = new PsiElement[]{(PsiFile)data1}; } diff --git a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserCombo.java b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserCombo.java index b32ec77e096f..0ae3650d073a 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserCombo.java +++ b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserCombo.java @@ -246,7 +246,7 @@ public class ScopeChooserCombo extends ComboboxWithBrowseButton implements Dispo result.add(GlobalSearchScopes.openFilesScope(project)); if (dataContext != null) { - PsiElement dataContextElement = LangDataKeys.PSI_FILE.getData(dataContext); + PsiElement dataContextElement = CommonDataKeys.PSI_FILE.getData(dataContext); if (dataContextElement == null) { dataContextElement = CommonDataKeys.PSI_ELEMENT.getData(dataContext); } diff --git a/platform/lang-impl/src/com/intellij/internal/SelectionBasedPsiElementInternalAction.java b/platform/lang-impl/src/com/intellij/internal/SelectionBasedPsiElementInternalAction.java index ad73e14b9dd0..f669e52c69d0 100644 --- a/platform/lang-impl/src/com/intellij/internal/SelectionBasedPsiElementInternalAction.java +++ b/platform/lang-impl/src/com/intellij/internal/SelectionBasedPsiElementInternalAction.java @@ -141,6 +141,6 @@ public abstract class SelectionBasedPsiElementInternalAction 1){ MyModuleOrProjectScope dlg = new MyModuleOrProjectScope(module.getName()); diff --git a/platform/lang-impl/src/com/intellij/openapi/editor/actions/LangIndentSelectionAction.java b/platform/lang-impl/src/com/intellij/openapi/editor/actions/LangIndentSelectionAction.java index 5ba19c00ce4a..2a20dad25d32 100644 --- a/platform/lang-impl/src/com/intellij/openapi/editor/actions/LangIndentSelectionAction.java +++ b/platform/lang-impl/src/com/intellij/openapi/editor/actions/LangIndentSelectionAction.java @@ -17,6 +17,7 @@ package com.intellij.openapi.editor.actions; import com.intellij.codeInsight.completion.NextPrevParameterAction; import com.intellij.codeInsight.lookup.LookupManager; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.editor.Editor; @@ -32,7 +33,7 @@ public class LangIndentSelectionAction extends IndentSelectionAction { if (!super.isEnabled(editor, dataContext)) return false; if (LookupManager.getActiveLookup(editor) != null) return false; - PsiFile psiFile = LangDataKeys.PSI_FILE.getData(dataContext); + PsiFile psiFile = CommonDataKeys.PSI_FILE.getData(dataContext); if (psiFile != null && NextPrevParameterAction.hasSutablePolicy(editor, psiFile)) return false; return true; diff --git a/platform/lang-impl/src/com/intellij/openapi/editor/actions/ToggleShowImportPopupsAction.java b/platform/lang-impl/src/com/intellij/openapi/editor/actions/ToggleShowImportPopupsAction.java index ecae4f121023..b4be4d7ab4ac 100644 --- a/platform/lang-impl/src/com/intellij/openapi/editor/actions/ToggleShowImportPopupsAction.java +++ b/platform/lang-impl/src/com/intellij/openapi/editor/actions/ToggleShowImportPopupsAction.java @@ -61,6 +61,6 @@ public class ToggleShowImportPopupsAction extends ToggleAction { @Nullable private static PsiFile getFile(AnActionEvent e) { Editor editor = e.getData(CommonDataKeys.EDITOR); - return editor == null ? null : e.getData(LangDataKeys.PSI_FILE); + return editor == null ? null : e.getData(CommonDataKeys.PSI_FILE); } } diff --git a/platform/lang-impl/src/com/intellij/refactoring/ClassRefactoringHandlerBase.java b/platform/lang-impl/src/com/intellij/refactoring/ClassRefactoringHandlerBase.java index 3062b1792e12..46db1ce84691 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/ClassRefactoringHandlerBase.java +++ b/platform/lang-impl/src/com/intellij/refactoring/ClassRefactoringHandlerBase.java @@ -54,7 +54,7 @@ public abstract class ClassRefactoringHandlerBase implements RefactoringActionHa @Override public void invoke(@NotNull Project project, @NotNull PsiElement[] elements, DataContext dataContext) { - final PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); + final PsiFile file = CommonDataKeys.PSI_FILE.getData(dataContext); final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); showDialog(project, elements[0], editor, file, dataContext); } diff --git a/platform/lang-impl/src/com/intellij/refactoring/actions/BasePlatformRefactoringAction.java b/platform/lang-impl/src/com/intellij/refactoring/actions/BasePlatformRefactoringAction.java index d10e5e360986..22ea5bf9b363 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/actions/BasePlatformRefactoringAction.java +++ b/platform/lang-impl/src/com/intellij/refactoring/actions/BasePlatformRefactoringAction.java @@ -66,7 +66,7 @@ public abstract class BasePlatformRefactoringAction extends BaseRefactoringActio protected final RefactoringActionHandler getHandler(@NotNull DataContext dataContext) { PsiElement element = null; Editor editor = CommonDataKeys.EDITOR.getData(dataContext); - PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); + PsiFile file = CommonDataKeys.PSI_FILE.getData(dataContext); if (editor != null && file != null) { element = getElementAtCaret(editor, file); if (element != null) { diff --git a/platform/lang-impl/src/com/intellij/refactoring/actions/BaseRefactoringAction.java b/platform/lang-impl/src/com/intellij/refactoring/actions/BaseRefactoringAction.java index 0c19a6363d50..7750d91ade5e 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/actions/BaseRefactoringAction.java +++ b/platform/lang-impl/src/com/intellij/refactoring/actions/BaseRefactoringAction.java @@ -143,7 +143,7 @@ public abstract class BaseRefactoringAction extends AnAction { } Editor editor = e.getData(CommonDataKeys.EDITOR); - PsiFile file = e.getData(LangDataKeys.PSI_FILE); + PsiFile file = e.getData(CommonDataKeys.PSI_FILE); if (file != null) { if (file instanceof PsiCompiledElement || !isAvailableForFile(file)) { hideAction(e); diff --git a/platform/lang-impl/src/com/intellij/refactoring/actions/ExtractIncludeAction.java b/platform/lang-impl/src/com/intellij/refactoring/actions/ExtractIncludeAction.java index 97ab5c6e027c..6625316d32c6 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/actions/ExtractIncludeAction.java +++ b/platform/lang-impl/src/com/intellij/refactoring/actions/ExtractIncludeAction.java @@ -19,6 +19,7 @@ package com.intellij.refactoring.actions; import com.intellij.ide.TitledHandler; import com.intellij.lang.Language; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.psi.PsiElement; @@ -66,7 +67,7 @@ public class ExtractIncludeAction extends BaseRefactoringAction { @Override public RefactoringActionHandler getHandler(@NotNull DataContext dataContext) { - PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); + PsiFile file = CommonDataKeys.PSI_FILE.getData(dataContext); if (file == null) return null; return LanguageExtractInclude.INSTANCE.forLanguage(file.getViewProvider().getBaseLanguage()); } diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenameHandler.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenameHandler.java index 077872eda153..b10f576163f7 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenameHandler.java +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenameHandler.java @@ -43,7 +43,7 @@ public class VariableInplaceRenameHandler implements RenameHandler { public final boolean isAvailableOnDataContext(final DataContext dataContext) { final PsiElement element = PsiElementRenameHandler.getElement(dataContext); final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); - final PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); + final PsiFile file = CommonDataKeys.PSI_FILE.getData(dataContext); if (editor == null || file == null) return false; if (ourPreventInlineRenameFlag.get() != null) { diff --git a/platform/lang-impl/src/com/intellij/testIntegration/GotoTestRelatedProvider.java b/platform/lang-impl/src/com/intellij/testIntegration/GotoTestRelatedProvider.java index d618fa60d0ab..3177bfce7c8a 100644 --- a/platform/lang-impl/src/com/intellij/testIntegration/GotoTestRelatedProvider.java +++ b/platform/lang-impl/src/com/intellij/testIntegration/GotoTestRelatedProvider.java @@ -17,6 +17,7 @@ package com.intellij.testIntegration; import com.intellij.navigation.GotoRelatedItem; import com.intellij.navigation.GotoRelatedProvider; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.psi.PsiElement; @@ -33,7 +34,7 @@ public class GotoTestRelatedProvider extends GotoRelatedProvider { @NotNull @Override public List getItems(@NotNull DataContext context) { - final PsiFile file = LangDataKeys.PSI_FILE.getData(context); + final PsiFile file = CommonDataKeys.PSI_FILE.getData(context); List result; final boolean isTest = TestFinderHelper.isTest(file); if (isTest) { diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/DataConstants.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/DataConstants.java index 2a00820236b8..20c185c6d7ff 100644 --- a/platform/platform-api/src/com/intellij/openapi/actionSystem/DataConstants.java +++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/DataConstants.java @@ -154,7 +154,7 @@ public interface DataConstants { /** * Returns {@link com.intellij.psi.PsiFile} * - * @deprecated use {@link com.intellij.openapi.actionSystem.LangDataKeys.PSI_FILE} instead + * @deprecated use {@link com.intellij.openapi.actionSystem.com.intellij.openapi.actionSystem.CommonDataKeys.PSI_FILE} instead */ @NonNls String PSI_FILE = "psi.File"; diff --git a/platform/testFramework/src/com/intellij/testFramework/LightPlatformCodeInsightTestCase.java b/platform/testFramework/src/com/intellij/testFramework/LightPlatformCodeInsightTestCase.java index a532b5e17177..7807323a07b5 100644 --- a/platform/testFramework/src/com/intellij/testFramework/LightPlatformCodeInsightTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/LightPlatformCodeInsightTestCase.java @@ -471,10 +471,10 @@ public abstract class LightPlatformCodeInsightTestCase extends LightPlatformTest if (dataId.equals(AnActionEvent.injectedId(CommonDataKeys.EDITOR.getName()))) { return InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(getEditor(), getFile()); } - if (LangDataKeys.PSI_FILE.is(dataId)) { + if (CommonDataKeys.PSI_FILE.is(dataId)) { return myFile; } - if (dataId.equals(AnActionEvent.injectedId(LangDataKeys.PSI_FILE.getName()))) { + if (dataId.equals(AnActionEvent.injectedId(CommonDataKeys.PSI_FILE.getName()))) { Editor editor = InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(getEditor(), getFile()); return editor instanceof EditorWindow ? ((EditorWindow)editor).getInjectedFile() : getFile(); } @@ -624,7 +624,7 @@ public abstract class LightPlatformCodeInsightTestCase extends LightPlatformTest if (CommonDataKeys.PROJECT.is(dataId)) { return getProject(); } - if (LangDataKeys.PSI_FILE.is(dataId)) { + if (CommonDataKeys.PSI_FILE.is(dataId)) { return getFile(); } if (CommonDataKeys.PSI_ELEMENT.is(dataId)) { diff --git a/platform/usageView/src/com/intellij/usages/UsageTargetUtil.java b/platform/usageView/src/com/intellij/usages/UsageTargetUtil.java index e343dbcb642b..d34513ea8db2 100644 --- a/platform/usageView/src/com/intellij/usages/UsageTargetUtil.java +++ b/platform/usageView/src/com/intellij/usages/UsageTargetUtil.java @@ -37,7 +37,7 @@ public class UsageTargetUtil { public static UsageTarget[] findUsageTargets(DataProvider dataProvider) { Editor editor = CommonDataKeys.EDITOR.getData(dataProvider); - PsiFile file = LangDataKeys.PSI_FILE.getData(dataProvider); + PsiFile file = CommonDataKeys.PSI_FILE.getData(dataProvider); List result = new ArrayList(); if (file != null && editor != null) { diff --git a/plugins/ant/src/com/intellij/lang/ant/refactoring/AntRenameHandler.java b/plugins/ant/src/com/intellij/lang/ant/refactoring/AntRenameHandler.java index 15f5e31e4fd9..2a75301422c6 100644 --- a/plugins/ant/src/com/intellij/lang/ant/refactoring/AntRenameHandler.java +++ b/plugins/ant/src/com/intellij/lang/ant/refactoring/AntRenameHandler.java @@ -17,6 +17,7 @@ package com.intellij.lang.ant.refactoring; import com.intellij.codeInsight.TargetElementUtilBase; import com.intellij.lang.ant.dom.AntDomFileDescription; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.editor.Editor; @@ -57,7 +58,7 @@ public final class AntRenameHandler extends PsiElementRenameHandler { @Nullable private static PsiElement[] getElements(DataContext dataContext) { - final PsiFile psiFile = LangDataKeys.PSI_FILE.getData(dataContext); + final PsiFile psiFile = CommonDataKeys.PSI_FILE.getData(dataContext); if (!(psiFile instanceof XmlFile && AntDomFileDescription.isAntFile((XmlFile)psiFile))) { return null; } diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/actions/GenerateCopyrightAction.java b/plugins/copyright/src/com/maddyhome/idea/copyright/actions/GenerateCopyrightAction.java index 2f647dcf275b..1c7c6ce94a06 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/actions/GenerateCopyrightAction.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/actions/GenerateCopyrightAction.java @@ -51,7 +51,7 @@ public class GenerateCopyrightAction extends AnAction @Nullable private static PsiFile getFile(DataContext context, Project project) { - PsiFile file = LangDataKeys.PSI_FILE.getData(context); + PsiFile file = CommonDataKeys.PSI_FILE.getData(context); if (file == null) { Editor editor = CommonDataKeys.EDITOR.getData(context); if (editor != null) { diff --git a/plugins/devkit/src/actions/GenerateComponentExternalizationAction.java b/plugins/devkit/src/actions/GenerateComponentExternalizationAction.java index aa1e8c5617f8..f1affb01da18 100644 --- a/plugins/devkit/src/actions/GenerateComponentExternalizationAction.java +++ b/plugins/devkit/src/actions/GenerateComponentExternalizationAction.java @@ -108,7 +108,7 @@ public class GenerateComponentExternalizationAction extends AnAction { PsiDocumentManager.getInstance(project).commitDocument(editor.getDocument()); - PsiFile file = LangDataKeys.PSI_FILE.getData(context); + PsiFile file = CommonDataKeys.PSI_FILE.getData(context); if (file == null) return null; PsiClass contextClass = PsiTreeUtil.findElementOfClassAtOffset(file, editor.getCaretModel().getOffset(), PsiClass.class, false); diff --git a/plugins/devkit/src/actions/ShowSerializedXmlAction.java b/plugins/devkit/src/actions/ShowSerializedXmlAction.java index 73abba4e9c90..9c53cacdf104 100644 --- a/plugins/devkit/src/actions/ShowSerializedXmlAction.java +++ b/plugins/devkit/src/actions/ShowSerializedXmlAction.java @@ -64,7 +64,7 @@ public class ShowSerializedXmlAction extends DumbAwareAction { @Override public void update(AnActionEvent e) { - e.getPresentation().setEnabled(getEventProject(e) != null && e.getData(LangDataKeys.PSI_FILE) != null + e.getPresentation().setEnabled(getEventProject(e) != null && e.getData(CommonDataKeys.PSI_FILE) != null && e.getData(CommonDataKeys.EDITOR) != null); } @@ -131,7 +131,7 @@ public class ShowSerializedXmlAction extends DumbAwareAction { @Nullable private static PsiClass getPsiClass(AnActionEvent e) { - final PsiFile psiFile = e.getData(LangDataKeys.PSI_FILE); + final PsiFile psiFile = e.getData(CommonDataKeys.PSI_FILE); final Editor editor = e.getData(CommonDataKeys.EDITOR); if (editor == null || psiFile == null) return null; final PsiElement element = psiFile.findElementAt(editor.getCaretModel().getOffset()); diff --git a/plugins/devkit/src/actions/ShuffleNamesAction.java b/plugins/devkit/src/actions/ShuffleNamesAction.java index deb83d93eea4..eac093207b03 100644 --- a/plugins/devkit/src/actions/ShuffleNamesAction.java +++ b/plugins/devkit/src/actions/ShuffleNamesAction.java @@ -42,14 +42,14 @@ public class ShuffleNamesAction extends AnAction { @Override public void update(AnActionEvent e) { Editor editor = CommonDataKeys.EDITOR.getData(e.getDataContext()); - PsiFile file = LangDataKeys.PSI_FILE.getData(e.getDataContext()); + PsiFile file = CommonDataKeys.PSI_FILE.getData(e.getDataContext()); e.getPresentation().setEnabled(editor != null && file != null); } @Override public void actionPerformed(AnActionEvent e) { final Editor editor = CommonDataKeys.EDITOR.getData(e.getDataContext()); - PsiFile file = LangDataKeys.PSI_FILE.getData(e.getDataContext()); + PsiFile file = CommonDataKeys.PSI_FILE.getData(e.getDataContext()); if (editor == null || file == null) return; final Project project = file.getProject(); CommandProcessorEx commandProcessor = (CommandProcessorEx)CommandProcessorEx.getInstance(); diff --git a/plugins/devkit/src/actions/ToggleHighlightingMarkupAction.java b/plugins/devkit/src/actions/ToggleHighlightingMarkupAction.java index 8be300f58f24..71f605ca6843 100644 --- a/plugins/devkit/src/actions/ToggleHighlightingMarkupAction.java +++ b/plugins/devkit/src/actions/ToggleHighlightingMarkupAction.java @@ -51,14 +51,14 @@ public class ToggleHighlightingMarkupAction extends AnAction { @Override public void update(AnActionEvent e) { Editor editor = CommonDataKeys.EDITOR.getData(e.getDataContext()); - PsiFile file = LangDataKeys.PSI_FILE.getData(e.getDataContext()); + PsiFile file = CommonDataKeys.PSI_FILE.getData(e.getDataContext()); e.getPresentation().setEnabled(editor != null && file != null); } @Override public void actionPerformed(AnActionEvent e) { final Editor editor = CommonDataKeys.EDITOR.getData(e.getDataContext()); - PsiFile file = LangDataKeys.PSI_FILE.getData(e.getDataContext()); + PsiFile file = CommonDataKeys.PSI_FILE.getData(e.getDataContext()); if (editor == null || file == null) return; final Project project = file.getProject(); CommandProcessorEx commandProcessor = (CommandProcessorEx)CommandProcessorEx.getInstance(); diff --git a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringActionHandlerImpl.java b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringActionHandlerImpl.java index e5082214c759..d5e3c8aaf5c7 100644 --- a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringActionHandlerImpl.java +++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringActionHandlerImpl.java @@ -157,7 +157,7 @@ public class GenerateToStringActionHandlerImpl extends EditorWriteActionHandler @Nullable private static PsiClass getSubjectClass(Editor editor, DataContext dataContext) { - PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); + PsiFile file = CommonDataKeys.PSI_FILE.getData(dataContext); if (file == null) return null; int offset = editor.getCaretModel().getOffset(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicToolWindowWrapper.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicToolWindowWrapper.java index 6323a079c0d6..002c2d62f2ae 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicToolWindowWrapper.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicToolWindowWrapper.java @@ -657,7 +657,7 @@ public class DynamicToolWindowWrapper { if (CommonDataKeys.PSI_ELEMENT.is(dataId)) { return getSelectedElement(); } - else if (LangDataKeys.PSI_FILE.is(dataId)) { + else if (CommonDataKeys.PSI_FILE.is(dataId)) { final PsiElement element = getSelectedElement(); if (element == null) return null; diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nizeAction.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nizeAction.java index 02dca3ddd307..af459ace8b97 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nizeAction.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nizeAction.java @@ -56,7 +56,7 @@ public class I18nizeAction extends AnAction { final Editor editor = getEditor(e); if (editor == null) return null; - PsiFile psiFile = e.getData(LangDataKeys.PSI_FILE); + PsiFile psiFile = e.getData(CommonDataKeys.PSI_FILE); if (psiFile == null) return null; TextRange range = JavaI18nUtil.getSelectedRange(editor, psiFile); @@ -144,7 +144,7 @@ public class I18nizeAction extends AnAction { final Editor editor = getEditor(e); final Project project = editor.getProject(); assert project != null; - final PsiFile psiFile = LangDataKeys.PSI_FILE.getData(e.getDataContext()); + final PsiFile psiFile = CommonDataKeys.PSI_FILE.getData(e.getDataContext()); if (psiFile == null) return; final I18nQuickFixHandler handler = getHandler(e); if (handler == null) return; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/MavenPropertyRenameHandler.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/MavenPropertyRenameHandler.java index 87bd05b64133..c5aa13f1c289 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/MavenPropertyRenameHandler.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/MavenPropertyRenameHandler.java @@ -58,6 +58,6 @@ public class MavenPropertyRenameHandler extends PsiElementRenameHandler { } private static PsiElement findTarget(DataContext context) { - return MavenTargetUtil.getRefactorTarget(CommonDataKeys.EDITOR.getData(context), LangDataKeys.PSI_FILE.getData(context)); + return MavenTargetUtil.getRefactorTarget(CommonDataKeys.EDITOR.getData(context), CommonDataKeys.PSI_FILE.getData(context)); } } diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomTestCase.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomTestCase.java index 4d4a96d372ff..5ab6163e6796 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomTestCase.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomTestCase.java @@ -354,7 +354,7 @@ public abstract class MavenDomTestCase extends MavenImportingTestCase { private MapDataContext createDataContext(VirtualFile f) throws IOException { MapDataContext context = new MapDataContext(); context.put(CommonDataKeys.EDITOR, getEditor(f)); - context.put(LangDataKeys.PSI_FILE, getTestPsiFile(f)); + context.put(CommonDataKeys.PSI_FILE, getTestPsiFile(f)); context.put(CommonDataKeys.PSI_ELEMENT, TargetElementUtil.findTargetElement(getEditor(f), TargetElementUtilBase.REFERENCED_ELEMENT_ACCEPTED | TargetElementUtilBase.ELEMENT_NAME_ACCEPTED)); diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGPatternConfigurationProducer.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGPatternConfigurationProducer.java index cc6d307812d2..ff5adf190eec 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGPatternConfigurationProducer.java +++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGPatternConfigurationProducer.java @@ -27,6 +27,7 @@ import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.actions.ConfigurationContext; import com.intellij.execution.configurations.ModuleBasedConfiguration; import com.intellij.execution.junit.JUnitUtil; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.module.Module; @@ -98,7 +99,7 @@ public class TestNGPatternConfigurationProducer extends TestNGConfigurationProdu } return elements; } else { - final PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); + final PsiFile file = CommonDataKeys.PSI_FILE.getData(dataContext); if (file instanceof PsiClassOwner) { for (PsiMember psiMember : collectTestMembers(((PsiClassOwner)file).getClasses())) { classes.add(((PsiClass)psiMember).getQualifiedName()); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/AddComponentAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/AddComponentAction.java index ba40d170cd1a..44270fe9ade8 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/AddComponentAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/AddComponentAction.java @@ -48,7 +48,7 @@ public class AddComponentAction extends AnAction { Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) return; GroupItem groupItem = e.getData(GroupItem.DATA_KEY); - PsiFile psiFile = e.getData(LangDataKeys.PSI_FILE); + PsiFile psiFile = e.getData(CommonDataKeys.PSI_FILE); PsiElement elementToAdd = (psiFile != null) ? findElementToAdd(psiFile) : null; String className = ""; if (elementToAdd instanceof PsiClass) { @@ -128,7 +128,7 @@ public class AddComponentAction extends AnAction { e.getPresentation().setEnabled(project != null && (groupItem == null || !groupItem.isReadOnly())); } else { - PsiFile psiFile = e.getData(LangDataKeys.PSI_FILE); + PsiFile psiFile = e.getData(CommonDataKeys.PSI_FILE); e.getPresentation().setVisible(psiFile != null && findElementToAdd(psiFile) != null); } } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspectorTable.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspectorTable.java index 838d06f89963..059ba0407107 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspectorTable.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspectorTable.java @@ -274,7 +274,7 @@ public final class PropertyInspectorTable extends Table implements DataProvider{ return PropertyUtil.findPropertySetter(aClass, introspectedProperty.getName(), false, true); } - else if (LangDataKeys.PSI_FILE.is(dataId) && myEditor != null) { + else if (CommonDataKeys.PSI_FILE.is(dataId) && myEditor != null) { return PsiManager.getInstance(myEditor.getProject()).findFile(myEditor.getFile()); } else if (GuiEditor.DATA_KEY.is(dataId)) { diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AssociationsGroup.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AssociationsGroup.java index 281d093bafed..42c0ff89e5f5 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AssociationsGroup.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AssociationsGroup.java @@ -81,6 +81,6 @@ public class AssociationsGroup extends ActionGroup { @Nullable static PsiFile getPsiFile(@Nullable AnActionEvent e) { - return e != null ? LangDataKeys.PSI_FILE.getData(e.getDataContext()) : null; + return e != null ? CommonDataKeys.PSI_FILE.getData(e.getDataContext()) : null; } } diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/ConfigureAssociationsAction.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/ConfigureAssociationsAction.java index bb446ca525c3..81df7a3c80d2 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/ConfigureAssociationsAction.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/ConfigureAssociationsAction.java @@ -32,7 +32,7 @@ class ConfigureAssociationsAction extends AnAction { final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) return; - final PsiFile file = LangDataKeys.PSI_FILE.getData(e.getDataContext()); + final PsiFile file = CommonDataKeys.PSI_FILE.getData(e.getDataContext()); FileAssociationsConfigurable.editAssociations(project, file); } } diff --git a/spellchecker/src/com/intellij/spellchecker/actions/SpellingPopupActionGroup.java b/spellchecker/src/com/intellij/spellchecker/actions/SpellingPopupActionGroup.java index a3639c9e2014..b8a45953b303 100644 --- a/spellchecker/src/com/intellij/spellchecker/actions/SpellingPopupActionGroup.java +++ b/spellchecker/src/com/intellij/spellchecker/actions/SpellingPopupActionGroup.java @@ -63,7 +63,7 @@ public final class SpellingPopupActionGroup extends ActionGroup { @NotNull private static AnAction[] findActions(@NotNull AnActionEvent e) { - PsiFile psiFile = e.getData(LangDataKeys.PSI_FILE); + PsiFile psiFile = e.getData(CommonDataKeys.PSI_FILE); Project project = e.getData(LangDataKeys.PROJECT); Editor editor = e.getData(LangDataKeys.EDITOR); if (psiFile != null && project != null && editor != null) { @@ -124,7 +124,7 @@ public final class SpellingPopupActionGroup extends ActionGroup { } public void actionPerformed(final AnActionEvent e) { - final PsiFile psiFile = e.getData(LangDataKeys.PSI_FILE); + final PsiFile psiFile = e.getData(CommonDataKeys.PSI_FILE); final Project project = e.getData(LangDataKeys.PROJECT); final Editor editor = e.getData(LangDataKeys.EDITOR); if (psiFile != null && project != null && editor != null) { diff --git a/xml/impl/src/com/intellij/ide/browsers/OpenFileInDefaultBrowserAction.java b/xml/impl/src/com/intellij/ide/browsers/OpenFileInDefaultBrowserAction.java index 0062567ed16f..7e822817a44e 100644 --- a/xml/impl/src/com/intellij/ide/browsers/OpenFileInDefaultBrowserAction.java +++ b/xml/impl/src/com/intellij/ide/browsers/OpenFileInDefaultBrowserAction.java @@ -37,7 +37,7 @@ public class OpenFileInDefaultBrowserAction extends DumbAwareAction { @Override public void update(AnActionEvent e) { final DataContext dataContext = e.getDataContext(); - final PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); + final PsiFile file = CommonDataKeys.PSI_FILE.getData(dataContext); final Presentation presentation = e.getPresentation(); if (file == null || file.getVirtualFile() == null) { @@ -99,7 +99,7 @@ public class OpenFileInDefaultBrowserAction extends DumbAwareAction { @Override public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - PsiFile psiFile = LangDataKeys.PSI_FILE.getData(dataContext); + PsiFile psiFile = CommonDataKeys.PSI_FILE.getData(dataContext); LOG.assertTrue(psiFile != null); InputEvent event = e.getInputEvent(); doOpen(psiFile, event != null && event.isShiftDown()); diff --git a/xml/impl/src/com/intellij/xml/actions/validate/ValidateXmlAction.java b/xml/impl/src/com/intellij/xml/actions/validate/ValidateXmlAction.java index 6881e9ba7a65..8abbe220e60b 100644 --- a/xml/impl/src/com/intellij/xml/actions/validate/ValidateXmlAction.java +++ b/xml/impl/src/com/intellij/xml/actions/validate/ValidateXmlAction.java @@ -50,7 +50,7 @@ public class ValidateXmlAction extends AnAction { } public void actionPerformed(AnActionEvent e) { - final PsiFile psiFile = LangDataKeys.PSI_FILE.getData(e.getDataContext()); + final PsiFile psiFile = CommonDataKeys.PSI_FILE.getData(e.getDataContext()); if (psiFile != null) { doRunAction(psiFile); } @@ -90,7 +90,7 @@ public class ValidateXmlAction extends AnAction { super.update(event); Presentation presentation = event.getPresentation(); - PsiElement psiElement = LangDataKeys.PSI_FILE.getData(event.getDataContext()); + PsiElement psiElement = CommonDataKeys.PSI_FILE.getData(event.getDataContext()); boolean flag = psiElement instanceof XmlFile; presentation.setVisible(flag); diff --git a/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameHandler.java b/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameHandler.java index ff3d95142b31..10ef18756a18 100644 --- a/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameHandler.java +++ b/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameHandler.java @@ -110,7 +110,7 @@ public class XmlTagRenameHandler implements RenameHandler, TitledHandler { final Editor editor = getEditor(context); if (editor != null) { final int offset = editor.getCaretModel().getOffset(); - final PsiFile file = LangDataKeys.PSI_FILE.getData(context); + final PsiFile file = CommonDataKeys.PSI_FILE.getData(context); if (file instanceof XmlFile) { return file.getViewProvider().findElementAt(offset); } diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/validation/ValidateAction.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/validation/ValidateAction.java index b26720638da4..d0d97f299701 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/validation/ValidateAction.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/validation/ValidateAction.java @@ -92,7 +92,7 @@ public class ValidateAction extends AnAction { } private boolean actionPerformedImpl(AnActionEvent e) { - final PsiFile file = e.getData(LangDataKeys.PSI_FILE); + final PsiFile file = e.getData(CommonDataKeys.PSI_FILE); if (file == null) { return false; }