From e0ad5ace610c53fc85f46e513aae63d81d6e4a94 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Tue, 1 Oct 2013 22:24:25 +0200 Subject: [PATCH] fix yellow code producing by CommonDataKeys --- .../com/intellij/compiler/actions/CompileActionBase.java | 2 +- .../debugger/actions/AddToWatchActionHandler.java | 5 +++-- .../debugger/actions/RunToCursorActionHandler.java | 5 +++-- .../actions/ToggleLineBreakpointActionHandler.java | 5 +++-- .../debugger/actions/ToggleMethodBreakpointAction.java | 2 +- .../src/com/intellij/execution/filters/YourkitFilter.java | 3 ++- .../javaDoc/JavaDocReferenceInspection.java | 3 ++- .../ide/hierarchy/method/JavaMethodHierarchyProvider.java | 2 +- .../ide/hierarchy/type/JavaTypeHierarchyProvider.java | 2 +- .../com/intellij/refactoring/IntroduceHandlerBase.java | 3 ++- .../anonymousToInner/AnonymousToInnerHandler.java | 3 ++- .../changeSignature/JavaChangeSignatureHandler.java | 3 ++- .../ConvertToInstanceMethodHandler.java | 5 +++-- .../encapsulateFields/EncapsulateFieldsHandler.java | 7 ++++--- .../refactoring/extractMethod/ExtractMethodHandler.java | 3 ++- .../extractSuperclass/ExtractSuperclassHandler.java | 3 ++- .../InheritanceToDelegationHandler.java | 3 ++- .../IntroduceParameterObjectHandler.java | 3 ++- .../refactoring/makeStatic/MakeStaticHandler.java | 3 ++- .../refactoring/memberPullUp/JavaPullUpHandler.java | 3 ++- .../moveInstanceMethod/MoveInstanceMethodHandler.java | 5 +++-- .../removemiddleman/RemoveMiddlemanHandler.java | 3 ++- .../refactoring/rename/RenameWrongRefHandler.java | 2 +- .../ReplaceConstructorWithFactoryHandler.java | 3 ++- .../refactoring/tempWithQuery/TempWithQueryHandler.java | 3 ++- .../turnRefsToSuper/TurnRefsToSuperHandler.java | 3 ++- .../wrapreturnvalue/WrapReturnValueHandler.java | 3 ++- .../BaseGenerateTestSupportMethodAction.java | 2 +- .../src/com/intellij/codeInsight/CodeInsightTestCase.java | 2 +- .../intellij/codeInsight/actions/CodeInsightAction.java | 2 +- .../intellij/execution/actions/ConfigurationContext.java | 2 +- .../lang-api/src/com/intellij/psi/util/PsiUtilBase.java | 3 ++- .../codeStyle/arrangement/action/RearrangeCodeAction.java | 2 +- .../intellij/codeEditor/printing/ExportToHTMLManager.java | 2 +- .../src/com/intellij/codeEditor/printing/PrintAction.java | 2 +- .../com/intellij/codeEditor/printing/PrintManager.java | 2 +- .../codeInsight/actions/OptimizeImportsAction.java | 4 ++-- .../intellij/codeInsight/actions/ReformatCodeAction.java | 4 ++-- .../completion/actions/BaseCodeCompletionAction.java | 5 +++-- .../completion/actions/CodeCompletionGroup.java | 2 +- .../intellij/codeInsight/daemon/impl/DaemonListeners.java | 2 +- .../codeInsight/documentation/DockablePopupManager.java | 2 +- .../documentation/actions/ShowQuickDocInfoAction.java | 4 ++-- .../editorActions/smartEnter/SmartEnterAction.java | 2 +- .../codeInsight/generation/actions/GenerateAction.java | 2 +- .../codeInsight/highlighting/HighlightManagerImpl.java | 3 ++- .../highlighting/actions/HighlightUsagesAction.java | 4 ++-- .../hint/actions/ShowImplementationsAction.java | 4 ++-- .../codeInsight/intention/impl/QuickEditHandler.java | 2 +- .../codeInsight/lookup/impl/LookupActionHandler.java | 8 ++++---- .../navigation/actions/IncrementalSearchAction.java | 4 ++-- .../template/actions/SaveAsTemplateAction.java | 4 ++-- .../com/intellij/diagnostic/logging/LogConsoleBase.java | 2 +- .../execution/actions/BaseRunConfigurationAction.java | 2 +- .../com/intellij/execution/console/FoldLinesLikeThis.java | 5 +++-- .../src/com/intellij/execution/impl/ConsoleViewImpl.java | 6 +++--- .../src/com/intellij/find/actions/FindUsagesAction.java | 3 ++- .../com/intellij/find/actions/FindUsagesInFileAction.java | 4 ++-- .../src/com/intellij/find/actions/ShowUsagesAction.java | 2 +- .../intellij/find/findInProject/FindInProjectManager.java | 3 ++- .../src/com/intellij/find/impl/FindInProjectUtil.java | 3 ++- .../find/replaceInProject/ReplaceInProjectManager.java | 3 ++- .../src/com/intellij/ide/actions/CopyElementAction.java | 6 +++--- .../src/com/intellij/ide/actions/CopyReferenceAction.java | 4 ++-- .../com/intellij/ide/actions/ExternalJavaDocAction.java | 4 ++-- .../src/com/intellij/ide/actions/GotoActionBase.java | 2 +- .../com/intellij/ide/actions/GotoRelatedFileAction.java | 2 +- .../com/intellij/ide/actions/PasteReferenceProvider.java | 4 ++-- .../com/intellij/ide/actions/ReloadFromDiskAction.java | 4 ++-- .../intellij/ide/bookmarks/actions/BookmarksAction.java | 2 +- .../ide/bookmarks/actions/ToggleBookmarkAction.java | 2 +- .../lang-impl/src/com/intellij/ide/macro/EditorMacro.java | 3 ++- .../intellij/ide/navigationToolbar/ShowNavBarAction.java | 2 +- .../src/com/intellij/ide/util/DeleteHandler.java | 2 +- .../com/intellij/internal/DumpLookupElementWeights.java | 5 +++-- .../internal/SelectionBasedPsiElementInternalAction.java | 2 +- .../internal/psiView/PsiViewerForContextAction.java | 3 ++- .../lang/customFolding/GotoCustomRegionAction.java | 5 +++-- .../editor/actions/ToggleShowImportPopupsAction.java | 2 +- .../intellij/refactoring/BaseRefactoringProcessor.java | 3 ++- .../intellij/refactoring/ClassRefactoringHandlerBase.java | 3 ++- .../actions/BasePlatformRefactoringAction.java | 3 ++- .../refactoring/actions/BaseRefactoringAction.java | 4 ++-- .../refactoring/actions/ChangeSignatureAction.java | 3 ++- .../actions/RefactoringQuickListPopupAction.java | 2 +- .../refactoring/changeSignature/MoveParameterAction.java | 4 ++-- .../inline/InlineRefactoringActionHandler.java | 3 ++- .../rename/DirectoryAsPackageRenameHandlerBase.java | 3 ++- .../refactoring/rename/PsiElementRenameHandler.java | 3 ++- .../rename/inplace/VariableInplaceRenameHandler.java | 5 +++-- .../intellij/testIntegration/GotoTestOrCodeAction.java | 2 +- .../com/intellij/unscramble/AnalyzeStacktraceUtil.java | 2 +- .../ui/actions/ShowSelectionHistoryAction.java | 3 ++- .../com/intellij/openapi/actionSystem/DataConstants.java | 2 +- .../openapi/editor/actionSystem/EditorAction.java | 2 +- .../src/com/intellij/util/ui/JTableCellEditorHelper.java | 3 ++- .../src/com/intellij/execution/impl/EditorCopyAction.java | 7 ++++--- .../src/com/intellij/ide/actionMacro/ActionMacro.java | 2 +- .../intellij/ide/actions/BaseNavigateToSourceAction.java | 2 +- .../src/com/intellij/ide/actions/GotoLineAction.java | 4 ++-- .../src/com/intellij/ide/actions/SaveDocumentAction.java | 3 ++- .../src/com/intellij/ide/actions/ShowPopupMenuAction.java | 3 ++- .../src/com/intellij/ide/actions/WindowAction.java | 3 ++- .../src/com/intellij/ide/impl/DataManagerImpl.java | 4 ++-- .../com/intellij/ide/impl/dataRules/CopyProviderRule.java | 3 ++- .../com/intellij/ide/impl/dataRules/CutProviderRule.java | 3 ++- .../com/intellij/ide/impl/dataRules/FileEditorRule.java | 3 ++- .../intellij/ide/impl/dataRules/InactiveEditorRule.java | 3 ++- .../intellij/ide/impl/dataRules/PasteProviderRule.java | 3 ++- .../src/com/intellij/notification/EventLogConsole.java | 4 ++-- .../intellij/openapi/command/impl/UndoManagerImpl.java | 5 +++-- .../diff/actions/CompareClipboardWithSelection.java | 3 ++- .../openapi/diff/impl/util/DiffPanelOuterComponent.java | 3 ++- .../editor/actions/AbstractToggleUseSoftWrapsAction.java | 3 ++- .../openapi/editor/actions/MultiplePasteAction.java | 4 ++-- .../openapi/editor/actions/PasteFromX11Action.java | 3 ++- .../openapi/editor/actions/ToggleColumnModeAction.java | 3 ++- .../intellij/openapi/editor/impl/EditorComponentImpl.java | 3 ++- .../openapi/fileEditor/impl/TrailingSpacesStripper.java | 5 +++-- .../openapi/fileEditor/impl/text/TextEditorComponent.java | 2 +- .../openapi/ui/playback/util/EditorPlaybackCall.java | 3 ++- .../openapi/vfs/encoding/ChangeFileEncodingAction.java | 2 +- .../src/com/intellij/ui/EditorTextField.java | 3 ++- .../src/com/intellij/ui/popup/AbstractPopup.java | 2 +- .../src/com/intellij/ui/popup/PopupFactoryImpl.java | 2 +- .../history/integration/ui/LocalHistoryActionsTest.java | 2 +- .../testFramework/LightPlatformCodeInsightTestCase.java | 6 +++--- .../src/com/intellij/testFramework/TestDataProvider.java | 4 ++-- .../fixtures/impl/CodeInsightTestFixtureImpl.java | 2 +- .../fixtures/impl/HeavyIdeaTestFixtureImpl.java | 4 ++-- .../src/com/intellij/usages/UsageTargetUtil.java | 3 ++- .../xdebugger/impl/actions/EditBreakpointAction.java | 3 ++- .../xdebugger/impl/actions/ViewBreakpointsAction.java | 2 +- .../handlers/XToggleLineBreakpointActionHandler.java | 3 ++- .../com/intellij/xdebugger/impl/ui/BreakpointEditor.java | 2 +- .../intellij/lang/ant/config/actions/RunTargetAction.java | 2 +- .../idea/copyright/actions/GenerateCopyrightAction.java | 2 +- .../idea/copyright/actions/UpdateCopyrightAction.java | 4 ++-- .../actions/GenerateComponentExternalizationAction.java | 2 +- plugins/devkit/src/actions/ShowSerializedXmlAction.java | 5 +++-- plugins/devkit/src/actions/ShuffleNamesAction.java | 5 +++-- .../src/actions/ToggleHighlightingMarkupAction.java | 5 +++-- .../jetbrains/plugins/github/GithubCreateGistAction.java | 4 ++-- .../plugins/github/GithubOpenInBrowserAction.java | 3 ++- .../groovy/actions/DumpGroovyControlFlowAction.java | 3 ++- .../plugins/groovy/actions/DumpGroovyStubsAction.java | 5 +++-- .../plugins/groovy/actions/GrGetPsiTypeAction.java | 5 +++-- .../changeSignature/GrChangeSignatureHandler.java | 3 ++- .../refactoring/convertToJava/ConvertToJavaHandler.java | 3 ++- .../groovy/refactoring/memberPullUp/GrPullUpHandler.java | 3 ++- .../groovy/refactoring/rename/PropertyRenameHandler.java | 3 ++- .../com/intellij/codeInspection/i18n/I18nizeAction.java | 2 +- .../plugins/javaFX/fxml/refs/JavaFxAnnotator.java | 3 ++- .../dom/refactorings/MavenPropertyRenameHandler.java | 5 +++-- .../org/jetbrains/idea/maven/dom/MavenDomTestCase.java | 3 ++- .../designer/inspection/AbstractQuickFixManager.java | 2 +- .../intellij/uiDesigner/actions/CreateListenerAction.java | 2 +- .../intellij/uiDesigner/actions/GenerateMainAction.java | 4 ++-- .../intellij/uiDesigner/quickFixes/ShowHintAction.java | 2 +- .../src/org/intellij/plugins/xpathView/XPathAction.java | 2 +- .../org/intellij/plugins/xpathView/XPathEvalAction.java | 2 +- .../plugins/xsltDebugger/ui/actions/OpenOutputAction.java | 4 ++-- .../com/intellij/spellchecker/quickfixes/RenameTo.java | 2 +- .../com/intellij/xml/refactoring/XmlTagRenameHandler.java | 3 ++- 164 files changed, 300 insertions(+), 219 deletions(-) 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 8fd1df58226d..7c021d08dff2 100644 --- a/java/compiler/impl/src/com/intellij/compiler/actions/CompileActionBase.java +++ b/java/compiler/impl/src/com/intellij/compiler/actions/CompileActionBase.java @@ -31,7 +31,7 @@ public abstract class CompileActionBase extends AnAction implements DumbAware { if (project == null) { return; } - Editor editor = e.getData(PlatformDataKeys.EDITOR); + Editor editor = e.getData(CommonDataKeys.EDITOR); PsiFile file = e.getData(LangDataKeys.PSI_FILE); if (file != null && editor != null && !DumbService.getInstance(project).isDumb()) { DaemonCodeAnalyzer.getInstance(project).autoImportReferenceAtCursor(editor, file); //let autoimport complete diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/AddToWatchActionHandler.java b/java/debugger/impl/src/com/intellij/debugger/actions/AddToWatchActionHandler.java index 99c3090afc46..5e8400045905 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/AddToWatchActionHandler.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/AddToWatchActionHandler.java @@ -34,6 +34,7 @@ import com.intellij.debugger.ui.impl.WatchDebuggerTree; import com.intellij.debugger.ui.impl.watch.*; import com.intellij.idea.ActionsBundle; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; @@ -60,7 +61,7 @@ public class AddToWatchActionHandler extends DebuggerActionHandler { } } else { - final Editor editor = event.getData(PlatformDataKeys.EDITOR); + final Editor editor = event.getData(CommonDataKeys.EDITOR); enabled = DebuggerUtilsEx.getEditorText(editor) != null; } return enabled; @@ -88,7 +89,7 @@ public class AddToWatchActionHandler extends DebuggerActionHandler { addFromNodes(debuggerContext, watchPanel, selectedNodes); } else { - final Editor editor = event.getData(PlatformDataKeys.EDITOR); + final Editor editor = event.getData(CommonDataKeys.EDITOR); if (editor != null) { final TextWithImports editorText = DebuggerUtilsEx.getEditorText(editor); if (editorText != null) { diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/RunToCursorActionHandler.java b/java/debugger/impl/src/com/intellij/debugger/actions/RunToCursorActionHandler.java index faa0c1e1a38d..4da56c6ebfe3 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/RunToCursorActionHandler.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/RunToCursorActionHandler.java @@ -26,6 +26,7 @@ import com.intellij.debugger.engine.DebuggerUtils; import com.intellij.debugger.impl.DebuggerContextImpl; import com.intellij.debugger.impl.DebuggerSession; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.fileTypes.FileType; @@ -50,7 +51,7 @@ public class RunToCursorActionHandler extends DebuggerActionHandler { public boolean isEnabled(final @NotNull Project project, final AnActionEvent event) { - Editor editor = event.getData(PlatformDataKeys.EDITOR); + Editor editor = event.getData(CommonDataKeys.EDITOR); if (editor == null) { return false; @@ -74,7 +75,7 @@ public class RunToCursorActionHandler extends DebuggerActionHandler { public void perform(@NotNull final Project project, final AnActionEvent event) { - Editor editor = event.getData(PlatformDataKeys.EDITOR); + Editor editor = event.getData(CommonDataKeys.EDITOR); if (editor == null) { return; } diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/ToggleLineBreakpointActionHandler.java b/java/debugger/impl/src/com/intellij/debugger/actions/ToggleLineBreakpointActionHandler.java index 561ae013e031..c886a14f307a 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/ToggleLineBreakpointActionHandler.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/ToggleLineBreakpointActionHandler.java @@ -23,6 +23,7 @@ import com.intellij.debugger.ui.breakpoints.Breakpoint; import com.intellij.debugger.ui.breakpoints.BreakpointManager; import com.intellij.debugger.ui.breakpoints.LineBreakpoint; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; @@ -71,7 +72,7 @@ public class ToggleLineBreakpointActionHandler extends DebuggerActionHandler { return; } - ExpandRegionAction.expandRegionAtCaret(project, event.getData(PlatformDataKeys.EDITOR)); + ExpandRegionAction.expandRegionAtCaret(project, event.getData(CommonDataKeys.EDITOR)); Document document = place.getDocument(); int line = document.getLineNumber(place.getOffset()); @@ -100,7 +101,7 @@ public class ToggleLineBreakpointActionHandler extends DebuggerActionHandler { @Nullable private static PlaceInDocument getPlace(@NotNull final Project project, AnActionEvent event) { - Editor editor = event.getData(PlatformDataKeys.EDITOR); + Editor editor = event.getData(CommonDataKeys.EDITOR); if(editor == null) { editor = FileEditorManager.getInstance(project).getSelectedTextEditor(); } diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/ToggleMethodBreakpointAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/ToggleMethodBreakpointAction.java index b462123af72c..360191731ae0 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/ToggleMethodBreakpointAction.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/ToggleMethodBreakpointAction.java @@ -105,7 +105,7 @@ public class ToggleMethodBreakpointAction extends AnAction { } } else { - Editor editor = event.getData(PlatformDataKeys.EDITOR); + Editor editor = event.getData(CommonDataKeys.EDITOR); if(editor == null) { editor = FileEditorManager.getInstance(project).getSelectedTextEditor(); } diff --git a/java/execution/impl/src/com/intellij/execution/filters/YourkitFilter.java b/java/execution/impl/src/com/intellij/execution/filters/YourkitFilter.java index 90e3091dd954..ff0aef31f283 100644 --- a/java/execution/impl/src/com/intellij/execution/filters/YourkitFilter.java +++ b/java/execution/impl/src/com/intellij/execution/filters/YourkitFilter.java @@ -18,6 +18,7 @@ package com.intellij.execution.filters; import com.intellij.ide.DataManager; import com.intellij.ide.util.EditSourceUtil; import com.intellij.ide.util.PsiElementListCellRenderer; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Editor; @@ -110,7 +111,7 @@ public class YourkitFilter implements Filter{ } }; - final Editor editor = PlatformDataKeys.EDITOR.getData(DataManager.getInstance().getDataContext()); + final Editor editor = CommonDataKeys.EDITOR.getData(DataManager.getInstance().getDataContext()); builder. setTitle("Choose file"). diff --git a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java index c4e98055425d..0573f26f4973 100644 --- a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java @@ -26,6 +26,7 @@ import com.intellij.codeInspection.*; import com.intellij.codeInspection.ex.BaseLocalInspectionTool; import com.intellij.ide.DataManager; import com.intellij.ide.util.FQNameCellRenderer; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.Result; @@ -304,7 +305,7 @@ public class JavaDocReferenceInspection extends BaseLocalInspectionTool { asyncResult.doWhenDone(new AsyncResult.Handler() { @Override public void run(DataContext dataContext) { - final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); assert editor != null; final TextRange textRange = ((ProblemDescriptorBase)descriptor).getTextRange(); editor.getSelectionModel().setSelection(textRange.getStartOffset(), textRange.getEndOffset()); diff --git a/java/java-impl/src/com/intellij/ide/hierarchy/method/JavaMethodHierarchyProvider.java b/java/java-impl/src/com/intellij/ide/hierarchy/method/JavaMethodHierarchyProvider.java index e66045c60aa6..16202eb3be08 100644 --- a/java/java-impl/src/com/intellij/ide/hierarchy/method/JavaMethodHierarchyProvider.java +++ b/java/java-impl/src/com/intellij/ide/hierarchy/method/JavaMethodHierarchyProvider.java @@ -60,7 +60,7 @@ public class JavaMethodHierarchyProvider implements HierarchyProvider { return method; } - final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (editor == null) { return null; } diff --git a/java/java-impl/src/com/intellij/ide/hierarchy/type/JavaTypeHierarchyProvider.java b/java/java-impl/src/com/intellij/ide/hierarchy/type/JavaTypeHierarchyProvider.java index c848d52fc63b..86b7ab06ac57 100644 --- a/java/java-impl/src/com/intellij/ide/hierarchy/type/JavaTypeHierarchyProvider.java +++ b/java/java-impl/src/com/intellij/ide/hierarchy/type/JavaTypeHierarchyProvider.java @@ -36,7 +36,7 @@ public class JavaTypeHierarchyProvider implements HierarchyProvider { final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return null; - final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (editor != null) { final PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument()); if (file == null) return null; diff --git a/java/java-impl/src/com/intellij/refactoring/IntroduceHandlerBase.java b/java/java-impl/src/com/intellij/refactoring/IntroduceHandlerBase.java index 279fc3f7a466..6eef977c6566 100644 --- a/java/java-impl/src/com/intellij/refactoring/IntroduceHandlerBase.java +++ b/java/java-impl/src/com/intellij/refactoring/IntroduceHandlerBase.java @@ -15,6 +15,7 @@ */ package com.intellij.refactoring; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.diagnostic.Logger; @@ -37,7 +38,7 @@ public abstract class IntroduceHandlerBase implements RefactoringActionHandler { final PsiElement tempExpr = elements[0]; final Editor editor; if (dataContext != null) { - final Editor editorFromDC = PlatformDataKeys.EDITOR.getData(dataContext); + final Editor editorFromDC = CommonDataKeys.EDITOR.getData(dataContext); final PsiFile cachedPsiFile = editorFromDC != null ? PsiDocumentManager.getInstance(project).getCachedPsiFile(editorFromDC.getDocument()) : null; if (cachedPsiFile != null && PsiTreeUtil.isAncestor(cachedPsiFile, tempExpr, false)) { editor = editorFromDC; diff --git a/java/java-impl/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerHandler.java b/java/java-impl/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerHandler.java index 390ac0e06f41..a11f5da41e3e 100644 --- a/java/java-impl/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerHandler.java @@ -16,6 +16,7 @@ package com.intellij.refactoring.anonymousToInner; import com.intellij.codeInsight.ChangeContextUtil; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; @@ -63,7 +64,7 @@ public class AnonymousToInnerHandler implements RefactoringActionHandler { public void invoke(@NotNull Project project, @NotNull PsiElement[] elements, DataContext dataContext) { if (elements.length == 1 && elements[0] instanceof PsiAnonymousClass) { - invoke(project, PlatformDataKeys.EDITOR.getData(dataContext), (PsiAnonymousClass)elements[0]); + invoke(project, CommonDataKeys.EDITOR.getData(dataContext), (PsiAnonymousClass)elements[0]); } } diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureHandler.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureHandler.java index a57b9966b855..b681d3294b67 100644 --- a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureHandler.java @@ -17,6 +17,7 @@ package com.intellij.refactoring.changeSignature; import com.intellij.codeInsight.TargetElementUtil; import com.intellij.ide.util.SuperMethodWarningUtil; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -65,7 +66,7 @@ public class JavaChangeSignatureHandler implements ChangeSignatureHandler { public void invoke(@NotNull final Project project, @NotNull final PsiElement[] elements, @Nullable final DataContext dataContext) { if (elements.length != 1) return; - Editor editor = dataContext != null ? PlatformDataKeys.EDITOR.getData(dataContext) : null; + Editor editor = dataContext != null ? CommonDataKeys.EDITOR.getData(dataContext) : null; invokeOnElement(project, editor, elements[0]); } diff --git a/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodHandler.java b/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodHandler.java index 1447926179fe..f443f18bda7b 100644 --- a/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodHandler.java @@ -15,6 +15,7 @@ */ package com.intellij.refactoring.convertToInstanceMethod; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -65,7 +66,7 @@ public class ConvertToInstanceMethodHandler implements RefactoringActionHandler final PsiMethod method = (PsiMethod)elements[0]; if (!method.hasModifierProperty(PsiModifier.STATIC)) { String message = RefactoringBundle.message("convertToInstanceMethod.method.is.not.static", method.getName()); - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); CommonRefactoringUtil.showErrorHint(project, editor, message, REFACTORING_NAME, HelpID.CONVERT_TO_INSTANCE_METHOD); return; } @@ -101,7 +102,7 @@ public class ConvertToInstanceMethodHandler implements RefactoringActionHandler message = RefactoringBundle.message("convertToInstanceMethod.all.reference.type.parameters.are.not.in.project"); } LOG.assertTrue(message != null); - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); CommonRefactoringUtil.showErrorHint(project, editor, RefactoringBundle.getCannotRefactorMessage(message), REFACTORING_NAME, HelpID.CONVERT_TO_INSTANCE_METHOD); return; } diff --git a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsHandler.java b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsHandler.java index 8e618ed988bb..b4b26c1ccc3f 100644 --- a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsHandler.java @@ -15,6 +15,7 @@ */ package com.intellij.refactoring.encapsulateFields; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.diagnostic.Logger; @@ -98,7 +99,7 @@ public class EncapsulateFieldsHandler implements RefactoringActionHandler { else { String message = RefactoringBundle.getCannotRefactorMessage( RefactoringBundle.message("fields.to.be.refactored.should.belong.to.the.same.class")); - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); CommonRefactoringUtil.showErrorHint(project, editor, message, REFACTORING_NAME, HelpID.ENCAPSULATE_FIELDS); return; } @@ -109,7 +110,7 @@ public class EncapsulateFieldsHandler implements RefactoringActionHandler { LOG.assertTrue(aClass != null); final PsiField[] fields = aClass.getFields(); if (fields.length == 0) { - CommonRefactoringUtil.showErrorHint(project, PlatformDataKeys.EDITOR.getData(dataContext), "Class has no fields to encapsulate", + CommonRefactoringUtil.showErrorHint(project, CommonDataKeys.EDITOR.getData(dataContext), "Class has no fields to encapsulate", REFACTORING_NAME, HelpID.ENCAPSULATE_FIELDS); return; } @@ -117,7 +118,7 @@ public class EncapsulateFieldsHandler implements RefactoringActionHandler { if (aClass.isInterface()) { String message = RefactoringBundle.getCannotRefactorMessage( RefactoringBundle.message("encapsulate.fields.refactoring.cannot.be.applied.to.interface")); - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); CommonRefactoringUtil.showErrorHint(project, editor, message, REFACTORING_NAME, HelpID.ENCAPSULATE_FIELDS); return; } 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 21de8fc80d2a..d6780fc41871 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodHandler.java @@ -18,6 +18,7 @@ package com.intellij.refactoring.extractMethod; import com.intellij.codeInsight.CodeInsightUtil; import com.intellij.codeInsight.daemon.impl.analysis.JavaHighlightUtil; import com.intellij.codeInsight.highlighting.HighlightManager; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -61,7 +62,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 Editor editor = PlatformDataKeys.EDITOR.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/extractSuperclass/ExtractSuperclassHandler.java b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassHandler.java index 4a4e8d80ec5e..2c93deca196b 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassHandler.java @@ -23,6 +23,7 @@ package com.intellij.refactoring.extractSuperclass; import com.intellij.history.LocalHistory; import com.intellij.history.LocalHistoryAction; import com.intellij.lang.findUsages.DescriptiveNameUtil; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; @@ -85,7 +86,7 @@ public class ExtractSuperclassHandler implements RefactoringActionHandler, Extra if (!CommonRefactoringUtil.checkReadOnlyStatus(project, mySubclass)) return; - Editor editor = dataContext != null ? PlatformDataKeys.EDITOR.getData(dataContext) : null; + Editor editor = dataContext != null ? CommonDataKeys.EDITOR.getData(dataContext) : null; if (mySubclass.isInterface()) { String message = RefactoringBundle.getCannotRefactorMessage(RefactoringBundle.message("superclass.cannot.be.extracted.from.an.interface")); diff --git a/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationHandler.java b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationHandler.java index 80750f4ef05b..c9daa8c1bbdb 100644 --- a/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationHandler.java @@ -24,6 +24,7 @@ */ package com.intellij.refactoring.inheritanceToDelegation; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.diagnostic.Logger; @@ -91,7 +92,7 @@ public class InheritanceToDelegationHandler implements RefactoringActionHandler final PsiClass aClass = (PsiClass)elements[0]; - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (aClass.isInterface()) { String message = RefactoringBundle.getCannotRefactorMessage(RefactoringBundle.message("class.is.interface", aClass.getQualifiedName())); CommonRefactoringUtil.showErrorHint(project, editor, message, REFACTORING_NAME, HelpID.INHERITANCE_TO_DELEGATION); diff --git a/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectHandler.java index b8011eecfebb..515d9fb4424f 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectHandler.java @@ -16,6 +16,7 @@ package com.intellij.refactoring.introduceparameterobject; import com.intellij.ide.util.SuperMethodWarningUtil; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -79,7 +80,7 @@ public class IntroduceParameterObjectHandler implements RefactoringActionHandler if (method == null) { return; } - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); invoke(project, method, editor); } diff --git a/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeStaticHandler.java b/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeStaticHandler.java index 9b08c17dd5f5..36f1f22b9568 100644 --- a/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeStaticHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeStaticHandler.java @@ -24,6 +24,7 @@ */ package com.intellij.refactoring.makeStatic; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -78,7 +79,7 @@ public class MakeStaticHandler implements RefactoringActionHandler { String error = validateTarget(member); if (error != null) { - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); CommonRefactoringUtil.showErrorHint(project, editor, error, REFACTORING_NAME, HelpID.MAKE_METHOD_STATIC); return; } diff --git a/java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaPullUpHandler.java b/java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaPullUpHandler.java index d0c10bafef21..d9c3a613b547 100644 --- a/java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaPullUpHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaPullUpHandler.java @@ -24,6 +24,7 @@ */ package com.intellij.refactoring.memberPullUp; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.diagnostic.Logger; @@ -105,7 +106,7 @@ public class JavaPullUpHandler implements RefactoringActionHandler, PullUpDialog } private void invoke(Project project, DataContext dataContext, PsiClass aClass, PsiElement aMember) { - final Editor editor = dataContext != null ? PlatformDataKeys.EDITOR.getData(dataContext) : null; + final Editor editor = dataContext != null ? CommonDataKeys.EDITOR.getData(dataContext) : null; if (aClass == null) { String message = RefactoringBundle.getCannotRefactorMessage(RefactoringBundle.message("is.not.supported.in.the.current.context", REFACTORING_NAME)); diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodHandler.java b/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodHandler.java index 5f98ed2fdf50..e08a99447297 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodHandler.java @@ -16,6 +16,7 @@ package com.intellij.refactoring.move.moveInstanceMethod; import com.intellij.lang.java.JavaLanguage; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -97,7 +98,7 @@ public class MoveInstanceMethodHandler implements RefactoringActionHandler { for (PsiClass aClass : classes) { if (aClass instanceof JspClass) { message = RefactoringBundle.message("synthetic.jsp.class.is.referenced.in.the.method"); - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); CommonRefactoringUtil.showErrorHint(project, editor, message, REFACTORING_NAME, HelpID.MOVE_INSTANCE_METHOD); break; } @@ -133,7 +134,7 @@ public class MoveInstanceMethodHandler implements RefactoringActionHandler { } private static void showErrorHint(Project project, DataContext dataContext, String message) { - Editor editor = dataContext == null ? null : PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = dataContext == null ? null : CommonDataKeys.EDITOR.getData(dataContext); CommonRefactoringUtil.showErrorHint(project, editor, RefactoringBundle.getCannotRefactorMessage(message), REFACTORING_NAME, HelpID.MOVE_INSTANCE_METHOD); } diff --git a/java/java-impl/src/com/intellij/refactoring/removemiddleman/RemoveMiddlemanHandler.java b/java/java-impl/src/com/intellij/refactoring/removemiddleman/RemoveMiddlemanHandler.java index cc64bae1b5e4..46295238a083 100644 --- a/java/java-impl/src/com/intellij/refactoring/removemiddleman/RemoveMiddlemanHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/removemiddleman/RemoveMiddlemanHandler.java @@ -15,6 +15,7 @@ */ package com.intellij.refactoring.removemiddleman; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -65,7 +66,7 @@ public class RemoveMiddlemanHandler implements RefactoringActionHandler { return; } if (elements[0] instanceof PsiField) { - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); invoke((PsiField)elements[0], editor); } } 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 68f4b2a5bd88..8cf94a48ee21 100644 --- a/java/java-impl/src/com/intellij/refactoring/rename/RenameWrongRefHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/rename/RenameWrongRefHandler.java @@ -32,7 +32,7 @@ public class RenameWrongRefHandler implements RenameHandler { public final boolean isAvailableOnDataContext(final DataContext dataContext) { - final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); final PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (editor == null || file == null || project == null) return false; diff --git a/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithFactory/ReplaceConstructorWithFactoryHandler.java b/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithFactory/ReplaceConstructorWithFactoryHandler.java index 470c5d68513a..ffc2787759b4 100644 --- a/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithFactory/ReplaceConstructorWithFactoryHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithFactory/ReplaceConstructorWithFactoryHandler.java @@ -15,6 +15,7 @@ */ package com.intellij.refactoring.replaceConstructorWithFactory; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; @@ -91,7 +92,7 @@ public class ReplaceConstructorWithFactoryHandler if (elements.length != 1) return; myProject = project; - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (elements[0] instanceof PsiMethod) { final PsiMethod method = (PsiMethod)elements[0]; invoke(method, editor); 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 ff557ffeca70..939a63bfb899 100644 --- a/java/java-impl/src/com/intellij/refactoring/tempWithQuery/TempWithQueryHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/tempWithQuery/TempWithQueryHandler.java @@ -17,6 +17,7 @@ package com.intellij.refactoring.tempWithQuery; import com.intellij.codeInsight.TargetElementUtilBase; import com.intellij.codeInsight.highlighting.HighlightManager; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -176,7 +177,7 @@ public class TempWithQueryHandler implements RefactoringActionHandler { if (elements.length == 1 && elements[0] instanceof PsiLocalVariable) { if (dataContext != null) { final PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); - final Editor editor = PlatformDataKeys.EDITOR.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/refactoring/turnRefsToSuper/TurnRefsToSuperHandler.java b/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperHandler.java index 72c5d3b59f7a..1d546d6280d8 100644 --- a/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperHandler.java @@ -20,6 +20,7 @@ */ package com.intellij.refactoring.turnRefsToSuper; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; @@ -69,7 +70,7 @@ public class TurnRefsToSuperHandler implements RefactoringActionHandler { if (basesList.isEmpty()) { String message = RefactoringBundle.getCannotRefactorMessage(RefactoringBundle.message("interface.does.not.have.base.interfaces", subClass.getQualifiedName())); - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); CommonRefactoringUtil.showErrorHint(project, editor, message, REFACTORING_NAME, HelpID.TURN_REFS_TO_SUPER); return; } diff --git a/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueHandler.java b/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueHandler.java index 6eb04548bfbc..08cad34ff448 100644 --- a/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueHandler.java @@ -16,6 +16,7 @@ package com.intellij.refactoring.wrapreturnvalue; import com.intellij.ide.util.SuperMethodWarningUtil; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -85,7 +86,7 @@ class WrapReturnValueHandler implements RefactoringActionHandler { if(method == null){ return; } - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); invoke(project, method, editor); } diff --git a/java/java-impl/src/com/intellij/testIntegration/BaseGenerateTestSupportMethodAction.java b/java/java-impl/src/com/intellij/testIntegration/BaseGenerateTestSupportMethodAction.java index 41a7a200a9e0..533c51bcc935 100644 --- a/java/java-impl/src/com/intellij/testIntegration/BaseGenerateTestSupportMethodAction.java +++ b/java/java-impl/src/com/intellij/testIntegration/BaseGenerateTestSupportMethodAction.java @@ -60,7 +60,7 @@ public class BaseGenerateTestSupportMethodAction extends BaseGenerateAction { @Override public AnAction createEditTemplateAction(DataContext dataContext) { final Project project = CommonDataKeys.PROJECT.getData(dataContext); - final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); final PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); final PsiClass targetClass = editor == null || file == null ? null : getTargetClass(editor, file); if (targetClass != null) { diff --git a/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java b/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java index 03ec96844a5c..1738bcd2978f 100644 --- a/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java +++ b/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java @@ -617,7 +617,7 @@ public abstract class CodeInsightTestCase extends PsiTestCase { @Override public Object getData(String dataId) { - return PlatformDataKeys.EDITOR.is(dataId) ? myEditor : super.getData(dataId); + return CommonDataKeys.EDITOR.is(dataId) ? myEditor : super.getData(dataId); } protected VirtualFile getVirtualFile(@NonNls String filePath) { diff --git a/platform/lang-api/src/com/intellij/codeInsight/actions/CodeInsightAction.java b/platform/lang-api/src/com/intellij/codeInsight/actions/CodeInsightAction.java index a141f5594629..5b002f6dc6d7 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/actions/CodeInsightAction.java +++ b/platform/lang-api/src/com/intellij/codeInsight/actions/CodeInsightAction.java @@ -44,7 +44,7 @@ public abstract class CodeInsightAction extends AnAction { @Nullable protected Editor getEditor(@NotNull DataContext dataContext, @NotNull Project project) { - return PlatformDataKeys.EDITOR.getData(dataContext); + return CommonDataKeys.EDITOR.getData(dataContext); } public void actionPerformedImpl(@NotNull final Project project, final Editor editor) { diff --git a/platform/lang-api/src/com/intellij/execution/actions/ConfigurationContext.java b/platform/lang-api/src/com/intellij/execution/actions/ConfigurationContext.java index 2eb9d5c89bad..7c232745b346 100644 --- a/platform/lang-api/src/com/intellij/execution/actions/ConfigurationContext.java +++ b/platform/lang-api/src/com/intellij/execution/actions/ConfigurationContext.java @@ -207,7 +207,7 @@ public class ConfigurationContext { @Nullable private static PsiElement getSelectedPsiElement(final DataContext dataContext, final Project project) { PsiElement element = null; - final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (editor != null){ final PsiFile psiFile = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument()); if (psiFile != null) { diff --git a/platform/lang-api/src/com/intellij/psi/util/PsiUtilBase.java b/platform/lang-api/src/com/intellij/psi/util/PsiUtilBase.java index 8f80b7fab64c..a5f72c8effb8 100644 --- a/platform/lang-api/src/com/intellij/psi/util/PsiUtilBase.java +++ b/platform/lang-api/src/com/intellij/psi/util/PsiUtilBase.java @@ -22,6 +22,7 @@ import com.intellij.lang.Language; import com.intellij.lang.PsiBuilder; import com.intellij.lang.PsiParser; import com.intellij.lang.injection.InjectedLanguageManager; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Document; @@ -271,7 +272,7 @@ public class PsiUtilBase extends PsiUtilCore { // We assume that data context from focus-based retrieval should success if performed from EDT. AsyncResult asyncResult = DataManager.getInstance().getDataContextFromFocus(); if (asyncResult.isDone()) { - Editor editor = PlatformDataKeys.EDITOR.getData(asyncResult.getResult()); + Editor editor = CommonDataKeys.EDITOR.getData(asyncResult.getResult()); if (editor != null) { Document cachedDocument = PsiDocumentManager.getInstance(psiFile.getProject()).getCachedDocument(psiFile); // Ensure that target editor is found by checking its document against the one from given PSI element. 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 545f692c5005..3d330e5bcaf5 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 @@ -57,7 +57,7 @@ public class RearrangeCodeAction extends AnAction { return; } - final Editor editor = PlatformDataKeys.EDITOR.getData(e.getDataContext()); + final Editor editor = CommonDataKeys.EDITOR.getData(e.getDataContext()); if (editor == null) { return; } 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 23461a1fa672..e062cd766c8b 100644 --- a/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLManager.java +++ b/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLManager.java @@ -73,7 +73,7 @@ class ExportToHTMLManager { } } - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); boolean isSelectedTextEnabled = false; if(editor != null && editor.getSelectionModel().hasSelection()) { isSelectedTextEnabled = true; 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 0d64d1b61ebb..0afebfee9740 100644 --- a/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintAction.java +++ b/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintAction.java @@ -48,7 +48,7 @@ public class PrintAction extends AnAction implements DumbAware { presentation.setEnabled(true); return; } - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); PsiFile psiFile = LangDataKeys.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 d09dd750597d..c1d6371c8d83 100644 --- a/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintManager.java +++ b/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintManager.java @@ -74,7 +74,7 @@ class PrintManager { } } - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); String text = null; if (editor != null) { if (editor.getSelectionModel().hasSelection()) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/OptimizeImportsAction.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/OptimizeImportsAction.java index 803d97525280..e882c9fd0ea1 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/actions/OptimizeImportsAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/OptimizeImportsAction.java @@ -43,7 +43,7 @@ public class OptimizeImportsAction extends AnAction { return; } PsiDocumentManager.getInstance(project).commitAllDocuments(); - final Editor editor = BaseCodeInsightAction.getInjectedEditor(project, PlatformDataKeys.EDITOR.getData(dataContext)); + final Editor editor = BaseCodeInsightAction.getInjectedEditor(project, CommonDataKeys.EDITOR.getData(dataContext)); final VirtualFile[] files = PlatformDataKeys.VIRTUAL_FILE_ARRAY.getData(dataContext); @@ -146,7 +146,7 @@ public class OptimizeImportsAction extends AnAction { final VirtualFile[] files = PlatformDataKeys.VIRTUAL_FILE_ARRAY.getData(dataContext); - final Editor editor = BaseCodeInsightAction.getInjectedEditor(project, PlatformDataKeys.EDITOR.getData(dataContext), false); + final Editor editor = BaseCodeInsightAction.getInjectedEditor(project, CommonDataKeys.EDITOR.getData(dataContext), false); if (editor != null){ PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument()); if (file == null || !isOptimizeImportsAvailable(file)){ diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java index 7c1a6cb78f56..4c20ae449095 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java @@ -63,7 +63,7 @@ public class ReformatCodeAction extends AnAction implements DumbAware { return; } PsiDocumentManager.getInstance(project).commitAllDocuments(); - final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); final VirtualFile[] files = PlatformDataKeys.VIRTUAL_FILE_ARRAY.getData(dataContext); if (files == null) { return; @@ -255,7 +255,7 @@ public class ReformatCodeAction extends AnAction implements DumbAware { return; } - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); final VirtualFile[] files = PlatformDataKeys.VIRTUAL_FILE_ARRAY.getData(dataContext); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/actions/BaseCodeCompletionAction.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/actions/BaseCodeCompletionAction.java index dc92fd0d8dc6..fce999053878 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/actions/BaseCodeCompletionAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/actions/BaseCodeCompletionAction.java @@ -20,6 +20,7 @@ import com.intellij.codeInsight.completion.CompletionType; import com.intellij.codeInsight.hint.HintManagerImpl; 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.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; @@ -43,7 +44,7 @@ public abstract class BaseCodeCompletionAction extends AnAction implements HintM protected static void invokeCompletion(AnActionEvent e, CompletionType type, int time) { Project project = e.getData(PlatformDataKeys.PROJECT); - Editor editor = e.getData(PlatformDataKeys.EDITOR); + Editor editor = e.getData(CommonDataKeys.EDITOR); assert project != null; assert editor != null; InputEvent inputEvent = e.getInputEvent(); @@ -57,7 +58,7 @@ public abstract class BaseCodeCompletionAction extends AnAction implements HintM Project project = PlatformDataKeys.PROJECT.getData(dataContext); if (project == null) return; - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (editor == null) return; final PsiFile psiFile = PsiUtilBase.getPsiFileInEditor(editor, project); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/actions/CodeCompletionGroup.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/actions/CodeCompletionGroup.java index 7e985a7d0244..6f70a90e740f 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/actions/CodeCompletionGroup.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/actions/CodeCompletionGroup.java @@ -35,7 +35,7 @@ public class CodeCompletionGroup extends DefaultActionGroup implements DumbAware return; } - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (editor == null){ presentation.setEnabled(false); return; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java index b7f2c1170e8a..9976237ddf50 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java @@ -543,7 +543,7 @@ public class DaemonListeners implements Disposable { @Override public void beforeEditorTyping(char c, DataContext dataContext) { - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); //no need to stop daemon if something happened in the console if (editor != null && !worthBothering(editor.getDocument(), editor.getProject())) { return; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DockablePopupManager.java b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DockablePopupManager.java index f052a6d50588..276b410262cc 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DockablePopupManager.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DockablePopupManager.java @@ -199,7 +199,7 @@ public abstract class DockablePopupManager { return; } - final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (editor == null) { PsiElement element = LangDataKeys.PSI_ELEMENT.getData(dataContext); if (element != null) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/documentation/actions/ShowQuickDocInfoAction.java b/platform/lang-impl/src/com/intellij/codeInsight/documentation/actions/ShowQuickDocInfoAction.java index 44e1b61516b4..d80904cda038 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/documentation/actions/ShowQuickDocInfoAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/documentation/actions/ShowQuickDocInfoAction.java @@ -75,7 +75,7 @@ public class ShowQuickDocInfoAction extends BaseCodeInsightAction implements Hin return; } - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); PsiElement element = LangDataKeys.PSI_ELEMENT.getData(dataContext); if (editor == null && element == null) { presentation.setEnabled(false); @@ -120,7 +120,7 @@ public class ShowQuickDocInfoAction extends BaseCodeInsightAction implements Hin public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); final Project project = CommonDataKeys.PROJECT.getData(dataContext); - final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); final PsiElement element = LangDataKeys.PSI_ELEMENT.getData(dataContext); if (project != null && editor != null) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/smartEnter/SmartEnterAction.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/smartEnter/SmartEnterAction.java index 0c6c31875c17..4968512eeb26 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/smartEnter/SmartEnterAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/smartEnter/SmartEnterAction.java @@ -45,7 +45,7 @@ public class SmartEnterAction extends EditorAction { @Override protected Editor getEditor(final DataContext dataContext) { - final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (editor == null) return null; Project project = editor.getProject(); if (project == null) project = CommonDataKeys.PROJECT.getData(dataContext); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/GenerateAction.java b/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/GenerateAction.java index 5f224dfcddde..9e06b75bc156 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/GenerateAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/GenerateAction.java @@ -53,7 +53,7 @@ public class GenerateAction extends DumbAwareAction implements PreloadableAction return; } - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (editor == null) { presentation.setEnabled(false); return; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightManagerImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightManagerImpl.java index 1b69bbc99589..74f1b63bcca1 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightManagerImpl.java @@ -20,6 +20,7 @@ import com.intellij.injected.editor.EditorWindow; import com.intellij.lang.injection.InjectedLanguageManager; 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.PlatformDataKeys; import com.intellij.openapi.actionSystem.ex.ActionManagerEx; @@ -313,7 +314,7 @@ public class HighlightManagerImpl extends HighlightManager implements ProjectCom } private void requestHideHighlights(final DataContext dataContext) { - final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (editor == null) return; hideHighlights(editor, HIDE_BY_ANY_KEY); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/actions/HighlightUsagesAction.java b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/actions/HighlightUsagesAction.java index 5a74bec92ae0..d37aa879b36a 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/actions/HighlightUsagesAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/actions/HighlightUsagesAction.java @@ -37,12 +37,12 @@ public class HighlightUsagesAction extends AnAction implements DumbAware { final Presentation presentation = event.getPresentation(); final DataContext dataContext = event.getDataContext(); presentation.setEnabled(CommonDataKeys.PROJECT.getData(dataContext) != null && - PlatformDataKeys.EDITOR.getData(dataContext) != null); + CommonDataKeys.EDITOR.getData(dataContext) != null); } @Override public void actionPerformed(AnActionEvent e) { - final Editor editor = PlatformDataKeys.EDITOR.getData(e.getDataContext()); + final Editor editor = CommonDataKeys.EDITOR.getData(e.getDataContext()); final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (editor == null || project == null) return; String commandName = getTemplatePresentation().getText(); 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 3f9a6204c052..a99e850142c2 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 @@ -81,7 +81,7 @@ public class ShowImplementationsAction extends AnAction implements PopupAction { } protected Editor getEditor(DataContext dataContext) { - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (editor == null) { final PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); @@ -106,7 +106,7 @@ public class ShowImplementationsAction extends AnAction implements PopupAction { final Editor editor = getEditor(dataContext); PsiElement element = LangDataKeys.PSI_ELEMENT.getData(dataContext); - boolean isInvokedFromEditor = PlatformDataKeys.EDITOR.getData(dataContext) != null; + boolean isInvokedFromEditor = CommonDataKeys.EDITOR.getData(dataContext) != null; element = getElement(project, file, editor, element); if (element == null && file == null) return; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/QuickEditHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/QuickEditHandler.java index 4224b525f241..247dd75f7675 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/QuickEditHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/QuickEditHandler.java @@ -144,7 +144,7 @@ public class QuickEditHandler extends DocumentAdapter implements Disposable { new AnAction() { @Override public void update(AnActionEvent e) { - Editor editor = PlatformDataKeys.EDITOR.getData(e.getDataContext()); + Editor editor = CommonDataKeys.EDITOR.getData(e.getDataContext()); e.getPresentation().setEnabled( editor != null && LookupManager.getActiveLookup(editor) == null && TemplateManager.getInstance(myProject).getActiveTemplate(editor) == null && diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupActionHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupActionHandler.java index 88d188710b3b..79838c5c2e89 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupActionHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupActionHandler.java @@ -108,7 +108,7 @@ public abstract class LookupActionHandler extends EditorActionHandler { @Override public void actionPerformed(AnActionEvent e) { FeatureUsageTracker.getInstance().triggerFeatureUsed(CodeCompletionFeatures.EDITING_COMPLETION_CONTROL_ARROWS); - LookupImpl lookup = (LookupImpl)LookupManager.getActiveLookup(PlatformDataKeys.EDITOR.getData(e.getDataContext())); + LookupImpl lookup = (LookupImpl)LookupManager.getActiveLookup(CommonDataKeys.EDITOR.getData(e.getDataContext())); assert lookup != null; lookup.hide(); ActionManager.getInstance().getAction(IdeActions.ACTION_EDITOR_MOVE_CARET_UP).actionPerformed(e); @@ -116,7 +116,7 @@ public abstract class LookupActionHandler extends EditorActionHandler { @Override public void update(AnActionEvent e) { - Lookup lookup = LookupManager.getActiveLookup(PlatformDataKeys.EDITOR.getData(e.getDataContext())); + Lookup lookup = LookupManager.getActiveLookup(CommonDataKeys.EDITOR.getData(e.getDataContext())); e.getPresentation().setEnabled(lookup != null); } } @@ -126,7 +126,7 @@ public abstract class LookupActionHandler extends EditorActionHandler { @Override public void actionPerformed(AnActionEvent e) { FeatureUsageTracker.getInstance().triggerFeatureUsed(CodeCompletionFeatures.EDITING_COMPLETION_CONTROL_ARROWS); - LookupImpl lookup = (LookupImpl)LookupManager.getActiveLookup(PlatformDataKeys.EDITOR.getData(e.getDataContext())); + LookupImpl lookup = (LookupImpl)LookupManager.getActiveLookup(CommonDataKeys.EDITOR.getData(e.getDataContext())); assert lookup != null; lookup.hide(); ActionManager.getInstance().getAction(IdeActions.ACTION_EDITOR_MOVE_CARET_DOWN).actionPerformed(e); @@ -134,7 +134,7 @@ public abstract class LookupActionHandler extends EditorActionHandler { @Override public void update(AnActionEvent e) { - Lookup lookup = LookupManager.getActiveLookup(PlatformDataKeys.EDITOR.getData(e.getDataContext())); + Lookup lookup = LookupManager.getActiveLookup(CommonDataKeys.EDITOR.getData(e.getDataContext())); e.getPresentation().setEnabled(lookup != null); } } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/IncrementalSearchAction.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/IncrementalSearchAction.java index 94f5abacd551..0bdad98e2a72 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/IncrementalSearchAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/IncrementalSearchAction.java @@ -31,7 +31,7 @@ public class IncrementalSearchAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); Project project = CommonDataKeys.PROJECT.getData(dataContext); - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (editor == null) return; new IncrementalSearchHandler().invoke(project, editor); @@ -47,7 +47,7 @@ public class IncrementalSearchAction extends AnAction implements DumbAware { return; } - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (editor == null){ presentation.setEnabled(false); 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 ac7f2e491478..d25f3a920a48 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 @@ -54,7 +54,7 @@ public class SaveAsTemplateAction extends AnAction { @Override public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); final Project project = file.getProject(); @@ -153,7 +153,7 @@ public class SaveAsTemplateAction extends AnAction { @Override public void update(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); if (file == null || editor == null) { diff --git a/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleBase.java b/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleBase.java index c624914a4c11..c6226b65035e 100644 --- a/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleBase.java +++ b/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleBase.java @@ -367,7 +367,7 @@ public abstract class LogConsoleBase extends AdditionalTabComponent implements L @Nullable private Editor getEditor() { final ConsoleView console = getConsole(); - return console != null ? PlatformDataKeys.EDITOR.getData((DataProvider) console) : null; + return console != null ? CommonDataKeys.EDITOR.getData((DataProvider) console) : null; } private void filterConsoleOutput() { diff --git a/platform/lang-impl/src/com/intellij/execution/actions/BaseRunConfigurationAction.java b/platform/lang-impl/src/com/intellij/execution/actions/BaseRunConfigurationAction.java index a2cf9ffea9df..beb8b10954d5 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/BaseRunConfigurationAction.java +++ b/platform/lang-impl/src/com/intellij/execution/actions/BaseRunConfigurationAction.java @@ -126,7 +126,7 @@ public abstract class BaseRunConfigurationAction extends ActionGroup { final List producers = getConfigurationsFromContext(context); if (producers.isEmpty()) return; if (producers.size() > 1) { - final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); Collections.sort(producers, ConfigurationFromContext.NAME_COMPARATOR); final ListPopup popup = JBPopupFactory.getInstance().createListPopup(new BaseListPopupStep(ExecutionBundle.message("configuration.action.chooser.title"), producers) { diff --git a/platform/lang-impl/src/com/intellij/execution/console/FoldLinesLikeThis.java b/platform/lang-impl/src/com/intellij/execution/console/FoldLinesLikeThis.java index d5eb03d6e88a..ce90aa782bc4 100644 --- a/platform/lang-impl/src/com/intellij/execution/console/FoldLinesLikeThis.java +++ b/platform/lang-impl/src/com/intellij/execution/console/FoldLinesLikeThis.java @@ -3,6 +3,7 @@ package com.intellij.execution.console; import com.intellij.execution.impl.ConsoleViewImpl; import com.intellij.execution.ui.ConsoleView; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; @@ -50,7 +51,7 @@ public class FoldLinesLikeThis extends DumbAwareAction { @Override public void update(AnActionEvent e) { - final Editor editor = e.getData(PlatformDataKeys.EDITOR); + final Editor editor = e.getData(CommonDataKeys.EDITOR); final boolean enabled = e.getData(LangDataKeys.CONSOLE_VIEW) != null && editor != null && getSingleLineSelection(editor) != null; e.getPresentation().setEnabled(enabled); @@ -59,7 +60,7 @@ public class FoldLinesLikeThis extends DumbAwareAction { @Override public void actionPerformed(AnActionEvent e) { - final Editor editor = e.getData(PlatformDataKeys.EDITOR); + final Editor editor = e.getData(CommonDataKeys.EDITOR); assert editor != null; final String selection = getSingleLineSelection(editor); assert selection != null; diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java index 00d39fcb09f3..ea50a7cac1d6 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java @@ -831,7 +831,7 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo return openFileDescriptor; } - if (PlatformDataKeys.EDITOR.is(dataId)) { + if (CommonDataKeys.EDITOR.is(dataId)) { return myEditor; } if (PlatformDataKeys.HELP_ID.is(dataId)) { @@ -1168,7 +1168,7 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo @Override public void update(AnActionEvent e) { boolean enabled = e.getData(LangDataKeys.CONSOLE_VIEW) != null; - Editor editor = e.getData(PlatformDataKeys.EDITOR); + Editor editor = e.getData(CommonDataKeys.EDITOR); if (editor != null && editor.getDocument().getTextLength() == 0) { enabled = false; } @@ -1301,7 +1301,7 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo @Nullable private static ConsoleViewImpl getRunningConsole(final DataContext context) { - final Editor editor = PlatformDataKeys.EDITOR.getData(context); + final Editor editor = CommonDataKeys.EDITOR.getData(context); if (editor != null) { final ConsoleViewImpl console = editor.getUserData(CONSOLE_VIEW_IN_EDITOR_VIEW); if (console != null && console.myState.isRunning()) { diff --git a/platform/lang-impl/src/com/intellij/find/actions/FindUsagesAction.java b/platform/lang-impl/src/com/intellij/find/actions/FindUsagesAction.java index cc92283c1ff7..51ac296f93c3 100644 --- a/platform/lang-impl/src/com/intellij/find/actions/FindUsagesAction.java +++ b/platform/lang-impl/src/com/intellij/find/actions/FindUsagesAction.java @@ -24,6 +24,7 @@ import com.intellij.find.FindManager; import com.intellij.find.findUsages.PsiElement2UsageTargetAdapter; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.editor.Editor; @@ -52,7 +53,7 @@ public class FindUsagesAction extends AnAction { UsageTarget[] usageTargets = e.getData(UsageView.USAGE_TARGETS_KEY); if (usageTargets == null) { - final Editor editor = e.getData(PlatformDataKeys.EDITOR); + final Editor editor = e.getData(CommonDataKeys.EDITOR); chooseAmbiguousTargetAndPerform(project, editor, new PsiElementProcessor() { @Override public boolean execute(@NotNull final PsiElement element) { diff --git a/platform/lang-impl/src/com/intellij/find/actions/FindUsagesInFileAction.java b/platform/lang-impl/src/com/intellij/find/actions/FindUsagesInFileAction.java index 4b26d8ea5efd..617b6a8b9b2f 100644 --- a/platform/lang-impl/src/com/intellij/find/actions/FindUsagesInFileAction.java +++ b/platform/lang-impl/src/com/intellij/find/actions/FindUsagesInFileAction.java @@ -45,7 +45,7 @@ public class FindUsagesInFileAction extends AnAction { final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return; PsiDocumentManager.getInstance(project).commitAllDocuments(); - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); UsageTarget[] usageTargets = UsageView.USAGE_TARGETS_KEY.getData(dataContext); if (usageTargets != null) { @@ -78,7 +78,7 @@ public class FindUsagesInFileAction extends AnAction { return false; } - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (editor == null) { UsageTarget[] target = UsageView.USAGE_TARGETS_KEY.getData(dataContext); return target != null && target.length > 0; diff --git a/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java b/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java index 3bcf30337fc5..58125ecb21f4 100644 --- a/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java +++ b/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java @@ -160,7 +160,7 @@ public class ShowUsagesAction extends AnAction implements PopupAction { FeatureUsageTracker.getInstance().triggerFeatureUsed("navigation.goto.usages"); UsageTarget[] usageTargets = e.getData(UsageView.USAGE_TARGETS_KEY); - final Editor editor = e.getData(PlatformDataKeys.EDITOR); + final Editor editor = e.getData(CommonDataKeys.EDITOR); if (usageTargets == null) { FindUsagesAction.chooseAmbiguousTargetAndPerform(project, editor, new PsiElementProcessor() { @Override diff --git a/platform/lang-impl/src/com/intellij/find/findInProject/FindInProjectManager.java b/platform/lang-impl/src/com/intellij/find/findInProject/FindInProjectManager.java index 0d21d8a081aa..a1e5625d8d3d 100644 --- a/platform/lang-impl/src/com/intellij/find/findInProject/FindInProjectManager.java +++ b/platform/lang-impl/src/com/intellij/find/findInProject/FindInProjectManager.java @@ -23,6 +23,7 @@ import com.intellij.find.FindUtil; import com.intellij.find.impl.FindInProjectUtil; import com.intellij.find.replaceInProject.ReplaceInProjectManager; import com.intellij.navigation.ItemPresentation; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.components.ServiceManager; @@ -80,7 +81,7 @@ public class FindInProjectManager { findModel.setOpenInNewTab(toOpenInNewTab[0]); FindInProjectUtil.setDirectoryName(findModel, dataContext); - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); FindUtil.initStringToFindWithSelection(findModel, editor); findManager.showFindDialog(findModel, new Runnable() { diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java b/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java index 5dc26739fb5b..c9707d45b969 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java @@ -20,6 +20,7 @@ import com.intellij.BundleBase; import com.intellij.find.*; import com.intellij.find.ngrams.TrigramIndex; import com.intellij.navigation.ItemPresentation; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -107,7 +108,7 @@ public class FindInProjectUtil { model.setModuleName(module.getName()); } - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (model.getModuleName() == null || editor == null) { model.setDirectoryName(directoryName); model.setProjectScope(directoryName == null && module == null && !model.isCustomScope() || editor != null); diff --git a/platform/lang-impl/src/com/intellij/find/replaceInProject/ReplaceInProjectManager.java b/platform/lang-impl/src/com/intellij/find/replaceInProject/ReplaceInProjectManager.java index 02d6b79a7fbb..ea3f97db0e01 100644 --- a/platform/lang-impl/src/com/intellij/find/replaceInProject/ReplaceInProjectManager.java +++ b/platform/lang-impl/src/com/intellij/find/replaceInProject/ReplaceInProjectManager.java @@ -20,6 +20,7 @@ import com.intellij.find.*; import com.intellij.find.findInProject.FindInProjectManager; import com.intellij.find.impl.FindInProjectUtil; import com.intellij.notification.NotificationGroup; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; @@ -114,7 +115,7 @@ public class ReplaceInProjectManager { findModel.setReplaceState(true); FindInProjectUtil.setDirectoryName(findModel, dataContext); - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); FindUtil.initStringToFindWithSelection(findModel, editor); findManager.showFindDialog(findModel, new Runnable() { diff --git a/platform/lang-impl/src/com/intellij/ide/actions/CopyElementAction.java b/platform/lang-impl/src/com/intellij/ide/actions/CopyElementAction.java index 8cfdd39da1de..0aed9b7ba727 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/CopyElementAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/CopyElementAction.java @@ -42,7 +42,7 @@ public class CopyElementAction extends AnAction { PsiDocumentManager.getInstance(project).commitAllDocuments(); }}, "", null ); - final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); PsiElement[] elements; PsiDirectory defaultTargetDirectory; @@ -77,7 +77,7 @@ public class CopyElementAction extends AnAction { return; } - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (editor != null) { updateForEditor(dataContext, presentation); } @@ -88,7 +88,7 @@ public class CopyElementAction extends AnAction { } protected void updateForEditor(DataContext dataContext, Presentation presentation) { - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (editor == null) { presentation.setVisible(false); return; diff --git a/platform/lang-impl/src/com/intellij/ide/actions/CopyReferenceAction.java b/platform/lang-impl/src/com/intellij/ide/actions/CopyReferenceAction.java index 7e52422cb129..b3b82106499d 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/CopyReferenceAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/CopyReferenceAction.java @@ -65,7 +65,7 @@ public class CopyReferenceAction extends DumbAwareAction { @Override public void update(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); boolean enabled = (editor != null && FileDocumentManager.getInstance().getFile(editor.getDocument()) != null) || getElementToCopy(editor, dataContext) != null; e.getPresentation().setEnabled(enabled); @@ -80,7 +80,7 @@ public class CopyReferenceAction extends DumbAwareAction { @Override public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); Project project = CommonDataKeys.PROJECT.getData(dataContext); PsiElement element = getElementToCopy(editor, dataContext); 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 d9d8bccfc4ca..330d16891230 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/ExternalJavaDocAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/ExternalJavaDocAction.java @@ -65,7 +65,7 @@ public class ExternalJavaDocAction extends AnAction { PsiFile context = LangDataKeys.PSI_FILE.getData(dataContext); - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); PsiElement originalElement = getOriginalElement(context, editor); DocumentationManager.storeOriginalElement(project, originalElement, element); final DocumentationProvider provider = DocumentationManager.getProviderFromElement(element); @@ -111,7 +111,7 @@ public class ExternalJavaDocAction extends AnAction { public void update(AnActionEvent event) { Presentation presentation = event.getPresentation(); DataContext dataContext = event.getDataContext(); - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); final PsiElement element = LangDataKeys.PSI_ELEMENT.getData(dataContext); final PsiElement originalElement = getOriginalElement(LangDataKeys.PSI_FILE.getData(dataContext), editor); DocumentationManager.storeOriginalElement(CommonDataKeys.PROJECT.getData(dataContext), originalElement, element); 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 523f38c0c254..b85d1c61064e 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java @@ -117,7 +117,7 @@ public abstract class GotoActionBase extends AnAction { return Pair.create(predefined, 0); } if (useEditorSelection) { - final Editor editor = e.getData(PlatformDataKeys.EDITOR); + final Editor editor = e.getData(CommonDataKeys.EDITOR); if (editor != null) { final String selectedText = editor.getSelectionModel().getSelectedText(); if (selectedText != null && !selectedText.contains("\n")) { 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 b9264d37b7bb..eda883f86226 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/GotoRelatedFileAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoRelatedFileAction.java @@ -55,7 +55,7 @@ public class GotoRelatedFileAction extends AnAction { public void actionPerformed(AnActionEvent e) { DataContext context = e.getDataContext(); - Editor editor = PlatformDataKeys.EDITOR.getData(context); + Editor editor = CommonDataKeys.EDITOR.getData(context); PsiFile psiFile = LangDataKeys.PSI_FILE.getData(context); if (psiFile == null) return; diff --git a/platform/lang-impl/src/com/intellij/ide/actions/PasteReferenceProvider.java b/platform/lang-impl/src/com/intellij/ide/actions/PasteReferenceProvider.java index d22cd3228059..c3a685c956f8 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/PasteReferenceProvider.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/PasteReferenceProvider.java @@ -44,7 +44,7 @@ public class PasteReferenceProvider implements PasteProvider { @Override public void performPaste(@NotNull DataContext dataContext) { final Project project = CommonDataKeys.PROJECT.getData(dataContext); - final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (project == null || editor == null) return; final String fqn = getCopiedFqn(dataContext); @@ -67,7 +67,7 @@ public class PasteReferenceProvider implements PasteProvider { @Override public boolean isPastePossible(@NotNull DataContext dataContext) { final Project project = CommonDataKeys.PROJECT.getData(dataContext); - final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); return project != null && editor != null && getCopiedFqn(dataContext) != null; } diff --git a/platform/lang-impl/src/com/intellij/ide/actions/ReloadFromDiskAction.java b/platform/lang-impl/src/com/intellij/ide/actions/ReloadFromDiskAction.java index d5188b6233d5..e52a2c00dd95 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/ReloadFromDiskAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/ReloadFromDiskAction.java @@ -34,7 +34,7 @@ public class ReloadFromDiskAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); final Project project = CommonDataKeys.PROJECT.getData(dataContext); - final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (editor == null) return; final PsiFile psiFile = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument()); if (psiFile == null) return; @@ -75,7 +75,7 @@ public class ReloadFromDiskAction extends AnAction implements DumbAware { presentation.setEnabled(false); return; } - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (editor == null){ presentation.setEnabled(false); return; diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/BookmarksAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/BookmarksAction.java index d774952290c1..d6d4f58ce77b 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/BookmarksAction.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/BookmarksAction.java @@ -200,7 +200,7 @@ public class BookmarksAction extends AnAction implements DumbAware, MasterDetail BookmarkManager bookmarkManager = BookmarkManager.getInstance(myProject); if (ToolWindowManager.getInstance(myProject).isEditorComponentActive()) { - Editor editor = PlatformDataKeys.EDITOR.getData(myDataContext); + Editor editor = CommonDataKeys.EDITOR.getData(myDataContext); if (editor != null) { Document document = editor.getDocument(); myLine = editor.getCaretModel().getLogicalPosition().line; diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleBookmarkAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleBookmarkAction.java index 0a3869304d6a..a6bbe29cc5e5 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleBookmarkAction.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleBookmarkAction.java @@ -53,7 +53,7 @@ public class ToggleBookmarkAction extends BookmarksAction implements DumbAware { final Project project = CommonDataKeys.PROJECT.getData(dataContext); event.getPresentation().setEnabled(project != null && (ToolWindowManager.getInstance(project).isEditorComponentActive() && - PlatformDataKeys.EDITOR.getData(dataContext) != null || + CommonDataKeys.EDITOR.getData(dataContext) != null || PlatformDataKeys.VIRTUAL_FILE.getData(dataContext) != null)); event.getPresentation().setText(IdeBundle.message("action.bookmark.toggle")); diff --git a/platform/lang-impl/src/com/intellij/ide/macro/EditorMacro.java b/platform/lang-impl/src/com/intellij/ide/macro/EditorMacro.java index 87524ebb014a..b10af030ecb2 100644 --- a/platform/lang-impl/src/com/intellij/ide/macro/EditorMacro.java +++ b/platform/lang-impl/src/com/intellij/ide/macro/EditorMacro.java @@ -15,6 +15,7 @@ */ package com.intellij.ide.macro; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; @@ -49,7 +50,7 @@ public abstract class EditorMacro extends Macro { Project project = PlatformDataKeys.PROJECT.getData(dataContext); if (project == null) return null; if (ToolWindowManager.getInstance(project).isEditorComponentActive()) { - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (editor != null){ return expand(editor); } diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ShowNavBarAction.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ShowNavBarAction.java index a68ad97d04b2..3e8c35cc2692 100644 --- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ShowNavBarAction.java +++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ShowNavBarAction.java @@ -40,7 +40,7 @@ public class ShowNavBarAction extends AnAction implements DumbAware, PopupAction } else { final Component component = PlatformDataKeys.CONTEXT_COMPONENT.getData(context); if (!isInsideNavBar(component)) { - final Editor editor = PlatformDataKeys.EDITOR.getData(context); + final Editor editor = CommonDataKeys.EDITOR.getData(context); final NavBarPanel toolbarPanel = new NavBarPanel(project, false); toolbarPanel.showHint(editor, context); } 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 680403e3ffe9..b1f5c7973ba4 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/DeleteHandler.java +++ b/platform/lang-impl/src/com/intellij/ide/util/DeleteHandler.java @@ -187,7 +187,7 @@ public class DeleteHandler { } // deleted from project view or something like that. - if (PlatformDataKeys.EDITOR.getData(DataManager.getInstance().getDataContext()) == null) { + if (CommonDataKeys.EDITOR.getData(DataManager.getInstance().getDataContext()) == null) { CommandProcessor.getInstance().markCurrentCommandAsGlobal(project); } diff --git a/platform/lang-impl/src/com/intellij/internal/DumpLookupElementWeights.java b/platform/lang-impl/src/com/intellij/internal/DumpLookupElementWeights.java index 0db3f4a4570d..63d8a6038b6a 100644 --- a/platform/lang-impl/src/com/intellij/internal/DumpLookupElementWeights.java +++ b/platform/lang-impl/src/com/intellij/internal/DumpLookupElementWeights.java @@ -21,6 +21,7 @@ import com.intellij.codeInsight.lookup.LookupManager; import com.intellij.codeInsight.lookup.impl.LookupImpl; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.diagnostic.Logger; @@ -40,14 +41,14 @@ public class DumpLookupElementWeights extends AnAction implements DumbAware { @Override public void actionPerformed(final AnActionEvent e) { - final Editor editor = e.getData(PlatformDataKeys.EDITOR); + final Editor editor = e.getData(CommonDataKeys.EDITOR); dumpLookupElementWeights((LookupImpl)LookupManager.getActiveLookup(editor)); } @Override public void update(final AnActionEvent e) { final Presentation presentation = e.getPresentation(); - final Editor editor = e.getData(PlatformDataKeys.EDITOR); + final Editor editor = e.getData(CommonDataKeys.EDITOR); presentation.setEnabled(editor != null && LookupManager.getActiveLookup(editor) != null); } diff --git a/platform/lang-impl/src/com/intellij/internal/SelectionBasedPsiElementInternalAction.java b/platform/lang-impl/src/com/intellij/internal/SelectionBasedPsiElementInternalAction.java index 0fe0d1d27cea..ad73e14b9dd0 100644 --- a/platform/lang-impl/src/com/intellij/internal/SelectionBasedPsiElementInternalAction.java +++ b/platform/lang-impl/src/com/intellij/internal/SelectionBasedPsiElementInternalAction.java @@ -136,7 +136,7 @@ public abstract class SelectionBasedPsiElementInternalAction ourSafeKeys = new HashSet(Arrays.asList( CommonDataKeys.PROJECT.getName(), - PlatformDataKeys.EDITOR.getName(), + CommonDataKeys.EDITOR.getName(), PlatformDataKeys.IS_MODAL_CONTEXT.getName(), PlatformDataKeys.CONTEXT_COMPONENT.getName(), PlatformDataKeys.MODALITY_STATE.getName() @@ -374,7 +374,7 @@ public class DataManagerImpl extends DataManager implements ApplicationComponent if (PlatformDataKeys.MODALITY_STATE.is(dataId)) { return component != null ? ModalityState.stateForComponent(component) : ModalityState.NON_MODAL; } - if (PlatformDataKeys.EDITOR.is(dataId)) { + if (CommonDataKeys.EDITOR.is(dataId)) { Editor editor = (Editor)((DataManagerImpl)DataManager.getInstance()).getData(dataId, component); return validateEditor(editor); } diff --git a/platform/platform-impl/src/com/intellij/ide/impl/dataRules/CopyProviderRule.java b/platform/platform-impl/src/com/intellij/ide/impl/dataRules/CopyProviderRule.java index 5068ebec966b..b30850e393ac 100644 --- a/platform/platform-impl/src/com/intellij/ide/impl/dataRules/CopyProviderRule.java +++ b/platform/platform-impl/src/com/intellij/ide/impl/dataRules/CopyProviderRule.java @@ -15,6 +15,7 @@ */ package com.intellij.ide.impl.dataRules; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; @@ -22,7 +23,7 @@ import com.intellij.openapi.editor.ex.EditorEx; public class CopyProviderRule implements GetDataRule { public Object getData(DataProvider dataProvider) { - final Editor editor = PlatformDataKeys.EDITOR.getData(dataProvider); + final Editor editor = CommonDataKeys.EDITOR.getData(dataProvider); if (editor instanceof EditorEx) { return ((EditorEx) editor).getCopyProvider(); } diff --git a/platform/platform-impl/src/com/intellij/ide/impl/dataRules/CutProviderRule.java b/platform/platform-impl/src/com/intellij/ide/impl/dataRules/CutProviderRule.java index e9dd25b4924c..7470f6551c0c 100644 --- a/platform/platform-impl/src/com/intellij/ide/impl/dataRules/CutProviderRule.java +++ b/platform/platform-impl/src/com/intellij/ide/impl/dataRules/CutProviderRule.java @@ -15,6 +15,7 @@ */ package com.intellij.ide.impl.dataRules; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; @@ -22,7 +23,7 @@ import com.intellij.openapi.editor.ex.EditorEx; public class CutProviderRule implements GetDataRule { public Object getData(DataProvider dataProvider) { - final Editor editor = PlatformDataKeys.EDITOR.getData(dataProvider); + final Editor editor = CommonDataKeys.EDITOR.getData(dataProvider); if (editor instanceof EditorEx) { return ((EditorEx) editor).getCutProvider(); } diff --git a/platform/platform-impl/src/com/intellij/ide/impl/dataRules/FileEditorRule.java b/platform/platform-impl/src/com/intellij/ide/impl/dataRules/FileEditorRule.java index 733e4b80b3ec..0ab72e0792c5 100644 --- a/platform/platform-impl/src/com/intellij/ide/impl/dataRules/FileEditorRule.java +++ b/platform/platform-impl/src/com/intellij/ide/impl/dataRules/FileEditorRule.java @@ -15,6 +15,7 @@ */ package com.intellij.ide.impl.dataRules; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; @@ -24,7 +25,7 @@ import com.intellij.ui.EditorTextField; public class FileEditorRule implements GetDataRule { @Override public Object getData(DataProvider dataProvider) { - final Editor editor = (Editor)dataProvider.getData(PlatformDataKeys.EDITOR.getName()); + final Editor editor = (Editor)dataProvider.getData(CommonDataKeys.EDITOR.getName()); if (editor == null || editor.isDisposed()) { return null; } diff --git a/platform/platform-impl/src/com/intellij/ide/impl/dataRules/InactiveEditorRule.java b/platform/platform-impl/src/com/intellij/ide/impl/dataRules/InactiveEditorRule.java index c2665e55b0cc..5011ac9438f2 100644 --- a/platform/platform-impl/src/com/intellij/ide/impl/dataRules/InactiveEditorRule.java +++ b/platform/platform-impl/src/com/intellij/ide/impl/dataRules/InactiveEditorRule.java @@ -19,6 +19,7 @@ */ package com.intellij.ide.impl.dataRules; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.actionSystem.PlatformDataKeys; import org.jetbrains.annotations.Nullable; @@ -26,6 +27,6 @@ import org.jetbrains.annotations.Nullable; public class InactiveEditorRule implements GetDataRule { @Nullable public Object getData(final DataProvider dataProvider) { - return dataProvider.getData(PlatformDataKeys.EDITOR.getName()); + return dataProvider.getData(CommonDataKeys.EDITOR.getName()); } } \ No newline at end of file diff --git a/platform/platform-impl/src/com/intellij/ide/impl/dataRules/PasteProviderRule.java b/platform/platform-impl/src/com/intellij/ide/impl/dataRules/PasteProviderRule.java index 02c42a0e7c33..a70b8553f917 100644 --- a/platform/platform-impl/src/com/intellij/ide/impl/dataRules/PasteProviderRule.java +++ b/platform/platform-impl/src/com/intellij/ide/impl/dataRules/PasteProviderRule.java @@ -15,6 +15,7 @@ */ package com.intellij.ide.impl.dataRules; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; @@ -22,7 +23,7 @@ import com.intellij.openapi.editor.ex.EditorEx; public class PasteProviderRule implements GetDataRule { public Object getData(DataProvider dataProvider) { - final Editor editor = PlatformDataKeys.EDITOR.getData(dataProvider); + final Editor editor = CommonDataKeys.EDITOR.getData(dataProvider); if (editor instanceof EditorEx) { return ((EditorEx) editor).getPasteProvider(); } diff --git a/platform/platform-impl/src/com/intellij/notification/EventLogConsole.java b/platform/platform-impl/src/com/intellij/notification/EventLogConsole.java index f4c792a5e923..ba2129073fdc 100644 --- a/platform/platform-impl/src/com/intellij/notification/EventLogConsole.java +++ b/platform/platform-impl/src/com/intellij/notification/EventLogConsole.java @@ -234,7 +234,7 @@ class EventLogConsole { @Override public void update(AnActionEvent e) { - Editor editor = e.getData(PlatformDataKeys.EDITOR); + Editor editor = e.getData(CommonDataKeys.EDITOR); e.getPresentation().setEnabled(editor != null && editor.getDocument().getTextLength() > 0); } @@ -245,7 +245,7 @@ class EventLogConsole { model.removeNotification(notification); } model.setStatusMessage(null, 0); - final Editor editor = e.getData(PlatformDataKeys.EDITOR); + final Editor editor = e.getData(CommonDataKeys.EDITOR); if (editor != null) { editor.getDocument().deleteString(0, editor.getDocument().getTextLength()); } diff --git a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoManagerImpl.java index 224bd2de7e8d..bf7fe9c9652f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoManagerImpl.java @@ -19,6 +19,7 @@ import com.intellij.CommonBundle; import com.intellij.ide.DataManager; import com.intellij.idea.ActionsBundle; import com.intellij.openapi.Disposable; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; @@ -258,12 +259,12 @@ public class UndoManagerImpl extends UndoManager implements ProjectComponent, Ap Editor editor = null; final Application application = ApplicationManager.getApplication(); if (application.isUnitTestMode() || application.isHeadlessEnvironment()) { - editor = PlatformDataKeys.EDITOR.getData(DataManager.getInstance().getDataContext()); + editor = CommonDataKeys.EDITOR.getData(DataManager.getInstance().getDataContext()); } else { Component component = WindowManagerEx.getInstanceEx().getFocusedComponent(myProject); if (component != null) { - editor = PlatformDataKeys.EDITOR.getData(DataManager.getInstance().getDataContext(component)); + editor = CommonDataKeys.EDITOR.getData(DataManager.getInstance().getDataContext(component)); } } diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/actions/CompareClipboardWithSelection.java b/platform/platform-impl/src/com/intellij/openapi/diff/actions/CompareClipboardWithSelection.java index dfeafd503c68..a9f473fee172 100644 --- a/platform/platform-impl/src/com/intellij/openapi/diff/actions/CompareClipboardWithSelection.java +++ b/platform/platform-impl/src/com/intellij/openapi/diff/actions/CompareClipboardWithSelection.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.diff.actions; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.diff.*; @@ -33,7 +34,7 @@ public class CompareClipboardWithSelection extends BaseDiffAction { protected DiffRequest getDiffData(DataContext dataContext) { Project project = PlatformDataKeys.PROJECT.getData(dataContext); if (project == null) return null; - Editor editorData = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editorData = CommonDataKeys.EDITOR.getData(dataContext); Editor editor = editorData != null ? editorData : FileEditorManager.getInstance(project).getSelectedTextEditor(); if (editor == null) return null; return new ClipboardSelectionContents(editor, project); diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/DiffPanelOuterComponent.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/DiffPanelOuterComponent.java index 69e0001581fb..5be40aedd921 100644 --- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/DiffPanelOuterComponent.java +++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/DiffPanelOuterComponent.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.diff.impl.util; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.diff.DiffRequest; @@ -143,7 +144,7 @@ public class DiffPanelOuterComponent extends JPanel implements DataProvider { if (myDataProvider == null) { return null; } - if (PlatformDataKeys.EDITOR.is(dataId)) { + if (CommonDataKeys.EDITOR.is(dataId)) { if (myBottomComponent != null) { // we don't want editor actions to be executed when the bottom component has focus final Component focusOwner = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner(); diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/AbstractToggleUseSoftWrapsAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/AbstractToggleUseSoftWrapsAction.java index af51fa1c2ecc..b5662c6ab49f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/AbstractToggleUseSoftWrapsAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/AbstractToggleUseSoftWrapsAction.java @@ -16,6 +16,7 @@ package com.intellij.openapi.editor.actions; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.actionSystem.ToggleAction; import com.intellij.openapi.editor.Editor; @@ -75,6 +76,6 @@ public abstract class AbstractToggleUseSoftWrapsAction extends ToggleAction { @Nullable protected Editor getEditor(AnActionEvent e) { - return e.getData(PlatformDataKeys.EDITOR); + return e.getData(CommonDataKeys.EDITOR); } } diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/MultiplePasteAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/MultiplePasteAction.java index 316bee4ede90..416c0a9d7eff 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/MultiplePasteAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/MultiplePasteAction.java @@ -51,7 +51,7 @@ public class MultiplePasteAction extends AnAction implements DumbAware { final DataContext dataContext = e.getDataContext(); Project project = CommonDataKeys.PROJECT.getData(dataContext); Component focusedComponent = e.getData(PlatformDataKeys.CONTEXT_COMPONENT); - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (!(focusedComponent instanceof JComponent)) return; @@ -135,7 +135,7 @@ public class MultiplePasteAction extends AnAction implements DumbAware { private static boolean isEnabled(AnActionEvent e) { Object component = e.getData(PlatformDataKeys.CONTEXT_COMPONENT); if (!(component instanceof JComponent)) return false; - Editor editor = e.getData(PlatformDataKeys.EDITOR); + Editor editor = e.getData(CommonDataKeys.EDITOR); if (editor != null) return !editor.isViewer(); Action pasteAction = ((JComponent)component).getActionMap().get(DefaultEditorKit.pasteAction); return pasteAction != null; diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/PasteFromX11Action.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/PasteFromX11Action.java index 07edc2767b4c..fcd7b9799360 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/PasteFromX11Action.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/PasteFromX11Action.java @@ -16,6 +16,7 @@ package com.intellij.openapi.editor.actions; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.actionSystem.Presentation; @@ -51,7 +52,7 @@ public class PasteFromX11Action extends EditorAction { public void update(AnActionEvent e) { Presentation presentation = e.getPresentation(); DataContext dataContext = e.getDataContext(); - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (editor == null || !SystemInfo.isXWindow) { presentation.setEnabled(false); } diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/ToggleColumnModeAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/ToggleColumnModeAction.java index 63cecef76113..695fac74827e 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/ToggleColumnModeAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/ToggleColumnModeAction.java @@ -25,6 +25,7 @@ package com.intellij.openapi.editor.actions; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.actionSystem.ToggleAction; import com.intellij.openapi.editor.CaretModel; @@ -83,7 +84,7 @@ public class ToggleColumnModeAction extends ToggleAction implements DumbAware { } private static EditorEx getEditor(AnActionEvent e) { - return (EditorEx) PlatformDataKeys.EDITOR.getData(e.getDataContext()); + return (EditorEx) CommonDataKeys.EDITOR.getData(e.getDataContext()); } @Override diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorComponentImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorComponentImpl.java index d8551c4524ce..4ac8704e7e7b 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorComponentImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorComponentImpl.java @@ -17,6 +17,7 @@ package com.intellij.openapi.editor.impl; import com.intellij.ide.IdeEventQueue; import com.intellij.ide.ui.UISettings; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; @@ -73,7 +74,7 @@ public class EditorComponentImpl extends JComponent implements Scrollable, DataP public Object getData(String dataId) { if (myEditor.isRendererMode()) return null; - if (PlatformDataKeys.EDITOR.is(dataId)) { + if (CommonDataKeys.EDITOR.is(dataId)) { // for 'big' editors return null to allow injected editors (see com.intellij.openapi.fileEditor.impl.text.TextEditorComponent.getData()) return myEditor.getVirtualFile() == null ? myEditor : null; } diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/TrailingSpacesStripper.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/TrailingSpacesStripper.java index db45506e99dd..f75449b66fcf 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/TrailingSpacesStripper.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/TrailingSpacesStripper.java @@ -17,6 +17,7 @@ package com.intellij.openapi.fileEditor.impl; import com.intellij.ide.DataManager; import com.intellij.injected.editor.DocumentWindow; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; @@ -116,7 +117,7 @@ public final class TrailingSpacesStripper extends FileDocumentManagerAdapter { Component focusOwner = IdeFocusManager.getGlobalInstance().getFocusOwner(); DataContext dataContext = DataManager.getInstance().getDataContext(focusOwner); boolean isDisposeInProgress = ApplicationManager.getApplication().isDisposeInProgress(); // ignore caret placing when exiting - Editor activeEditor = isDisposeInProgress ? null : PlatformDataKeys.EDITOR.getData(dataContext); + Editor activeEditor = isDisposeInProgress ? null : CommonDataKeys.EDITOR.getData(dataContext); // when virtual space enabled, we can strip whitespace anywhere boolean isVirtualSpaceEnabled = activeEditor == null || activeEditor.getSettings().isVirtualSpace(); @@ -144,7 +145,7 @@ public final class TrailingSpacesStripper extends FileDocumentManagerAdapter { } DataContext dataContext = DataManager.getInstance().getDataContext(IdeFocusManager.getGlobalInstance().getFocusOwner()); boolean isDisposeInProgress = ApplicationManager.getApplication().isDisposeInProgress(); // ignore caret placing when exiting - Editor activeEditor = isDisposeInProgress ? null : PlatformDataKeys.EDITOR.getData(dataContext); + Editor activeEditor = isDisposeInProgress ? null : CommonDataKeys.EDITOR.getData(dataContext); // when virtual space enabled, we can strip whitespace anywhere boolean isVirtualSpaceEnabled = activeEditor == null || activeEditor.getSettings().isVirtualSpace(); diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java index 9c198917c145..cf15cd9385be 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java @@ -268,7 +268,7 @@ class TextEditorComponent extends JBLoadingPanel implements DataProvider{ if (o != null) return o; } - if (PlatformDataKeys.EDITOR.is(dataId)) { + if (CommonDataKeys.EDITOR.is(dataId)) { return e; } if (PlatformDataKeys.VIRTUAL_FILE.is(dataId)) { diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/playback/util/EditorPlaybackCall.java b/platform/platform-impl/src/com/intellij/openapi/ui/playback/util/EditorPlaybackCall.java index 0462398dec7c..f229d5ef8b33 100644 --- a/platform/platform-impl/src/com/intellij/openapi/ui/playback/util/EditorPlaybackCall.java +++ b/platform/platform-impl/src/com/intellij/openapi/ui/playback/util/EditorPlaybackCall.java @@ -18,6 +18,7 @@ package com.intellij.openapi.ui.playback.util; import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; import com.intellij.ide.DataManager; import com.intellij.openapi.Disposable; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; @@ -34,7 +35,7 @@ public class EditorPlaybackCall { WindowSystemPlaybackCall.getUiReady(context).doWhenDone(new Runnable() { @Override public void run() { - Editor editor = PlatformDataKeys.EDITOR.getData(DataManager.getInstance().getDataContextFromFocus().getResult()); + Editor editor = CommonDataKeys.EDITOR.getData(DataManager.getInstance().getDataContextFromFocus().getResult()); if (editor == null) { editor = PlatformDataKeys.EDITOR_EVEN_IF_INACTIVE.getData(DataManager.getInstance().getDataContextFromFocus().getResult()); } diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/ChangeFileEncodingAction.java b/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/ChangeFileEncodingAction.java index 90e429a7d6c9..6b701193925f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/ChangeFileEncodingAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/ChangeFileEncodingAction.java @@ -87,7 +87,7 @@ public class ChangeFileEncodingAction extends AnAction implements DumbAware { if (virtualFile == null) return null; boolean enabled = checkEnabled(virtualFile); if (!enabled) return null; - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); FileDocumentManager documentManager = FileDocumentManager.getInstance(); final Document document = documentManager.getDocument(virtualFile); if (!allowDirectories && virtualFile.isDirectory() || document == null && !virtualFile.isDirectory()) return null; diff --git a/platform/platform-impl/src/com/intellij/ui/EditorTextField.java b/platform/platform-impl/src/com/intellij/ui/EditorTextField.java index a2584c22f34b..58b50f6b0ff6 100644 --- a/platform/platform-impl/src/com/intellij/ui/EditorTextField.java +++ b/platform/platform-impl/src/com/intellij/ui/EditorTextField.java @@ -17,6 +17,7 @@ package com.intellij.ui; import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; import com.intellij.ide.ui.laf.darcula.ui.DarculaEditorTextFieldBorder; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.Application; @@ -762,7 +763,7 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener, public Object getData(String dataId) { if (myEditor != null && myEditor.isRendererMode()) return null; - if (PlatformDataKeys.EDITOR.is(dataId)) { + if (CommonDataKeys.EDITOR.is(dataId)) { return myEditor; } diff --git a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java index bdcbc250663c..9cb42264c462 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java @@ -446,7 +446,7 @@ public class AbstractPopup implements JBPopup { @Override public void showInBestPositionFor(@NotNull DataContext dataContext) { - final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (editor != null) { showInBestPositionFor(editor); } diff --git a/platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java b/platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java index a47f03801151..c7194ca5b4c4 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java @@ -453,7 +453,7 @@ public class PopupFactoryImpl extends JBPopupFactory { return new RelativePoint(focusOwner, point); } - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (editor != null && focusOwner == editor.getContentComponent()) { return guessBestPopupLocation(editor); } diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/ui/LocalHistoryActionsTest.java b/platform/platform-tests/testSrc/com/intellij/history/integration/ui/LocalHistoryActionsTest.java index fcc97247651f..ef4037bae494 100644 --- a/platform/platform-tests/testSrc/com/intellij/history/integration/ui/LocalHistoryActionsTest.java +++ b/platform/platform-tests/testSrc/com/intellij/history/integration/ui/LocalHistoryActionsTest.java @@ -130,7 +130,7 @@ public class LocalHistoryActionsTest extends LocalHistoryUITestCase { @Nullable public Object getData(String id) { if (PlatformDataKeys.VIRTUAL_FILE_ARRAY.is(id)) return files; - if (PlatformDataKeys.EDITOR.is(id)) return editor; + if (CommonDataKeys.EDITOR.is(id)) return editor; if (CommonDataKeys.PROJECT.is(id)) return p; return null; } diff --git a/platform/testFramework/src/com/intellij/testFramework/LightPlatformCodeInsightTestCase.java b/platform/testFramework/src/com/intellij/testFramework/LightPlatformCodeInsightTestCase.java index c9b05517b6dd..f72b6796c6ad 100644 --- a/platform/testFramework/src/com/intellij/testFramework/LightPlatformCodeInsightTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/LightPlatformCodeInsightTestCase.java @@ -465,10 +465,10 @@ public abstract class LightPlatformCodeInsightTestCase extends LightPlatformTest @Override public Object getData(String dataId) { - if (PlatformDataKeys.EDITOR.is(dataId)) { + if (CommonDataKeys.EDITOR.is(dataId)) { return myEditor; } - if (dataId.equals(AnActionEvent.injectedId(PlatformDataKeys.EDITOR.getName()))) { + if (dataId.equals(AnActionEvent.injectedId(CommonDataKeys.EDITOR.getName()))) { return InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(getEditor(), getFile()); } if (LangDataKeys.PSI_FILE.is(dataId)) { @@ -618,7 +618,7 @@ public abstract class LightPlatformCodeInsightTestCase extends LightPlatformTest @Override @Nullable public Object getData(@NonNls String dataId) { - if (PlatformDataKeys.EDITOR.is(dataId)) { + if (CommonDataKeys.EDITOR.is(dataId)) { return getEditor(); } if (CommonDataKeys.PROJECT.is(dataId)) { diff --git a/platform/testFramework/src/com/intellij/testFramework/TestDataProvider.java b/platform/testFramework/src/com/intellij/testFramework/TestDataProvider.java index f8bf61ae57a9..e6f6a0a66adc 100644 --- a/platform/testFramework/src/com/intellij/testFramework/TestDataProvider.java +++ b/platform/testFramework/src/com/intellij/testFramework/TestDataProvider.java @@ -49,11 +49,11 @@ public class TestDataProvider implements DataProvider { if (CommonDataKeys.PROJECT.is(dataId)) { return myProject; } - else if (PlatformDataKeys.EDITOR.is(dataId) || OpenFileDescriptor.NAVIGATE_IN_EDITOR.is(dataId)) { + else if (CommonDataKeys.EDITOR.is(dataId) || OpenFileDescriptor.NAVIGATE_IN_EDITOR.is(dataId)) { return FileEditorManager.getInstance(myProject).getSelectedTextEditor(); } else { - Editor editor = (Editor)getData(PlatformDataKeys.EDITOR.getName()); + Editor editor = (Editor)getData(CommonDataKeys.EDITOR.getName()); if (editor != null) { FileEditorManagerEx manager = FileEditorManagerEx.getInstanceEx(myProject); Object managerData = manager.getData(dataId, editor, manager.getSelectedFiles()[0]); diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java index f736ecd96823..d2995a92a4ed 100644 --- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java @@ -834,7 +834,7 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig configureByFiles(files); testAction(new HighlightUsagesAction()); final Editor editor = getEditor(); - //final Editor editor = PlatformDataKeys.EDITOR.getData(DataManager.getInstance().getDataContext()); + //final Editor editor = com.intellij.openapi.actionSystem.CommonDataKeys.EDITOR.getData(DataManager.getInstance().getDataContext()); //assert editor != null; //HighlightUsagesHandler.invoke(getProject(), editor, getFile()); return editor.getMarkupModel().getAllHighlighters(); diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/HeavyIdeaTestFixtureImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/HeavyIdeaTestFixtureImpl.java index a9087552b916..eb04e4b312ea 100644 --- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/HeavyIdeaTestFixtureImpl.java +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/HeavyIdeaTestFixtureImpl.java @@ -197,12 +197,12 @@ class HeavyIdeaTestFixtureImpl extends BaseFixture implements HeavyIdeaTestFixtu if (CommonDataKeys.PROJECT.is(dataId)) { return myProject; } - else if (PlatformDataKeys.EDITOR.is(dataId) || OpenFileDescriptor.NAVIGATE_IN_EDITOR.is(dataId)) { + else if (CommonDataKeys.EDITOR.is(dataId) || OpenFileDescriptor.NAVIGATE_IN_EDITOR.is(dataId)) { if (myProject == null) return null; return FileEditorManager.getInstance(myProject).getSelectedTextEditor(); } else { - Editor editor = (Editor)getData(PlatformDataKeys.EDITOR.getName()); + Editor editor = (Editor)getData(CommonDataKeys.EDITOR.getName()); if (editor != null) { FileEditorManagerEx manager = FileEditorManagerEx.getInstanceEx(myProject); return manager.getData(dataId, editor, manager.getSelectedFiles()[0]); diff --git a/platform/usageView/src/com/intellij/usages/UsageTargetUtil.java b/platform/usageView/src/com/intellij/usages/UsageTargetUtil.java index 9e841dfa53c5..6fd8e6d245ea 100644 --- a/platform/usageView/src/com/intellij/usages/UsageTargetUtil.java +++ b/platform/usageView/src/com/intellij/usages/UsageTargetUtil.java @@ -15,6 +15,7 @@ */ package com.intellij.usages; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -35,7 +36,7 @@ public class UsageTargetUtil { private static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.usageTargetProvider"); public static UsageTarget[] findUsageTargets(DataProvider dataProvider) { - Editor editor = PlatformDataKeys.EDITOR.getData(dataProvider); + Editor editor = CommonDataKeys.EDITOR.getData(dataProvider); PsiFile file = LangDataKeys.PSI_FILE.getData(dataProvider); List result = new ArrayList(); diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/EditBreakpointAction.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/EditBreakpointAction.java index 5c8410dced18..a9f15890bbea 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/EditBreakpointAction.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/EditBreakpointAction.java @@ -18,6 +18,7 @@ package com.intellij.xdebugger.impl.actions; import com.intellij.idea.ActionsBundle; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.markup.GutterIconRenderer; @@ -40,7 +41,7 @@ public class EditBreakpointAction extends XDebuggerActionBase { @Override public void actionPerformed(AnActionEvent e) { - final Editor editor = PlatformDataKeys.EDITOR.getData(e.getDataContext()); + final Editor editor = CommonDataKeys.EDITOR.getData(e.getDataContext()); if (editor == null) return; myDebuggerSupport.getEditBreakpointAction().editBreakpoint(getEventProject(e), editor, myBreakpoint, myRenderer); } diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/ViewBreakpointsAction.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/ViewBreakpointsAction.java index 9069719c8404..6d8d43e6db21 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/ViewBreakpointsAction.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/ViewBreakpointsAction.java @@ -46,7 +46,7 @@ public class ViewBreakpointsAction extends AnAction implements AnAction.Transpar if (project == null) return; if (myInitialBreakpoint == null) { - Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (editor != null) { myInitialBreakpoint = XBreakpointUtil.findSelectedBreakpoint(project, editor).second; } diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XToggleLineBreakpointActionHandler.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XToggleLineBreakpointActionHandler.java index 97efce837eb7..03ae0184ec22 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XToggleLineBreakpointActionHandler.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XToggleLineBreakpointActionHandler.java @@ -17,6 +17,7 @@ package com.intellij.xdebugger.impl.actions.handlers; import com.intellij.codeInsight.folding.impl.actions.ExpandRegionAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; @@ -62,7 +63,7 @@ public class XToggleLineBreakpointActionHandler extends DebuggerActionHandler { XSourcePosition position = XDebuggerUtilImpl.getCaretPosition(project, event.getDataContext()); if (position == null) return; - ExpandRegionAction.expandRegionAtCaret(project, event.getData(PlatformDataKeys.EDITOR)); + ExpandRegionAction.expandRegionAtCaret(project, event.getData(CommonDataKeys.EDITOR)); int line = position.getLine(); VirtualFile file = position.getFile(); diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/BreakpointEditor.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/BreakpointEditor.java index 56398bfd4904..f51ce77d3fee 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/BreakpointEditor.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/BreakpointEditor.java @@ -84,7 +84,7 @@ public class BreakpointEditor { public void update(AnActionEvent e) { super.update(e); boolean lookup = LookupManager.getInstance(getEventProject(e)).getActiveLookup() != null; - Editor editor = e.getData(PlatformDataKeys.EDITOR); + Editor editor = e.getData(CommonDataKeys.EDITOR); e.getPresentation().setEnabled(!lookup && (editor == null || StringUtil.isEmpty(editor.getSelectionModel().getSelectedText())) ); } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/actions/RunTargetAction.java b/plugins/ant/src/com/intellij/lang/ant/config/actions/RunTargetAction.java index 60adc0298525..0a01b7ee4aba 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/actions/RunTargetAction.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/actions/RunTargetAction.java @@ -83,7 +83,7 @@ public class RunTargetAction extends AnAction { private static Pair findAntTarget(@NotNull AnActionEvent e) { final DataContext dataContext = e.getDataContext(); - final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null || editor == 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 46c08fcf3ca2..2f647dcf275b 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/actions/GenerateCopyrightAction.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/actions/GenerateCopyrightAction.java @@ -53,7 +53,7 @@ public class GenerateCopyrightAction extends AnAction private static PsiFile getFile(DataContext context, Project project) { PsiFile file = LangDataKeys.PSI_FILE.getData(context); if (file == null) { - Editor editor = PlatformDataKeys.EDITOR.getData(context); + Editor editor = CommonDataKeys.EDITOR.getData(context); if (editor != null) { file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument()); } diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/actions/UpdateCopyrightAction.java b/plugins/copyright/src/com/maddyhome/idea/copyright/actions/UpdateCopyrightAction.java index 2d51d43c22c3..9068d824631c 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/actions/UpdateCopyrightAction.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/actions/UpdateCopyrightAction.java @@ -50,7 +50,7 @@ public class UpdateCopyrightAction extends AnAction { return false; } final VirtualFile[] files = PlatformDataKeys.VIRTUAL_FILE_ARRAY.getData(context); - final Editor editor = PlatformDataKeys.EDITOR.getData(context); + final Editor editor = CommonDataKeys.EDITOR.getData(context); if (editor != null) { final PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument()); if (file == null || !FileTypeUtil.isSupportedFile(file)) { @@ -103,7 +103,7 @@ public class UpdateCopyrightAction extends AnAction { PsiDocumentManager.getInstance(project).commitAllDocuments(); final VirtualFile[] files = PlatformDataKeys.VIRTUAL_FILE_ARRAY.getData(context); - final Editor editor = PlatformDataKeys.EDITOR.getData(context); + final Editor editor = CommonDataKeys.EDITOR.getData(context); PsiFile file = null; PsiDirectory dir; diff --git a/plugins/devkit/src/actions/GenerateComponentExternalizationAction.java b/plugins/devkit/src/actions/GenerateComponentExternalizationAction.java index 2f4423b157b7..aa1e8c5617f8 100644 --- a/plugins/devkit/src/actions/GenerateComponentExternalizationAction.java +++ b/plugins/devkit/src/actions/GenerateComponentExternalizationAction.java @@ -102,7 +102,7 @@ public class GenerateComponentExternalizationAction extends AnAction { @Nullable private PsiClass getComponentInContext(DataContext context) { - Editor editor = PlatformDataKeys.EDITOR.getData(context); + Editor editor = CommonDataKeys.EDITOR.getData(context); Project project = CommonDataKeys.PROJECT.getData(context); if (editor == null || project == null) return null; diff --git a/plugins/devkit/src/actions/ShowSerializedXmlAction.java b/plugins/devkit/src/actions/ShowSerializedXmlAction.java index 9de4276ddefb..73abba4e9c90 100644 --- a/plugins/devkit/src/actions/ShowSerializedXmlAction.java +++ b/plugins/devkit/src/actions/ShowSerializedXmlAction.java @@ -18,6 +18,7 @@ package org.jetbrains.idea.devkit.actions; import com.intellij.CommonBundle; import com.intellij.compiler.impl.FileSetCompileScope; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.compiler.CompileContext; @@ -64,7 +65,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.getData(PlatformDataKeys.EDITOR) != null); + && e.getData(CommonDataKeys.EDITOR) != null); } @Override @@ -131,7 +132,7 @@ public class ShowSerializedXmlAction extends DumbAwareAction { @Nullable private static PsiClass getPsiClass(AnActionEvent e) { final PsiFile psiFile = e.getData(LangDataKeys.PSI_FILE); - final Editor editor = e.getData(PlatformDataKeys.EDITOR); + final Editor editor = e.getData(CommonDataKeys.EDITOR); if (editor == null || psiFile == null) return null; final PsiElement element = psiFile.findElementAt(editor.getCaretModel().getOffset()); return PsiTreeUtil.getParentOfType(element, PsiClass.class); diff --git a/plugins/devkit/src/actions/ShuffleNamesAction.java b/plugins/devkit/src/actions/ShuffleNamesAction.java index 5cf7dde89b25..deb83d93eea4 100644 --- a/plugins/devkit/src/actions/ShuffleNamesAction.java +++ b/plugins/devkit/src/actions/ShuffleNamesAction.java @@ -17,6 +17,7 @@ package org.jetbrains.idea.devkit.actions; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.AccessToken; @@ -40,14 +41,14 @@ import java.util.*; public class ShuffleNamesAction extends AnAction { @Override public void update(AnActionEvent e) { - Editor editor = PlatformDataKeys.EDITOR.getData(e.getDataContext()); + Editor editor = CommonDataKeys.EDITOR.getData(e.getDataContext()); PsiFile file = LangDataKeys.PSI_FILE.getData(e.getDataContext()); e.getPresentation().setEnabled(editor != null && file != null); } @Override public void actionPerformed(AnActionEvent e) { - final Editor editor = PlatformDataKeys.EDITOR.getData(e.getDataContext()); + final Editor editor = CommonDataKeys.EDITOR.getData(e.getDataContext()); PsiFile file = LangDataKeys.PSI_FILE.getData(e.getDataContext()); if (editor == null || file == null) return; final Project project = file.getProject(); diff --git a/plugins/devkit/src/actions/ToggleHighlightingMarkupAction.java b/plugins/devkit/src/actions/ToggleHighlightingMarkupAction.java index b3142ba1b1b1..8be300f58f24 100644 --- a/plugins/devkit/src/actions/ToggleHighlightingMarkupAction.java +++ b/plugins/devkit/src/actions/ToggleHighlightingMarkupAction.java @@ -21,6 +21,7 @@ import com.intellij.codeInsight.daemon.impl.IndentsPass; import com.intellij.lang.annotation.HighlightSeverity; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.AccessToken; @@ -49,14 +50,14 @@ import java.util.regex.Pattern; public class ToggleHighlightingMarkupAction extends AnAction { @Override public void update(AnActionEvent e) { - Editor editor = PlatformDataKeys.EDITOR.getData(e.getDataContext()); + Editor editor = CommonDataKeys.EDITOR.getData(e.getDataContext()); PsiFile file = LangDataKeys.PSI_FILE.getData(e.getDataContext()); e.getPresentation().setEnabled(editor != null && file != null); } @Override public void actionPerformed(AnActionEvent e) { - final Editor editor = PlatformDataKeys.EDITOR.getData(e.getDataContext()); + final Editor editor = CommonDataKeys.EDITOR.getData(e.getDataContext()); PsiFile file = LangDataKeys.PSI_FILE.getData(e.getDataContext()); if (editor == null || file == null) return; final Project project = file.getProject(); diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubCreateGistAction.java b/plugins/github/src/org/jetbrains/plugins/github/GithubCreateGistAction.java index a2b6876ec2d4..88c3a02d37bf 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/GithubCreateGistAction.java +++ b/plugins/github/src/org/jetbrains/plugins/github/GithubCreateGistAction.java @@ -71,7 +71,7 @@ public class GithubCreateGistAction extends DumbAwareAction { e.getPresentation().setEnabled(false); return; } - Editor editor = e.getData(PlatformDataKeys.EDITOR); + Editor editor = e.getData(CommonDataKeys.EDITOR); VirtualFile file = e.getData(PlatformDataKeys.VIRTUAL_FILE); VirtualFile[] files = e.getData(PlatformDataKeys.VIRTUAL_FILE_ARRAY); @@ -89,7 +89,7 @@ public class GithubCreateGistAction extends DumbAwareAction { return; } - final Editor editor = e.getData(PlatformDataKeys.EDITOR); + final Editor editor = e.getData(CommonDataKeys.EDITOR); final VirtualFile file = e.getData(PlatformDataKeys.VIRTUAL_FILE); final VirtualFile[] files = e.getData(PlatformDataKeys.VIRTUAL_FILE_ARRAY); if (editor == null && file == null && files == null) { diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubOpenInBrowserAction.java b/plugins/github/src/org/jetbrains/plugins/github/GithubOpenInBrowserAction.java index cfab3291206d..a850a46660a9 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/GithubOpenInBrowserAction.java +++ b/plugins/github/src/org/jetbrains/plugins/github/GithubOpenInBrowserAction.java @@ -17,6 +17,7 @@ package org.jetbrains.plugins.github; import com.intellij.ide.BrowserUtil; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.SelectionModel; @@ -92,7 +93,7 @@ public class GithubOpenInBrowserAction extends DumbAwareAction { public void actionPerformed(final AnActionEvent e) { final Project project = e.getData(PlatformDataKeys.PROJECT); final VirtualFile virtualFile = e.getData(PlatformDataKeys.VIRTUAL_FILE); - final Editor editor = e.getData(PlatformDataKeys.EDITOR); + final Editor editor = e.getData(CommonDataKeys.EDITOR); if (virtualFile == null || project == null || project.isDisposed()) { return; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/DumpGroovyControlFlowAction.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/DumpGroovyControlFlowAction.java index 1402c4316abd..bcba952255bb 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/DumpGroovyControlFlowAction.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/DumpGroovyControlFlowAction.java @@ -17,6 +17,7 @@ package org.jetbrains.plugins.groovy.actions; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.DumbAware; @@ -39,7 +40,7 @@ import java.util.List; public class DumpGroovyControlFlowAction extends AnAction implements DumbAware { @Override public void actionPerformed(AnActionEvent e) { - final Editor editor = PlatformDataKeys.EDITOR.getData(e.getDataContext()); + final Editor editor = CommonDataKeys.EDITOR.getData(e.getDataContext()); if (editor == null) return; final PsiFile psiFile = HandlerUtils.getPsiFile(editor, e.getDataContext()); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/DumpGroovyStubsAction.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/DumpGroovyStubsAction.java index b26ceb8e28ed..0ec786861e2f 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/DumpGroovyStubsAction.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/DumpGroovyStubsAction.java @@ -17,6 +17,7 @@ package org.jetbrains.plugins.groovy.actions; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.DumbAware; @@ -31,7 +32,7 @@ import org.jetbrains.plugins.groovy.refactoring.convertToJava.GroovyToJavaGenera public class DumpGroovyStubsAction extends AnAction implements DumbAware { @Override public void update(AnActionEvent e) { - Editor editor = PlatformDataKeys.EDITOR.getData(e.getDataContext()); + Editor editor = CommonDataKeys.EDITOR.getData(e.getDataContext()); if (editor != null) { PsiFile psiFile = HandlerUtils.getPsiFile(editor, e.getDataContext()); if (psiFile instanceof GroovyFile) { @@ -44,7 +45,7 @@ public class DumpGroovyStubsAction extends AnAction implements DumbAware { @Override public void actionPerformed(AnActionEvent e) { - final Editor editor = PlatformDataKeys.EDITOR.getData(e.getDataContext()); + final Editor editor = CommonDataKeys.EDITOR.getData(e.getDataContext()); if (editor == null) return; final PsiFile psiFile = HandlerUtils.getPsiFile(editor, e.getDataContext()); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/GrGetPsiTypeAction.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/GrGetPsiTypeAction.java index bcc284c5d90b..e40066cb53bb 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/GrGetPsiTypeAction.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/GrGetPsiTypeAction.java @@ -17,6 +17,7 @@ package org.jetbrains.plugins.groovy.actions; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.DumbAware; @@ -47,7 +48,7 @@ import java.util.List; public class GrGetPsiTypeAction extends AnAction implements DumbAware { @Override public void actionPerformed(AnActionEvent e) { - final Editor editor = PlatformDataKeys.EDITOR.getData(e.getDataContext()); + final Editor editor = CommonDataKeys.EDITOR.getData(e.getDataContext()); if (editor == null) return; final PsiFile psiFile = HandlerUtils.getPsiFile(editor, e.getDataContext()); @@ -107,7 +108,7 @@ public class GrGetPsiTypeAction extends AnAction implements DumbAware { @Override public void update(AnActionEvent e) { - Editor editor = PlatformDataKeys.EDITOR.getData(e.getDataContext()); + Editor editor = CommonDataKeys.EDITOR.getData(e.getDataContext()); if (editor != null) { PsiFile psiFile = HandlerUtils.getPsiFile(editor, e.getDataContext()); if (psiFile instanceof GroovyFile) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureHandler.java index 03e9120c4915..b56e8ed497af 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureHandler.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureHandler.java @@ -16,6 +16,7 @@ package org.jetbrains.plugins.groovy.refactoring.changeSignature; import com.intellij.ide.util.SuperMethodWarningUtil; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -67,7 +68,7 @@ public class GrChangeSignatureHandler implements ChangeSignatureHandler { public void invoke(@NotNull final Project project, @NotNull final PsiElement[] elements, final DataContext dataContext) { if (elements.length != 1) return; - Editor editor = dataContext == null ? null : PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = dataContext == null ? null : CommonDataKeys.EDITOR.getData(dataContext); invokeOnElement(project, editor, elements[0]); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ConvertToJavaHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ConvertToJavaHandler.java index 8e5abecf10d9..5178884f845c 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ConvertToJavaHandler.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ConvertToJavaHandler.java @@ -15,6 +15,7 @@ */ package org.jetbrains.plugins.groovy.refactoring.convertToJava; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; @@ -46,7 +47,7 @@ public class ConvertToJavaHandler implements RefactoringActionHandler { public void invoke(@NotNull Project project, @NotNull PsiElement[] elements, DataContext dataContext) { Editor editor = null; if (dataContext != null) { - editor = PlatformDataKeys.EDITOR.getData(dataContext); + editor = CommonDataKeys.EDITOR.getData(dataContext); } invokeInner(project, elements, editor); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/memberPullUp/GrPullUpHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/memberPullUp/GrPullUpHandler.java index c067d03ee40c..9e004b0378e1 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/memberPullUp/GrPullUpHandler.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/memberPullUp/GrPullUpHandler.java @@ -15,6 +15,7 @@ */ package org.jetbrains.plugins.groovy.refactoring.memberPullUp; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.diagnostic.Logger; @@ -110,7 +111,7 @@ public class GrPullUpHandler implements RefactoringActionHandler, GrPullUpDialog } private void invokeImpl(Project project, DataContext dataContext, GrTypeDefinition aClass, PsiElement aMember) { - final Editor editor = dataContext != null ? PlatformDataKeys.EDITOR.getData(dataContext) : null; + final Editor editor = dataContext != null ? CommonDataKeys.EDITOR.getData(dataContext) : null; if (aClass == null) { String message = RefactoringBundle.getCannotRefactorMessage(RefactoringBundle.message("is.not.supported.in.the.current.context", REFACTORING_NAME)); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/PropertyRenameHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/PropertyRenameHandler.java index 553f12101b3f..5216854e9faa 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/PropertyRenameHandler.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/PropertyRenameHandler.java @@ -16,6 +16,7 @@ package org.jetbrains.plugins.groovy.refactoring.rename; import com.intellij.ide.TitledHandler; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -69,7 +70,7 @@ public class PropertyRenameHandler implements RenameHandler, TitledHandler { public void invoke(@NotNull Project project, @NotNull PsiElement[] elements, @Nullable DataContext dataContext) { PsiElement element = elements.length == 1 ? elements[0] : null; if (element == null) element = getElement(dataContext); - Editor editor = dataContext == null ? null : PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = dataContext == null ? null : CommonDataKeys.EDITOR.getData(dataContext); invokeInner(project, editor, element); } 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 43a649181141..02dca3ddd307 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nizeAction.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nizeAction.java @@ -93,7 +93,7 @@ public class I18nizeAction extends AnAction { } private static Editor getEditor(final AnActionEvent e) { - return PlatformDataKeys.EDITOR.getData(e.getDataContext()); + return CommonDataKeys.EDITOR.getData(e.getDataContext()); } public static void doI18nSelectedString(final @NotNull Project project, diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxAnnotator.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxAnnotator.java index a348d38c2fdd..0261bd81d421 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxAnnotator.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxAnnotator.java @@ -23,6 +23,7 @@ import com.intellij.lang.annotation.AnnotationHolder; import com.intellij.lang.annotation.Annotator; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.markup.GutterIconRenderer; @@ -175,7 +176,7 @@ public class JavaFxAnnotator implements Annotator { return new AnAction() { @Override public void actionPerformed(AnActionEvent e) { - final Editor editor = PlatformDataKeys.EDITOR.getData(e.getDataContext()); + final Editor editor = CommonDataKeys.EDITOR.getData(e.getDataContext()); if (editor != null) { XmlChooseColorIntentionAction.chooseColor(editor.getComponent(), myElement, "Color Chooser", true); } 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 87de799bc1d8..87bd05b64133 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 @@ -15,6 +15,7 @@ */ package org.jetbrains.idea.maven.dom.refactorings; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -45,7 +46,7 @@ public class MavenPropertyRenameHandler extends PsiElementRenameHandler { PsiElement element = elements.length == 1 ? elements[0] : null; if (element == null) element = findTarget(dataContext); - RenameDialog dialog = new RenameDialog(project, element, null, PlatformDataKeys.EDITOR.getData(dataContext)); + RenameDialog dialog = new RenameDialog(project, element, null, CommonDataKeys.EDITOR.getData(dataContext)); if (ApplicationManager.getApplication().isUnitTestMode()) { String name = DEFAULT_NAME.getData(dataContext); dialog.performRename(name); @@ -57,6 +58,6 @@ public class MavenPropertyRenameHandler extends PsiElementRenameHandler { } private static PsiElement findTarget(DataContext context) { - return MavenTargetUtil.getRefactorTarget(PlatformDataKeys.EDITOR.getData(context), LangDataKeys.PSI_FILE.getData(context)); + return MavenTargetUtil.getRefactorTarget(CommonDataKeys.EDITOR.getData(context), LangDataKeys.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 f47b6e152bdf..5d9609bd012e 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 @@ -24,6 +24,7 @@ import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.find.findUsages.PsiElement2UsageTargetAdapter; import com.intellij.lang.documentation.DocumentationProvider; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -352,7 +353,7 @@ public abstract class MavenDomTestCase extends MavenImportingTestCase { private MapDataContext createDataContext(VirtualFile f) throws IOException { MapDataContext context = new MapDataContext(); - context.put(PlatformDataKeys.EDITOR, getEditor(f)); + context.put(CommonDataKeys.EDITOR, getEditor(f)); context.put(LangDataKeys.PSI_FILE, getTestPsiFile(f)); context.put(LangDataKeys.PSI_ELEMENT, TargetElementUtil.findTargetElement(getEditor(f), TargetElementUtilBase.REFERENCED_ELEMENT_ACCEPTED diff --git a/plugins/ui-designer-core/src/com/intellij/designer/inspection/AbstractQuickFixManager.java b/plugins/ui-designer-core/src/com/intellij/designer/inspection/AbstractQuickFixManager.java index 5f96cad473e3..bf8e071ad8ce 100644 --- a/plugins/ui-designer-core/src/com/intellij/designer/inspection/AbstractQuickFixManager.java +++ b/plugins/ui-designer-core/src/com/intellij/designer/inspection/AbstractQuickFixManager.java @@ -116,7 +116,7 @@ public abstract class AbstractQuickFixManager { @Override public void update(AnActionEvent e) { - e.getPresentation().setEnabled(e.getData(PlatformDataKeys.EDITOR) == null); + e.getPresentation().setEnabled(e.getData(CommonDataKeys.EDITOR) == null); } }; showHintAction.registerCustomShortcutSet( diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/CreateListenerAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/CreateListenerAction.java index 00393b85d225..20a3c3c85e00 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/CreateListenerAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/CreateListenerAction.java @@ -230,7 +230,7 @@ public class CreateListenerAction extends AbstractGuiEditorAction { IdeFocusManager.findInstance().doWhenFocusSettlesDown(new Runnable() { public void run() { final PsiClass newClass = (PsiClass)ptr.getElement(); - final Editor editor = PlatformDataKeys.EDITOR.getData(DataManager.getInstance().getDataContext()); + final Editor editor = CommonDataKeys.EDITOR.getData(DataManager.getInstance().getDataContext()); if (editor != null && newClass != null) { CommandProcessor.getInstance().executeCommand(myClass.getProject(), new Runnable() { public void run() { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/GenerateMainAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/GenerateMainAction.java index 2f432927ab41..d698a076b891 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/GenerateMainAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/GenerateMainAction.java @@ -56,7 +56,7 @@ public class GenerateMainAction extends AnAction { public void actionPerformed(AnActionEvent e) { final Project project = e.getData(CommonDataKeys.PROJECT); assert project != null; - final Editor editor = e.getData(PlatformDataKeys.EDITOR); + final Editor editor = e.getData(CommonDataKeys.EDITOR); assert editor != null; final int offset = editor.getCaretModel().getOffset(); final PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument()); @@ -136,7 +136,7 @@ public class GenerateMainAction extends AnAction { private static boolean isActionEnabled(final AnActionEvent e) { Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) return false; - Editor editor = e.getData(PlatformDataKeys.EDITOR); + Editor editor = e.getData(CommonDataKeys.EDITOR); if (editor == null) return false; int offset = editor.getCaretModel().getOffset(); PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument()); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/quickFixes/ShowHintAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/quickFixes/ShowHintAction.java index f8db319cb65a..f08294c5cbff 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/quickFixes/ShowHintAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/quickFixes/ShowHintAction.java @@ -56,6 +56,6 @@ final class ShowHintAction extends AnAction { public void update(AnActionEvent e) { // Alt-Enter hotkey for editor takes precedence over this action - e.getPresentation().setEnabled(e.getData(PlatformDataKeys.EDITOR) == null); + e.getPresentation().setEnabled(e.getData(CommonDataKeys.EDITOR) == null); } } diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathAction.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathAction.java index 0206666beac2..20e3597c8f2f 100644 --- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathAction.java +++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathAction.java @@ -64,7 +64,7 @@ public abstract class XPathAction extends AnAction { return false; } - Editor editor = PlatformDataKeys.EDITOR.getData(event.getDataContext()); + Editor editor = CommonDataKeys.EDITOR.getData(event.getDataContext()); if (editor == null) { FileEditorManager fem = FileEditorManager.getInstance(project); editor = fem.getSelectedTextEditor(); diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathEvalAction.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathEvalAction.java index 97eacf6e028b..83a52404abea 100644 --- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathEvalAction.java +++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathEvalAction.java @@ -143,7 +143,7 @@ public class XPathEvalAction extends XPathAction { return; } - Editor editor = PlatformDataKeys.EDITOR.getData(event.getDataContext()); + Editor editor = CommonDataKeys.EDITOR.getData(event.getDataContext()); if (editor == null) { FileEditorManager fem = FileEditorManager.getInstance(project); editor = fem.getSelectedTextEditor(); diff --git a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/actions/OpenOutputAction.java b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/actions/OpenOutputAction.java index 67ef74de7da9..aa6edcd65c91 100644 --- a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/actions/OpenOutputAction.java +++ b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/actions/OpenOutputAction.java @@ -41,7 +41,7 @@ public class OpenOutputAction extends AnAction { } public void actionPerformed(AnActionEvent e) { - final Editor editor = PlatformDataKeys.EDITOR.getData(DataManager.getInstance().getDataContext(myConsole.getComponent())); + final Editor editor = CommonDataKeys.EDITOR.getData(DataManager.getInstance().getDataContext(myConsole.getComponent())); if (editor != null) { try { final byte[] content = editor.getDocument().getText().getBytes("UTF-8"); @@ -60,7 +60,7 @@ public class OpenOutputAction extends AnAction { } public void update(AnActionEvent e) { - final Editor editor = PlatformDataKeys.EDITOR.getData(DataManager.getInstance().getDataContext(myConsole.getComponent())); + final Editor editor = CommonDataKeys.EDITOR.getData(DataManager.getInstance().getDataContext(myConsole.getComponent())); e.getPresentation().setEnabled(editor != null && editor.getDocument().getTextLength() > 0); } } diff --git a/spellchecker/src/com/intellij/spellchecker/quickfixes/RenameTo.java b/spellchecker/src/com/intellij/spellchecker/quickfixes/RenameTo.java index 5a97b266ec50..a2d026e63f0f 100644 --- a/spellchecker/src/com/intellij/spellchecker/quickfixes/RenameTo.java +++ b/spellchecker/src/com/intellij/spellchecker/quickfixes/RenameTo.java @@ -97,7 +97,7 @@ public class RenameTo extends ShowSuggestions implements SpellCheckerQuickFix { if (editor == null) return; if (editor instanceof EditorWindow) { - map.put(PlatformDataKeys.EDITOR.getName(), editor); + map.put(CommonDataKeys.EDITOR.getName(), editor); map.put(LangDataKeys.PSI_ELEMENT.getName(), psiElement); } else if (ApplicationManager.getApplication().isUnitTestMode()) { // TextEditorComponent / FiledEditorManagerImpl give away the data in real life map.put( diff --git a/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameHandler.java b/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameHandler.java index e2531e7956fc..ff3d95142b31 100644 --- a/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameHandler.java +++ b/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameHandler.java @@ -25,6 +25,7 @@ package com.intellij.xml.refactoring; import com.intellij.featureStatistics.FeatureUsageTracker; import com.intellij.ide.TitledHandler; import com.intellij.lang.Language; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -100,7 +101,7 @@ public class XmlTagRenameHandler implements RenameHandler, TitledHandler { @Nullable private static Editor getEditor(@Nullable DataContext context) { - return PlatformDataKeys.EDITOR.getData(context); + return CommonDataKeys.EDITOR.getData(context); } @Nullable