From 9ecde9f8255d80345fc0693970123fcd5e9586b2 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Tue, 1 Oct 2013 22:18:26 +0200 Subject: [PATCH] fix yellow code producing by CommonDataKeys --- .../images/actions/EditExternallyAction.java | 3 ++- .../images/actions/ShowThumbnailsAction.java | 3 ++- .../intellij/images/editor/impl/ImageEditorUI.java | 2 +- .../images/thumbnail/impl/ThumbnailViewUI.java | 2 +- .../com/intellij/compiler/actions/CompileAction.java | 2 +- .../intellij/compiler/actions/CompileActionBase.java | 4 ++-- .../compiler/actions/CompileDirtyAction.java | 3 ++- .../compiler/actions/CompileProjectAction.java | 3 ++- .../compiler/impl/CompilerErrorTreeView.java | 4 ++-- .../compiler/impl/CompilerPropertiesAction.java | 3 ++- .../javaCompiler/api/CompilerPerfTestAction.java | 5 +++-- .../packaging/impl/ui/actions/PackageFileAction.java | 5 +++-- .../intellij/debugger/actions/BaseValueAction.java | 3 ++- .../debugger/actions/CustomizeContextViewAction.java | 3 ++- .../debugger/actions/CustomizeThreadsViewAction.java | 3 ++- .../intellij/debugger/actions/DebuggerAction.java | 2 +- .../intellij/debugger/actions/EditSourceAction.java | 4 ++-- .../intellij/debugger/actions/EditWatchAction.java | 3 ++- .../debugger/actions/ExportThreadsAction.java | 5 +++-- .../debugger/actions/GotoFrameSourceAction.java | 3 ++- .../com/intellij/debugger/actions/HotSwapAction.java | 5 +++-- .../com/intellij/debugger/actions/InspectAction.java | 3 ++- .../intellij/debugger/actions/NewWatchAction.java | 3 ++- .../intellij/debugger/actions/PopFrameAction.java | 3 ++- .../intellij/debugger/actions/ThreadDumpAction.java | 5 +++-- .../actions/ToggleBreakpointEnabledAction.java | 5 +++-- .../actions/ToggleMethodBreakpointAction.java | 4 ++-- .../execution/impl/DefaultJavaProgramRunner.java | 2 +- .../com/intellij/ide/actions/OpenProjectAction.java | 3 ++- .../ide/actions/ShowModulePropertiesAction.java | 4 ++-- .../ide/actions/ShowStructureSettingsAction.java | 3 ++- .../com/intellij/ide/palette/impl/PaletteWindow.java | 2 +- .../openapi/projectRoots/ui/ProjectJdksEditor.java | 3 ++- .../AnalyzeDependenciesComponent.java | 2 +- .../intellij/projectImport/ProjectImportBuilder.java | 3 ++- .../codeInsight/hint/actions/ShowSiblingsAction.java | 2 +- .../dependencyViolation/DependencyInspection.java | 3 ++- .../nullable/NullableStuffInspection.java | 3 ++- .../codeInspection/util/SpecialAnnotationsUtil.java | 3 ++- .../actions/CyclicDependenciesAction.java | 8 ++++---- .../PsiClassFavoriteNodeProvider.java | 3 ++- .../PsiFieldFavoriteNodeProvider.java | 3 ++- .../PsiMethodFavoriteNodeProvider.java | 3 ++- .../PsiPackageFavoriteNodeProvider.java | 3 ++- .../method/JavaMethodHierarchyProvider.java | 3 ++- .../method/OverrideImplementMethodAction.java | 4 ++-- .../hierarchy/type/JavaTypeHierarchyProvider.java | 3 ++- .../src/com/intellij/ide/macro/ClasspathMacro.java | 3 ++- .../src/com/intellij/ide/macro/JavaDocPathMacro.java | 3 ++- .../src/com/intellij/ide/macro/OutputPathMacro.java | 3 ++- .../internal/GenerateVisitorByHierarchyAction.java | 5 +++-- .../intellij/javadoc/JavadocNavigationDelegate.java | 3 ++- .../intellij/refactoring/actions/MigrateAction.java | 5 +++-- .../refactoring/actions/RenameFileAction.java | 4 ++-- .../intellij/refactoring/actions/TypeCookAction.java | 3 ++- .../refactoring/rename/RenameWrongRefHandler.java | 3 ++- .../actions/ChangeTypeSignatureAction.java | 3 ++- .../BaseGenerateTestSupportMethodAction.java | 2 +- .../com/intellij/unscramble/UnscrambleAction.java | 5 +++-- .../action/AttachExternalProjectAction.java | 3 ++- .../externalSystem/action/ExternalActionUtil.java | 3 ++- .../execution/actions/ConfigurationContext.java | 3 ++- .../ide/actions/CreateElementActionBase.java | 4 ++-- .../intellij/openapi/projectRoots/ui/PathEditor.java | 4 ++-- .../com/intellij/analysis/BaseAnalysisAction.java | 8 ++++---- .../application/options/CodeCompletionPanel.java | 3 ++- .../options/InitialConfigurationDialog.java | 4 ++-- .../arrangement/action/RearrangeCodeAction.java | 3 ++- .../options/colors/ScopeColorsPageFactory.java | 3 ++- .../codeEditor/printing/ExportToHTMLAction.java | 2 +- .../codeEditor/printing/ExportToHTMLManager.java | 3 ++- .../intellij/codeEditor/printing/PrintAction.java | 2 +- .../intellij/codeEditor/printing/PrintManager.java | 3 ++- .../codeInsight/actions/BaseCodeInsightAction.java | 3 ++- .../codeInsight/actions/OptimizeImportsAction.java | 4 ++-- .../codeInsight/actions/ReformatCodeAction.java | 4 ++-- .../completion/actions/CodeCompletionGroup.java | 2 +- .../documentation/DockablePopupManager.java | 2 +- .../actions/ShowQuickDocInfoAction.java | 4 ++-- .../codeInsight/editorActions/BackspaceHandler.java | 3 ++- .../editorActions/CodeBlockEndAction.java | 3 ++- .../editorActions/CodeBlockStartAction.java | 3 ++- .../CodeBlockStartWithSelectionAction.java | 3 ++- .../codeInsight/editorActions/CopyHandler.java | 3 ++- .../codeInsight/editorActions/CutHandler.java | 3 ++- .../codeInsight/editorActions/EndHandler.java | 3 ++- .../codeInsight/editorActions/EnterHandler.java | 3 ++- .../editorActions/FixDocCommentAction.java | 2 +- .../codeInsight/editorActions/JoinLinesHandler.java | 3 ++- .../codeInsight/editorActions/MatchBraceAction.java | 3 ++- .../codeInsight/editorActions/PasteHandler.java | 3 ++- .../codeInsight/editorActions/SelectWordHandler.java | 3 ++- .../codeInsight/editorActions/TypedHandler.java | 3 ++- .../editorActions/UnSelectWordHandler.java | 3 ++- .../editorActions/enter/BaseIndentEnterHandler.java | 3 ++- .../editorActions/smartEnter/SmartEnterAction.java | 5 +++-- .../folding/impl/actions/ExpandRegionAction.java | 3 ++- .../generation/actions/GenerateAction.java | 2 +- .../generation/surroundWith/SurroundWithHandler.java | 2 +- .../highlighting/actions/HighlightUsagesAction.java | 4 ++-- .../codeInsight/hint/PrevNextParameterHandler.java | 5 +++-- .../hint/actions/ShowImplementationsAction.java | 4 ++-- .../ShowQuickDocAtPinnedWindowFromTooltipAction.java | 3 ++- .../navigation/actions/IncrementalSearchAction.java | 4 ++-- .../template/impl/editorActions/EnterHandler.java | 3 ++- .../template/impl/editorActions/SpaceHandler.java | 3 ++- .../codeInspection/LossyEncodingInspection.java | 3 ++- .../actions/CodeInspectionOnEditorAction.java | 4 ++-- .../codeInspection/actions/RunInspectionAction.java | 3 ++- .../codeInspection/ex/SeverityEditorDialog.java | 6 +++--- .../com/intellij/execution/ExecutorRegistryImpl.java | 2 +- .../actions/ChooseRunConfigurationPopupAction.java | 5 +++-- .../actions/RunConfigurationsComboBoxAction.java | 8 ++++---- .../com/intellij/execution/actions/StopAction.java | 4 ++-- .../intellij/execution/runners/RerunTestsAction.java | 2 +- .../com/intellij/find/actions/FindInPathAction.java | 4 ++-- .../find/actions/FindUsagesInFileAction.java | 4 ++-- .../intellij/find/actions/ReplaceInPathAction.java | 2 +- .../com/intellij/find/actions/ShowUsagesAction.java | 2 +- .../find/impl/ShowRecentFindUsagesAction.java | 5 +++-- .../find/impl/ShowRecentFindUsagesGroup.java | 4 ++-- .../src/com/intellij/ide/CopyPasteDelegator.java | 3 ++- .../src/com/intellij/ide/FileListPasteProvider.java | 3 ++- .../com/intellij/ide/actions/CopyElementAction.java | 6 +++--- .../intellij/ide/actions/CopyReferenceAction.java | 4 ++-- .../ide/actions/CreateDirectoryOrPackageAction.java | 4 ++-- .../ide/actions/CreateFromTemplateAction.java | 4 ++-- .../ide/actions/CreateTemplateInPackageAction.java | 3 ++- .../ide/actions/EditFileTemplatesAction.java | 3 ++- .../intellij/ide/actions/ExternalJavaDocAction.java | 4 ++-- .../com/intellij/ide/actions/GotoActionAction.java | 2 +- .../com/intellij/ide/actions/GotoClassAction.java | 5 +++-- .../src/com/intellij/ide/actions/GotoFileAction.java | 3 ++- .../com/intellij/ide/actions/GotoSymbolAction.java | 3 ++- .../com/intellij/ide/actions/NewElementAction.java | 2 +- .../ide/actions/NewElementToolbarAction.java | 5 +++-- .../intellij/ide/actions/PasteReferenceProvider.java | 7 ++++--- .../actions/QuickChangeCodeStyleSchemeAction.java | 2 +- .../intellij/ide/actions/ReloadFromDiskAction.java | 4 ++-- .../src/com/intellij/ide/actions/SaveAsAction.java | 5 +++-- .../ide/actions/SaveFileAsTemplateAction.java | 3 ++- .../com/intellij/ide/actions/SearchAgainAction.java | 5 +++-- .../com/intellij/ide/actions/SearchBackAction.java | 5 +++-- .../intellij/ide/actions/SelectInContextImpl.java | 7 ++++--- .../intellij/ide/actions/TogglePopupHintsAction.java | 5 +++-- .../ide/bookmarks/actions/BookmarksAction.java | 4 ++-- .../actions/GoToMnemonicBookmarkActionBase.java | 5 +++-- .../bookmarks/actions/GotoBookmarkActionBase.java | 3 ++- .../ide/bookmarks/actions/ToggleBookmarkAction.java | 5 +++-- .../actions/ToggleBookmarkWithMnemonicAction.java | 3 ++- .../actions/ToggleNumberedBookmarkActionBase.java | 5 +++-- .../favoritesTreeView/FavoritesTreeViewPanel.java | 2 +- .../ide/favoritesTreeView/ImportUsagesAction.java | 5 +++-- .../favoritesTreeView/UsageFavoriteNodeProvider.java | 5 +++-- .../actions/SendToFavoritesGroup.java | 2 +- .../actions/CreateFromTemplateActionBase.java | 2 +- .../fileTemplates/impl/FileTemplateConfigurable.java | 3 ++- .../ide/hierarchy/HierarchyBrowserBaseEx.java | 2 +- .../hierarchy/actions/BrowseHierarchyActionBase.java | 2 +- .../intellij/ide/impl/StructureViewWrapperImpl.java | 2 +- .../com/intellij/ide/impl/dataRules/ModuleRule.java | 3 ++- .../ide/macro/FileDirRelativeToProjectRootMacro.java | 3 ++- .../ide/macro/FileDirRelativeToSourcepathMacro.java | 3 ++- .../macro/FilePathRelativeToProjectRootMacro.java | 3 ++- .../ide/macro/FilePathRelativeToSourcepathMacro.java | 3 ++- .../src/com/intellij/ide/macro/FilePromptMacro.java | 3 ++- .../intellij/ide/macro/FileRelativePathMacro.java | 3 ++- .../src/com/intellij/ide/macro/JdkPathMacro.java | 3 ++- .../src/com/intellij/ide/macro/MacroManager.java | 3 ++- .../src/com/intellij/ide/macro/ProjectNameMacro.java | 3 ++- .../com/intellij/ide/macro/SourcepathEntryMacro.java | 3 ++- .../src/com/intellij/ide/macro/SourcepathMacro.java | 3 ++- .../ActivateNavigationBarAction.java | 5 +++-- .../intellij/ide/navigationToolbar/NavBarModel.java | 3 ++- .../ide/navigationToolbar/NavBarUpdateQueue.java | 3 ++- .../ide/navigationToolbar/ShowNavBarAction.java | 4 ++-- .../projectView/actions/ChangeProjectViewAction.java | 5 +++-- .../projectView/actions/MarkExcludeRootAction.java | 3 ++- .../ide/projectView/impl/MoveModuleToGroup.java | 2 +- .../src/com/intellij/ide/util/DeleteHandler.java | 5 +++-- .../internal/DumpConfigurationTypesAction.java | 5 +++-- .../intellij/internal/DumpDirectoryInfoAction.java | 5 +++-- .../com/intellij/internal/DumpExtensionsAction.java | 3 ++- .../com/intellij/internal/DumpIntentionsAction.java | 5 +++-- .../com/intellij/internal/LoadAllContentsAction.java | 5 +++-- .../internal/LoadAllVfsStoredContentsAction.java | 3 ++- .../intellij/internal/psiView/PsiViewerAction.java | 5 +++-- .../moduleDependencies/ModulesDependenciesPanel.java | 2 +- .../editor/actions/FindWordAtCaretAction.java | 5 +++-- .../editor/actions/IncrementalFindAction.java | 5 +++-- .../openapi/editor/actions/ReplaceAction.java | 5 +++-- .../editor/actions/ToggleShowImportPopupsAction.java | 3 ++- .../encoding/ConfigureFileDefaultEncodingAction.java | 5 +++-- .../openapi/wm/impl/ProjectWindowActionGroup.java | 5 +++-- .../platform/renameProject/RenameProjectAction.java | 5 +++-- .../codeInspection/ui/actions/AddScopeAction.java | 2 +- .../impl/source/codeStyle/CodeFormatterFacade.java | 4 ++-- .../ChangeTemplateDataLanguageAction.java | 5 +++-- .../refactoring/actions/BaseRefactoringAction.java | 4 ++-- .../refactoring/rename/RenameHandlerRegistry.java | 3 ++- .../testIntegration/GotoTestOrCodeAction.java | 3 ++- .../com/intellij/tools/BaseExternalToolsGroup.java | 2 +- .../com/intellij/tools/ScanSourceCommentsAction.java | 3 ++- platform/lang-impl/src/com/intellij/tools/Tool.java | 3 ++- .../src/com/intellij/tools/ToolEditorDialog.java | 3 ++- .../intellij/unscramble/AnalyzeStacktraceAction.java | 5 +++-- .../unscramble/AnalyzeStacktraceOnErrorAction.java | 3 ++- .../com/intellij/unscramble/ShowRecentlyChanged.java | 5 +++-- .../com/intellij/ide/macro/MacroManagerTest.java | 3 ++- .../integration/ui/actions/LocalHistoryGroup.java | 3 ++- .../ide/actions/QuickSwitchSchemeAction.java | 6 +++--- .../intellij/openapi/actionSystem/DataConstants.java | 2 +- .../intellij/openapi/actionSystem/ex/ActionUtil.java | 8 ++++---- .../openapi/editor/actionSystem/TypedAction.java | 6 +++--- .../src/com/intellij/openapi/wm/IdeFocusManager.java | 4 ++-- .../src/com/intellij/ui/switcher/SwitchAction.java | 4 ++-- .../util/EditSourceOnDoubleClickHandler.java | 8 ++++---- .../intellij/util/EditSourceOnEnterKeyHandler.java | 4 ++-- .../intellij/util/ui/update/LazyUiDisposable.java | 3 ++- .../com/intellij/codeInsight/hint/EscapeHandler.java | 6 +++--- .../AbstractConvertLineSeparatorsAction.java | 4 ++-- .../src/com/intellij/diagnostic/ITNReporter.java | 3 ++- .../diagnostic/SubmitPerformanceReportAction.java | 4 ++-- .../com/intellij/ide/MacOSApplicationProvider.java | 4 ++-- .../com/intellij/ide/RecentProjectsManagerBase.java | 4 ++-- .../src/com/intellij/ide/ReopenProjectAction.java | 3 ++- .../ide/actionMacro/actions/EditMacrosAction.java | 4 ++-- .../actions/StartStopMacroRecordingAction.java | 4 ++-- .../src/com/intellij/ide/actions/AboutAction.java | 6 +++--- .../ide/actions/ActivateToolWindowAction.java | 4 ++-- .../com/intellij/ide/actions/AssociateFileType.java | 2 +- .../src/com/intellij/ide/actions/BackAction.java | 8 ++++---- .../ide/actions/BaseShowRecentFilesAction.java | 4 ++-- .../ide/actions/BaseToolWindowToggleAction.java | 7 ++++--- .../intellij/ide/actions/CloseAllEditorsAction.java | 6 +++--- .../ide/actions/CloseAllEditorsButActiveAction.java | 11 ++++------- .../intellij/ide/actions/CloseEditorsActionBase.java | 6 +++--- .../com/intellij/ide/actions/CloseProjectAction.java | 5 +++-- .../com/intellij/ide/actions/CustomizeUIAction.java | 3 ++- .../src/com/intellij/ide/actions/CutAction.java | 2 +- .../src/com/intellij/ide/actions/DeleteAction.java | 2 +- .../intellij/ide/actions/ExportToTextFileAction.java | 5 +++-- .../src/com/intellij/ide/actions/ForwardAction.java | 8 ++++---- .../src/com/intellij/ide/actions/GotoLineAction.java | 11 ++++------- .../ide/actions/HideAllToolWindowsAction.java | 8 ++++---- .../intellij/ide/actions/HideSideWindowsAction.java | 8 ++++---- .../intellij/ide/actions/HideToolWindowAction.java | 5 +++-- .../intellij/ide/actions/InvalidateCachesAction.java | 4 ++-- .../intellij/ide/actions/JumpToLastEditAction.java | 4 ++-- .../intellij/ide/actions/JumpToLastWindowAction.java | 5 +++-- .../ide/actions/MinimizeCurrentWindowAction.java | 3 ++- .../com/intellij/ide/actions/NextSplitAction.java | 8 ++++---- .../ide/actions/OccurenceNavigatorActionBase.java | 6 +++--- .../src/com/intellij/ide/actions/OpenFileAction.java | 4 ++-- .../com/intellij/ide/actions/PinActiveTabAction.java | 4 ++-- .../intellij/ide/actions/ResizeToolWindowAction.java | 4 ++-- .../ide/actions/RestoreDefaultLayoutAction.java | 8 ++++---- .../actions/SaveAsDirectoryBasedFormatAction.java | 6 +++--- .../com/intellij/ide/actions/SelectAllAction.java | 4 ++-- .../com/intellij/ide/actions/ShowContentAction.java | 3 ++- .../intellij/ide/actions/ShowRecentFilesAction.java | 4 ++-- .../com/intellij/ide/actions/SplitterActionBase.java | 2 +- .../ide/actions/StoreDefaultLayoutAction.java | 8 ++++---- .../src/com/intellij/ide/actions/Switcher.java | 2 +- .../intellij/ide/actions/ToggleDockModeAction.java | 10 +++++----- .../ide/actions/ToggleFloatingModeAction.java | 10 +++++----- .../ide/actions/ToggleReadOnlyAttributeAction.java | 7 ++----- .../src/com/intellij/ide/actions/UndoRedoAction.java | 3 ++- .../src/com/intellij/ide/actions/UnsplitAction.java | 2 +- .../com/intellij/ide/actions/UnsplitAllAction.java | 4 ++-- .../intellij/ide/diff/VirtualFileDiffElement.java | 3 ++- .../errorTreeView/actions/TestErrorViewAction.java | 4 ++-- .../src/com/intellij/ide/impl/DataManagerImpl.java | 4 ++-- .../src/com/intellij/ide/impl/DataValidator.java | 8 ++++---- .../intellij/ide/impl/dataRules/FileTextRule.java | 3 ++- .../ide/impl/dataRules/ProjectFileDirectoryRule.java | 3 ++- .../ide/ui/laf/darcula/DarculaWelcomeScreenForm.java | 2 +- .../com/intellij/internal/ReloadProjectAction.java | 6 +++--- .../com/intellij/internal/ToggleDumbModeAction.java | 6 +++--- .../internal/statistic/tmp/SendStatisticsAction.java | 7 ++++--- .../validation/TestDialogWithValidationAction.java | 4 ++-- .../notification/impl/IdeNotificationArea.java | 3 ++- .../impl/actions/NotificationTestAction.java | 4 ++-- .../intellij/openapi/actionSystem/impl/Utils.java | 2 +- .../openapi/diff/actions/CompareFileWithEditor.java | 4 ++-- .../intellij/openapi/diff/actions/CompareFiles.java | 4 ++-- .../openapi/diff/actions/MergeActionGroup.java | 2 +- .../openapi/diff/actions/MergeFilesAction.java | 5 +++-- .../com/intellij/openapi/diff/impl/DiffSideView.java | 2 +- .../editor/actions/IndentSelectionAction.java | 4 ++-- .../openapi/editor/actions/MultiplePasteAction.java | 2 +- .../intellij/openapi/editor/actions/TabAction.java | 3 ++- .../editor/actions/TextComponentEditorAction.java | 5 +++-- .../openapi/editor/actions/TextEndAction.java | 4 ++-- .../openapi/editor/actions/TextStartAction.java | 4 ++-- .../editor/actions/UnindentSelectionAction.java | 3 ++- .../com/intellij/openapi/editor/impl/EditorImpl.java | 6 +++--- .../actions/VirtualFileDeleteProvider.java | 8 ++++---- .../fileEditor/impl/EditorTabbedContainer.java | 2 +- .../openapi/fileEditor/impl/EditorWindow.java | 3 ++- .../openapi/keymap/impl/IdeKeyEventDispatcher.java | 12 ++++++------ .../src/com/intellij/openapi/ui/FrameWrapper.java | 4 ++-- .../openapi/ui/impl/DialogWrapperPeerImpl.java | 6 +++--- .../openapi/ui/impl/GlassPaneDialogWrapperPeer.java | 4 ++-- .../updateSettings/impl/CheckForUpdateAction.java | 4 ++-- .../impl/UpdateSettingsConfigurable.java | 4 ++-- .../com/intellij/openapi/wm/impl/IdeFrameImpl.java | 4 ++-- .../com/intellij/openapi/wm/impl/WindowWatcher.java | 9 ++++----- .../openapi/wm/impl/status/AddTestProcessAction.java | 4 ++-- .../impl/status/AddTestProcessActionIndefinite.java | 6 +++--- .../openapi/wm/impl/status/EncodingPanel.java | 5 +++-- .../openapi/wm/impl/status/LineSeparatorPanel.java | 2 +- .../wm/impl/status/ToggleReadOnlyAttributePanel.java | 4 ++-- .../wm/impl/welcomeScreen/DefaultWelcomeScreen.java | 2 +- .../platform/OpenDirectoryProjectAction.java | 3 ++- .../src/com/intellij/ui/FocusTrackback.java | 4 ++-- .../src/com/intellij/ui/SpeedSearchBase.java | 4 ++-- .../src/com/intellij/ui/popup/AbstractPopup.java | 3 ++- .../src/com/intellij/ui/popup/PopupFactoryImpl.java | 2 +- .../src/com/intellij/ui/popup/WizardPopup.java | 4 ++-- .../integration/ui/LocalHistoryActionsTest.java | 3 ++- .../LightPlatformCodeInsightTestCase.java | 2 +- .../testFramework/LightPlatformTestCase.java | 3 ++- .../com/intellij/testFramework/TestDataProvider.java | 3 ++- .../fixtures/impl/HeavyIdeaTestFixtureImpl.java | 3 ++- .../actions/AbstractRerunFailedTestsAction.java | 2 +- .../actions/ViewAssertEqualsDiffAction.java | 4 ++-- .../testframework/autotest/ToggleAutoTestAction.java | 5 +++-- .../export/ExportTestResultsAction.java | 5 +++-- .../usages/impl/UsageFilteringRuleProviderImpl.java | 4 ++-- .../src/com/intellij/usages/impl/UsageViewImpl.java | 4 ++-- .../openapi/vcs/actions/StandardVcsGroup.java | 4 ++-- .../vcs/annotate/ShowAllAffectedGenericAction.java | 6 +++--- .../src/com/intellij/ide/actions/VcsDataWrapper.java | 3 ++- .../intellij/openapi/diff/impl/dir/DirDiffPanel.java | 2 +- .../openapi/vcs/actions/RefreshStatuses.java | 5 +++-- .../vcs/actions/ShowMessageHistoryAction.java | 5 +++-- .../changes/actions/AbstractMissingFilesAction.java | 3 ++- .../vcs/changes/actions/BrowseChangesAction.java | 5 +++-- .../actions/CreatePatchFromChangesAction.java | 3 ++- .../openapi/vcs/changes/actions/EditAction.java | 3 ++- .../vcs/changes/actions/IgnoreUnversionedAction.java | 3 ++- .../vcs/changes/actions/IgnoredSettingsAction.java | 3 ++- .../vcs/changes/actions/MarkFileDirtyAction.java | 3 ++- .../actions/MoveChangesToAnotherListAction.java | 4 ++-- .../openapi/vcs/changes/actions/RefreshAction.java | 3 ++- .../vcs/changes/actions/RemoveChangeListAction.java | 5 +++-- .../vcs/changes/actions/RenameChangeListAction.java | 3 ++- .../actions/RevertCommittedStuffAbstractAction.java | 5 +++-- .../openapi/vcs/changes/actions/RollbackAction.java | 5 +++-- .../vcs/changes/actions/RollbackDialogAction.java | 5 +++-- .../changes/actions/SetDefaultChangeListAction.java | 3 ++- .../changes/actions/ShowChangeAbstractAction.java | 3 ++- .../openapi/vcs/changes/actions/ShowDiffAction.java | 5 +++-- .../changes/committed/ChangeListDetailsAction.java | 5 +++-- .../vcs/changes/committed/ClearCommittedAction.java | 5 +++-- .../changes/committed/IncomingChangesIndicator.java | 3 ++- .../changes/committed/RefreshCommittedAction.java | 5 +++-- .../committed/RefreshIncomingChangesAction.java | 5 +++-- .../openapi/vcs/changes/patch/ApplyPatchAction.java | 5 +++-- .../changes/shelf/DeleteAlreadyUnshelvedAction.java | 5 +++-- .../vcs/changes/shelf/DiffShelvedChangesAction.java | 2 +- .../vcs/changes/shelf/ImportIntoShelfAction.java | 5 +++-- .../changes/shelf/RenameShelvedChangeListAction.java | 5 +++-- .../vcs/changes/shelf/RestoreShelvedChange.java | 5 +++-- .../vcs/changes/shelf/ShelvedChangesViewManager.java | 2 +- .../vcs/changes/shelf/ShowHideRecycledAction.java | 5 +++-- .../vcs/changes/shelf/UnshelveChangesAction.java | 5 +++-- .../vcs/changes/shelf/UnshelveWithDialogAction.java | 5 +++-- .../openapi/vcs/checkout/CheckoutAction.java | 3 ++- .../openapi/vcs/history/FileHistoryPanelImpl.java | 2 +- .../openapi/vcs/history/impl/VcsHistoryDialog.java | 6 ++++-- .../openapi/vcs/update/ShowUpdatedDiffAction.java | 4 ++-- .../openapi/vcs/update/TestContinuationAction.java | 5 +++-- .../xdebugger/impl/actions/MarkObjectAction.java | 3 ++- .../xdebugger/impl/actions/ResumeAction.java | 3 ++- .../impl/actions/ViewBreakpointsAction.java | 4 ++-- .../impl/ui/tree/actions/SortValuesToggleAction.java | 3 ++- .../src/com/siyeh/ig/ui/UiUtils.java | 5 +++-- .../lang/ant/config/actions/AddAntBuildFile.java | 4 ++-- .../lang/ant/config/actions/RunTargetAction.java | 2 +- .../lang/ant/config/actions/TargetAction.java | 2 +- .../lang/ant/config/impl/AntConfigurationImpl.java | 3 ++- .../ide/actions/CommanderViewActionGroup.java | 3 ++- .../com/intellij/ide/actions/SwapPanelsAction.java | 5 +++-- .../src/com/intellij/ide/commander/Commander.java | 2 +- .../copyright/actions/GenerateCopyrightAction.java | 4 ++-- .../actions/BrowseCvsRepositoryAction.java | 3 ++- .../cvsSupport2/cvsBrowser/ui/BrowserPanel.java | 2 +- .../cvsoperations/cvsEdit/ui/EditorsPanel.java | 5 +++-- .../GenerateComponentExternalizationAction.java | 2 +- .../src/actions/GeneratePluginClassAction.java | 2 +- .../devkit/src/build/PrepareAllToDeployAction.java | 5 +++-- plugins/devkit/src/build/PrepareToDeployAction.java | 3 ++- .../src/dom/generator/GenerateDomModelAction.java | 3 ++- .../eclipse/export/ExportEclipseProjectsAction.java | 5 +++-- .../tostring/GenerateToStringActionHandlerImpl.java | 3 ++- .../git4idea/src/git4idea/actions/BasicAction.java | 5 +++-- plugins/git4idea/src/git4idea/actions/GitAction.java | 3 ++- plugins/git4idea/src/git4idea/actions/GitInit.java | 3 ++- .../src/git4idea/actions/GitRepositoryAction.java | 7 ++++--- .../git4idea/history/wholeTree/BasePopupAction.java | 2 +- .../src/git4idea/history/wholeTree/GitLogUI.java | 2 +- .../wholeTree/SelectRepositoryAndShowLogAction.java | 3 ++- .../src/git4idea/update/GitSkippedCommits.java | 3 ++- .../git4idea/history/GitAnnotationsClosedTest.java | 3 ++- .../plugins/github/GithubCreateGistAction.java | 5 +++-- .../github/GithubCreatePullRequestAction.java | 5 +++-- .../jetbrains/plugins/github/GithubRebaseAction.java | 5 +++-- .../GithubShowCommitInBrowserFromAnnotateAction.java | 3 ++- .../action/AbstractGradleLinkedProjectAction.java | 5 +++-- .../gradle/action/GradleToolWindowHelpAction.java | 3 ++- .../plugins/groovy/actions/NewGroovyClassAction.java | 2 +- .../groovy/doc/actions/GenerateGroovyDocAction.java | 2 +- .../doc/actions/GroovyDocAddPackageAction.java | 3 ++- .../groovy/editor/actions/GroovyEnterHandler.java | 5 +++-- .../zmlx/hg4idea/action/HgAbstractFilesAction.java | 4 ++-- .../zmlx/hg4idea/action/HgAbstractGlobalAction.java | 5 +++-- .../src/org/zmlx/hg4idea/action/HgAction.java | 3 ++- .../hg4idea/src/org/zmlx/hg4idea/action/HgInit.java | 3 ++- .../execution/junit/AddToTestsPatternAction.java | 4 ++-- .../execution/junit/ExcludeFromRunAction.java | 4 ++-- .../maven/navigator/MavenProjectsNavigatorPanel.java | 2 +- .../actions/EditMavenRunConfigurationAction.java | 3 ++- .../navigator/actions/MavenExecuteGoalAction.java | 3 ++- .../navigator/actions/MavenRunConfigurationMenu.java | 2 +- .../actions/RemoveMavenRunConfigurationAction.java | 3 ++- .../maven/tasks/MavenBeforeRunTasksProvider.java | 3 ++- .../idea/maven/utils/actions/MavenActionUtil.java | 9 +++++---- .../ResourcesFavoriteNodeProvider.java | 3 ++- .../lang/properties/editor/ResourceBundleUtil.java | 5 +++-- .../projectView/ResourceBundleDeleteProvider.java | 5 +++-- .../projectView/ResourceBundleMoveProvider.java | 3 ++- .../refactoring/ResourceBundleRenameHandler.java | 3 ++- .../svn/actions/AbstractIntegrateChangesAction.java | 4 ++-- .../actions/AbstractShowPropertiesDiffAction.java | 4 ++-- .../org/jetbrains/idea/svn/actions/BasicAction.java | 4 ++-- .../idea/svn/actions/CleanupProjectAction.java | 5 +++-- .../idea/svn/actions/CompareWithBranchAction.java | 5 +++-- .../idea/svn/actions/ConfigureBranchesAction.java | 5 +++-- .../idea/svn/actions/CreateExternalAction.java | 5 +++-- .../idea/svn/actions/IgnoreActionGroup.java | 3 ++- .../idea/svn/actions/ImportToRepositoryAction.java | 5 +++-- ...MarkLocallyDeletedTreeConflictResolvedAction.java | 3 ++- .../idea/svn/actions/ShareProjectAction.java | 3 ++- .../idea/svn/actions/ShareWholeProject.java | 2 +- .../svn/actions/ShowAllSubmittedFilesAction.java | 5 +++-- .../jetbrains/idea/svn/actions/ShowSvnMapAction.java | 5 +++-- .../jetbrains/idea/svn/dialogs/MergeFromAction.java | 7 ++++--- .../idea/svn/dialogs/PropertiesComponent.java | 10 +++++----- .../idea/svn/dialogs/RepositoryBrowserComponent.java | 3 ++- .../idea/svn/history/MergeSourceDetailsAction.java | 5 +++-- .../idea/svn/history/SvnEditCommitMessageAction.java | 5 +++-- .../testSource/org/jetbrains/idea/SvnTestCase.java | 3 ++- .../idea/svn/SvnAnnotationIsClosedTest.java | 5 +++-- .../tasks/actions/AssociateWithTaskAction.java | 5 +++-- .../com/intellij/tasks/actions/BaseTaskAction.java | 3 ++- .../com/intellij/tasks/actions/CloseTaskAction.java | 3 ++- .../tasks/actions/OpenTaskInBrowserAction.java | 3 ++- .../com/intellij/tasks/actions/SwitchTaskAction.java | 4 ++-- .../com/intellij/tasks/actions/SwitchTaskCombo.java | 2 +- .../plugins/terminal/OpenLocalTerminalAction.java | 3 ++- .../testng/configuration/ConfigurationsTest.java | 3 ++- .../src/com/intellij/uiDesigner/FormEditingUtil.java | 3 ++- .../uiDesigner/actions/GenerateMainAction.java | 5 +++-- .../uiDesigner/palette/AddComponentAction.java | 5 +++-- .../uiDesigner/palette/DeleteComponentAction.java | 5 +++-- .../uiDesigner/palette/DeleteGroupAction.java | 5 +++-- .../uiDesigner/palette/EditComponentAction.java | 5 +++-- .../intellij/uiDesigner/palette/EditGroupAction.java | 5 +++-- .../projectView/FormMergerTreeStructureProvider.java | 3 ++- .../projectView/UIDesignerFavoriteNodeProvider.java | 3 ++- .../editors/string/KeyChooserDialog.java | 3 ++- .../uiDesigner/snapShooter/CreateSnapShotAction.java | 5 +++-- .../impl/ConfigureAssociationsAction.java | 3 ++- .../org/intellij/plugins/xpathView/XPathAction.java | 2 +- .../intellij/plugins/xpathView/XPathEvalAction.java | 3 ++- .../plugins/xpathView/ui/EditContextDialog.java | 3 ++- .../xsltDebugger/ui/actions/OpenOutputAction.java | 3 ++- samples/actions/src/myActions/HelloWorldAction.java | 2 +- .../util/xml/ui/actions/AddDomElementAction.java | 2 +- .../editorActions/EnterBetweenXmlTagsHandler.java | 3 ++- .../GenerateInstanceDocumentFromSchemaAction.java | 3 ++- .../plugins/relaxNG/validation/ValidateAction.java | 3 ++- 484 files changed, 1079 insertions(+), 798 deletions(-) diff --git a/images/src/org/intellij/images/actions/EditExternallyAction.java b/images/src/org/intellij/images/actions/EditExternallyAction.java index db8e0fee6a74..889171609590 100644 --- a/images/src/org/intellij/images/actions/EditExternallyAction.java +++ b/images/src/org/intellij/images/actions/EditExternallyAction.java @@ -22,6 +22,7 @@ import com.intellij.execution.util.ExecUtil; import com.intellij.openapi.actionSystem.ActionPlaces; 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.project.Project; import com.intellij.openapi.ui.Messages; @@ -47,7 +48,7 @@ import java.util.Map; */ public final class EditExternallyAction extends AnAction { public void actionPerformed(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); VirtualFile[] files = e.getData(PlatformDataKeys.VIRTUAL_FILE_ARRAY); Options options = OptionsManager.getInstance().getOptions(); String executablePath = options.getExternalEditorOptions().getExecutablePath(); diff --git a/images/src/org/intellij/images/actions/ShowThumbnailsAction.java b/images/src/org/intellij/images/actions/ShowThumbnailsAction.java index 70a8f113a4cf..0ed258691c5b 100644 --- a/images/src/org/intellij/images/actions/ShowThumbnailsAction.java +++ b/images/src/org/intellij/images/actions/ShowThumbnailsAction.java @@ -18,6 +18,7 @@ package org.intellij.images.actions; import com.intellij.openapi.actionSystem.ActionPlaces; 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.project.Project; import com.intellij.openapi.vfs.VirtualFile; @@ -31,7 +32,7 @@ import org.intellij.images.thumbnail.ThumbnailView; */ public final class ShowThumbnailsAction extends AnAction { public void actionPerformed(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); VirtualFile file = e.getData(PlatformDataKeys.VIRTUAL_FILE); if (project != null && file != null && file.isDirectory()) { ThumbnailManager thumbnailManager = ThumbnailManager.getManager(project); diff --git a/images/src/org/intellij/images/editor/impl/ImageEditorUI.java b/images/src/org/intellij/images/editor/impl/ImageEditorUI.java index 695700f4a923..1d00ce9f6f18 100644 --- a/images/src/org/intellij/images/editor/impl/ImageEditorUI.java +++ b/images/src/org/intellij/images/editor/impl/ImageEditorUI.java @@ -359,7 +359,7 @@ final class ImageEditorUI extends JPanel implements DataProvider { @Nullable public Object getData(String dataId) { - if (PlatformDataKeys.PROJECT.is(dataId)) { + if (CommonDataKeys.PROJECT.is(dataId)) { return editor.getProject(); } else if (PlatformDataKeys.VIRTUAL_FILE.is(dataId)) { return editor.getFile(); diff --git a/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java b/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java index 138b4394bc1c..103d3ce9a3ba 100644 --- a/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java +++ b/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java @@ -413,7 +413,7 @@ final class ThumbnailViewUI extends JPanel implements DataProvider, Disposable { @Nullable public Object getData(String dataId) { - if (PlatformDataKeys.PROJECT.is(dataId)) { + if (CommonDataKeys.PROJECT.is(dataId)) { return thumbnailView.getProject(); } else if (PlatformDataKeys.VIRTUAL_FILE.is(dataId)) { VirtualFile[] selectedFiles = getSelectedFiles(); diff --git a/java/compiler/impl/src/com/intellij/compiler/actions/CompileAction.java b/java/compiler/impl/src/com/intellij/compiler/actions/CompileAction.java index 8d5bb8c54d0e..057a0b13ca6b 100644 --- a/java/compiler/impl/src/com/intellij/compiler/actions/CompileAction.java +++ b/java/compiler/impl/src/com/intellij/compiler/actions/CompileAction.java @@ -62,7 +62,7 @@ public class CompileAction extends CompileActionBase { presentation.setText(ActionsBundle.actionText(IdeActions.ACTION_COMPILE)); presentation.setVisible(true); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { presentation.setEnabled(false); return; 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 905dd92cf547..8fd1df58226d 100644 --- a/java/compiler/impl/src/com/intellij/compiler/actions/CompileActionBase.java +++ b/java/compiler/impl/src/com/intellij/compiler/actions/CompileActionBase.java @@ -27,7 +27,7 @@ import com.intellij.psi.PsiFile; public abstract class CompileActionBase extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { final DataContext dataContext = e.getDataContext(); - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) { return; } @@ -43,7 +43,7 @@ public abstract class CompileActionBase extends AnAction implements DumbAware { public void update(final AnActionEvent e) { super.update(e); - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) { e.getPresentation().setEnabled(false); } diff --git a/java/compiler/impl/src/com/intellij/compiler/actions/CompileDirtyAction.java b/java/compiler/impl/src/com/intellij/compiler/actions/CompileDirtyAction.java index 8bea2886c3da..87c6c39a9b90 100644 --- a/java/compiler/impl/src/com/intellij/compiler/actions/CompileDirtyAction.java +++ b/java/compiler/impl/src/com/intellij/compiler/actions/CompileDirtyAction.java @@ -16,6 +16,7 @@ package com.intellij.compiler.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; @@ -34,6 +35,6 @@ public class CompileDirtyAction extends CompileActionBase { if (!presentation.isEnabled()) { return; } - presentation.setEnabled(PlatformDataKeys.PROJECT.getData(event.getDataContext()) != null); + presentation.setEnabled(CommonDataKeys.PROJECT.getData(event.getDataContext()) != null); } } \ No newline at end of file diff --git a/java/compiler/impl/src/com/intellij/compiler/actions/CompileProjectAction.java b/java/compiler/impl/src/com/intellij/compiler/actions/CompileProjectAction.java index fde4f552a8ca..c7596e5cbaa4 100644 --- a/java/compiler/impl/src/com/intellij/compiler/actions/CompileProjectAction.java +++ b/java/compiler/impl/src/com/intellij/compiler/actions/CompileProjectAction.java @@ -17,6 +17,7 @@ package com.intellij.compiler.actions; import com.intellij.history.LocalHistory; 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; @@ -46,7 +47,7 @@ public class CompileProjectAction extends CompileActionBase { if (!presentation.isEnabled()) { return; } - Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); presentation.setEnabled(project != null); } } \ No newline at end of file diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerErrorTreeView.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerErrorTreeView.java index 25991f02185a..132c97dc878e 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerErrorTreeView.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerErrorTreeView.java @@ -75,7 +75,7 @@ public class CompilerErrorTreeView extends NewErrorTreeViewPanel { final String[] text = messageElement.getText(); final String id = text[0].substring(1, text[0].indexOf("]")); final SuppressFix suppressInspectionFix = getSuppressAction(id); - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); assert project != null; final OpenFileDescriptor navigatable = (OpenFileDescriptor)messageElement.getNavigatable(); final PsiFile file = PsiManager.getInstance(project).findFile(navigatable.getFile()); @@ -101,7 +101,7 @@ public class CompilerErrorTreeView extends NewErrorTreeViewPanel { final Presentation presentation = e.getPresentation(); presentation.setVisible(false); presentation.setEnabled(false); - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) { return; } diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerPropertiesAction.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerPropertiesAction.java index 5f1bf292cdd1..5fe6d43339fe 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerPropertiesAction.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerPropertiesAction.java @@ -19,6 +19,7 @@ import com.intellij.compiler.options.CompilerConfigurable; import com.intellij.icons.AllIcons; 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.compiler.CompilerBundle; import com.intellij.openapi.options.ShowSettingsUtil; @@ -34,7 +35,7 @@ class CompilerPropertiesAction extends AnAction { } public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project != null) { ShowSettingsUtil.getInstance().editConfigurable(project, new CompilerConfigurable(project)); } diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/api/CompilerPerfTestAction.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/api/CompilerPerfTestAction.java index 1b6b3557cb60..ad587875157f 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/api/CompilerPerfTestAction.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/api/CompilerPerfTestAction.java @@ -20,6 +20,7 @@ import com.intellij.compiler.CompilerConfigurationImpl; import com.intellij.compiler.impl.javaCompiler.BackendCompiler; 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.compiler.CompileContext; import com.intellij.openapi.compiler.CompileStatusNotification; @@ -36,12 +37,12 @@ import java.util.concurrent.TimeUnit; public class CompilerPerfTestAction extends AnAction { @Override public void update(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); e.getPresentation().setEnabled(project != null); } public void actionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final CompilerManager compilerManager = CompilerManager.getInstance(project); diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/ui/actions/PackageFileAction.java b/java/compiler/impl/src/com/intellij/packaging/impl/ui/actions/PackageFileAction.java index 26e472149195..d776561fc267 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/ui/actions/PackageFileAction.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/ui/actions/PackageFileAction.java @@ -5,6 +5,7 @@ package com.intellij.packaging.impl.ui.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.compiler.CompilerBundle; import com.intellij.openapi.compiler.CompilerManager; @@ -39,7 +40,7 @@ public class PackageFileAction extends AnAction { @Override public void update(AnActionEvent e) { boolean visible = false; - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project != null) { final List files = getFilesToPackage(e, project); if (!files.isEmpty()) { @@ -77,7 +78,7 @@ public class PackageFileAction extends AnAction { @Override public void actionPerformed(AnActionEvent event) { - final Project project = event.getData(PlatformDataKeys.PROJECT); + final Project project = event.getData(CommonDataKeys.PROJECT); if (project == null) return; FileDocumentManager.getInstance().saveAllDocuments(); diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/BaseValueAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/BaseValueAction.java index bd0373a5c439..6c86ac3089b8 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/BaseValueAction.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/BaseValueAction.java @@ -29,6 +29,7 @@ import com.intellij.debugger.ui.impl.watch.DebuggerTreeNodeImpl; import com.intellij.debugger.ui.impl.watch.NodeDescriptorImpl; import com.intellij.debugger.ui.tree.ValueDescriptor; 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; @@ -49,7 +50,7 @@ public abstract class BaseValueAction extends DebuggerAction { if (value == null) { return; } - final Project project = PlatformDataKeys.PROJECT.getData(actionContext); + final Project project = CommonDataKeys.PROJECT.getData(actionContext); final DebuggerManagerEx debuggerManager = DebuggerManagerEx.getInstanceEx(project); if(debuggerManager == null) { return; diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/CustomizeContextViewAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/CustomizeContextViewAction.java index 4be77763f912..854492ed1fab 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/CustomizeContextViewAction.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/CustomizeContextViewAction.java @@ -24,6 +24,7 @@ import com.intellij.debugger.ui.impl.watch.DebuggerTree; import com.intellij.idea.ActionsBundle; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.options.CompositeConfigurable; import com.intellij.openapi.options.Configurable; @@ -43,7 +44,7 @@ import java.util.List; */ public class CustomizeContextViewAction extends DebuggerAction{ public void actionPerformed(AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); Disposable disposable = Disposer.newDisposable(); final CompositeConfigurable configurable = new TabbedConfigurable(disposable) { diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/CustomizeThreadsViewAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/CustomizeThreadsViewAction.java index 1681d681ccf6..64705a373a21 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/CustomizeThreadsViewAction.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/CustomizeThreadsViewAction.java @@ -19,6 +19,7 @@ import com.intellij.debugger.settings.ThreadsViewConfigurable; import com.intellij.debugger.settings.ThreadsViewSettings; 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.options.ex.SingleConfigurableEditor; import com.intellij.openapi.project.Project; @@ -30,7 +31,7 @@ import com.intellij.openapi.project.Project; */ public class CustomizeThreadsViewAction extends DebuggerAction { public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); final SingleConfigurableEditor editor = new SingleConfigurableEditor(project, new ThreadsViewConfigurable(ThreadsViewSettings.getInstance())); editor.show(); } diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/DebuggerAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/DebuggerAction.java index 8aebe9e5a86c..86ddfaa5fc08 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/DebuggerAction.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/DebuggerAction.java @@ -95,7 +95,7 @@ public abstract class DebuggerAction extends AnAction { if(panel != null) { return panel.getContext(); } else { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); return project != null ? (DebuggerManagerEx.getInstanceEx(project)).getContext() : DebuggerContextImpl.EMPTY_CONTEXT; } } diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/EditSourceAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/EditSourceAction.java index b0093709c874..da01b9f28b38 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/EditSourceAction.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/EditSourceAction.java @@ -29,7 +29,7 @@ import com.intellij.openapi.util.Computable; public class EditSourceAction extends DebuggerAction{ public void actionPerformed(AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if(project == null) return; @@ -84,7 +84,7 @@ public class EditSourceAction extends DebuggerAction{ } public void update(AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); final DebuggerContextImpl debuggerContext = getDebuggerContext(e.getDataContext()); final DebuggerTreeNodeImpl node = getSelectedNode(e.getDataContext()); diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/EditWatchAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/EditWatchAction.java index 1654287cd8fa..48bf5acd10bb 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/EditWatchAction.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/EditWatchAction.java @@ -20,6 +20,7 @@ import com.intellij.debugger.ui.impl.MainWatchPanel; import com.intellij.debugger.ui.impl.watch.DebuggerTreeNodeImpl; import com.intellij.debugger.ui.impl.watch.WatchItemDescriptor; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; @@ -33,7 +34,7 @@ public class EditWatchAction extends DebuggerAction { final DebuggerTreeNodeImpl selectedNode = getSelectedNode(e.getDataContext()); if(selectedNode == null || !(selectedNode.getDescriptor() instanceof WatchItemDescriptor)) return; - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); MainWatchPanel watchPanel = DebuggerPanelsManager.getInstance(project).getWatchPanel(); if(watchPanel != null) { diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/ExportThreadsAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/ExportThreadsAction.java index e7b43d11de10..20876de93890 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/ExportThreadsAction.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/ExportThreadsAction.java @@ -27,6 +27,7 @@ import com.intellij.debugger.ui.ExportDialog; 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.actionSystem.Presentation; import com.intellij.openapi.project.Project; @@ -42,7 +43,7 @@ import java.io.IOException; public class ExportThreadsAction extends AnAction implements AnAction.TransparentUpdate { public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) { return; } @@ -78,7 +79,7 @@ public class ExportThreadsAction extends AnAction implements AnAction.Transparen public void update(AnActionEvent event){ Presentation presentation = event.getPresentation(); - Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); if (project == null) { presentation.setEnabled(false); return; diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/GotoFrameSourceAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/GotoFrameSourceAction.java index e13a0eb28564..01e214091308 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/GotoFrameSourceAction.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/GotoFrameSourceAction.java @@ -19,6 +19,7 @@ import com.intellij.debugger.impl.DebuggerContextUtil; import com.intellij.debugger.ui.impl.watch.DebuggerTreeNodeImpl; import com.intellij.debugger.ui.impl.watch.StackFrameDescriptorImpl; 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.project.Project; @@ -33,7 +34,7 @@ public abstract class GotoFrameSourceAction extends DebuggerAction{ } protected static void doAction(DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if(project == null) return; StackFrameDescriptorImpl stackFrameDescriptor = getStackFrameDescriptor(dataContext); if(stackFrameDescriptor != null) { diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/HotSwapAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/HotSwapAction.java index 250ae85cf884..aeaacaa042f1 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/HotSwapAction.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/HotSwapAction.java @@ -21,6 +21,7 @@ import com.intellij.debugger.settings.DebuggerSettings; import com.intellij.debugger.ui.HotSwapUI; 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.project.Project; @@ -32,7 +33,7 @@ public class HotSwapAction extends AnAction{ public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if(project == null) { return; } @@ -47,7 +48,7 @@ public class HotSwapAction extends AnAction{ public void update(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if(project == null) { e.getPresentation().setEnabled(false); return; diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/InspectAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/InspectAction.java index 36bc1b70bb8f..6347e0e17053 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/InspectAction.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/InspectAction.java @@ -33,6 +33,7 @@ import com.intellij.debugger.ui.impl.InspectDialog; 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.project.Project; import com.intellij.openapi.ui.Messages; @@ -40,7 +41,7 @@ import com.sun.jdi.Field; public class InspectAction extends DebuggerAction { public void actionPerformed(AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); final DebuggerTreeNodeImpl node = getSelectedNode(e.getDataContext()); if(node == null) return; final NodeDescriptorImpl descriptor = node.getDescriptor(); diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/NewWatchAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/NewWatchAction.java index b7289f5600d7..062eabaf54ae 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/NewWatchAction.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/NewWatchAction.java @@ -23,12 +23,13 @@ package com.intellij.debugger.actions; import com.intellij.debugger.ui.DebuggerPanelsManager; import com.intellij.debugger.ui.impl.MainWatchPanel; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; public class NewWatchAction extends DebuggerAction { public void actionPerformed(final AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if(project == null) return; final MainWatchPanel watchPanel = DebuggerPanelsManager.getInstance(project).getWatchPanel(); diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/PopFrameAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/PopFrameAction.java index f2f310cebf5a..7d15c05e0a4b 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/PopFrameAction.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/PopFrameAction.java @@ -29,6 +29,7 @@ import com.intellij.debugger.ui.impl.watch.*; import com.intellij.idea.ActionsBundle; import com.intellij.openapi.actionSystem.ActionPlaces; 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.ui.Messages; @@ -39,7 +40,7 @@ import org.jetbrains.annotations.Nullable; public class PopFrameAction extends DebuggerAction { public void actionPerformed(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); StackFrameProxyImpl stackFrame = getStackFrameProxy(e); if(stackFrame == null) { return; diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/ThreadDumpAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/ThreadDumpAction.java index a1ddd95b6f2d..ac513d7a40b9 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/ThreadDumpAction.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/ThreadDumpAction.java @@ -32,6 +32,7 @@ import com.intellij.debugger.ui.DebuggerPanelsManager; import com.intellij.debugger.ui.DebuggerSessionTab; 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.application.ApplicationManager; @@ -51,7 +52,7 @@ import java.util.Map; public class ThreadDumpAction extends AnAction implements AnAction.TransparentUpdate { public void actionPerformed(AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) { return; } @@ -312,7 +313,7 @@ public class ThreadDumpAction extends AnAction implements AnAction.TransparentUp public void update(AnActionEvent event){ Presentation presentation = event.getPresentation(); - Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); if (project == null) { presentation.setEnabled(false); return; diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/ToggleBreakpointEnabledAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/ToggleBreakpointEnabledAction.java index a3f395bbd2ac..fda3e6128a3e 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/ToggleBreakpointEnabledAction.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/ToggleBreakpointEnabledAction.java @@ -21,6 +21,7 @@ import com.intellij.debugger.ui.breakpoints.Breakpoint; import com.intellij.debugger.ui.breakpoints.BreakpointManager; 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.editor.Editor; @@ -36,7 +37,7 @@ import org.jetbrains.annotations.Nullable; public class ToggleBreakpointEnabledAction extends AnAction { public void actionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); Breakpoint breakpoint = findBreakpoint(project); if (breakpoint != null) { final BreakpointManager breakpointManager = DebuggerManagerEx.getInstanceEx(project).getBreakpointManager(); @@ -57,7 +58,7 @@ public class ToggleBreakpointEnabledAction extends AnAction { public void update(AnActionEvent event){ final Presentation presentation = event.getPresentation(); - Project project = event.getData(PlatformDataKeys.PROJECT); + Project project = event.getData(CommonDataKeys.PROJECT); if (project == null) { presentation.setEnabled(false); return; 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 80992e3669fc..b462123af72c 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/ToggleMethodBreakpointAction.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/ToggleMethodBreakpointAction.java @@ -56,7 +56,7 @@ public class ToggleMethodBreakpointAction extends AnAction { public void actionPerformed(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) { return; } @@ -83,7 +83,7 @@ public class ToggleMethodBreakpointAction extends AnAction { @Nullable private static PlaceInDocument getPlace(AnActionEvent event) { - final Project project = event.getData(PlatformDataKeys.PROJECT); + final Project project = event.getData(CommonDataKeys.PROJECT); if(project == null) { return null; } diff --git a/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java b/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java index 8898c3628985..76b093afae0c 100644 --- a/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java +++ b/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java @@ -181,7 +181,7 @@ public class DefaultJavaProgramRunner extends JavaPatchableProgramRunner { ProcessProxy proxy = ProcessProxyFactory.getInstance().getAttachedProxy(myProcessHandler); if (proxy != null) { final WiseDumpThreadsListener wiseListener = Boolean.TRUE.equals(Boolean.getBoolean(ourWiseThreadDumpProperty)) ? - new WiseDumpThreadsListener(PlatformDataKeys.PROJECT.getData(e.getDataContext()), myProcessHandler) : null; + new WiseDumpThreadsListener(CommonDataKeys.PROJECT.getData(e.getDataContext()), myProcessHandler) : null; proxy.sendBreak(); diff --git a/java/idea-ui/src/com/intellij/ide/actions/OpenProjectAction.java b/java/idea-ui/src/com/intellij/ide/actions/OpenProjectAction.java index b15a94cbe6aa..e817b262b1da 100644 --- a/java/idea-ui/src/com/intellij/ide/actions/OpenProjectAction.java +++ b/java/idea-ui/src/com/intellij/ide/actions/OpenProjectAction.java @@ -21,6 +21,7 @@ import com.intellij.ide.impl.ProjectUtil; import com.intellij.openapi.actionSystem.ActionPlaces; 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.extensions.Extensions; import com.intellij.openapi.fileChooser.FileChooser; @@ -63,7 +64,7 @@ public class OpenProjectAction extends AnAction implements DumbAware { descriptor.putUserData(PathChooserDialog.PREFER_LAST_OVER_EXPLICIT, Boolean.TRUE); - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); FileChooser.chooseFiles(descriptor, project, userHomeDir, new Consumer>() { @Override public void consume(final List files) { diff --git a/java/idea-ui/src/com/intellij/ide/actions/ShowModulePropertiesAction.java b/java/idea-ui/src/com/intellij/ide/actions/ShowModulePropertiesAction.java index 2fc6d6f371da..ea280f1a5a84 100644 --- a/java/idea-ui/src/com/intellij/ide/actions/ShowModulePropertiesAction.java +++ b/java/idea-ui/src/com/intellij/ide/actions/ShowModulePropertiesAction.java @@ -28,7 +28,7 @@ public class ShowModulePropertiesAction extends AnAction{ public void actionPerformed(AnActionEvent e) { final DataContext dataContext = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return; } @@ -42,7 +42,7 @@ public class ShowModulePropertiesAction extends AnAction{ public void update(AnActionEvent e) { super.update(e); final DataContext dataContext = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final Module module = LangDataKeys.MODULE_CONTEXT.getData(dataContext); e.getPresentation().setVisible(project != null && module != null); } diff --git a/java/idea-ui/src/com/intellij/ide/actions/ShowStructureSettingsAction.java b/java/idea-ui/src/com/intellij/ide/actions/ShowStructureSettingsAction.java index 777105f840ba..9b803f5d8d6e 100644 --- a/java/idea-ui/src/com/intellij/ide/actions/ShowStructureSettingsAction.java +++ b/java/idea-ui/src/com/intellij/ide/actions/ShowStructureSettingsAction.java @@ -17,6 +17,7 @@ package com.intellij.ide.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.options.ShowSettingsUtil; import com.intellij.openapi.options.newEditor.OptionsEditorDialog; @@ -27,7 +28,7 @@ import com.intellij.openapi.roots.ui.configuration.ProjectStructureConfigurable; public class ShowStructureSettingsAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) { project = ProjectManager.getInstance().getDefaultProject(); } diff --git a/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteWindow.java b/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteWindow.java index e18cc60d1aee..27f280386731 100644 --- a/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteWindow.java +++ b/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteWindow.java @@ -227,7 +227,7 @@ public class PaletteWindow extends JPanel implements DataProvider { if (PlatformDataKeys.HELP_ID.is(dataId)) { return ourHelpID; } - if (PlatformDataKeys.PROJECT.is(dataId)) { + if (CommonDataKeys.PROJECT.is(dataId)) { return myProject; } PaletteItem item = getActiveItem(); diff --git a/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/ProjectJdksEditor.java b/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/ProjectJdksEditor.java index 28a7a524d371..86c08243bade 100644 --- a/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/ProjectJdksEditor.java +++ b/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/ProjectJdksEditor.java @@ -17,6 +17,7 @@ package com.intellij.openapi.projectRoots.ui; 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.options.ConfigurationException; import com.intellij.openapi.project.Project; @@ -65,7 +66,7 @@ public class ProjectJdksEditor extends DialogWrapper { } public ProjectJdksEditor(Sdk jdk, Component parent){ - this(jdk, PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()), parent); + this(jdk, CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()), parent); } @Override diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesComponent.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesComponent.java index 25b49dae9641..120f07b96fca 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesComponent.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesComponent.java @@ -325,7 +325,7 @@ public class AnalyzeDependenciesComponent extends MasterDetailsComponent { */ @Override public Object getData(@NonNls String dataId) { - if (PlatformDataKeys.PROJECT.is(dataId)) { + if (CommonDataKeys.PROJECT.is(dataId)) { return myModule.getProject(); } if (LangDataKeys.MODULE.is(dataId)) { diff --git a/java/idea-ui/src/com/intellij/projectImport/ProjectImportBuilder.java b/java/idea-ui/src/com/intellij/projectImport/ProjectImportBuilder.java index 70958716f2c9..af31a479c872 100644 --- a/java/idea-ui/src/com/intellij/projectImport/ProjectImportBuilder.java +++ b/java/idea-ui/src/com/intellij/projectImport/ProjectImportBuilder.java @@ -18,6 +18,7 @@ package com.intellij.projectImport; import com.intellij.ide.DataManager; import com.intellij.ide.IdeBundle; import com.intellij.ide.util.projectWizard.ProjectBuilder; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.module.ModifiableModuleModel; @@ -72,7 +73,7 @@ public abstract class ProjectImportBuilder extends ProjectBuilder { @Nullable public static Project getCurrentProject() { - return PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()); + return CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()); } protected String getTitle() { diff --git a/java/java-impl/src/com/intellij/codeInsight/hint/actions/ShowSiblingsAction.java b/java/java-impl/src/com/intellij/codeInsight/hint/actions/ShowSiblingsAction.java index 8a8bc919f296..baafe13ff106 100644 --- a/java/java-impl/src/com/intellij/codeInsight/hint/actions/ShowSiblingsAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/hint/actions/ShowSiblingsAction.java @@ -44,7 +44,7 @@ public class ShowSiblingsAction extends ShowImplementationsAction { @Override public void performForContext(DataContext dataContext, final boolean invokedByShortcut) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); if (project == null) return; diff --git a/java/java-impl/src/com/intellij/codeInspection/dependencyViolation/DependencyInspection.java b/java/java-impl/src/com/intellij/codeInspection/dependencyViolation/DependencyInspection.java index 2d8f36426093..65f908c15569 100644 --- a/java/java-impl/src/com/intellij/codeInspection/dependencyViolation/DependencyInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/dependencyViolation/DependencyInspection.java @@ -21,6 +21,7 @@ import com.intellij.codeInspection.*; import com.intellij.codeInspection.ex.BaseLocalInspectionTool; import com.intellij.ide.DataManager; import com.intellij.lang.StdLanguages; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.options.ShowSettingsUtil; import com.intellij.openapi.project.Project; @@ -76,7 +77,7 @@ public class DependencyInspection extends BaseLocalInspectionTool { editDependencies.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(editDependencies)); + Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(editDependencies)); if (project == null) project = ProjectManager.getInstance().getDefaultProject(); ShowSettingsUtil.getInstance().editConfigurable(editDependencies, new DependencyConfigurable(project)); } diff --git a/java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java b/java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java index 7e8448ec49a2..193f9a73c475 100644 --- a/java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java @@ -17,6 +17,7 @@ package com.intellij.codeInspection.nullable; import com.intellij.codeInsight.NullableNotNullDialog; import com.intellij.ide.DataManager; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; @@ -55,7 +56,7 @@ public class NullableStuffInspection extends NullableStuffInspectionBase { myConfigureAnnotationsButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(OptionsPanel.this)); + Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(OptionsPanel.this)); if (project == null) project = ProjectManager.getInstance().getDefaultProject(); final NullableNotNullDialog dialog = new NullableNotNullDialog(project); dialog.show(); diff --git a/java/java-impl/src/com/intellij/codeInspection/util/SpecialAnnotationsUtil.java b/java/java-impl/src/com/intellij/codeInspection/util/SpecialAnnotationsUtil.java index 1e630d4e82c0..7fd161f31691 100644 --- a/java/java-impl/src/com/intellij/codeInspection/util/SpecialAnnotationsUtil.java +++ b/java/java-impl/src/com/intellij/codeInspection/util/SpecialAnnotationsUtil.java @@ -23,6 +23,7 @@ import com.intellij.ide.util.ClassFilter; import com.intellij.ide.util.TreeClassChooser; import com.intellij.ide.util.TreeClassChooserFactory; 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; @@ -93,7 +94,7 @@ public class SpecialAnnotationsUtil { .setAddAction(new AnActionButtonRunnable() { @Override public void run(AnActionButton button) { - Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(injectionList)); + Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(injectionList)); if (project == null) project = ProjectManager.getInstance().getDefaultProject(); TreeClassChooser chooser = TreeClassChooserFactory.getInstance(project) .createWithInnerClassesScopeChooser(InspectionsBundle.message("special.annotations.list.annotation.class"), diff --git a/java/java-impl/src/com/intellij/cyclicDependencies/actions/CyclicDependenciesAction.java b/java/java-impl/src/com/intellij/cyclicDependencies/actions/CyclicDependenciesAction.java index 77c39c581c2f..ab355274380c 100644 --- a/java/java-impl/src/com/intellij/cyclicDependencies/actions/CyclicDependenciesAction.java +++ b/java/java-impl/src/com/intellij/cyclicDependencies/actions/CyclicDependenciesAction.java @@ -51,12 +51,12 @@ public class CyclicDependenciesAction extends AnAction{ Presentation presentation = event.getPresentation(); presentation.setEnabled( getInspectionScope(event.getDataContext()) != null || - event.getData(PlatformDataKeys.PROJECT) != null); + event.getData(CommonDataKeys.PROJECT) != null); } public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final Module module = LangDataKeys.MODULE.getData(dataContext); if (project != null) { AnalysisScope scope = getInspectionScope(dataContext); @@ -89,7 +89,7 @@ public class CyclicDependenciesAction extends AnAction{ @Nullable private static AnalysisScope getInspectionScope(final DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return null; AnalysisScope scope = getInspectionScopeImpl(dataContext); @@ -133,7 +133,7 @@ public class CyclicDependenciesAction extends AnAction{ @Nullable private static AnalysisScope getProjectScope(DataContext dataContext) { - final Project data = PlatformDataKeys.PROJECT.getData(dataContext); + final Project data = CommonDataKeys.PROJECT.getData(dataContext); if (data == null) { return null; } diff --git a/java/java-impl/src/com/intellij/ide/favoritesTreeView/PsiClassFavoriteNodeProvider.java b/java/java-impl/src/com/intellij/ide/favoritesTreeView/PsiClassFavoriteNodeProvider.java index 1df418f077db..d8c290f10a5e 100644 --- a/java/java-impl/src/com/intellij/ide/favoritesTreeView/PsiClassFavoriteNodeProvider.java +++ b/java/java-impl/src/com/intellij/ide/favoritesTreeView/PsiClassFavoriteNodeProvider.java @@ -24,6 +24,7 @@ import com.intellij.ide.favoritesTreeView.smartPointerPsiNodes.ClassSmartPointer import com.intellij.ide.projectView.ViewSettings; import com.intellij.ide.projectView.impl.nodes.ClassTreeNode; import com.intellij.ide.util.treeView.AbstractTreeNode; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -48,7 +49,7 @@ import java.util.Collection; public class PsiClassFavoriteNodeProvider extends FavoriteNodeProvider { @Override public Collection getFavoriteNodes(final DataContext context, final ViewSettings viewSettings) { - final Project project = PlatformDataKeys.PROJECT.getData(context); + final Project project = CommonDataKeys.PROJECT.getData(context); if (project == null) return null; PsiElement[] elements = LangDataKeys.PSI_ELEMENT_ARRAY.getData(context); if (elements == null) { diff --git a/java/java-impl/src/com/intellij/ide/favoritesTreeView/PsiFieldFavoriteNodeProvider.java b/java/java-impl/src/com/intellij/ide/favoritesTreeView/PsiFieldFavoriteNodeProvider.java index 8a5e0f587c30..1177904ae445 100644 --- a/java/java-impl/src/com/intellij/ide/favoritesTreeView/PsiFieldFavoriteNodeProvider.java +++ b/java/java-impl/src/com/intellij/ide/favoritesTreeView/PsiFieldFavoriteNodeProvider.java @@ -23,6 +23,7 @@ package com.intellij.ide.favoritesTreeView; import com.intellij.ide.favoritesTreeView.smartPointerPsiNodes.FieldSmartPointerNode; import com.intellij.ide.projectView.ViewSettings; import com.intellij.ide.util.treeView.AbstractTreeNode; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -46,7 +47,7 @@ import java.util.Collection; public class PsiFieldFavoriteNodeProvider extends FavoriteNodeProvider { @Override public Collection getFavoriteNodes(final DataContext context, final ViewSettings viewSettings) { - final Project project = PlatformDataKeys.PROJECT.getData(context); + final Project project = CommonDataKeys.PROJECT.getData(context); if (project == null) return null; PsiElement[] elements = LangDataKeys.PSI_ELEMENT_ARRAY.getData(context); if (elements == null) { diff --git a/java/java-impl/src/com/intellij/ide/favoritesTreeView/PsiMethodFavoriteNodeProvider.java b/java/java-impl/src/com/intellij/ide/favoritesTreeView/PsiMethodFavoriteNodeProvider.java index f62b68d2fc83..28e01eaea5fb 100644 --- a/java/java-impl/src/com/intellij/ide/favoritesTreeView/PsiMethodFavoriteNodeProvider.java +++ b/java/java-impl/src/com/intellij/ide/favoritesTreeView/PsiMethodFavoriteNodeProvider.java @@ -24,6 +24,7 @@ import com.intellij.codeInspection.reference.RefMethodImpl; import com.intellij.ide.favoritesTreeView.smartPointerPsiNodes.MethodSmartPointerNode; import com.intellij.ide.projectView.ViewSettings; import com.intellij.ide.util.treeView.AbstractTreeNode; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -46,7 +47,7 @@ import java.util.Collection; public class PsiMethodFavoriteNodeProvider extends FavoriteNodeProvider { @Override public Collection getFavoriteNodes(final DataContext context, final ViewSettings viewSettings) { - final Project project = PlatformDataKeys.PROJECT.getData(context); + final Project project = CommonDataKeys.PROJECT.getData(context); if (project == null) return null; PsiElement[] elements = LangDataKeys.PSI_ELEMENT_ARRAY.getData(context); if (elements == null) { diff --git a/java/java-impl/src/com/intellij/ide/favoritesTreeView/PsiPackageFavoriteNodeProvider.java b/java/java-impl/src/com/intellij/ide/favoritesTreeView/PsiPackageFavoriteNodeProvider.java index 138fee701a11..1a7f2946cef8 100644 --- a/java/java-impl/src/com/intellij/ide/favoritesTreeView/PsiPackageFavoriteNodeProvider.java +++ b/java/java-impl/src/com/intellij/ide/favoritesTreeView/PsiPackageFavoriteNodeProvider.java @@ -27,6 +27,7 @@ import com.intellij.ide.projectView.impl.PackageViewPane; import com.intellij.ide.projectView.impl.ProjectRootsUtil; import com.intellij.ide.projectView.impl.nodes.*; import com.intellij.ide.util.treeView.AbstractTreeNode; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -52,7 +53,7 @@ import java.util.Set; public class PsiPackageFavoriteNodeProvider extends FavoriteNodeProvider { @Override public Collection getFavoriteNodes(final DataContext context, final ViewSettings viewSettings) { - final Project project = PlatformDataKeys.PROJECT.getData(context); + final Project project = CommonDataKeys.PROJECT.getData(context); if (project == null) return null; PsiElement[] elements = LangDataKeys.PSI_ELEMENT_ARRAY.getData(context); if (elements == null) { 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 3bb99914f275..e66045c60aa6 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 @@ -18,6 +18,7 @@ package com.intellij.ide.hierarchy.method; import com.intellij.ide.hierarchy.HierarchyProvider; import com.intellij.ide.hierarchy.HierarchyBrowser; import com.intellij.ide.hierarchy.MethodHierarchyBrowserBase; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.openapi.actionSystem.DataContext; @@ -49,7 +50,7 @@ public class JavaMethodHierarchyProvider implements HierarchyProvider { @Nullable private static PsiMethod getMethodImpl(final DataContext dataContext){ - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return null; PsiElement element = LangDataKeys.PSI_ELEMENT.getData(dataContext); diff --git a/java/java-impl/src/com/intellij/ide/hierarchy/method/OverrideImplementMethodAction.java b/java/java-impl/src/com/intellij/ide/hierarchy/method/OverrideImplementMethodAction.java index 2b09e70f0d2a..cf7ea89360ee 100644 --- a/java/java-impl/src/com/intellij/ide/hierarchy/method/OverrideImplementMethodAction.java +++ b/java/java-impl/src/com/intellij/ide/hierarchy/method/OverrideImplementMethodAction.java @@ -43,7 +43,7 @@ abstract class OverrideImplementMethodAction extends AnAction { final DataContext dataContext = event.getDataContext(); final MethodHierarchyBrowser methodHierarchyBrowser = (MethodHierarchyBrowser)MethodHierarchyBrowserBase.DATA_KEY.getData(dataContext); if (methodHierarchyBrowser == null) return; - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return; final String commandName = event.getPresentation().getText(); @@ -100,7 +100,7 @@ abstract class OverrideImplementMethodAction extends AnAction { presentation.setVisible(false); return; } - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { presentation.setEnabled(false); presentation.setVisible(false); 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 0811506e9ae0..c848d52fc63b 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 @@ -19,6 +19,7 @@ import com.intellij.codeInsight.TargetElementUtilBase; import com.intellij.ide.hierarchy.HierarchyBrowser; import com.intellij.ide.hierarchy.HierarchyProvider; import com.intellij.ide.hierarchy.TypeHierarchyBrowserBase; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -32,7 +33,7 @@ import org.jetbrains.annotations.NotNull; */ public class JavaTypeHierarchyProvider implements HierarchyProvider { public PsiElement getTarget(@NotNull final DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return null; final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); diff --git a/java/java-impl/src/com/intellij/ide/macro/ClasspathMacro.java b/java/java-impl/src/com/intellij/ide/macro/ClasspathMacro.java index 0a2e1150d89b..447b8daf1c70 100644 --- a/java/java-impl/src/com/intellij/ide/macro/ClasspathMacro.java +++ b/java/java-impl/src/com/intellij/ide/macro/ClasspathMacro.java @@ -16,6 +16,7 @@ package com.intellij.ide.macro; import com.intellij.ide.IdeBundle; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; @@ -31,7 +32,7 @@ public final class ClasspathMacro extends Macro { } public String expand(DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return null; return OrderEnumerator.orderEntries(project).getPathsList().getPathsString(); } diff --git a/java/java-impl/src/com/intellij/ide/macro/JavaDocPathMacro.java b/java/java-impl/src/com/intellij/ide/macro/JavaDocPathMacro.java index f9a488654d7b..de3dbca10493 100644 --- a/java/java-impl/src/com/intellij/ide/macro/JavaDocPathMacro.java +++ b/java/java-impl/src/com/intellij/ide/macro/JavaDocPathMacro.java @@ -18,6 +18,7 @@ package com.intellij.ide.macro; import com.intellij.ide.IdeBundle; import com.intellij.javadoc.JavadocConfiguration; import com.intellij.javadoc.JavadocGenerationManager; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; @@ -34,7 +35,7 @@ public final class JavaDocPathMacro extends Macro { } public String expand(DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return null; } diff --git a/java/java-impl/src/com/intellij/ide/macro/OutputPathMacro.java b/java/java-impl/src/com/intellij/ide/macro/OutputPathMacro.java index 95a05e02849f..4829fb33540f 100644 --- a/java/java-impl/src/com/intellij/ide/macro/OutputPathMacro.java +++ b/java/java-impl/src/com/intellij/ide/macro/OutputPathMacro.java @@ -16,6 +16,7 @@ package com.intellij.ide.macro; import com.intellij.ide.IdeBundle; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.compiler.ex.CompilerPathsEx; @@ -40,7 +41,7 @@ public final class OutputPathMacro extends Macro { } public String expand(DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return null; } diff --git a/java/java-impl/src/com/intellij/internal/GenerateVisitorByHierarchyAction.java b/java/java-impl/src/com/intellij/internal/GenerateVisitorByHierarchyAction.java index c54a0e5460e3..21477c390677 100644 --- a/java/java-impl/src/com/intellij/internal/GenerateVisitorByHierarchyAction.java +++ b/java/java-impl/src/com/intellij/internal/GenerateVisitorByHierarchyAction.java @@ -29,6 +29,7 @@ import com.intellij.ide.util.PackageChooserDialog; import com.intellij.ide.util.PackageUtil; 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.Result; @@ -71,7 +72,7 @@ public class GenerateVisitorByHierarchyAction extends AnAction { public void actionPerformed(AnActionEvent e) { final Ref visitorNameRef = Ref.create("MyVisitor"); final Ref parentClassRef = Ref.create(null); - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); assert project != null; final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project); final PsiNameHelper helper = psiFacade.getNameHelper(); @@ -173,7 +174,7 @@ public class GenerateVisitorByHierarchyAction extends AnAction { } public void update(final AnActionEvent e) { - e.getPresentation().setEnabled(e.getData(PlatformDataKeys.PROJECT) != null); + e.getPresentation().setEnabled(e.getData(CommonDataKeys.PROJECT) != null); } private static void generateVisitorClass(final String visitorName, diff --git a/java/java-impl/src/com/intellij/javadoc/JavadocNavigationDelegate.java b/java/java-impl/src/com/intellij/javadoc/JavadocNavigationDelegate.java index 20d8005282a1..6f9cb2263528 100644 --- a/java/java-impl/src/com/intellij/javadoc/JavadocNavigationDelegate.java +++ b/java/java-impl/src/com/intellij/javadoc/JavadocNavigationDelegate.java @@ -16,6 +16,7 @@ package com.intellij.javadoc; import com.intellij.codeInsight.CodeInsightSettings; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -80,7 +81,7 @@ public class JavadocNavigationDelegate extends EditorNavigationDelegateAdapter { return Result.CONTINUE; } - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return Result.CONTINUE; } diff --git a/java/java-impl/src/com/intellij/refactoring/actions/MigrateAction.java b/java/java-impl/src/com/intellij/refactoring/actions/MigrateAction.java index 2126d271fb7b..c0ff04d4c55f 100644 --- a/java/java-impl/src/com/intellij/refactoring/actions/MigrateAction.java +++ b/java/java-impl/src/com/intellij/refactoring/actions/MigrateAction.java @@ -18,6 +18,7 @@ package com.intellij.refactoring.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.actionSystem.Presentation; import com.intellij.openapi.project.Project; @@ -25,13 +26,13 @@ import com.intellij.refactoring.RefactoringManager; public class MigrateAction extends AnAction { public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); RefactoringManager.getInstance(project).getMigrateManager().showMigrationDialog(); } public void update(AnActionEvent event){ Presentation presentation = event.getPresentation(); - Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); presentation.setEnabled(project != null); } } diff --git a/java/java-impl/src/com/intellij/refactoring/actions/RenameFileAction.java b/java/java-impl/src/com/intellij/refactoring/actions/RenameFileAction.java index 1a3244595e6d..d90eb35168ee 100644 --- a/java/java-impl/src/com/intellij/refactoring/actions/RenameFileAction.java +++ b/java/java-impl/src/com/intellij/refactoring/actions/RenameFileAction.java @@ -34,7 +34,7 @@ public class RenameFileAction extends AnAction implements DumbAware { assert file != null; final VirtualFile virtualFile = file.getVirtualFile(); assert virtualFile != null; - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); assert project != null; PsiElementRenameHandler.invoke(file, project, file, null); } @@ -42,7 +42,7 @@ public class RenameFileAction extends AnAction implements DumbAware { public void update(AnActionEvent e) { PsiFile file = e.getData(LangDataKeys.PSI_FILE); Presentation presentation = e.getPresentation(); - boolean enabled = file instanceof PsiClassOwner && e.getPlace() != ActionPlaces.EDITOR_POPUP && e.getData(PlatformDataKeys.PROJECT) != null; + boolean enabled = file instanceof PsiClassOwner && e.getPlace() != ActionPlaces.EDITOR_POPUP && e.getData(CommonDataKeys.PROJECT) != null; presentation.setEnabled(enabled); presentation.setVisible(enabled); if (enabled) { diff --git a/java/java-impl/src/com/intellij/refactoring/actions/TypeCookAction.java b/java/java-impl/src/com/intellij/refactoring/actions/TypeCookAction.java index f05c7aafe0c2..a4cb28f40f90 100644 --- a/java/java-impl/src/com/intellij/refactoring/actions/TypeCookAction.java +++ b/java/java-impl/src/com/intellij/refactoring/actions/TypeCookAction.java @@ -18,6 +18,7 @@ package com.intellij.refactoring.actions; import com.intellij.ide.DataManager; import com.intellij.lang.Language; import com.intellij.lang.java.JavaLanguage; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; @@ -37,7 +38,7 @@ public class TypeCookAction extends BaseRefactoringAction { } public boolean isEnabledOnElements(@NotNull PsiElement[] elements) { - Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()); if (project == null) { return false; 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 94d161fad7a7..68f4b2a5bd88 100644 --- a/java/java-impl/src/com/intellij/refactoring/rename/RenameWrongRefHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/rename/RenameWrongRefHandler.java @@ -17,6 +17,7 @@ package com.intellij.refactoring.rename; import com.intellij.codeInsight.daemon.impl.quickfix.RenameWrongRefFix; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -33,7 +34,7 @@ public class RenameWrongRefHandler implements RenameHandler { public final boolean isAvailableOnDataContext(final DataContext dataContext) { final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); final PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (editor == null || file == null || project == null) return false; return isAvailable(project, editor, file); } diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/actions/ChangeTypeSignatureAction.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/actions/ChangeTypeSignatureAction.java index b7eb338fe326..e6fc424a827a 100644 --- a/java/java-impl/src/com/intellij/refactoring/typeMigration/actions/ChangeTypeSignatureAction.java +++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/actions/ChangeTypeSignatureAction.java @@ -17,6 +17,7 @@ package com.intellij.refactoring.typeMigration.actions; import com.intellij.codeInsight.TargetElementUtilBase; import com.intellij.ide.DataManager; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; @@ -34,7 +35,7 @@ public class ChangeTypeSignatureAction extends BaseRefactoringAction { } public boolean isEnabledOnElements(@NotNull PsiElement[] elements) { - Project currProject = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()); + Project currProject = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()); if (currProject == null) { return false; diff --git a/java/java-impl/src/com/intellij/testIntegration/BaseGenerateTestSupportMethodAction.java b/java/java-impl/src/com/intellij/testIntegration/BaseGenerateTestSupportMethodAction.java index 42f6e3a23d1a..41a7a200a9e0 100644 --- a/java/java-impl/src/com/intellij/testIntegration/BaseGenerateTestSupportMethodAction.java +++ b/java/java-impl/src/com/intellij/testIntegration/BaseGenerateTestSupportMethodAction.java @@ -59,7 +59,7 @@ public class BaseGenerateTestSupportMethodAction extends BaseGenerateAction { @Nullable @Override public AnAction createEditTemplateAction(DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); final PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); final PsiClass targetClass = editor == null || file == null ? null : getTargetClass(editor, file); diff --git a/java/java-impl/src/com/intellij/unscramble/UnscrambleAction.java b/java/java-impl/src/com/intellij/unscramble/UnscrambleAction.java index 32588e120ca5..25f505d0ffd4 100644 --- a/java/java-impl/src/com/intellij/unscramble/UnscrambleAction.java +++ b/java/java-impl/src/com/intellij/unscramble/UnscrambleAction.java @@ -17,6 +17,7 @@ package com.intellij.unscramble; 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.application.ApplicationActivationListener; @@ -57,13 +58,13 @@ public final class UnscrambleAction extends AnAction implements DumbAware { } public void actionPerformed(AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); new UnscrambleDialog(project).show(); } public void update(AnActionEvent event) { final Presentation presentation = event.getPresentation(); - final Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); presentation.setEnabled(project != null); } } diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/AttachExternalProjectAction.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/AttachExternalProjectAction.java index 5c2855305b16..04b1dec9c56a 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/AttachExternalProjectAction.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/AttachExternalProjectAction.java @@ -20,6 +20,7 @@ import com.intellij.ide.actions.ImportModuleAction; import com.intellij.ide.util.newProjectWizard.AddModuleWizard; 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.externalSystem.ExternalSystemManager; import com.intellij.openapi.externalSystem.model.ExternalSystemDataKeys; @@ -67,7 +68,7 @@ public class AttachExternalProjectAction extends AnAction implements DumbAware { return; } - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) { return; } diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/ExternalActionUtil.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/ExternalActionUtil.java index 772ce688a2e5..9543edf25943 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/ExternalActionUtil.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/ExternalActionUtil.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.externalSystem.action; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.externalSystem.model.ExternalSystemDataKeys; @@ -45,7 +46,7 @@ public class ExternalActionUtil { return MyInfo.EMPTY; } - Project ideProject = PlatformDataKeys.PROJECT.getData(context); + Project ideProject = CommonDataKeys.PROJECT.getData(context); if (ideProject == null) { return MyInfo.EMPTY; } 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 da32521c73bc..2eb9d5c89bad 100644 --- a/platform/lang-api/src/com/intellij/execution/actions/ConfigurationContext.java +++ b/platform/lang-api/src/com/intellij/execution/actions/ConfigurationContext.java @@ -25,6 +25,7 @@ import com.intellij.execution.configurations.ConfigurationTypeUtil; import com.intellij.execution.configurations.RunConfiguration; import com.intellij.execution.junit.RuntimeConfigurationProducer; import com.intellij.ide.DataManager; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -88,7 +89,7 @@ public class ConfigurationContext { myLocation = location; return; } - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { myLocation = null; return; diff --git a/platform/lang-api/src/com/intellij/ide/actions/CreateElementActionBase.java b/platform/lang-api/src/com/intellij/ide/actions/CreateElementActionBase.java index 0f191cd7d2bb..1f2034a0c807 100644 --- a/platform/lang-api/src/com/intellij/ide/actions/CreateElementActionBase.java +++ b/platform/lang-api/src/com/intellij/ide/actions/CreateElementActionBase.java @@ -70,7 +70,7 @@ public abstract class CreateElementActionBase extends AnAction { return; } - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final PsiDirectory dir = view.getOrChooseDirectory(); if (dir == null) return; @@ -98,7 +98,7 @@ public abstract class CreateElementActionBase extends AnAction { } protected boolean isAvailable(final DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return false; } diff --git a/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java b/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java index 0266235828c9..33f1cced24bf 100644 --- a/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java +++ b/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java @@ -18,7 +18,7 @@ package com.intellij.openapi.projectRoots.ui; import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.fileChooser.FileChooser; @@ -177,7 +177,7 @@ public class PathEditor { private VirtualFile[] doAdd() { VirtualFile baseDir = myAddBaseDir; - Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(myPanel)); + Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(myPanel)); if (baseDir == null && project != null) { baseDir = project.getBaseDir(); } diff --git a/platform/lang-impl/src/com/intellij/analysis/BaseAnalysisAction.java b/platform/lang-impl/src/com/intellij/analysis/BaseAnalysisAction.java index 48e237d3115c..aef7a6e3e9b4 100644 --- a/platform/lang-impl/src/com/intellij/analysis/BaseAnalysisAction.java +++ b/platform/lang-impl/src/com/intellij/analysis/BaseAnalysisAction.java @@ -58,7 +58,7 @@ public abstract class BaseAnalysisAction extends AnAction { public void update(AnActionEvent event) { Presentation presentation = event.getPresentation(); final DataContext dataContext = event.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final boolean dumbMode = project == null || DumbService.getInstance(project).isDumb(); presentation.setEnabled(!dumbMode && getInspectionScope(dataContext) != null); } @@ -66,7 +66,7 @@ public abstract class BaseAnalysisAction extends AnAction { @Override public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final Module module = e.getData(LangDataKeys.MODULE); if (project == null) { return; @@ -129,7 +129,7 @@ public abstract class BaseAnalysisAction extends AnAction { @Nullable private AnalysisScope getInspectionScope(@NotNull DataContext dataContext) { - if (PlatformDataKeys.PROJECT.getData(dataContext) == null) return null; + if (CommonDataKeys.PROJECT.getData(dataContext) == null) return null; AnalysisScope scope = getInspectionScopeImpl(dataContext); @@ -165,7 +165,7 @@ public abstract class BaseAnalysisAction extends AnAction { } VirtualFile[] virtualFiles = PlatformDataKeys.VIRTUAL_FILE_ARRAY.getData(dataContext); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (virtualFiles != null && project != null) { //analyze on selection ProjectFileIndex fileIndex = ProjectRootManager.getInstance(project).getFileIndex(); if (virtualFiles.length == 1) { diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeCompletionPanel.java b/platform/lang-impl/src/com/intellij/application/options/CodeCompletionPanel.java index 8bf50e5722a4..8cf79dfbd4d3 100644 --- a/platform/lang-impl/src/com/intellij/application/options/CodeCompletionPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/CodeCompletionPanel.java @@ -21,6 +21,7 @@ import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; import com.intellij.ide.DataManager; import com.intellij.ide.ui.UISettings; import com.intellij.openapi.actionSystem.ActionManager; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.IdeActions; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationBundle; @@ -165,7 +166,7 @@ public class CodeCompletionPanel { UISettings.getInstance().SORT_LOOKUP_ELEMENTS_LEXICOGRAPHICALLY = myCbSorting.isSelected(); - final Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(myPanel)); + final Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(myPanel)); if (project != null){ DaemonCodeAnalyzer.getInstance(project).settingsChanged(); } diff --git a/platform/lang-impl/src/com/intellij/application/options/InitialConfigurationDialog.java b/platform/lang-impl/src/com/intellij/application/options/InitialConfigurationDialog.java index e8f3d9273113..9baeea3f8080 100644 --- a/platform/lang-impl/src/com/intellij/application/options/InitialConfigurationDialog.java +++ b/platform/lang-impl/src/com/intellij/application/options/InitialConfigurationDialog.java @@ -29,7 +29,7 @@ import com.intellij.ide.ui.LafManager; import com.intellij.ide.ui.laf.LafManagerImpl; import com.intellij.ide.ui.laf.darcula.DarculaLookAndFeelInfo; import com.intellij.openapi.Disposable; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ApplicationNamesInfo; import com.intellij.openapi.application.PathManager; @@ -400,7 +400,7 @@ public class InitialConfigurationDialog extends DialogWrapper { @Override protected void doOKAction() { - final Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(myMainPanel)); + final Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(myMainPanel)); super.doOKAction(); 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 062ddec25790..545f692c5005 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 @@ -17,6 +17,7 @@ package com.intellij.application.options.codeStyle.arrangement.action; 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.command.CommandProcessor; @@ -51,7 +52,7 @@ public class RearrangeCodeAction extends AnAction { @Override public void actionPerformed(AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) { return; } diff --git a/platform/lang-impl/src/com/intellij/application/options/colors/ScopeColorsPageFactory.java b/platform/lang-impl/src/com/intellij/application/options/colors/ScopeColorsPageFactory.java index 7b7e8870b968..2a751603afa3 100644 --- a/platform/lang-impl/src/com/intellij/application/options/colors/ScopeColorsPageFactory.java +++ b/platform/lang-impl/src/com/intellij/application/options/colors/ScopeColorsPageFactory.java @@ -19,6 +19,7 @@ package com.intellij.application.options.colors; import com.intellij.ide.DataManager; import com.intellij.ide.util.scopeChooser.EditScopesDialog; import com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationBundle; import com.intellij.openapi.options.Configurable; @@ -56,7 +57,7 @@ class ScopeColorsPageFactory implements ColorAndFontPanelFactory { if (projects.length == 0) return panel; GridBagConstraints gc = new GridBagConstraints(0, 0, 1, 1, 0, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0); - final Project contextProject = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()); + final Project contextProject = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()); final Project project = contextProject != null ? contextProject : projects[0]; JButton button = new JButton(ApplicationBundle.message("button.edit.scopes")); diff --git a/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLAction.java b/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLAction.java index 9020d2e7b762..aad512e8bc4d 100644 --- a/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLAction.java +++ b/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLAction.java @@ -31,7 +31,7 @@ public class ExportToHTMLAction extends AnAction { @Override public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == 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 dca9b33f43e3..23461a1fa672 100644 --- a/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLManager.java +++ b/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLManager.java @@ -18,6 +18,7 @@ package com.intellij.codeEditor.printing; import com.intellij.CommonBundle; import com.intellij.ide.BrowserUtil; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -57,7 +58,7 @@ class ExportToHTMLManager { psiDirectory = (PsiDirectory)psiElement; } final PsiFile psiFile = LangDataKeys.PSI_FILE.getData(dataContext); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); String shortFileName = null; String directoryName = null; if(psiFile != null || psiDirectory != null) { diff --git a/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintAction.java b/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintAction.java index a0274047bc23..0d64d1b61ebb 100644 --- a/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintAction.java +++ b/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintAction.java @@ -32,7 +32,7 @@ public class PrintAction extends AnAction implements DumbAware { @Override public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return; } 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 4048ad8094a7..d09dd750597d 100644 --- a/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintManager.java +++ b/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintManager.java @@ -20,6 +20,7 @@ import com.intellij.ide.highlighter.HighlighterFactory; import com.intellij.notification.Notification; import com.intellij.notification.NotificationType; import com.intellij.notification.Notifications; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -49,7 +50,7 @@ class PrintManager { private static final Logger LOG = Logger.getInstance("#com.intellij.codeEditor.printing.PrintManager"); public static void executePrint(DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return; PsiDirectory[] psiDirectory = new PsiDirectory[1]; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/BaseCodeInsightAction.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/BaseCodeInsightAction.java index f5caf628836d..4dc3c699027e 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/actions/BaseCodeInsightAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/BaseCodeInsightAction.java @@ -19,6 +19,7 @@ package com.intellij.codeInsight.actions; import com.intellij.codeInsight.lookup.Lookup; import com.intellij.codeInsight.lookup.LookupManager; 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; @@ -75,7 +76,7 @@ public abstract class BaseCodeInsightAction extends CodeInsightAction { public void update(AnActionEvent event) { Presentation presentation = event.getPresentation(); DataContext dataContext = event.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null){ presentation.setEnabled(false); return; 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 408d45ab8b8c..803d97525280 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/actions/OptimizeImportsAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/OptimizeImportsAction.java @@ -38,7 +38,7 @@ public class OptimizeImportsAction extends AnAction { } public static void actionPerformedImpl(final DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return; } @@ -138,7 +138,7 @@ public class OptimizeImportsAction extends AnAction { Presentation presentation = event.getPresentation(); DataContext dataContext = event.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null){ presentation.setEnabled(false); return; 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 64d77f6b4462..7c1a6cb78f56 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java @@ -58,7 +58,7 @@ public class ReformatCodeAction extends AnAction implements DumbAware { @Override public void actionPerformed(AnActionEvent event) { DataContext dataContext = event.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return; } @@ -249,7 +249,7 @@ public class ReformatCodeAction extends AnAction implements DumbAware { public void update(AnActionEvent event){ Presentation presentation = event.getPresentation(); DataContext dataContext = event.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null){ presentation.setEnabled(false); return; 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 037440cc00d1..7e985a7d0244 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 @@ -29,7 +29,7 @@ public class CodeCompletionGroup extends DefaultActionGroup implements DumbAware public void update(AnActionEvent event){ Presentation presentation = event.getPresentation(); DataContext dataContext = event.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null){ presentation.setEnabled(false); 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 0371eb11b8c4..f052a6d50588 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DockablePopupManager.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DockablePopupManager.java @@ -195,7 +195,7 @@ public abstract class DockablePopupManager { return; } - if (PlatformDataKeys.PROJECT.getData(dataContext) != myProject) { + if (CommonDataKeys.PROJECT.getData(dataContext) != myProject) { return; } 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 a98bb7ce7492..44e1b61516b4 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 @@ -69,7 +69,7 @@ public class ShowQuickDocInfoAction extends BaseCodeInsightAction implements Hin Presentation presentation = event.getPresentation(); DataContext dataContext = event.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { presentation.setEnabled(false); return; @@ -119,7 +119,7 @@ public class ShowQuickDocInfoAction extends BaseCodeInsightAction implements Hin @Override public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); final PsiElement element = LangDataKeys.PSI_ELEMENT.getData(dataContext); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/BackspaceHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/BackspaceHandler.java index 52f06a6b79a4..c4379e2f223b 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/BackspaceHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/BackspaceHandler.java @@ -20,6 +20,7 @@ import com.intellij.codeInsight.highlighting.BraceMatcher; import com.intellij.codeInsight.highlighting.BraceMatchingUtil; import com.intellij.injected.editor.EditorWindow; 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.Editor; @@ -55,7 +56,7 @@ public class BackspaceHandler extends EditorWriteActionHandler { } protected boolean handleBackspace(Editor editor, DataContext dataContext, boolean toWordStart) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return false; PsiFile file = PsiUtilBase.getPsiFileInEditor(editor, project); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CodeBlockEndAction.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CodeBlockEndAction.java index 84273df1423a..8ebd653bcb14 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CodeBlockEndAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CodeBlockEndAction.java @@ -24,6 +24,7 @@ */ package com.intellij.codeInsight.editorActions; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; @@ -40,7 +41,7 @@ public class CodeBlockEndAction extends EditorAction { private static class Handler extends EditorActionHandler { @Override public void execute(Editor editor, DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project != null) { CodeBlockUtil.moveCaretToCodeBlockEnd(project, editor, false); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CodeBlockStartAction.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CodeBlockStartAction.java index ad4f6e4d5b73..3ab23ae1b4c9 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CodeBlockStartAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CodeBlockStartAction.java @@ -24,6 +24,7 @@ */ package com.intellij.codeInsight.editorActions; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; @@ -40,7 +41,7 @@ public class CodeBlockStartAction extends EditorAction { private static class Handler extends EditorActionHandler { @Override public void execute(Editor editor, DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project != null) { CodeBlockUtil.moveCaretToCodeBlockStart(project, editor, false); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CodeBlockStartWithSelectionAction.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CodeBlockStartWithSelectionAction.java index 1fbd5b05fd1b..352297b17dfa 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CodeBlockStartWithSelectionAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CodeBlockStartWithSelectionAction.java @@ -24,6 +24,7 @@ */ package com.intellij.codeInsight.editorActions; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; @@ -40,7 +41,7 @@ public class CodeBlockStartWithSelectionAction extends EditorAction { private static class Handler extends EditorActionHandler { @Override public void execute(Editor editor, DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project != null) { CodeBlockUtil.moveCaretToCodeBlockStart(project, editor, true); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CopyHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CopyHandler.java index e64076bd1fa5..2e70f9eee2c1 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CopyHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CopyHandler.java @@ -18,6 +18,7 @@ package com.intellij.codeInsight.editorActions; import com.intellij.codeInsight.CodeInsightSettings; import com.intellij.ide.DataManager; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; @@ -46,7 +47,7 @@ public class CopyHandler extends EditorActionHandler { @Override public void execute(final Editor editor, final DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(editor.getComponent())); + final Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(editor.getComponent())); if (project == null){ if (myOriginalAction != null){ myOriginalAction.execute(editor, dataContext); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CutHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CutHandler.java index f069cd2b125b..426d95d1fe3e 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CutHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CutHandler.java @@ -17,6 +17,7 @@ package com.intellij.codeInsight.editorActions; import com.intellij.ide.DataManager; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.IdeActions; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -41,7 +42,7 @@ public class CutHandler extends EditorWriteActionHandler { @Override public void executeWriteAction(Editor editor, DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(editor.getContentComponent())); + Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(editor.getContentComponent())); if (project == null) { if (myOriginalHandler != null) { myOriginalHandler.execute(editor, dataContext); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EndHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EndHandler.java index 8c2e5db4c7d6..7315311e653c 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EndHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EndHandler.java @@ -18,6 +18,7 @@ package com.intellij.codeInsight.editorActions; import com.intellij.codeInsight.CodeInsightSettings; import com.intellij.ide.DataManager; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; @@ -49,7 +50,7 @@ public class EndHandler extends EditorActionHandler { return; } - final Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(editor.getComponent())); + final Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(editor.getComponent())); if (project == null) { if (myOriginalHandler != null) { myOriginalHandler.execute(editor, dataContext); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EnterHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EnterHandler.java index 96dd9fa25643..9fc8492d176c 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EnterHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EnterHandler.java @@ -25,6 +25,7 @@ import com.intellij.lang.documentation.CodeDocumentationProvider; import com.intellij.lang.documentation.CompositeDocumentationProvider; import com.intellij.lang.documentation.DocumentationProvider; import com.intellij.lexer.Lexer; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.command.CommandProcessor; @@ -66,7 +67,7 @@ public class EnterHandler extends BaseEnterHandler { @Override public void executeWriteAction(final Editor editor, final DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project != null && !project.isDefault()) { PostprocessReformattingAspect.getInstance(project).disablePostprocessFormattingInside(new Runnable() { @Override diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/FixDocCommentAction.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/FixDocCommentAction.java index cb3de1cb6270..0c1e1ccd9659 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/FixDocCommentAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/FixDocCommentAction.java @@ -59,7 +59,7 @@ public class FixDocCommentAction extends EditorAction { private static final class MyHandler extends EditorActionHandler { @Override public void execute(Editor editor, DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return; } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/JoinLinesHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/JoinLinesHandler.java index 6f5b682096f6..1d8330713483 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/JoinLinesHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/JoinLinesHandler.java @@ -26,6 +26,7 @@ package com.intellij.codeInsight.editorActions; import com.intellij.ide.DataManager; import com.intellij.lang.ASTNode; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.diagnostic.Logger; @@ -73,7 +74,7 @@ public class JoinLinesHandler extends EditorWriteActionHandler { return; } final DocumentEx doc = (DocumentEx)editor.getDocument(); - final Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(editor.getContentComponent())); + final Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(editor.getContentComponent())); if (project == null) { return; } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/MatchBraceAction.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/MatchBraceAction.java index 3dfd663c8082..11b70bb88790 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/MatchBraceAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/MatchBraceAction.java @@ -1,5 +1,6 @@ package com.intellij.codeInsight.editorActions; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.CaretModel; @@ -25,7 +26,7 @@ public class MatchBraceAction extends EditorAction { private static class MyHandler extends EditorActionHandler { @Override public void execute(Editor editor, DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return; } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/PasteHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/PasteHandler.java index 816f685cec7f..65655c4a468f 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/PasteHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/PasteHandler.java @@ -20,6 +20,7 @@ import com.intellij.codeInsight.CodeInsightSettings; import com.intellij.codeInsight.CodeInsightUtilBase; import com.intellij.ide.PasteProvider; import com.intellij.lang.LanguageFormatting; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; @@ -71,7 +72,7 @@ public class PasteHandler extends EditorActionHandler implements EditorTextInser if (!CodeInsightUtilBase.prepareEditorForWrite(editor)) return; final Document document = editor.getDocument(); - if (!FileDocumentManager.getInstance().requestWriting(document, PlatformDataKeys.PROJECT.getData(dataContext))) { + if (!FileDocumentManager.getInstance().requestWriting(document, CommonDataKeys.PROJECT.getData(dataContext))) { return; } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/SelectWordHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/SelectWordHandler.java index a49c4c17a1ef..338dbed9ab36 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/SelectWordHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/SelectWordHandler.java @@ -21,6 +21,7 @@ import com.intellij.ide.DataManager; import com.intellij.injected.editor.EditorWindow; import com.intellij.lang.CompositeLanguage; import com.intellij.lang.Language; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.diagnostic.Logger; @@ -57,7 +58,7 @@ public class SelectWordHandler extends EditorActionHandler { // selection about to spread beyond injected fragment editor = ((EditorWindow)editor).getDelegate(); } - Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(editor.getComponent())); + Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(editor.getComponent())); if (project == null) { if (myOriginalHandler != null) { myOriginalHandler.execute(editor, dataContext); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/TypedHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/TypedHandler.java index 80aec6760b25..4177ee792e7d 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/TypedHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/TypedHandler.java @@ -29,6 +29,7 @@ import com.intellij.lang.ASTNode; import com.intellij.lang.Language; import com.intellij.lang.LanguageParserDefinitions; import com.intellij.lang.ParserDefinition; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; @@ -135,7 +136,7 @@ public class TypedHandler extends TypedActionHandlerBase { @Override public void execute(@NotNull Editor editor, char charTyped, @NotNull DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null || editor.isColumnMode()){ if (myOriginalHandler != null){ myOriginalHandler.execute(editor, charTyped, dataContext); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/UnSelectWordHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/UnSelectWordHandler.java index 967a672b7452..ab63582f8835 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/UnSelectWordHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/UnSelectWordHandler.java @@ -17,6 +17,7 @@ package com.intellij.codeInsight.editorActions; import com.intellij.ide.DataManager; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Document; @@ -37,7 +38,7 @@ public class UnSelectWordHandler extends EditorActionHandler { @Override public void execute(Editor editor, DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(editor.getComponent())); + Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(editor.getComponent())); Document document = editor.getDocument(); final PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(document); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/BaseIndentEnterHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/BaseIndentEnterHandler.java index 77b7e65a0033..facdaf812a4b 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/BaseIndentEnterHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/BaseIndentEnterHandler.java @@ -17,6 +17,7 @@ package com.intellij.codeInsight.editorActions.enter; import com.intellij.lang.Language; import com.intellij.lang.LanguageFormatting; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Document; @@ -78,7 +79,7 @@ public class BaseIndentEnterHandler extends EnterHandlerDelegateAdapter { @NotNull final DataContext dataContext, final EditorActionHandler originalHandler) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return Result.Continue; } 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 c44d99c96d82..0c6c31875c17 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 @@ -20,6 +20,7 @@ import com.intellij.codeInsight.actions.BaseCodeInsightAction; import com.intellij.codeInsight.editorActions.enter.EnterAfterUnmatchedBraceHandler; import com.intellij.codeInsight.lookup.LookupManager; import com.intellij.lang.Language; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.IdeActions; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -47,7 +48,7 @@ public class SmartEnterAction extends EditorAction { final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); if (editor == null) return null; Project project = editor.getProject(); - if (project == null) project = PlatformDataKeys.PROJECT.getData(dataContext); + if (project == null) project = CommonDataKeys.PROJECT.getData(dataContext); return project == null ? null : BaseCodeInsightAction.getInjectedEditor(project, editor); } @@ -59,7 +60,7 @@ public class SmartEnterAction extends EditorAction { @Override public void executeWriteAction(Editor editor, DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null || editor.isOneLineMode()) { plainEnter(editor, dataContext); return; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/actions/ExpandRegionAction.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/actions/ExpandRegionAction.java index 1c5f32f10424..e2dbf16cac92 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/actions/ExpandRegionAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/actions/ExpandRegionAction.java @@ -18,6 +18,7 @@ package com.intellij.codeInsight.folding.impl.actions; import com.intellij.codeInsight.folding.CodeFoldingManager; import com.intellij.codeInsight.folding.impl.FoldingUtil; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; @@ -37,7 +38,7 @@ public class ExpandRegionAction extends EditorAction { @Override public boolean isEnabled(Editor editor, DataContext dataContext) { - return super.isEnabled(editor, dataContext) && PlatformDataKeys.PROJECT.getData(dataContext) != null; + return super.isEnabled(editor, dataContext) && CommonDataKeys.PROJECT.getData(dataContext) != null; } }); 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 d909be614997..5f224dfcddde 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 @@ -47,7 +47,7 @@ public class GenerateAction extends DumbAwareAction implements PreloadableAction public void update(AnActionEvent event){ Presentation presentation = event.getPresentation(); DataContext dataContext = event.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { presentation.setEnabled(false); return; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/generation/surroundWith/SurroundWithHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/generation/surroundWith/SurroundWithHandler.java index 9c734b3e201d..f4bca9e90dc5 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/generation/surroundWith/SurroundWithHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/generation/surroundWith/SurroundWithHandler.java @@ -299,7 +299,7 @@ public class SurroundWithHandler implements CodeInsightActionHandler { @Override public void actionPerformed(AnActionEvent e) { - ShowSettingsUtil.getInstance().showSettingsDialog(e.getData(PlatformDataKeys.PROJECT), "Live Templates"); + ShowSettingsUtil.getInstance().showSettingsDialog(e.getData(CommonDataKeys.PROJECT), "Live Templates"); } } } 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 a659a3a47665..5a74bec92ae0 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 @@ -36,14 +36,14 @@ public class HighlightUsagesAction extends AnAction implements DumbAware { public void update(final AnActionEvent event) { final Presentation presentation = event.getPresentation(); final DataContext dataContext = event.getDataContext(); - presentation.setEnabled(PlatformDataKeys.PROJECT.getData(dataContext) != null && + presentation.setEnabled(CommonDataKeys.PROJECT.getData(dataContext) != null && PlatformDataKeys.EDITOR.getData(dataContext) != null); } @Override public void actionPerformed(AnActionEvent e) { final Editor editor = PlatformDataKeys.EDITOR.getData(e.getDataContext()); - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (editor == null || project == null) return; String commandName = getTemplatePresentation().getText(); if (commandName == null) commandName = ""; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/PrevNextParameterHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/PrevNextParameterHandler.java index 8d9139029adf..fe50ae79de7e 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/hint/PrevNextParameterHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/PrevNextParameterHandler.java @@ -16,6 +16,7 @@ package com.intellij.codeInsight.hint; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; @@ -44,7 +45,7 @@ public class PrevNextParameterHandler extends EditorActionHandler { @Override public boolean isEnabled(Editor editor, DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return false; PsiDocumentManager.getInstance(project).commitAllDocuments(); @@ -54,7 +55,7 @@ public class PrevNextParameterHandler extends EditorActionHandler { @Override public void execute(Editor editor, DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); PsiElement exprList = getExpressionList(editor, project); int listOffset = exprList.getTextRange().getStartOffset(); if (myIsNextParameterHandler) { 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 1633ecca7943..3f9a6204c052 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 @@ -96,7 +96,7 @@ public class ShowImplementationsAction extends AnAction implements PopupAction { } public void performForContext(DataContext dataContext, boolean invokedByShortcut) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); if (project == null) return; @@ -359,7 +359,7 @@ public class ShowImplementationsAction extends AnAction implements PopupAction { @Override public void update(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); e.getPresentation().setEnabled(project != null); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/ShowQuickDocAtPinnedWindowFromTooltipAction.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/ShowQuickDocAtPinnedWindowFromTooltipAction.java index 426b716a1e4b..bde34a1c9555 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/ShowQuickDocAtPinnedWindowFromTooltipAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/ShowQuickDocAtPinnedWindowFromTooltipAction.java @@ -18,6 +18,7 @@ package com.intellij.codeInsight.navigation; import com.intellij.codeInsight.documentation.DocumentationManager; import com.intellij.icons.AllIcons; import com.intellij.idea.ActionsBundle; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; @@ -40,7 +41,7 @@ public class ShowQuickDocAtPinnedWindowFromTooltipAction extends AbstractDocumen @Override protected void doActionPerformed(@NotNull DataContext context, @NotNull PsiElement docAnchor, @NotNull PsiElement originalElement) { - Project project = PlatformDataKeys.PROJECT.getData(context); + Project project = CommonDataKeys.PROJECT.getData(context); if (project == null) { return; } 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 5b6403dff115..94f5abacd551 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 @@ -30,7 +30,7 @@ public class IncrementalSearchAction extends AnAction implements DumbAware { @Override public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); if (editor == null) return; @@ -41,7 +41,7 @@ public class IncrementalSearchAction extends AnAction implements DumbAware { public void update(AnActionEvent event){ Presentation presentation = event.getPresentation(); DataContext dataContext = event.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { presentation.setEnabled(false); return; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/EnterHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/EnterHandler.java index de65922b54f9..adf9c857ff53 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/EnterHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/EnterHandler.java @@ -19,6 +19,7 @@ import com.intellij.codeInsight.editorActions.BaseEnterHandler; import com.intellij.codeInsight.template.TemplateManager; import com.intellij.codeInsight.template.impl.TemplateManagerImpl; import com.intellij.codeInsight.template.impl.TemplateSettings; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; @@ -39,7 +40,7 @@ public class EnterHandler extends BaseEnterHandler { @Override public void executeWriteAction(Editor editor, DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project != null) { TemplateManagerImpl templateManager = (TemplateManagerImpl)TemplateManager.getInstance(project); if (templateManager != null && templateManager.startTemplate(editor, TemplateSettings.ENTER_CHAR)) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/SpaceHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/SpaceHandler.java index d038b2f7cf44..3a03428e38ec 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/SpaceHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/SpaceHandler.java @@ -18,6 +18,7 @@ package com.intellij.codeInsight.template.impl.editorActions; import com.intellij.codeInsight.template.TemplateManager; import com.intellij.codeInsight.template.impl.TemplateManagerImpl; import com.intellij.codeInsight.template.impl.TemplateSettings; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; @@ -33,7 +34,7 @@ public class SpaceHandler extends TypedActionHandlerBase { @Override public void execute(@NotNull Editor editor, char charTyped, @NotNull DataContext dataContext) { if (charTyped == ' ') { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project != null) { TemplateManagerImpl templateManager = (TemplateManagerImpl)TemplateManager.getInstance(project); if (templateManager != null && templateManager.startTemplate(editor, TemplateSettings.SPACE_CHAR)) { diff --git a/platform/lang-impl/src/com/intellij/codeInspection/LossyEncodingInspection.java b/platform/lang-impl/src/com/intellij/codeInspection/LossyEncodingInspection.java index 229c6da16413..65b78997707e 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/LossyEncodingInspection.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/LossyEncodingInspection.java @@ -26,6 +26,7 @@ import com.intellij.codeStyle.CodeStyleFacade; import com.intellij.ide.DataManager; import com.intellij.lang.injection.InjectedLanguageManager; import com.intellij.lang.properties.charset.Native2AsciiCharset; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.actionSystem.impl.SimpleDataContext; @@ -257,7 +258,7 @@ public class LossyEncodingInspection extends LocalInspectionTool { public static DataContext createDataContext(Editor editor, Component component, VirtualFile selectedFile, Project project) { DataContext parent = DataManager.getInstance().getDataContext(component); DataContext context = SimpleDataContext.getSimpleContext(PlatformDataKeys.CONTEXT_COMPONENT.getName(), editor == null ? null : editor.getComponent(), parent); - DataContext projectContext = SimpleDataContext.getSimpleContext(PlatformDataKeys.PROJECT.getName(), project, context); + DataContext projectContext = SimpleDataContext.getSimpleContext(CommonDataKeys.PROJECT.getName(), project, context); return SimpleDataContext.getSimpleContext(PlatformDataKeys.VIRTUAL_FILE.getName(), selectedFile, projectContext); } } diff --git a/platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionOnEditorAction.java b/platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionOnEditorAction.java index 4649c0b475a9..b04077fd6eb9 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionOnEditorAction.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionOnEditorAction.java @@ -32,7 +32,7 @@ public class CodeInspectionOnEditorAction extends AnAction { @Override public void actionPerformed(AnActionEvent e) { final DataContext dataContext = e.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null){ return; } @@ -57,7 +57,7 @@ public class CodeInspectionOnEditorAction extends AnAction { @Override public void update(AnActionEvent e) { final DataContext dataContext = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final PsiFile psiFile = LangDataKeys.PSI_FILE.getData(dataContext); e.getPresentation().setEnabled(project != null && psiFile != null && DaemonCodeAnalyzer.getInstance(project).isHighlightingAvailable(psiFile)); } diff --git a/platform/lang-impl/src/com/intellij/codeInspection/actions/RunInspectionAction.java b/platform/lang-impl/src/com/intellij/codeInspection/actions/RunInspectionAction.java index 8f65af5cd7da..65e60e358f40 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/actions/RunInspectionAction.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/actions/RunInspectionAction.java @@ -29,6 +29,7 @@ import com.intellij.ide.actions.GotoActionBase; import com.intellij.ide.util.gotoByName.ChooseByNameFilter; import com.intellij.ide.util.gotoByName.ChooseByNamePopup; 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; @@ -55,7 +56,7 @@ public class RunInspectionAction extends GotoActionBase { @Override protected void gotoActionPerformed(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) return; PsiDocumentManager.getInstance(project).commitAllDocuments(); diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/SeverityEditorDialog.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/SeverityEditorDialog.java index f87f56aaba8b..ec2974082ac7 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/SeverityEditorDialog.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/SeverityEditorDialog.java @@ -27,6 +27,7 @@ import com.intellij.codeInspection.InspectionsBundle; import com.intellij.ide.DataManager; import com.intellij.lang.annotation.HighlightSeverity; 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.diagnostic.Logger; @@ -131,8 +132,7 @@ public class SeverityEditorDialog extends DialogWrapper { if (name == null) return; final TextAttributes textAttributes = CodeInsightColors.WARNINGS_ATTRIBUTES.getDefaultAttributes(); HighlightInfoType.HighlightInfoTypeImpl info = new HighlightInfoType.HighlightInfoTypeImpl(new HighlightSeverity(name, 50), - com.intellij.openapi.editor.colors - .TextAttributesKey + TextAttributesKey .createTextAttributesKey(name)); SeverityBasedTextAttributes newSeverityBasedTextAttributes = new SeverityBasedTextAttributes(textAttributes.clone(), info); @@ -252,7 +252,7 @@ public class SeverityEditorDialog extends DialogWrapper { try { final SearchableConfigurable javaPage = colorAndFontOptions.findSubConfigurable(InspectionColorSettingsPage.class); LOG.assertTrue(javaPage != null); - ShowSettingsUtil.getInstance().editConfigurable(PlatformDataKeys.PROJECT.getData(dataContext), javaPage); + ShowSettingsUtil.getInstance().editConfigurable(CommonDataKeys.PROJECT.getData(dataContext), javaPage); } finally { for (Configurable configurable : configurables) { diff --git a/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java b/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java index c9e29e1fc4da..bd9f5014fabb 100644 --- a/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java @@ -206,7 +206,7 @@ public class ExecutorRegistryImpl extends ExecutorRegistry { @Override public void update(final AnActionEvent e) { final Presentation presentation = e.getPresentation(); - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null || !project.isInitialized() || project.isDisposed() || DumbService.getInstance(project).isDumb()) { presentation.setEnabled(false); diff --git a/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopupAction.java b/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopupAction.java index 94f78ff48301..8f273dd28432 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopupAction.java +++ b/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopupAction.java @@ -21,6 +21,7 @@ import com.intellij.execution.ExecutorRegistry; import com.intellij.execution.executors.DefaultRunExecutor; 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.project.Project; @@ -29,7 +30,7 @@ import com.intellij.openapi.wm.ToolWindowId; public class ChooseRunConfigurationPopupAction extends AnAction { @Override public void actionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); assert project != null; new ChooseRunConfigurationPopup(project, @@ -53,7 +54,7 @@ public class ChooseRunConfigurationPopupAction extends AnAction { @Override public void update(AnActionEvent e) { final Presentation presentation = e.getPresentation(); - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); presentation.setEnabled(true); if (project == null || project.isDisposed()) { diff --git a/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java b/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java index 67d743db3ec9..c323e8e6281f 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java +++ b/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java @@ -64,7 +64,7 @@ public class RunConfigurationsComboBoxAction extends ComboBoxAction implements D @Override public void update(final AnActionEvent e) { final Presentation presentation = e.getPresentation(); - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (ActionPlaces.MAIN_MENU.equals(e.getPlace())) { presentation.setDescription(ExecutionBundle.message("choose.run.configuration.action.description")); presentation.setEnabled(findFrame(e.getData(PlatformDataKeys.CONTEXT_COMPONENT)) != null); @@ -165,7 +165,7 @@ public class RunConfigurationsComboBoxAction extends ComboBoxAction implements D @NotNull protected DefaultActionGroup createPopupActionGroup(final JComponent button) { final DefaultActionGroup allActionsGroup = new DefaultActionGroup(); - final Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(button)); + final Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(button)); if (project != null) { final RunManagerEx runManager = RunManagerEx.getInstanceEx(project); @@ -232,7 +232,7 @@ public class RunConfigurationsComboBoxAction extends ComboBoxAction implements D @Override public void actionPerformed(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project != null) { RunnerAndConfigurationSettings settings = chooseTempSettings(project); if (settings != null) { @@ -245,7 +245,7 @@ public class RunConfigurationsComboBoxAction extends ComboBoxAction implements D @Override public void update(final AnActionEvent e) { final Presentation presentation = e.getPresentation(); - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) { disable(presentation); return; diff --git a/platform/lang-impl/src/com/intellij/execution/actions/StopAction.java b/platform/lang-impl/src/com/intellij/execution/actions/StopAction.java index 25a9fa157916..6bc3cb7824af 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/StopAction.java +++ b/platform/lang-impl/src/com/intellij/execution/actions/StopAction.java @@ -229,7 +229,7 @@ public class StopAction extends DumbAwareAction implements AnAction.TransparentU } else { // main menu toolbar - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final RunContentDescriptor selectedContent = project == null ? null : ExecutionManager.getInstance(project).getContentManager().getSelectedContent(); processHandler = selectedContent == null ? null : selectedContent.getProcessHandler(); @@ -239,7 +239,7 @@ public class StopAction extends DumbAwareAction implements AnAction.TransparentU @NotNull private static List getActiveDescriptors(final DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return Collections.emptyList(); } diff --git a/platform/lang-impl/src/com/intellij/execution/runners/RerunTestsAction.java b/platform/lang-impl/src/com/intellij/execution/runners/RerunTestsAction.java index 901a500f8825..c4e8fd0a3e0d 100644 --- a/platform/lang-impl/src/com/intellij/execution/runners/RerunTestsAction.java +++ b/platform/lang-impl/src/com/intellij/execution/runners/RerunTestsAction.java @@ -45,7 +45,7 @@ public class RerunTestsAction extends DumbAwareAction implements AnAction.Transp @Override public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return; } diff --git a/platform/lang-impl/src/com/intellij/find/actions/FindInPathAction.java b/platform/lang-impl/src/com/intellij/find/actions/FindInPathAction.java index f31bbd2829f0..06148e9171f1 100644 --- a/platform/lang-impl/src/com/intellij/find/actions/FindInPathAction.java +++ b/platform/lang-impl/src/com/intellij/find/actions/FindInPathAction.java @@ -34,7 +34,7 @@ public class FindInPathAction extends AnAction implements DumbAware { @Override public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); FindInProjectManager findManager = FindInProjectManager.getInstance(project); if (!findManager.isEnabled()) { @@ -57,7 +57,7 @@ public class FindInPathAction extends AnAction implements DumbAware { static void doUpdate(AnActionEvent e) { Presentation presentation = e.getPresentation(); - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); presentation.setEnabled(project != null); if (ActionPlaces.isPopupPlace(e.getPlace())) { presentation.setVisible(isValidSearchScope(e)); 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 ed2b7676cce0..4b26d8ea5efd 100644 --- a/platform/lang-impl/src/com/intellij/find/actions/FindUsagesInFileAction.java +++ b/platform/lang-impl/src/com/intellij/find/actions/FindUsagesInFileAction.java @@ -42,7 +42,7 @@ public class FindUsagesInFileAction extends AnAction { @Override public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return; PsiDocumentManager.getInstance(project).commitAllDocuments(); Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); @@ -73,7 +73,7 @@ public class FindUsagesInFileAction extends AnAction { } private static boolean isEnabled(DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return false; } diff --git a/platform/lang-impl/src/com/intellij/find/actions/ReplaceInPathAction.java b/platform/lang-impl/src/com/intellij/find/actions/ReplaceInPathAction.java index a5b34b6aeb13..ae7a0233c86f 100644 --- a/platform/lang-impl/src/com/intellij/find/actions/ReplaceInPathAction.java +++ b/platform/lang-impl/src/com/intellij/find/actions/ReplaceInPathAction.java @@ -25,7 +25,7 @@ public class ReplaceInPathAction extends AnAction { @Override public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); ReplaceInProjectManager replaceManager = ReplaceInProjectManager.getInstance(project); if (!replaceManager.isEnabled()) { 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 1572fd30bb54..3bcf30337fc5 100644 --- a/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java +++ b/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java @@ -143,7 +143,7 @@ public class ShowUsagesAction extends AnAction implements PopupAction { @Override public void actionPerformed(@NotNull AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) return; Runnable searchEverywhere = mySearchEverywhereRunnable; diff --git a/platform/lang-impl/src/com/intellij/find/impl/ShowRecentFindUsagesAction.java b/platform/lang-impl/src/com/intellij/find/impl/ShowRecentFindUsagesAction.java index 1b9e66e50d2f..77835ad8fb1e 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/ShowRecentFindUsagesAction.java +++ b/platform/lang-impl/src/com/intellij/find/impl/ShowRecentFindUsagesAction.java @@ -22,6 +22,7 @@ import com.intellij.find.findUsages.FindUsagesManager; import com.intellij.lang.findUsages.DescriptiveNameUtil; 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.project.Project; import com.intellij.openapi.ui.popup.JBPopupFactory; @@ -50,14 +51,14 @@ public class ShowRecentFindUsagesAction extends AnAction { @Override public void update(final AnActionEvent e) { UsageView usageView = e.getData(UsageView.USAGE_VIEW_KEY); - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); e.getPresentation().setEnabled(usageView != null && project != null); } @Override public void actionPerformed(AnActionEvent e) { UsageView usageView = e.getData(UsageView.USAGE_VIEW_KEY); - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); final FindUsagesManager findUsagesManager = ((FindManagerImpl)FindManager.getInstance(project)).getFindUsagesManager(); List history = new ArrayList(findUsagesManager.getFindUsageHistory()); diff --git a/platform/lang-impl/src/com/intellij/find/impl/ShowRecentFindUsagesGroup.java b/platform/lang-impl/src/com/intellij/find/impl/ShowRecentFindUsagesGroup.java index 09715d21fae4..d9752a78a784 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/ShowRecentFindUsagesGroup.java +++ b/platform/lang-impl/src/com/intellij/find/impl/ShowRecentFindUsagesGroup.java @@ -40,7 +40,7 @@ import java.util.List; public class ShowRecentFindUsagesGroup extends ActionGroup { @Override public void update(final AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); e.getPresentation().setEnabled(project != null); e.getPresentation().setVisible(project != null); } @@ -49,7 +49,7 @@ public class ShowRecentFindUsagesGroup extends ActionGroup { @NotNull public AnAction[] getChildren(@Nullable final AnActionEvent e) { if (e == null) return EMPTY_ARRAY; - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) return EMPTY_ARRAY; final FindUsagesManager findUsagesManager = ((FindManagerImpl)FindManager.getInstance(project)).getFindUsagesManager(); List history = new ArrayList(findUsagesManager.getFindUsageHistory()); diff --git a/platform/lang-impl/src/com/intellij/ide/CopyPasteDelegator.java b/platform/lang-impl/src/com/intellij/ide/CopyPasteDelegator.java index 500535ddb819..6c151d2fcc7e 100644 --- a/platform/lang-impl/src/com/intellij/ide/CopyPasteDelegator.java +++ b/platform/lang-impl/src/com/intellij/ide/CopyPasteDelegator.java @@ -16,6 +16,7 @@ package com.intellij.ide; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -206,7 +207,7 @@ public abstract class CopyPasteDelegator implements CopyPasteSupport { } private boolean isDefaultPasteEnabled(final DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return false; } diff --git a/platform/lang-impl/src/com/intellij/ide/FileListPasteProvider.java b/platform/lang-impl/src/com/intellij/ide/FileListPasteProvider.java index e4cf7f901579..16a19ebba113 100644 --- a/platform/lang-impl/src/com/intellij/ide/FileListPasteProvider.java +++ b/platform/lang-impl/src/com/intellij/ide/FileListPasteProvider.java @@ -18,6 +18,7 @@ package com.intellij.ide; import com.intellij.ide.dnd.FileCopyPasteUtil; import com.intellij.ide.dnd.LinuxDragAndDropSupport; +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 @@ import java.util.List; public class FileListPasteProvider implements PasteProvider { @Override public void performPaste(@NotNull DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final IdeView ideView = LangDataKeys.IDE_VIEW.getData(dataContext); if (project == null || ideView == null) return; 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 417927f03f57..8cfdd39da1de 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/CopyElementAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/CopyElementAction.java @@ -31,7 +31,7 @@ public class CopyElementAction extends AnAction { @Override public void actionPerformed(AnActionEvent e) { final DataContext dataContext = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return; } @@ -71,7 +71,7 @@ public class CopyElementAction extends AnAction { public void update(AnActionEvent event){ Presentation presentation = event.getPresentation(); DataContext dataContext = event.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); presentation.setEnabled(false); if (project == null) { return; @@ -94,7 +94,7 @@ public class CopyElementAction extends AnAction { return; } - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { 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 44718b509139..7e52422cb129 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/CopyReferenceAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/CopyReferenceAction.java @@ -81,7 +81,7 @@ public class CopyReferenceAction extends DumbAwareAction { public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); PsiElement element = getElementToCopy(editor, dataContext); if (!doCopy(element, project, editor) && editor != null) { @@ -128,7 +128,7 @@ public class CopyReferenceAction extends DumbAwareAction { } if (element == null && editor == null) { VirtualFile virtualFile = PlatformDataKeys.VIRTUAL_FILE.getData(dataContext); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (virtualFile != null && project != null) { element = PsiManager.getInstance(project).findFile(virtualFile); } diff --git a/platform/lang-impl/src/com/intellij/ide/actions/CreateDirectoryOrPackageAction.java b/platform/lang-impl/src/com/intellij/ide/actions/CreateDirectoryOrPackageAction.java index b0442977b883..ab4928f7bd87 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/CreateDirectoryOrPackageAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/CreateDirectoryOrPackageAction.java @@ -36,7 +36,7 @@ public class CreateDirectoryOrPackageAction extends AnAction implements DumbAwar @Override public void actionPerformed(AnActionEvent e) { IdeView view = e.getData(LangDataKeys.IDE_VIEW); - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); if (view == null || project == null) { return; @@ -64,7 +64,7 @@ public class CreateDirectoryOrPackageAction extends AnAction implements DumbAwar public void update(AnActionEvent event) { Presentation presentation = event.getPresentation(); - Project project = event.getData(PlatformDataKeys.PROJECT); + Project project = event.getData(CommonDataKeys.PROJECT); if (project == null) { presentation.setVisible(false); presentation.setEnabled(false); diff --git a/platform/lang-impl/src/com/intellij/ide/actions/CreateFromTemplateAction.java b/platform/lang-impl/src/com/intellij/ide/actions/CreateFromTemplateAction.java index 66f87caebb96..26ecb5616972 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/CreateFromTemplateAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/CreateFromTemplateAction.java @@ -54,7 +54,7 @@ public abstract class CreateFromTemplateAction extends AnA return; } - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final PsiDirectory dir = view.getOrChooseDirectory(); if (dir == null || project == null) return; @@ -115,7 +115,7 @@ public abstract class CreateFromTemplateAction extends AnA } protected boolean isAvailable(DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final IdeView view = LangDataKeys.IDE_VIEW.getData(dataContext); return project != null && view != null && view.getDirectories().length != 0; } diff --git a/platform/lang-impl/src/com/intellij/ide/actions/CreateTemplateInPackageAction.java b/platform/lang-impl/src/com/intellij/ide/actions/CreateTemplateInPackageAction.java index c4ab2023ac6f..51d36e7bbd9b 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/CreateTemplateInPackageAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/CreateTemplateInPackageAction.java @@ -17,6 +17,7 @@ package com.intellij.ide.actions; import com.intellij.ide.IdeView; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -57,7 +58,7 @@ public abstract class CreateTemplateInPackageAction extend @Override protected boolean isAvailable(final DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final IdeView view = LangDataKeys.IDE_VIEW.getData(dataContext); if (project == null || view == null || view.getDirectories().length == 0) { return false; diff --git a/platform/lang-impl/src/com/intellij/ide/actions/EditFileTemplatesAction.java b/platform/lang-impl/src/com/intellij/ide/actions/EditFileTemplatesAction.java index f490161e5b14..b5aaa5460973 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/EditFileTemplatesAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/EditFileTemplatesAction.java @@ -19,6 +19,7 @@ package com.intellij.ide.actions; import com.intellij.ide.fileTemplates.ui.ConfigureTemplatesDialog; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; public class EditFileTemplatesAction extends AnAction{ @@ -28,7 +29,7 @@ public class EditFileTemplatesAction extends AnAction{ @Override public void actionPerformed(AnActionEvent e){ - ConfigureTemplatesDialog dialog = new ConfigureTemplatesDialog(PlatformDataKeys.PROJECT.getData(e.getDataContext())); + ConfigureTemplatesDialog dialog = new ConfigureTemplatesDialog(CommonDataKeys.PROJECT.getData(e.getDataContext())); dialog.show(); } } 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 e4933f4c94d8..d9d8bccfc4ca 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/ExternalJavaDocAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/ExternalJavaDocAction.java @@ -47,7 +47,7 @@ public class ExternalJavaDocAction extends AnAction { @Override public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return; } @@ -114,7 +114,7 @@ public class ExternalJavaDocAction extends AnAction { Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); final PsiElement element = LangDataKeys.PSI_ELEMENT.getData(dataContext); final PsiElement originalElement = getOriginalElement(LangDataKeys.PSI_FILE.getData(dataContext), editor); - DocumentationManager.storeOriginalElement(PlatformDataKeys.PROJECT.getData(dataContext), originalElement, element); + DocumentationManager.storeOriginalElement(CommonDataKeys.PROJECT.getData(dataContext), originalElement, element); final DocumentationProvider provider = DocumentationManager.getProviderFromElement(element); boolean enabled; if (provider instanceof ExternalDocumentationProvider) { diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java index 0ab7b0092018..5385494382fb 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java @@ -51,7 +51,7 @@ public class GotoActionAction extends GotoActionBase implements DumbAware { @Override public void gotoActionPerformed(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final Component component = e.getData(PlatformDataKeys.CONTEXT_COMPONENT); FeatureUsageTracker.getInstance().triggerFeatureUsed("navigation.popup.action"); diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoClassAction.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoClassAction.java index fca1f0f7bd6b..7070b065c959 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/GotoClassAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoClassAction.java @@ -33,6 +33,7 @@ import com.intellij.navigation.ItemPresentation; import com.intellij.navigation.NavigationItem; import com.intellij.openapi.actionSystem.ActionManager; 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.AccessToken; @@ -62,7 +63,7 @@ import java.util.List; public class GotoClassAction extends GotoActionBase implements DumbAware { @Override public void actionPerformed(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); assert project != null; if (!DumbService.getInstance(project).isDumb()) { super.actionPerformed(e); @@ -78,7 +79,7 @@ public class GotoClassAction extends GotoActionBase implements DumbAware { @Override public void gotoActionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); assert project != null; PsiDocumentManager.getInstance(project).commitAllDocuments(); diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoFileAction.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoFileAction.java index e5fdf928775e..5fbdfeaa93b3 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/GotoFileAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoFileAction.java @@ -22,6 +22,7 @@ import com.intellij.ide.util.gotoByName.ChooseByNamePopup; import com.intellij.ide.util.gotoByName.GotoFileConfiguration; import com.intellij.ide.util.gotoByName.GotoFileModel; 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.application.ModalityState; @@ -55,7 +56,7 @@ public class GotoFileAction extends GotoActionBase implements DumbAware { @Override public void gotoActionPerformed(AnActionEvent e) { FeatureUsageTracker.getInstance().triggerFeatureUsed("navigation.popup.file"); - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final GotoFileModel gotoFileModel = new GotoFileModel(project); showNavigationPopup(e, gotoFileModel, new GotoActionCallback() { @Override diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoSymbolAction.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoSymbolAction.java index b685d0671a7d..8a93da3b9646 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/GotoSymbolAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoSymbolAction.java @@ -23,6 +23,7 @@ import com.intellij.lang.Language; import com.intellij.navigation.ChooseByNameRegistry; import com.intellij.navigation.NavigationItem; 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.project.Project; @@ -34,7 +35,7 @@ public class GotoSymbolAction extends GotoActionBase { @Override public void gotoActionPerformed(AnActionEvent e) { FeatureUsageTracker.getInstance().triggerFeatureUsed("navigation.popup.symbol"); - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final GotoSymbolModel2 model = new GotoSymbolModel2(project); PsiDocumentManager.getInstance(project).commitAllDocuments(); showNavigationPopup(e, model, new GotoActionCallback() { diff --git a/platform/lang-impl/src/com/intellij/ide/actions/NewElementAction.java b/platform/lang-impl/src/com/intellij/ide/actions/NewElementAction.java index a4aaf0b638b4..9ca024a7842f 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/NewElementAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/NewElementAction.java @@ -87,7 +87,7 @@ public class NewElementAction extends AnAction implements DumbAware, PopupActio public void update(AnActionEvent e){ final Presentation presentation = e.getPresentation(); final DataContext context = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(context); + final Project project = CommonDataKeys.PROJECT.getData(context); if (project == null) { presentation.setEnabled(false); return; diff --git a/platform/lang-impl/src/com/intellij/ide/actions/NewElementToolbarAction.java b/platform/lang-impl/src/com/intellij/ide/actions/NewElementToolbarAction.java index 4dfb80ed75c2..53d5f8dc6a46 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/NewElementToolbarAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/NewElementToolbarAction.java @@ -19,6 +19,7 @@ package com.intellij.ide.actions; import com.intellij.ide.DataManager; import com.intellij.ide.projectView.impl.ProjectViewImpl; 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.project.Project; @@ -35,7 +36,7 @@ public class NewElementToolbarAction extends NewElementAction { @Override public void actionPerformed(AnActionEvent e) { if (e.getData(LangDataKeys.IDE_VIEW) == null) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final PsiFileSystemItem psiFile = e.getData(LangDataKeys.PSI_FILE).getParent(); ProjectViewImpl.getInstance(project).selectCB(psiFile, psiFile.getVirtualFile(), true).doWhenDone(new Runnable() { @Override @@ -53,7 +54,7 @@ public class NewElementToolbarAction extends NewElementAction { public void update(AnActionEvent event) { super.update(event); if (event.getData(LangDataKeys.IDE_VIEW) == null) { - Project project = event.getData(PlatformDataKeys.PROJECT); + Project project = event.getData(CommonDataKeys.PROJECT); PsiFile psiFile = event.getData(LangDataKeys.PSI_FILE); if (project != null && psiFile != null) { final ToolWindow projectViewWindow = ToolWindowManager.getInstance(project).getToolWindow(ToolWindowId.PROJECT_VIEW); 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 ad1430493cd2..d22cd3228059 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/PasteReferenceProvider.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/PasteReferenceProvider.java @@ -20,6 +20,7 @@ import com.intellij.codeInsight.FileModificationService; import com.intellij.codeInsight.editorActions.PasteHandler; import com.intellij.ide.IdeBundle; import com.intellij.ide.PasteProvider; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; @@ -42,7 +43,7 @@ import java.awt.datatransfer.Transferable; public class PasteReferenceProvider implements PasteProvider { @Override public void performPaste(@NotNull DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); if (project == null || editor == null) return; @@ -65,14 +66,14 @@ public class PasteReferenceProvider implements PasteProvider { @Override public boolean isPastePossible(@NotNull DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); return project != null && editor != null && getCopiedFqn(dataContext) != null; } @Override public boolean isPasteEnabled(@NotNull DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); String fqn = getCopiedFqn(dataContext); if (project == null || fqn == null) { return false; diff --git a/platform/lang-impl/src/com/intellij/ide/actions/QuickChangeCodeStyleSchemeAction.java b/platform/lang-impl/src/com/intellij/ide/actions/QuickChangeCodeStyleSchemeAction.java index b3f790a42f88..9a351928c96b 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/QuickChangeCodeStyleSchemeAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/QuickChangeCodeStyleSchemeAction.java @@ -94,6 +94,6 @@ public class QuickChangeCodeStyleSchemeAction extends QuickSwitchSchemeAction { @Override public void update(AnActionEvent e) { super.update(e); - e.getPresentation().setEnabled(PlatformDataKeys.PROJECT.getData(e.getDataContext()) != null); + e.getPresentation().setEnabled(CommonDataKeys.PROJECT.getData(e.getDataContext()) != 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 33e5d33abd42..d5188b6233d5 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/ReloadFromDiskAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/ReloadFromDiskAction.java @@ -33,7 +33,7 @@ public class ReloadFromDiskAction extends AnAction implements DumbAware { @Override public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); if (editor == null) return; final PsiFile psiFile = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument()); @@ -70,7 +70,7 @@ public class ReloadFromDiskAction extends AnAction implements DumbAware { public void update(AnActionEvent event){ Presentation presentation = event.getPresentation(); DataContext dataContext = event.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null){ presentation.setEnabled(false); return; diff --git a/platform/lang-impl/src/com/intellij/ide/actions/SaveAsAction.java b/platform/lang-impl/src/com/intellij/ide/actions/SaveAsAction.java index 1e79fbf82358..0e3f4e1fe6af 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/SaveAsAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/SaveAsAction.java @@ -1,6 +1,7 @@ package com.intellij.ide.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.project.DumbAwareAction; @@ -15,7 +16,7 @@ public class SaveAsAction extends DumbAwareAction { @Override public void update(AnActionEvent e) { final DataContext dataContext = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final VirtualFile virtualFile = PlatformDataKeys.VIRTUAL_FILE.getData(dataContext); e.getPresentation().setEnabled(project!=null && virtualFile!=null); } @@ -23,7 +24,7 @@ public class SaveAsAction extends DumbAwareAction { @Override public void actionPerformed(AnActionEvent e) { final DataContext dataContext = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final VirtualFile virtualFile = PlatformDataKeys.VIRTUAL_FILE.getData(dataContext); @SuppressWarnings({"ConstantConditions"}) final PsiElement element = PsiManager.getInstance(project).findFile(virtualFile); if(element==null) return; diff --git a/platform/lang-impl/src/com/intellij/ide/actions/SaveFileAsTemplateAction.java b/platform/lang-impl/src/com/intellij/ide/actions/SaveFileAsTemplateAction.java index 1b5d740ca0a3..939745f5332d 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/SaveFileAsTemplateAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/SaveFileAsTemplateAction.java @@ -20,6 +20,7 @@ import com.intellij.ide.fileTemplates.impl.AllFileTemplatesConfigurable; import com.intellij.ide.fileTemplates.ui.ConfigureTemplatesDialog; 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.extensions.Extensions; @@ -30,7 +31,7 @@ import com.intellij.psi.PsiFile; public class SaveFileAsTemplateAction extends AnAction{ @Override public void actionPerformed(AnActionEvent e){ - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); String fileText = e.getData(PlatformDataKeys.FILE_TEXT); VirtualFile file = e.getData(PlatformDataKeys.VIRTUAL_FILE); String extension = file.getExtension(); diff --git a/platform/lang-impl/src/com/intellij/ide/actions/SearchAgainAction.java b/platform/lang-impl/src/com/intellij/ide/actions/SearchAgainAction.java index ecdc84b67bfe..3e28023a935c 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/SearchAgainAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/SearchAgainAction.java @@ -21,6 +21,7 @@ import com.intellij.find.FindUtil; import com.intellij.ide.IdeBundle; 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.command.CommandProcessor; @@ -38,7 +39,7 @@ public class SearchAgainAction extends AnAction implements DumbAware { @Override public void actionPerformed(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final FileEditor editor = e.getData(PlatformDataKeys.FILE_EDITOR); if (editor == null || project == null) return; CommandProcessor commandProcessor = CommandProcessor.getInstance(); @@ -63,7 +64,7 @@ public class SearchAgainAction extends AnAction implements DumbAware { @Override public void update(AnActionEvent event){ Presentation presentation = event.getPresentation(); - Project project = event.getData(PlatformDataKeys.PROJECT); + Project project = event.getData(CommonDataKeys.PROJECT); if (project == null) { presentation.setEnabled(false); return; diff --git a/platform/lang-impl/src/com/intellij/ide/actions/SearchBackAction.java b/platform/lang-impl/src/com/intellij/ide/actions/SearchBackAction.java index de4d892abc42..4783205ae8c0 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/SearchBackAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/SearchBackAction.java @@ -21,6 +21,7 @@ import com.intellij.find.FindUtil; import com.intellij.ide.IdeBundle; 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.command.CommandProcessor; @@ -37,7 +38,7 @@ public class SearchBackAction extends AnAction implements DumbAware { @Override public void actionPerformed(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final FileEditor editor = e.getData(PlatformDataKeys.FILE_EDITOR); CommandProcessor commandProcessor = CommandProcessor.getInstance(); commandProcessor.executeCommand( @@ -59,7 +60,7 @@ public class SearchBackAction extends AnAction implements DumbAware { @Override public void update(AnActionEvent event){ Presentation presentation = event.getPresentation(); - Project project = event.getData(PlatformDataKeys.PROJECT); + Project project = event.getData(CommonDataKeys.PROJECT); if (project == null) { presentation.setEnabled(false); return; diff --git a/platform/lang-impl/src/com/intellij/ide/actions/SelectInContextImpl.java b/platform/lang-impl/src/com/intellij/ide/actions/SelectInContextImpl.java index 9377369df6bc..2064b228b396 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/SelectInContextImpl.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/SelectInContextImpl.java @@ -19,6 +19,7 @@ package com.intellij.ide.actions; import com.intellij.ide.FileEditorProvider; import com.intellij.ide.SelectInContext; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -91,7 +92,7 @@ public abstract class SelectInContextImpl implements SelectInContext { if (descriptor instanceof OpenFileDescriptor) { final VirtualFile file = ((OpenFileDescriptor)descriptor).getFile(); if (file.isValid()) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); selectInContext = OpenFileDescriptorContext.create(project, file); } } @@ -99,7 +100,7 @@ public abstract class SelectInContextImpl implements SelectInContext { if (selectInContext == null) { VirtualFile virtualFile = PlatformDataKeys.VIRTUAL_FILE.getData(dataContext); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (virtualFile != null && project != null) { return new VirtualFileSelectInContext(project, virtualFile); } @@ -110,7 +111,7 @@ public abstract class SelectInContextImpl implements SelectInContext { @Nullable private static SelectInContext createEditorContext(DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final FileEditor editor = PlatformDataKeys.FILE_EDITOR.getData(dataContext); return doCreateEditorContext(project, editor, dataContext); } diff --git a/platform/lang-impl/src/com/intellij/ide/actions/TogglePopupHintsAction.java b/platform/lang-impl/src/com/intellij/ide/actions/TogglePopupHintsAction.java index db63dc84c272..7a27b8ea315e 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/TogglePopupHintsAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/TogglePopupHintsAction.java @@ -23,6 +23,7 @@ import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; import com.intellij.codeInsight.daemon.impl.DaemonListeners; 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.diagnostic.Logger; @@ -36,7 +37,7 @@ public class TogglePopupHintsAction extends AnAction{ private static final Logger LOG=Logger.getInstance("#com.intellij.ide.actions.TogglePopupHintsAction"); private static PsiFile getTargetFile(DataContext dataContext){ - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if(project==null){ return null; } @@ -59,7 +60,7 @@ public class TogglePopupHintsAction extends AnAction{ public void actionPerformed(AnActionEvent e){ PsiFile psiFile=getTargetFile(e.getDataContext()); LOG.assertTrue(psiFile!=null); - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); LOG.assertTrue(project!=null); DaemonCodeAnalyzer codeAnalyzer = DaemonCodeAnalyzer.getInstance(project); codeAnalyzer.setImportHintsEnabled(psiFile,!codeAnalyzer.isImportHintsEnabled(psiFile)); 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 b27b064bd00f..d774952290c1 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 @@ -54,14 +54,14 @@ public class BookmarksAction extends AnAction implements DumbAware, MasterDetail @Override public void update(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); e.getPresentation().setEnabled(project != null); } @Override public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return; if (myPopup != null && myPopup.isVisible()) return; diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/GoToMnemonicBookmarkActionBase.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/GoToMnemonicBookmarkActionBase.java index dbe3ccaa95e7..0ec3d92fae91 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/GoToMnemonicBookmarkActionBase.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/GoToMnemonicBookmarkActionBase.java @@ -23,6 +23,7 @@ import com.intellij.ide.bookmarks.Bookmark; import com.intellij.ide.bookmarks.BookmarkManager; 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.project.DumbAware; @@ -38,14 +39,14 @@ public abstract class GoToMnemonicBookmarkActionBase extends AnAction implements @Override public void update(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); e.getPresentation().setEnabled(project != null); } @Override public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final Bookmark bookmark = BookmarkManager.getInstance(project).findBookmarkForMnemonic((char)('0' + myNumber)); if (bookmark != null) { diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/GotoBookmarkActionBase.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/GotoBookmarkActionBase.java index fc0be5444365..5aeb35e84226 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/GotoBookmarkActionBase.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/GotoBookmarkActionBase.java @@ -18,6 +18,7 @@ package com.intellij.ide.bookmarks.actions; import com.intellij.ide.bookmarks.Bookmark; import com.intellij.ide.bookmarks.BookmarkManager; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; @@ -58,7 +59,7 @@ abstract class GotoBookmarkActionBase extends EditorAction { @Nullable private Bookmark getBookmarkToGo(DataContext dataContext, Editor editor) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return null; BookmarkManager manager = BookmarkManager.getInstance(project); return next ? manager.getNextBookmark(editor, true) : manager.getPreviousBookmark(editor, true); 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 5f8b9f8a9587..0a3869304d6a 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 @@ -19,6 +19,7 @@ package com.intellij.ide.bookmarks.actions; import com.intellij.ide.IdeBundle; import com.intellij.ide.bookmarks.BookmarkManager; 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.project.DumbAware; @@ -33,7 +34,7 @@ public class ToggleBookmarkAction extends BookmarksAction implements DumbAware { @Override public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return; BookmarkInContextInfo info = new BookmarkInContextInfo(dataContext, project).invoke(); if (info.getFile() == null) return; @@ -49,7 +50,7 @@ public class ToggleBookmarkAction extends BookmarksAction implements DumbAware { @Override public void update(AnActionEvent event) { DataContext dataContext = event.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); event.getPresentation().setEnabled(project != null && (ToolWindowManager.getInstance(project).isEditorComponentActive() && PlatformDataKeys.EDITOR.getData(dataContext) != null || diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleBookmarkWithMnemonicAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleBookmarkWithMnemonicAction.java index bce1319f14de..d51324724274 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleBookmarkWithMnemonicAction.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleBookmarkWithMnemonicAction.java @@ -23,6 +23,7 @@ import com.intellij.ide.IdeBundle; import com.intellij.ide.bookmarks.Bookmark; import com.intellij.ide.bookmarks.BookmarkManager; 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.project.Project; @@ -41,7 +42,7 @@ public class ToggleBookmarkWithMnemonicAction extends ToggleBookmarkAction { super.actionPerformed(e); DataContext dataContext = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return; final BookmarkInContextInfo info = new BookmarkInContextInfo(dataContext, project).invoke(); final Bookmark bookmark = info.getBookmarkAtPlace(); diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleNumberedBookmarkActionBase.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleNumberedBookmarkActionBase.java index a2c9a1b544e7..9758fff98d39 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleNumberedBookmarkActionBase.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleNumberedBookmarkActionBase.java @@ -23,6 +23,7 @@ import com.intellij.ide.bookmarks.Bookmark; import com.intellij.ide.bookmarks.BookmarkManager; 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.project.DumbAware; @@ -38,14 +39,14 @@ public abstract class ToggleNumberedBookmarkActionBase extends AnAction implemen @Override public void update(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); e.getPresentation().setEnabled(project != null); } @Override public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); BookmarksAction.BookmarkInContextInfo info = new BookmarksAction.BookmarkInContextInfo(dataContext, project).invoke(); if (info.getFile() == null) return; diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java index 9764b181a123..4a61827f03a3 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java @@ -402,7 +402,7 @@ public class FavoritesTreeViewPanel extends JPanel implements DataProvider, Dock @Override public Object getData(String dataId) { - if (PlatformDataKeys.PROJECT.is(dataId)) { + if (CommonDataKeys.PROJECT.is(dataId)) { return myProject; } if (PlatformDataKeys.NAVIGATABLE.is(dataId)) { diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/ImportUsagesAction.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/ImportUsagesAction.java index 373cac54c3f5..f9f5e6e0def1 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/ImportUsagesAction.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/ImportUsagesAction.java @@ -20,6 +20,7 @@ import com.intellij.ide.projectView.ViewSettings; import com.intellij.ide.util.treeView.AbstractTreeNode; 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.project.Project; @@ -47,7 +48,7 @@ public class ImportUsagesAction extends AnAction { } private boolean isEnabled(DataContext dc) { - final Project project = PlatformDataKeys.PROJECT.getData(dc); + final Project project = CommonDataKeys.PROJECT.getData(dc); final Usage[] usages = UsageView.USAGES_KEY.getData(dc); return project != null && usages != null && usages.length > 0; } @@ -58,7 +59,7 @@ public class ImportUsagesAction extends AnAction { final boolean enabled = isEnabled(dc); if (!enabled) return; - final Project project = PlatformDataKeys.PROJECT.getData(dc); + final Project project = CommonDataKeys.PROJECT.getData(dc); final Collection nodes = new UsageFavoriteNodeProvider().getFavoriteNodes(dc, ViewSettings.DEFAULT); final FavoritesManager favoritesManager = FavoritesManager.getInstance(project); diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/UsageFavoriteNodeProvider.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/UsageFavoriteNodeProvider.java index 968242f77aad..521ff3e28a6c 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/UsageFavoriteNodeProvider.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/UsageFavoriteNodeProvider.java @@ -17,6 +17,7 @@ package com.intellij.ide.favoritesTreeView; import com.intellij.ide.projectView.ViewSettings; import com.intellij.ide.util.treeView.AbstractTreeNode; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.diagnostic.Logger; @@ -92,7 +93,7 @@ public class UsageFavoriteNodeProvider extends FavoriteNodeProvider { @Override public Collection getFavoriteNodes(DataContext context, ViewSettings viewSettings) { - final Project project = PlatformDataKeys.PROJECT.getData(context); + final Project project = CommonDataKeys.PROJECT.getData(context); if (project == null) { return null; } @@ -285,7 +286,7 @@ public class UsageFavoriteNodeProvider extends FavoriteNodeProvider { if (set != null && !set.isEmpty()) { final int version = Integer.parseInt(parts.get(1)); final String cut = StringUtil.join(parts.subList(2, parts.size()), " "); - for (java.util.Iterator iterator = set.descendingIterator(); iterator.hasNext(); ) { + for (Iterator iterator = set.descendingIterator(); iterator.hasNext(); ) { WorkingSetSerializable serializable = iterator.next(); if (serializable.getVersion() == version) { return readWithSerializable(project, url, cut, serializable); diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/SendToFavoritesGroup.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/SendToFavoritesGroup.java index e700bcd416c5..1f6e74b9fcf1 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/SendToFavoritesGroup.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/SendToFavoritesGroup.java @@ -39,7 +39,7 @@ public class SendToFavoritesGroup extends ActionGroup { if (e == null) { return EMPTY_ARRAY; } - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); final List availableFavoritesLists = FavoritesManager.getInstance(project).getAvailableFavoritesListNames(); availableFavoritesLists.remove(FavoritesTreeViewPanel.FAVORITES_LIST_NAME_DATA_KEY.getData(e.getDataContext())); if (availableFavoritesLists.isEmpty()) { diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/actions/CreateFromTemplateActionBase.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/actions/CreateFromTemplateActionBase.java index 8cee833f1729..2f626492ce74 100644 --- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/actions/CreateFromTemplateActionBase.java +++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/actions/CreateFromTemplateActionBase.java @@ -43,7 +43,7 @@ public abstract class CreateFromTemplateActionBase extends AnAction { if (view == null) { return; } - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); PsiDirectory dir = getTargetDirectory(dataContext, view); if (dir == null) return; diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateConfigurable.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateConfigurable.java index 81c736bdafc1..7963b7386b93 100644 --- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateConfigurable.java +++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateConfigurable.java @@ -25,6 +25,7 @@ import com.intellij.lexer.CompositeLexer; import com.intellij.lexer.FlexAdapter; import com.intellij.lexer.Lexer; import com.intellij.lexer.MergingLexerAdapter; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Document; @@ -105,7 +106,7 @@ public class FileTemplateConfigurable implements Configurable, Configurable.NoSc private JPanel myDescriptionPanel; public FileTemplateConfigurable() { - Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()); myProject = project != null ? project : ProjectManager.getInstance().getDefaultProject(); } diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java index 55214fc245d6..5e3be097319c 100644 --- a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java +++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java @@ -653,7 +653,7 @@ public abstract class HierarchyBrowserBaseEx extends HierarchyBrowserBase implem @Override public final void update(final AnActionEvent e) { final Presentation presentation = e.getPresentation(); - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) return; presentation.setEnabled(isEnabled()); presentation.setText(getCurrentScopeType()); diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseHierarchyActionBase.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseHierarchyActionBase.java index 8d6401a2960f..ee0a67f6644b 100644 --- a/platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseHierarchyActionBase.java +++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseHierarchyActionBase.java @@ -50,7 +50,7 @@ public abstract class BrowseHierarchyActionBase extends AnAction { @Override public final void actionPerformed(final AnActionEvent e) { final DataContext dataContext = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return; PsiDocumentManager.getInstance(project).commitAllDocuments(); // prevents problems with smart pointers creation diff --git a/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.java b/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.java index 4bb08af8aa12..89beddaf7b8c 100644 --- a/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.java +++ b/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.java @@ -146,7 +146,7 @@ public class StructureViewWrapperImpl implements StructureViewWrapper, Disposabl final DataContext dataContext = DataManager.getInstance().getDataContext(owner); if (dataContext.getData(myKey) == this) return; - if (PlatformDataKeys.PROJECT.getData(dataContext) != myProject) return; + if (CommonDataKeys.PROJECT.getData(dataContext) != myProject) return; final VirtualFile[] files = hasFocus() ? null : PlatformDataKeys.VIRTUAL_FILE_ARRAY.getData(dataContext); if (!myToolWindow.isVisible()) { diff --git a/platform/lang-impl/src/com/intellij/ide/impl/dataRules/ModuleRule.java b/platform/lang-impl/src/com/intellij/ide/impl/dataRules/ModuleRule.java index 646e67120f07..16f00293d880 100644 --- a/platform/lang-impl/src/com/intellij/ide/impl/dataRules/ModuleRule.java +++ b/platform/lang-impl/src/com/intellij/ide/impl/dataRules/ModuleRule.java @@ -18,6 +18,7 @@ package com.intellij.ide.impl.dataRules; import com.intellij.ide.DataManager; import com.intellij.ide.impl.DataManagerImpl; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -38,7 +39,7 @@ public class ModuleRule implements GetDataRule { if (moduleContext != null) { return moduleContext; } - Project project = PlatformDataKeys.PROJECT.getData(dataProvider); + Project project = CommonDataKeys.PROJECT.getData(dataProvider); if (project == null) { PsiElement element = LangDataKeys.PSI_ELEMENT.getData(dataProvider); if (element == null) { diff --git a/platform/lang-impl/src/com/intellij/ide/macro/FileDirRelativeToProjectRootMacro.java b/platform/lang-impl/src/com/intellij/ide/macro/FileDirRelativeToProjectRootMacro.java index cd19f6e36611..d1d5309767d6 100644 --- a/platform/lang-impl/src/com/intellij/ide/macro/FileDirRelativeToProjectRootMacro.java +++ b/platform/lang-impl/src/com/intellij/ide/macro/FileDirRelativeToProjectRootMacro.java @@ -17,6 +17,7 @@ package com.intellij.ide.macro; import com.intellij.ide.IdeBundle; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; @@ -37,7 +38,7 @@ public class FileDirRelativeToProjectRootMacro extends Macro { @Override public String expand(final DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return null; } diff --git a/platform/lang-impl/src/com/intellij/ide/macro/FileDirRelativeToSourcepathMacro.java b/platform/lang-impl/src/com/intellij/ide/macro/FileDirRelativeToSourcepathMacro.java index 5119cd5c2032..18e1443e5e8d 100644 --- a/platform/lang-impl/src/com/intellij/ide/macro/FileDirRelativeToSourcepathMacro.java +++ b/platform/lang-impl/src/com/intellij/ide/macro/FileDirRelativeToSourcepathMacro.java @@ -17,6 +17,7 @@ package com.intellij.ide.macro; import com.intellij.ide.IdeBundle; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; @@ -37,7 +38,7 @@ public class FileDirRelativeToSourcepathMacro extends Macro { @Override public String expand(final DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return null; } diff --git a/platform/lang-impl/src/com/intellij/ide/macro/FilePathRelativeToProjectRootMacro.java b/platform/lang-impl/src/com/intellij/ide/macro/FilePathRelativeToProjectRootMacro.java index 7e539f2ff275..a7c7858e3b3f 100644 --- a/platform/lang-impl/src/com/intellij/ide/macro/FilePathRelativeToProjectRootMacro.java +++ b/platform/lang-impl/src/com/intellij/ide/macro/FilePathRelativeToProjectRootMacro.java @@ -17,6 +17,7 @@ package com.intellij.ide.macro; import com.intellij.ide.IdeBundle; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; @@ -37,7 +38,7 @@ public class FilePathRelativeToProjectRootMacro extends Macro { @Override public String expand(final DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return null; } diff --git a/platform/lang-impl/src/com/intellij/ide/macro/FilePathRelativeToSourcepathMacro.java b/platform/lang-impl/src/com/intellij/ide/macro/FilePathRelativeToSourcepathMacro.java index 96981ba5f2b9..482705f009ba 100644 --- a/platform/lang-impl/src/com/intellij/ide/macro/FilePathRelativeToSourcepathMacro.java +++ b/platform/lang-impl/src/com/intellij/ide/macro/FilePathRelativeToSourcepathMacro.java @@ -17,6 +17,7 @@ package com.intellij.ide.macro; import com.intellij.ide.IdeBundle; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; @@ -37,7 +38,7 @@ public class FilePathRelativeToSourcepathMacro extends Macro { @Override public String expand(final DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return null; } diff --git a/platform/lang-impl/src/com/intellij/ide/macro/FilePromptMacro.java b/platform/lang-impl/src/com/intellij/ide/macro/FilePromptMacro.java index 45b9e9529be5..120252cd86e1 100644 --- a/platform/lang-impl/src/com/intellij/ide/macro/FilePromptMacro.java +++ b/platform/lang-impl/src/com/intellij/ide/macro/FilePromptMacro.java @@ -16,6 +16,7 @@ package com.intellij.ide.macro; import com.intellij.ide.IdeBundle; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.fileChooser.*; @@ -39,7 +40,7 @@ public class FilePromptMacro extends PromptingMacro implements SecondQueueExpand @Override protected String promptUser(DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); final FileChooserDescriptor descriptor = FileChooserDescriptorFactory.createSingleLocalFileDescriptor(); final VirtualFile[] result = FileChooser.chooseFiles(descriptor, project, null); return result.length == 1? FileUtil.toSystemDependentName(result[0].getPath()) : null; diff --git a/platform/lang-impl/src/com/intellij/ide/macro/FileRelativePathMacro.java b/platform/lang-impl/src/com/intellij/ide/macro/FileRelativePathMacro.java index 977986f1ae71..801132f814a3 100644 --- a/platform/lang-impl/src/com/intellij/ide/macro/FileRelativePathMacro.java +++ b/platform/lang-impl/src/com/intellij/ide/macro/FileRelativePathMacro.java @@ -17,6 +17,7 @@ package com.intellij.ide.macro; import com.intellij.ide.IdeBundle; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; @@ -37,7 +38,7 @@ public class FileRelativePathMacro extends Macro { @Override public String expand(DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); final VirtualFile baseDir = project == null ? null : project.getBaseDir(); if (baseDir == null) { return null; diff --git a/platform/lang-impl/src/com/intellij/ide/macro/JdkPathMacro.java b/platform/lang-impl/src/com/intellij/ide/macro/JdkPathMacro.java index fdf082c8d9b0..e2989d16950a 100644 --- a/platform/lang-impl/src/com/intellij/ide/macro/JdkPathMacro.java +++ b/platform/lang-impl/src/com/intellij/ide/macro/JdkPathMacro.java @@ -17,6 +17,7 @@ package com.intellij.ide.macro; import com.intellij.ide.IdeBundle; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; @@ -40,7 +41,7 @@ public final class JdkPathMacro extends Macro { @Override public String expand(DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return null; } diff --git a/platform/lang-impl/src/com/intellij/ide/macro/MacroManager.java b/platform/lang-impl/src/com/intellij/ide/macro/MacroManager.java index b1bc627458e0..a4b999b2c088 100644 --- a/platform/lang-impl/src/com/intellij/ide/macro/MacroManager.java +++ b/platform/lang-impl/src/com/intellij/ide/macro/MacroManager.java @@ -18,6 +18,7 @@ package com.intellij.ide.macro; import com.intellij.application.options.PathMacrosImpl; import com.intellij.ide.DataManager; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.components.ServiceManager; @@ -122,7 +123,7 @@ public final class MacroManager { if (PlatformDataKeys.FILE_EDITOR.getData(dataContext) != null) { return dataContext; } - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return dataContext; } diff --git a/platform/lang-impl/src/com/intellij/ide/macro/ProjectNameMacro.java b/platform/lang-impl/src/com/intellij/ide/macro/ProjectNameMacro.java index 6cf18fb1471f..c315f2075f42 100644 --- a/platform/lang-impl/src/com/intellij/ide/macro/ProjectNameMacro.java +++ b/platform/lang-impl/src/com/intellij/ide/macro/ProjectNameMacro.java @@ -17,6 +17,7 @@ package com.intellij.ide.macro; import com.intellij.ide.IdeBundle; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; @@ -34,7 +35,7 @@ public final class ProjectNameMacro extends Macro { @Override public String expand(DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return null; } diff --git a/platform/lang-impl/src/com/intellij/ide/macro/SourcepathEntryMacro.java b/platform/lang-impl/src/com/intellij/ide/macro/SourcepathEntryMacro.java index a0951fea797c..ef8ed1339ffc 100644 --- a/platform/lang-impl/src/com/intellij/ide/macro/SourcepathEntryMacro.java +++ b/platform/lang-impl/src/com/intellij/ide/macro/SourcepathEntryMacro.java @@ -17,6 +17,7 @@ package com.intellij.ide.macro; import com.intellij.ide.IdeBundle; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; @@ -39,7 +40,7 @@ public final class SourcepathEntryMacro extends Macro { @Override public String expand(final DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return null; } diff --git a/platform/lang-impl/src/com/intellij/ide/macro/SourcepathMacro.java b/platform/lang-impl/src/com/intellij/ide/macro/SourcepathMacro.java index 9e577696e458..f5d4ca36fdfe 100644 --- a/platform/lang-impl/src/com/intellij/ide/macro/SourcepathMacro.java +++ b/platform/lang-impl/src/com/intellij/ide/macro/SourcepathMacro.java @@ -17,6 +17,7 @@ package com.intellij.ide.macro; import com.intellij.ide.IdeBundle; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; @@ -35,7 +36,7 @@ public final class SourcepathMacro extends Macro { @Override public String expand(DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return null; return OrderEnumerator.orderEntries(project).withoutSdk().withoutLibraries().getSourcePathsList().getPathsString(); } diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ActivateNavigationBarAction.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ActivateNavigationBarAction.java index 073004cfe00d..964a336632f6 100644 --- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ActivateNavigationBarAction.java +++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ActivateNavigationBarAction.java @@ -18,6 +18,7 @@ package com.intellij.ide.navigationToolbar; import com.intellij.ide.ui.UISettings; 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.project.DumbAware; import com.intellij.openapi.project.Project; @@ -32,7 +33,7 @@ import com.intellij.openapi.wm.impl.IdeRootPane; public class ActivateNavigationBarAction extends AnAction implements DumbAware { @Override public void actionPerformed(AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project != null && UISettings.getInstance().SHOW_NAVIGATION_BAR){ final IdeFrameImpl frame = WindowManagerEx.getInstanceEx().getFrame(project); final IdeRootPane ideRootPane = ((IdeRootPane)frame.getRootPane()); @@ -43,7 +44,7 @@ public class ActivateNavigationBarAction extends AnAction implements DumbAware { @Override public void update(AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); UISettings settings = UISettings.getInstance(); final boolean enabled = project != null && settings.SHOW_NAVIGATION_BAR && !settings.PRESENTATION_MODE; e.getPresentation().setEnabled(enabled); diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarModel.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarModel.java index ec069bd1ebd3..9a5936173e82 100644 --- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarModel.java +++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarModel.java @@ -17,6 +17,7 @@ package com.intellij.ide.navigationToolbar; import com.intellij.ide.ui.UISettings; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -114,7 +115,7 @@ public class NavBarModel { Object moduleOrProject = LangDataKeys.MODULE.getData(dataContext); if (moduleOrProject == null) { - moduleOrProject = PlatformDataKeys.PROJECT.getData(dataContext); + moduleOrProject = CommonDataKeys.PROJECT.getData(dataContext); } if (moduleOrProject != null) { diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarUpdateQueue.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarUpdateQueue.java index 297334710c06..8f16ccefd7f8 100644 --- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarUpdateQueue.java +++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarUpdateQueue.java @@ -17,6 +17,7 @@ package com.intellij.ide.navigationToolbar; import com.intellij.ide.DataManager; import com.intellij.ide.IdeEventQueue; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; @@ -96,7 +97,7 @@ public class NavBarUpdateQueue extends MergingUpdateQueue { private void requestModelUpdateFromContextOrObject(DataContext dataContext, Object object) { final NavBarModel model = myPanel.getModel(); if (dataContext != null) { - if (PlatformDataKeys.PROJECT.getData(dataContext) != myPanel.getProject() || myPanel.isNodePopupShowing()) { + if (CommonDataKeys.PROJECT.getData(dataContext) != myPanel.getProject() || myPanel.isNodePopupShowing()) { requestModelUpdate(null, myPanel.getContextObject(), true); return; } 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 1c1b38e682eb..a68ad97d04b2 100644 --- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ShowNavBarAction.java +++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ShowNavBarAction.java @@ -32,7 +32,7 @@ public class ShowNavBarAction extends AnAction implements DumbAware, PopupAction @Override public void actionPerformed(AnActionEvent e){ final DataContext context = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(context); + final Project project = CommonDataKeys.PROJECT.getData(context); if (project != null) { UISettings uiSettings = UISettings.getInstance(); if (uiSettings.SHOW_NAVIGATION_BAR && !uiSettings.PRESENTATION_MODE){ @@ -57,7 +57,7 @@ public class ShowNavBarAction extends AnAction implements DumbAware, PopupAction @Override public void update(final AnActionEvent e){ - final boolean enabled = e.getData(PlatformDataKeys.PROJECT) != null; + final boolean enabled = e.getData(CommonDataKeys.PROJECT) != null; e.getPresentation().setEnabled(enabled); } } diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/actions/ChangeProjectViewAction.java b/platform/lang-impl/src/com/intellij/ide/projectView/actions/ChangeProjectViewAction.java index 1030e6c50278..2b50107eab26 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/actions/ChangeProjectViewAction.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/actions/ChangeProjectViewAction.java @@ -19,6 +19,7 @@ package com.intellij.ide.projectView.actions; import com.intellij.ide.projectView.ProjectView; 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.project.Project; @@ -28,7 +29,7 @@ import com.intellij.openapi.wm.ToolWindowManager; public final class ChangeProjectViewAction extends AnAction { @Override public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) { return; } @@ -39,7 +40,7 @@ public final class ChangeProjectViewAction extends AnAction { @Override public void update(AnActionEvent event){ Presentation presentation = event.getPresentation(); - Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); if (project == null){ presentation.setEnabled(false); return; diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/actions/MarkExcludeRootAction.java b/platform/lang-impl/src/com/intellij/ide/projectView/actions/MarkExcludeRootAction.java index e00fd3bfa9f4..d44972aeffd8 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/actions/MarkExcludeRootAction.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/actions/MarkExcludeRootAction.java @@ -16,6 +16,7 @@ package com.intellij.ide.projectView.actions; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.roots.ContentEntry; import com.intellij.openapi.ui.Messages; @@ -32,7 +33,7 @@ public class MarkExcludeRootAction extends MarkRootActionBase { VirtualFile[] files = e.getData(PlatformDataKeys.VIRTUAL_FILE_ARRAY); String message = files.length == 1 ? FileUtil.toSystemDependentName(files[0].getPath()) : files.length + " selected files"; - final int rc = Messages.showOkCancelDialog(e.getData(PlatformDataKeys.PROJECT), getPromptText(message), "Mark as Excluded", + final int rc = Messages.showOkCancelDialog(e.getData(CommonDataKeys.PROJECT), getPromptText(message), "Mark as Excluded", Messages.getQuestionIcon()); if (rc != 0) { return; diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/MoveModuleToGroup.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/MoveModuleToGroup.java index 97d52d8a4e13..a3264d2fcbbe 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/MoveModuleToGroup.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/MoveModuleToGroup.java @@ -44,7 +44,7 @@ public class MoveModuleToGroup extends ActionGroup { @Override public void update(AnActionEvent e){ final DataContext dataContext = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final Module[] modules = LangDataKeys.MODULE_CONTEXT_ARRAY.getData(dataContext); boolean active = project != null && modules != null && modules.length != 0; final Presentation presentation = e.getPresentation(); 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 b8bc4bc40977..680403e3ffe9 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/DeleteHandler.java +++ b/platform/lang-impl/src/com/intellij/ide/util/DeleteHandler.java @@ -22,6 +22,7 @@ import com.intellij.history.LocalHistoryAction; import com.intellij.ide.DataManager; import com.intellij.ide.DeleteProvider; import com.intellij.ide.IdeBundle; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -65,7 +66,7 @@ public class DeleteHandler { public static class DefaultDeleteProvider implements DeleteProvider { @Override public boolean canDeleteElement(@NotNull DataContext dataContext) { - if (PlatformDataKeys.PROJECT.getData(dataContext) == null) { + if (CommonDataKeys.PROJECT.getData(dataContext) == null) { return false; } final PsiElement[] elements = getPsiElements(dataContext); @@ -94,7 +95,7 @@ public class DeleteHandler { public void deleteElement(@NotNull DataContext dataContext) { PsiElement[] elements = getPsiElements(dataContext); if (elements == null) return; - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return; LocalHistoryAction a = LocalHistory.getInstance().startAction(IdeBundle.message("progress.deleting")); try { diff --git a/platform/lang-impl/src/com/intellij/internal/DumpConfigurationTypesAction.java b/platform/lang-impl/src/com/intellij/internal/DumpConfigurationTypesAction.java index 598742e13bd4..fc616f8511f5 100644 --- a/platform/lang-impl/src/com/intellij/internal/DumpConfigurationTypesAction.java +++ b/platform/lang-impl/src/com/intellij/internal/DumpConfigurationTypesAction.java @@ -24,6 +24,7 @@ import com.intellij.execution.RunManager; import com.intellij.execution.configurations.ConfigurationType; 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.project.DumbAware; import com.intellij.openapi.project.Project; @@ -35,7 +36,7 @@ public class DumpConfigurationTypesAction extends AnAction implements DumbAware @Override public void actionPerformed(AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); final ConfigurationType[] factories = RunManager.getInstance(project).getConfigurationFactories(); for (ConfigurationType factory : factories) { @@ -45,6 +46,6 @@ public class DumpConfigurationTypesAction extends AnAction implements DumbAware @Override public void update(final AnActionEvent e) { - e.getPresentation().setEnabled(e.getData(PlatformDataKeys.PROJECT) != null); + e.getPresentation().setEnabled(e.getData(CommonDataKeys.PROJECT) != null); } } \ No newline at end of file diff --git a/platform/lang-impl/src/com/intellij/internal/DumpDirectoryInfoAction.java b/platform/lang-impl/src/com/intellij/internal/DumpDirectoryInfoAction.java index f7a9cbc92257..29322d42cf24 100644 --- a/platform/lang-impl/src/com/intellij/internal/DumpDirectoryInfoAction.java +++ b/platform/lang-impl/src/com/intellij/internal/DumpDirectoryInfoAction.java @@ -17,6 +17,7 @@ package com.intellij.internal; 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.diagnostic.Logger; import com.intellij.openapi.progress.ProgressManager; @@ -40,7 +41,7 @@ public class DumpDirectoryInfoAction extends AnAction { @Override public void actionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final DirectoryIndex index = DirectoryIndex.getInstance(project); if (project != null) { final VirtualFile root = e.getData(PlatformDataKeys.VIRTUAL_FILE); @@ -71,6 +72,6 @@ public class DumpDirectoryInfoAction extends AnAction { @Override public void update(AnActionEvent e) { - e.getPresentation().setEnabled(e.getData(PlatformDataKeys.PROJECT) != null); + e.getPresentation().setEnabled(e.getData(CommonDataKeys.PROJECT) != null); } } diff --git a/platform/lang-impl/src/com/intellij/internal/DumpExtensionsAction.java b/platform/lang-impl/src/com/intellij/internal/DumpExtensionsAction.java index 02a7ada09bf8..58875c8746e7 100644 --- a/platform/lang-impl/src/com/intellij/internal/DumpExtensionsAction.java +++ b/platform/lang-impl/src/com/intellij/internal/DumpExtensionsAction.java @@ -16,6 +16,7 @@ package com.intellij.internal; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.extensions.ExtensionPoint; import com.intellij.openapi.extensions.Extensions; @@ -38,7 +39,7 @@ public class DumpExtensionsAction extends DumbAwareAction { public void actionPerformed(AnActionEvent e) { List areas = new ArrayList(); areas.add(Extensions.getRootArea()); - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project != null) { areas.add(Extensions.getArea(project)); final Module[] modules = ModuleManager.getInstance(project).getModules(); diff --git a/platform/lang-impl/src/com/intellij/internal/DumpIntentionsAction.java b/platform/lang-impl/src/com/intellij/internal/DumpIntentionsAction.java index 12a7be843102..a59844365191 100644 --- a/platform/lang-impl/src/com/intellij/internal/DumpIntentionsAction.java +++ b/platform/lang-impl/src/com/intellij/internal/DumpIntentionsAction.java @@ -24,6 +24,7 @@ import com.intellij.codeInsight.intention.impl.config.IntentionActionMetaData; import com.intellij.codeInsight.intention.impl.config.IntentionManagerSettings; 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.fileChooser.FileChooser; import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory; @@ -49,7 +50,7 @@ public class DumpIntentionsAction extends AnAction implements DumbAware { @Override public void actionPerformed(AnActionEvent e) { final VirtualFile file = - FileChooser.chooseFile(FileChooserDescriptorFactory.createSingleFolderDescriptor(), e.getData(PlatformDataKeys.PROJECT), null); + FileChooser.chooseFile(FileChooserDescriptorFactory.createSingleFolderDescriptor(), e.getData(CommonDataKeys.PROJECT), null); if (file != null) { final List list = IntentionManagerSettings.getInstance().getMetaData(); final File root = VfsUtil.virtualToIoFile(file); @@ -98,6 +99,6 @@ public class DumpIntentionsAction extends AnAction implements DumbAware { @Override public void update(final AnActionEvent e) { - e.getPresentation().setEnabled(e.getData(PlatformDataKeys.PROJECT) != null); + e.getPresentation().setEnabled(e.getData(CommonDataKeys.PROJECT) != null); } } \ No newline at end of file diff --git a/platform/lang-impl/src/com/intellij/internal/LoadAllContentsAction.java b/platform/lang-impl/src/com/intellij/internal/LoadAllContentsAction.java index 36291e228c92..87629e2e638c 100644 --- a/platform/lang-impl/src/com/intellij/internal/LoadAllContentsAction.java +++ b/platform/lang-impl/src/com/intellij/internal/LoadAllContentsAction.java @@ -22,6 +22,7 @@ package com.intellij.internal; 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.ex.ApplicationManagerEx; import com.intellij.openapi.diagnostic.Logger; @@ -53,7 +54,7 @@ public class LoadAllContentsAction extends AnAction implements DumbAware { @Override public void actionPerformed(AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); String m = "Started loading content"; LOG.info(m); System.out.println(m); @@ -95,6 +96,6 @@ public class LoadAllContentsAction extends AnAction implements DumbAware { @Override public void update(final AnActionEvent e) { - e.getPresentation().setEnabled(e.getData(PlatformDataKeys.PROJECT) != null); + e.getPresentation().setEnabled(e.getData(CommonDataKeys.PROJECT) != null); } } \ No newline at end of file diff --git a/platform/lang-impl/src/com/intellij/internal/LoadAllVfsStoredContentsAction.java b/platform/lang-impl/src/com/intellij/internal/LoadAllVfsStoredContentsAction.java index aaeb486584cc..3918f5df6188 100644 --- a/platform/lang-impl/src/com/intellij/internal/LoadAllVfsStoredContentsAction.java +++ b/platform/lang-impl/src/com/intellij/internal/LoadAllVfsStoredContentsAction.java @@ -22,6 +22,7 @@ package com.intellij.internal; 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.ex.ApplicationEx; import com.intellij.openapi.application.ex.ApplicationManagerEx; @@ -111,6 +112,6 @@ public class LoadAllVfsStoredContentsAction extends AnAction implements DumbAwar @Override public void update(final AnActionEvent e) { - e.getPresentation().setEnabled(e.getData(PlatformDataKeys.PROJECT) != null); + e.getPresentation().setEnabled(e.getData(CommonDataKeys.PROJECT) != null); } } \ No newline at end of file diff --git a/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerAction.java b/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerAction.java index bd048887f075..ea3826dfb88c 100644 --- a/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerAction.java +++ b/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerAction.java @@ -17,6 +17,7 @@ package com.intellij.internal.psiView; 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.application.ex.ApplicationManagerEx; @@ -32,13 +33,13 @@ import com.intellij.openapi.project.Project; public class PsiViewerAction extends AnAction implements DumbAware { @Override public void actionPerformed(AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); new PsiViewerDialog(project, false, null, null).show(); } @Override public void update(AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); final Presentation p = e.getPresentation(); if (project == null) { p.setVisible(false); diff --git a/platform/lang-impl/src/com/intellij/moduleDependencies/ModulesDependenciesPanel.java b/platform/lang-impl/src/com/intellij/moduleDependencies/ModulesDependenciesPanel.java index c3217b9c5f4a..ac63fde71750 100644 --- a/platform/lang-impl/src/com/intellij/moduleDependencies/ModulesDependenciesPanel.java +++ b/platform/lang-impl/src/com/intellij/moduleDependencies/ModulesDependenciesPanel.java @@ -512,7 +512,7 @@ public class ModulesDependenciesPanel extends JPanel implements ModuleRootListen @Override public Object getData(String dataId) { - if (PlatformDataKeys.PROJECT.is(dataId)){ + if (CommonDataKeys.PROJECT.is(dataId)){ return myProject; } if (LangDataKeys.MODULE_CONTEXT.is(dataId)){ diff --git a/platform/lang-impl/src/com/intellij/openapi/editor/actions/FindWordAtCaretAction.java b/platform/lang-impl/src/com/intellij/openapi/editor/actions/FindWordAtCaretAction.java index 5e08dcf70a22..5eb68f714da5 100644 --- a/platform/lang-impl/src/com/intellij/openapi/editor/actions/FindWordAtCaretAction.java +++ b/platform/lang-impl/src/com/intellij/openapi/editor/actions/FindWordAtCaretAction.java @@ -26,6 +26,7 @@ package com.intellij.openapi.editor.actions; import com.intellij.find.FindUtil; import com.intellij.ide.DataManager; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; @@ -37,13 +38,13 @@ public class FindWordAtCaretAction extends EditorAction { private static class Handler extends EditorActionHandler { @Override public void execute(Editor editor, DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(editor.getComponent())); + Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(editor.getComponent())); FindUtil.findWordAtCaret(project, editor); } @Override public boolean isEnabled(Editor editor, DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(editor.getComponent())); + Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(editor.getComponent())); return project != null; } } diff --git a/platform/lang-impl/src/com/intellij/openapi/editor/actions/IncrementalFindAction.java b/platform/lang-impl/src/com/intellij/openapi/editor/actions/IncrementalFindAction.java index aaef70936953..f29bc30929aa 100644 --- a/platform/lang-impl/src/com/intellij/openapi/editor/actions/IncrementalFindAction.java +++ b/platform/lang-impl/src/com/intellij/openapi/editor/actions/IncrementalFindAction.java @@ -22,6 +22,7 @@ import com.intellij.find.FindManager; import com.intellij.find.FindModel; import com.intellij.find.FindUtil; import com.intellij.ide.DataManager; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; @@ -43,7 +44,7 @@ public class IncrementalFindAction extends EditorAction { @Override public void execute(final Editor editor, DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(editor.getComponent())); + final Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(editor.getComponent())); if (!editor.isOneLineMode()) { final JComponent headerComponent = editor.getHeaderComponent(); if (headerComponent instanceof EditorSearchComponent) { @@ -72,7 +73,7 @@ public class IncrementalFindAction extends EditorAction { if (myReplace && ConsoleViewUtil.isConsoleViewEditor(editor)) { return false; } - Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(editor.getComponent())); + Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(editor.getComponent())); return project != null && !editor.isOneLineMode(); } } diff --git a/platform/lang-impl/src/com/intellij/openapi/editor/actions/ReplaceAction.java b/platform/lang-impl/src/com/intellij/openapi/editor/actions/ReplaceAction.java index b95ee8d4e0e3..03b22887164e 100644 --- a/platform/lang-impl/src/com/intellij/openapi/editor/actions/ReplaceAction.java +++ b/platform/lang-impl/src/com/intellij/openapi/editor/actions/ReplaceAction.java @@ -25,6 +25,7 @@ package com.intellij.openapi.editor.actions; import com.intellij.ide.DataManager; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; @@ -37,13 +38,13 @@ public class ReplaceAction extends EditorAction { private static class Handler extends EditorActionHandler { @Override public void execute(Editor editor, DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(editor.getComponent())); + Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(editor.getComponent())); FindUtil.replace(project, editor); } @Override public boolean isEnabled(Editor editor, DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(editor.getComponent())); + Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(editor.getComponent())); return project != null; } } diff --git a/platform/lang-impl/src/com/intellij/openapi/editor/actions/ToggleShowImportPopupsAction.java b/platform/lang-impl/src/com/intellij/openapi/editor/actions/ToggleShowImportPopupsAction.java index 508bce5eb6dd..4970aa9e6c57 100644 --- a/platform/lang-impl/src/com/intellij/openapi/editor/actions/ToggleShowImportPopupsAction.java +++ b/platform/lang-impl/src/com/intellij/openapi/editor/actions/ToggleShowImportPopupsAction.java @@ -17,6 +17,7 @@ package com.intellij.openapi.editor.actions; 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.actionSystem.ToggleAction; @@ -54,7 +55,7 @@ public class ToggleShowImportPopupsAction extends ToggleAction { } private DaemonCodeAnalyzer getAnalyzer(AnActionEvent e) { - return DaemonCodeAnalyzer.getInstance(e.getData(PlatformDataKeys.PROJECT)); + return DaemonCodeAnalyzer.getInstance(e.getData(CommonDataKeys.PROJECT)); } @Nullable diff --git a/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/ConfigureFileDefaultEncodingAction.java b/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/ConfigureFileDefaultEncodingAction.java index 0dbfc68d0c88..8e3fdd167899 100644 --- a/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/ConfigureFileDefaultEncodingAction.java +++ b/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/ConfigureFileDefaultEncodingAction.java @@ -18,6 +18,7 @@ package com.intellij.openapi.vfs.encoding; 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.options.ShowSettingsUtil; import com.intellij.openapi.project.Project; @@ -26,7 +27,7 @@ import com.intellij.openapi.vfs.VirtualFile; public class ConfigureFileDefaultEncodingAction extends AnAction { @Override public void actionPerformed(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final VirtualFile virtualFile = e.getData(PlatformDataKeys.VIRTUAL_FILE); assert project != null; @@ -43,6 +44,6 @@ public class ConfigureFileDefaultEncodingAction extends AnAction { @Override public void update(final AnActionEvent e) { - e.getPresentation().setEnabled(e.getData(PlatformDataKeys.PROJECT) != null); + e.getPresentation().setEnabled(e.getData(CommonDataKeys.PROJECT) != null); } } diff --git a/platform/lang-impl/src/com/intellij/openapi/wm/impl/ProjectWindowActionGroup.java b/platform/lang-impl/src/com/intellij/openapi/wm/impl/ProjectWindowActionGroup.java index 5536ae5b225e..6d98aa964cfe 100644 --- a/platform/lang-impl/src/com/intellij/openapi/wm/impl/ProjectWindowActionGroup.java +++ b/platform/lang-impl/src/com/intellij/openapi/wm/impl/ProjectWindowActionGroup.java @@ -17,6 +17,7 @@ package com.intellij.openapi.wm.impl; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; @@ -92,7 +93,7 @@ public class ProjectWindowActionGroup extends DefaultActionGroup { } public void activateNextWindow(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) { return; } @@ -107,7 +108,7 @@ public class ProjectWindowActionGroup extends DefaultActionGroup { } public void activatePreviousWindow(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) { return; } diff --git a/platform/lang-impl/src/com/intellij/platform/renameProject/RenameProjectAction.java b/platform/lang-impl/src/com/intellij/platform/renameProject/RenameProjectAction.java index a1474ccbc682..1cc9bb910a13 100644 --- a/platform/lang-impl/src/com/intellij/platform/renameProject/RenameProjectAction.java +++ b/platform/lang-impl/src/com/intellij/platform/renameProject/RenameProjectAction.java @@ -1,6 +1,7 @@ package com.intellij.platform.renameProject; 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.diagnostic.Logger; @@ -27,14 +28,14 @@ public class RenameProjectAction extends DumbAwareAction { @Override public void update(AnActionEvent e) { final DataContext dataContext = e.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); e.getPresentation().setEnabled(project != null && !project.isDefault()); } @Override public void actionPerformed(AnActionEvent e) { final DataContext dataContext = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); LOG.assertTrue(project instanceof ProjectEx); Module module; Module[] modules = ModuleManager.getInstance(project).getModules(); diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/actions/AddScopeAction.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/actions/AddScopeAction.java index 1927263c9963..3a1031946b6b 100644 --- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/actions/AddScopeAction.java +++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/actions/AddScopeAction.java @@ -71,7 +71,7 @@ public abstract class AddScopeAction extends AnAction { } private static Project getProject(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) { project = ProjectManager.getInstance().getDefaultProject(); } diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java index 68d5c090ea2c..8ebc3aadbe07 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java @@ -22,9 +22,9 @@ import com.intellij.injected.editor.DocumentWindow; import com.intellij.lang.ASTNode; import com.intellij.lang.LanguageFormatting; import com.intellij.lang.injection.InjectedLanguageManager; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.IdeActions; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.diagnostic.Logger; @@ -700,7 +700,7 @@ public class CodeFormatterFacade { @Override public Object getData(@NonNls String dataId) { Object result = baseDataContext.getData(dataId); - if (result == null && PlatformDataKeys.PROJECT.is(dataId)) { + if (result == null && CommonDataKeys.PROJECT.is(dataId)) { result = project; } return result; diff --git a/platform/lang-impl/src/com/intellij/psi/templateLanguages/ChangeTemplateDataLanguageAction.java b/platform/lang-impl/src/com/intellij/psi/templateLanguages/ChangeTemplateDataLanguageAction.java index 3995f1595eab..f20b4a13abbe 100644 --- a/platform/lang-impl/src/com/intellij/psi/templateLanguages/ChangeTemplateDataLanguageAction.java +++ b/platform/lang-impl/src/com/intellij/psi/templateLanguages/ChangeTemplateDataLanguageAction.java @@ -17,6 +17,7 @@ package com.intellij.psi.templateLanguages; 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.project.Project; import com.intellij.openapi.vfs.VirtualFile; @@ -40,7 +41,7 @@ public class ChangeTemplateDataLanguageAction extends AnAction { } if (virtualFile == null || virtualFile.isDirectory()) return; - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) return; final FileViewProvider provider = PsiManager.getInstance(project).findViewProvider(virtualFile); @@ -56,7 +57,7 @@ public class ChangeTemplateDataLanguageAction extends AnAction { @Override public void actionPerformed(final AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) return; final VirtualFile virtualFile = e.getData(PlatformDataKeys.VIRTUAL_FILE); diff --git a/platform/lang-impl/src/com/intellij/refactoring/actions/BaseRefactoringAction.java b/platform/lang-impl/src/com/intellij/refactoring/actions/BaseRefactoringAction.java index aec5594b974b..86ddcd939405 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/actions/BaseRefactoringAction.java +++ b/platform/lang-impl/src/com/intellij/refactoring/actions/BaseRefactoringAction.java @@ -73,7 +73,7 @@ public abstract class BaseRefactoringAction extends AnAction { @Override public final void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) return; PsiDocumentManager.getInstance(project).commitAllDocuments(); final Editor editor = e.getData(PlatformDataKeys.EDITOR); @@ -136,7 +136,7 @@ public abstract class BaseRefactoringAction extends AnAction { presentation.setVisible(true); presentation.setEnabled(true); DataContext dataContext = e.getDataContext(); - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); if (project == null || isHidden()) { hideAction(e); return; diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameHandlerRegistry.java b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameHandlerRegistry.java index 59b03f9ca0ed..f569eddf24ac 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameHandlerRegistry.java +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameHandlerRegistry.java @@ -17,6 +17,7 @@ package com.intellij.refactoring.rename; import com.intellij.ide.TitledHandler; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; @@ -95,7 +96,7 @@ public class RenameHandlerRegistry { if (availableHandlers.size() == 1) return availableHandlers.values().iterator().next(); if (availableHandlers.size() > 1) { final String[] strings = ArrayUtil.toStringArray(availableHandlers.keySet()); - final HandlersChooser chooser = new HandlersChooser(PlatformDataKeys.PROJECT.getData(dataContext), strings); + final HandlersChooser chooser = new HandlersChooser(CommonDataKeys.PROJECT.getData(dataContext), strings); chooser.show(); if (chooser.isOK()) { return availableHandlers.get(chooser.getSelection()); diff --git a/platform/lang-impl/src/com/intellij/testIntegration/GotoTestOrCodeAction.java b/platform/lang-impl/src/com/intellij/testIntegration/GotoTestOrCodeAction.java index 47a22ea60b3c..d0b91b365b2b 100644 --- a/platform/lang-impl/src/com/intellij/testIntegration/GotoTestOrCodeAction.java +++ b/platform/lang-impl/src/com/intellij/testIntegration/GotoTestOrCodeAction.java @@ -20,6 +20,7 @@ import com.intellij.codeInsight.CodeInsightActionHandler; import com.intellij.codeInsight.actions.BaseCodeInsightAction; 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.actionSystem.Presentation; import com.intellij.openapi.editor.Editor; @@ -44,7 +45,7 @@ public class GotoTestOrCodeAction extends BaseCodeInsightAction { return; } p.setEnabled(false); - Project project = event.getData(PlatformDataKeys.PROJECT); + Project project = event.getData(CommonDataKeys.PROJECT); Editor editor = event.getData(PlatformDataKeys.EDITOR); if (editor == null || project == null) return; diff --git a/platform/lang-impl/src/com/intellij/tools/BaseExternalToolsGroup.java b/platform/lang-impl/src/com/intellij/tools/BaseExternalToolsGroup.java index 6dbfe80257d8..76b78dfeaf4a 100644 --- a/platform/lang-impl/src/com/intellij/tools/BaseExternalToolsGroup.java +++ b/platform/lang-impl/src/com/intellij/tools/BaseExternalToolsGroup.java @@ -31,7 +31,7 @@ public abstract class BaseExternalToolsGroup extends SimpleActio Presentation presentation = event.getPresentation(); removeAll(); String context = event.getPlace(); - Project project = event.getData(PlatformDataKeys.PROJECT); + Project project = event.getData(CommonDataKeys.PROJECT); if (project == null) { presentation.setVisible(false); presentation.setEnabled(false); diff --git a/platform/lang-impl/src/com/intellij/tools/ScanSourceCommentsAction.java b/platform/lang-impl/src/com/intellij/tools/ScanSourceCommentsAction.java index 150d0fb3eab4..be3fa32182de 100644 --- a/platform/lang-impl/src/com/intellij/tools/ScanSourceCommentsAction.java +++ b/platform/lang-impl/src/com/intellij/tools/ScanSourceCommentsAction.java @@ -21,6 +21,7 @@ package com.intellij.tools; 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.diagnostic.Logger; import com.intellij.openapi.fileTypes.LanguageFileType; @@ -48,7 +49,7 @@ public class ScanSourceCommentsAction extends AnAction { @Override public void actionPerformed(AnActionEvent e) { - final Project p = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project p = CommonDataKeys.PROJECT.getData(e.getDataContext()); final String file = Messages.showInputDialog(p, "Enter path to the file comments will be extracted to", "Comments File Path", Messages.getQuestionIcon()); diff --git a/platform/lang-impl/src/com/intellij/tools/Tool.java b/platform/lang-impl/src/com/intellij/tools/Tool.java index 23f4d785dd66..80ffc7626f30 100644 --- a/platform/lang-impl/src/com/intellij/tools/Tool.java +++ b/platform/lang-impl/src/com/intellij/tools/Tool.java @@ -32,6 +32,7 @@ import com.intellij.execution.util.ExecutionErrorDialog; import com.intellij.ide.macro.Macro; import com.intellij.ide.macro.MacroManager; 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.fileEditor.FileDocumentManager; @@ -269,7 +270,7 @@ public class Tool implements SchemeElement { * @return true if task has been started successfully */ public boolean execute(AnActionEvent event, DataContext dataContext, long executionId, @Nullable final ProcessListener processListener) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return false; } diff --git a/platform/lang-impl/src/com/intellij/tools/ToolEditorDialog.java b/platform/lang-impl/src/com/intellij/tools/ToolEditorDialog.java index 4fdfe2732d4b..67df65e2e3f7 100644 --- a/platform/lang-impl/src/com/intellij/tools/ToolEditorDialog.java +++ b/platform/lang-impl/src/com/intellij/tools/ToolEditorDialog.java @@ -20,6 +20,7 @@ import com.intellij.execution.ExecutionBundle; import com.intellij.ide.DataManager; import com.intellij.ide.macro.MacroManager; import com.intellij.ide.macro.MacrosDialog; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.fileChooser.FileChooserDescriptor; @@ -190,7 +191,7 @@ public class ToolEditorDialog extends DialogWrapper { myOutputFiltersButton = new JButton(ToolsBundle.message("tools.filters.button")); DataContext dataContext = DataManager.getInstance().getDataContext(parent); - myProject = PlatformDataKeys.PROJECT.getData(dataContext); + myProject = CommonDataKeys.PROJECT.getData(dataContext); MacroManager.getInstance().cacheMacrosPreview(dataContext); setTitle(title); init(); diff --git a/platform/lang-impl/src/com/intellij/unscramble/AnalyzeStacktraceAction.java b/platform/lang-impl/src/com/intellij/unscramble/AnalyzeStacktraceAction.java index 9a8950eda53b..9b0692d98fe2 100644 --- a/platform/lang-impl/src/com/intellij/unscramble/AnalyzeStacktraceAction.java +++ b/platform/lang-impl/src/com/intellij/unscramble/AnalyzeStacktraceAction.java @@ -18,6 +18,7 @@ package com.intellij.unscramble; 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.project.DumbAware; import com.intellij.openapi.project.Project; @@ -31,13 +32,13 @@ import com.intellij.openapi.project.Project; public class AnalyzeStacktraceAction extends AnAction implements DumbAware { @Override public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); AnalyzeStacktraceDialog dialog = new AnalyzeStacktraceDialog(project); dialog.show(); } @Override public void update(AnActionEvent e) { - e.getPresentation().setEnabled(e.getData(PlatformDataKeys.PROJECT) != null); + e.getPresentation().setEnabled(e.getData(CommonDataKeys.PROJECT) != null); } } diff --git a/platform/lang-impl/src/com/intellij/unscramble/AnalyzeStacktraceOnErrorAction.java b/platform/lang-impl/src/com/intellij/unscramble/AnalyzeStacktraceOnErrorAction.java index 8e7983efd083..e1de663c9418 100644 --- a/platform/lang-impl/src/com/intellij/unscramble/AnalyzeStacktraceOnErrorAction.java +++ b/platform/lang-impl/src/com/intellij/unscramble/AnalyzeStacktraceOnErrorAction.java @@ -19,6 +19,7 @@ package com.intellij.unscramble; import com.intellij.diagnostic.IdeErrorsDialog; 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.project.Project; @@ -32,7 +33,7 @@ public class AnalyzeStacktraceOnErrorAction extends AnAction { public void actionPerformed(AnActionEvent e) { final DataContext dataContext = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return; final String message = IdeErrorsDialog.CURRENT_TRACE_KEY.getData(dataContext); diff --git a/platform/lang-impl/src/com/intellij/unscramble/ShowRecentlyChanged.java b/platform/lang-impl/src/com/intellij/unscramble/ShowRecentlyChanged.java index baea20c95e0e..c7085c6ac2c8 100644 --- a/platform/lang-impl/src/com/intellij/unscramble/ShowRecentlyChanged.java +++ b/platform/lang-impl/src/com/intellij/unscramble/ShowRecentlyChanged.java @@ -16,6 +16,7 @@ package com.intellij.unscramble; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.options.ShowSettingsUtil; import com.intellij.openapi.project.DumbAwareAction; @@ -39,14 +40,14 @@ public class ShowRecentlyChanged extends DumbAwareAction { @Override public void actionPerformed(AnActionEvent e) { if (! enabled(e)) return; - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); VcsContentAnnotationConfigurable configurable = new VcsContentAnnotationConfigurable(project); ShowSettingsUtil.getInstance().editConfigurable(project, configurable); // todo recalculate highlight } private boolean enabled(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) return false; ProjectLevelVcsManager vcsManager = ProjectLevelVcsManager.getInstance(project); if (! vcsManager.hasActiveVcss()) return false; diff --git a/platform/lang-impl/testSources/com/intellij/ide/macro/MacroManagerTest.java b/platform/lang-impl/testSources/com/intellij/ide/macro/MacroManagerTest.java index db0e19face5b..19136b3df158 100644 --- a/platform/lang-impl/testSources/com/intellij/ide/macro/MacroManagerTest.java +++ b/platform/lang-impl/testSources/com/intellij/ide/macro/MacroManagerTest.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.actionSystem.impl.SimpleDataContext; @@ -37,7 +38,7 @@ public class MacroManagerTest extends CodeInsightFixtureTestCase { public DataContext getContext(VirtualFile file) { Project project = myFixture.getProject(); Map dataId2data = new THashMap(); - dataId2data.put(PlatformDataKeys.PROJECT.getName(), project); + dataId2data.put(CommonDataKeys.PROJECT.getName(), project); dataId2data.put(PlatformDataKeys.VIRTUAL_FILE.getName(), file); dataId2data.put(PlatformDataKeys.PROJECT_FILE_DIRECTORY.getName(), project.getBaseDir()); return SimpleDataContext.getSimpleContext(dataId2data, null); diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/ui/actions/LocalHistoryGroup.java b/platform/lvcs-impl/src/com/intellij/history/integration/ui/actions/LocalHistoryGroup.java index 8e67d2372493..550374a9541f 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/ui/actions/LocalHistoryGroup.java +++ b/platform/lvcs-impl/src/com/intellij/history/integration/ui/actions/LocalHistoryGroup.java @@ -17,6 +17,7 @@ package com.intellij.history.integration.ui.actions; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.actionSystem.Presentation; @@ -25,7 +26,7 @@ import com.intellij.openapi.project.DumbAware; public class LocalHistoryGroup extends DefaultActionGroup implements DumbAware { public void update(AnActionEvent event) { Presentation p = event.getPresentation(); - boolean hasProject = event.getData(PlatformDataKeys.PROJECT) != null; + boolean hasProject = event.getData(CommonDataKeys.PROJECT) != null; p.setVisible(hasProject); p.setEnabled(hasProject); diff --git a/platform/platform-api/src/com/intellij/ide/actions/QuickSwitchSchemeAction.java b/platform/platform-api/src/com/intellij/ide/actions/QuickSwitchSchemeAction.java index 6323ffec31ef..b0bd74f28368 100644 --- a/platform/platform-api/src/com/intellij/ide/actions/QuickSwitchSchemeAction.java +++ b/platform/platform-api/src/com/intellij/ide/actions/QuickSwitchSchemeAction.java @@ -48,7 +48,7 @@ public abstract class QuickSwitchSchemeAction extends AnAction implements DumbAw @Override public void actionPerformed(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); DefaultActionGroup group = new DefaultActionGroup(); fillActions(project, group, e.getDataContext()); showPopup(e, group); @@ -68,7 +68,7 @@ public abstract class QuickSwitchSchemeAction extends AnAction implements DumbAw } protected void showPopup(AnActionEvent e, ListPopup popup) { - popup.showCenteredInCurrentWindow(e.getData(PlatformDataKeys.PROJECT)); + popup.showCenteredInCurrentWindow(e.getData(CommonDataKeys.PROJECT)); } protected JBPopupFactory.ActionSelectionAid getAidMethod() { @@ -82,7 +82,7 @@ public abstract class QuickSwitchSchemeAction extends AnAction implements DumbAw @Override public void update(AnActionEvent e) { super.update(e); - e.getPresentation().setEnabled(e.getData(PlatformDataKeys.PROJECT) != null && isEnabled()); + e.getPresentation().setEnabled(e.getData(CommonDataKeys.PROJECT) != null && isEnabled()); } protected abstract boolean isEnabled(); diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/DataConstants.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/DataConstants.java index 776b2e9f8673..f5360c78034d 100644 --- a/platform/platform-api/src/com/intellij/openapi/actionSystem/DataConstants.java +++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/DataConstants.java @@ -30,7 +30,7 @@ public interface DataConstants { * * @deprecated use {@link com.intellij.openapi.actionSystem.PlatformDataKeys#PROJECT} instead */ - String PROJECT = PlatformDataKeys.PROJECT.getName(); + String PROJECT = CommonDataKeys.PROJECT.getName(); /** * Returns {@link com.intellij.openapi.module.Module} diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionUtil.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionUtil.java index 9f990c17bdeb..8132f9e65990 100644 --- a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionUtil.java +++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionUtil.java @@ -17,7 +17,7 @@ package com.intellij.openapi.actionSystem.ex; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.application.ApplicationNamesInfo; import com.intellij.openapi.project.DumbService; @@ -47,7 +47,7 @@ public class ActionUtil { actionNames.add(s); } - final Project _project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + final Project _project = CommonDataKeys.PROJECT.getData(event.getDataContext()); if (_project != null && project == null) { project = _project; } @@ -92,7 +92,7 @@ public class ActionUtil { public static boolean performDumbAwareUpdate(AnAction action, AnActionEvent e, boolean beforeActionPerformed) { final Presentation presentation = e.getPresentation(); final Boolean wasEnabledBefore = (Boolean)presentation.getClientProperty(WAS_ENABLED_BEFORE_DUMB); - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); final boolean dumbMode = project != null && DumbService.getInstance(project).isDumb(); if (wasEnabledBefore != null && !dumbMode) { presentation.putClientProperty(WAS_ENABLED_BEFORE_DUMB, null); @@ -134,7 +134,7 @@ public class ActionUtil { public static boolean lastUpdateAndCheckDumb(AnAction action, AnActionEvent e, boolean visibilityMatters) { performDumbAwareUpdate(action, e, true); - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project != null && DumbService.getInstance(project).isDumb() && !action.isDumbAware()) { if (Boolean.FALSE.equals(e.getPresentation().getClientProperty(WOULD_BE_ENABLED_IF_NOT_DUMB_MODE))) { return false; diff --git a/platform/platform-api/src/com/intellij/openapi/editor/actionSystem/TypedAction.java b/platform/platform-api/src/com/intellij/openapi/editor/actionSystem/TypedAction.java index d3eaaa785ee8..30458b0a393e 100644 --- a/platform/platform-api/src/com/intellij/openapi/editor/actionSystem/TypedAction.java +++ b/platform/platform-api/src/com/intellij/openapi/editor/actionSystem/TypedAction.java @@ -15,8 +15,8 @@ */ package com.intellij.openapi.editor.actionSystem; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.command.UndoConfirmationPolicy; @@ -54,7 +54,7 @@ public class TypedAction { if (editor.isViewer()) return; Document doc = editor.getDocument(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (!FileDocumentManager.getInstance().requestWriting(doc, project)) { return; } @@ -103,7 +103,7 @@ public class TypedAction { Runnable command = new TypingCommand(editor, charTyped, dataContext); - CommandProcessor.getInstance().executeCommand(PlatformDataKeys.PROJECT.getData(dataContext), command, "", editor.getDocument(), UndoConfirmationPolicy.DEFAULT, editor.getDocument()); + CommandProcessor.getInstance().executeCommand(CommonDataKeys.PROJECT.getData(dataContext), command, "", editor.getDocument(), UndoConfirmationPolicy.DEFAULT, editor.getDocument()); } public static boolean isTypedActionInProgress() { diff --git a/platform/platform-api/src/com/intellij/openapi/wm/IdeFocusManager.java b/platform/platform-api/src/com/intellij/openapi/wm/IdeFocusManager.java index 2e61a6d32da0..5f996397d648 100644 --- a/platform/platform-api/src/com/intellij/openapi/wm/IdeFocusManager.java +++ b/platform/platform-api/src/com/intellij/openapi/wm/IdeFocusManager.java @@ -15,8 +15,8 @@ */ package com.intellij.openapi.wm; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.Project; @@ -192,7 +192,7 @@ public abstract class IdeFocusManager implements FocusRequestor { public static IdeFocusManager findInstanceByContext(@Nullable DataContext context) { IdeFocusManager instance = null; if (context != null) { - instance = getInstanceSafe(PlatformDataKeys.PROJECT.getData(context)); + instance = getInstanceSafe(CommonDataKeys.PROJECT.getData(context)); } if (instance == null) { diff --git a/platform/platform-api/src/com/intellij/ui/switcher/SwitchAction.java b/platform/platform-api/src/com/intellij/ui/switcher/SwitchAction.java index 06e22cbcb8b7..b066ee84fd99 100644 --- a/platform/platform-api/src/com/intellij/ui/switcher/SwitchAction.java +++ b/platform/platform-api/src/com/intellij/ui/switcher/SwitchAction.java @@ -17,7 +17,7 @@ package com.intellij.ui.switcher; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; @@ -65,7 +65,7 @@ public abstract class SwitchAction extends AnAction implements DumbAware { } private static SwitchManager getManager(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); return SwitchManager.getInstance(project); } diff --git a/platform/platform-api/src/com/intellij/util/EditSourceOnDoubleClickHandler.java b/platform/platform-api/src/com/intellij/util/EditSourceOnDoubleClickHandler.java index f8ae101733d7..2851a38535c9 100644 --- a/platform/platform-api/src/com/intellij/util/EditSourceOnDoubleClickHandler.java +++ b/platform/platform-api/src/com/intellij/util/EditSourceOnDoubleClickHandler.java @@ -17,8 +17,8 @@ package com.intellij.util; import com.intellij.ide.DataManager; import com.intellij.ide.util.treeView.NodeDescriptor; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.project.Project; import com.intellij.ui.DoubleClickListener; @@ -51,7 +51,7 @@ public class EditSourceOnDoubleClickHandler { if (ModalityState.current().dominates(ModalityState.NON_MODAL)) return false; if (treeTable.getTree().getPathForLocation(e.getX(), e.getY()) == null) return false; DataContext dataContext = DataManager.getInstance().getDataContext(treeTable); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return false; OpenSourceUtil.openSourcesFrom(dataContext, true); return true; @@ -67,7 +67,7 @@ public class EditSourceOnDoubleClickHandler { if (table.columnAtPoint(e.getPoint()) < 0) return false; if (table.rowAtPoint(e.getPoint()) < 0) return false; DataContext dataContext = DataManager.getInstance().getDataContext(table); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return false; OpenSourceUtil.openSourcesFrom(dataContext, true); return true; @@ -111,7 +111,7 @@ public class EditSourceOnDoubleClickHandler { if (clickPath == null) return false; final DataContext dataContext = DataManager.getInstance().getDataContext(myTree); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return false; final TreePath selectionPath = myTree.getSelectionPath(); diff --git a/platform/platform-api/src/com/intellij/util/EditSourceOnEnterKeyHandler.java b/platform/platform-api/src/com/intellij/util/EditSourceOnEnterKeyHandler.java index 3c91e846d55d..da19533a6455 100644 --- a/platform/platform-api/src/com/intellij/util/EditSourceOnEnterKeyHandler.java +++ b/platform/platform-api/src/com/intellij/util/EditSourceOnEnterKeyHandler.java @@ -16,8 +16,8 @@ package com.intellij.util; import com.intellij.ide.DataManager; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.Nullable; @@ -39,7 +39,7 @@ public class EditSourceOnEnterKeyHandler{ if (KeyEvent.VK_ENTER == e.getKeyCode()) { DataContext dataContext = DataManager.getInstance().getDataContext(tree); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return; OpenSourceUtil.openSourcesFrom(dataContext, false); diff --git a/platform/platform-api/src/com/intellij/util/ui/update/LazyUiDisposable.java b/platform/platform-api/src/com/intellij/util/ui/update/LazyUiDisposable.java index f2f767603fb1..647da084659e 100644 --- a/platform/platform-api/src/com/intellij/util/ui/update/LazyUiDisposable.java +++ b/platform/platform-api/src/com/intellij/util/ui/update/LazyUiDisposable.java @@ -17,6 +17,7 @@ package com.intellij.util.ui.update; import com.intellij.ide.DataManager; import com.intellij.openapi.Disposable; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.DataKey; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -57,7 +58,7 @@ public abstract class LazyUiDisposable implements Activata public void run(Disposable parent) { Project project = null; if (ApplicationManager.getApplication() != null) { - project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()); + project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()); } initialize(parent, myChild, project); Disposer.register(parent, myChild); diff --git a/platform/platform-impl/src/com/intellij/codeInsight/hint/EscapeHandler.java b/platform/platform-impl/src/com/intellij/codeInsight/hint/EscapeHandler.java index 7742b2b2bb29..8fda013dfb6b 100644 --- a/platform/platform-impl/src/com/intellij/codeInsight/hint/EscapeHandler.java +++ b/platform/platform-impl/src/com/intellij/codeInsight/hint/EscapeHandler.java @@ -15,8 +15,8 @@ */ package com.intellij.codeInsight.hint; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.actionSystem.EditorActionHandler; import com.intellij.openapi.project.Project; @@ -30,7 +30,7 @@ public class EscapeHandler extends EditorActionHandler { @Override public void execute(Editor editor, DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null || !HintManagerImpl.getInstanceImpl().hideHints(HintManager.HIDE_BY_ESCAPE | HintManager.HIDE_BY_ANY_KEY, true, false)) { myOriginalHandler.execute(editor, dataContext); } @@ -38,7 +38,7 @@ public class EscapeHandler extends EditorActionHandler { @Override public boolean isEnabled(Editor editor, DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project != null) { HintManagerImpl hintManager = HintManagerImpl.getInstanceImpl(); diff --git a/platform/platform-impl/src/com/intellij/codeStyle/AbstractConvertLineSeparatorsAction.java b/platform/platform-impl/src/com/intellij/codeStyle/AbstractConvertLineSeparatorsAction.java index 1d179d90e0a9..f6c287cf4fcd 100644 --- a/platform/platform-impl/src/com/intellij/codeStyle/AbstractConvertLineSeparatorsAction.java +++ b/platform/platform-impl/src/com/intellij/codeStyle/AbstractConvertLineSeparatorsAction.java @@ -58,7 +58,7 @@ public abstract class AbstractConvertLineSeparatorsAction extends AnAction { @Override public void update(AnActionEvent e) { final DataContext dataContext = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project != null) { final VirtualFile[] virtualFiles = PlatformDataKeys.VIRTUAL_FILE_ARRAY.getData(dataContext); final Presentation presentation = e.getPresentation(); @@ -79,7 +79,7 @@ public abstract class AbstractConvertLineSeparatorsAction extends AnAction { @Override public void actionPerformed(AnActionEvent event) { final DataContext dataContext = event.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return; } diff --git a/platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.java b/platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.java index 272ce83f0db6..5eabd41a001e 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.java +++ b/platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.java @@ -27,6 +27,7 @@ import com.intellij.ide.plugins.PluginManager; import com.intellij.idea.IdeaLogger; import com.intellij.notification.NotificationListener; import com.intellij.notification.NotificationType; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; @@ -96,7 +97,7 @@ public class ITNReporter extends ErrorReportSubmitter { final ErrorBean errorBean, final String description) { final DataContext dataContext = DataManager.getInstance().getDataContext(parentComponent); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final ErrorReportConfigurable errorReportConfigurable = ErrorReportConfigurable.getInstance(); if (!errorReportConfigurable.KEEP_ITN_PASSWORD && diff --git a/platform/platform-impl/src/com/intellij/diagnostic/SubmitPerformanceReportAction.java b/platform/platform-impl/src/com/intellij/diagnostic/SubmitPerformanceReportAction.java index 33f1593af26d..74206ed33ad6 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/SubmitPerformanceReportAction.java +++ b/platform/platform-impl/src/com/intellij/diagnostic/SubmitPerformanceReportAction.java @@ -17,7 +17,7 @@ package com.intellij.diagnostic; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.application.ApplicationInfo; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.PathManager; @@ -55,7 +55,7 @@ public class SubmitPerformanceReportAction extends AnAction implements DumbAware SystemProperties.getUserName() + "_" + myDateFormat.format(new Date()) + ".zip"; final File reportPath = new File(SystemProperties.getUserHome(), reportFileName); final File logDir = new File(PathManager.getLogPath()); - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final boolean[] archiveCreated = new boolean[1]; final boolean completed = ProgressManager.getInstance().runProcessWithProgressSynchronously(new Runnable() { diff --git a/platform/platform-impl/src/com/intellij/ide/MacOSApplicationProvider.java b/platform/platform-impl/src/com/intellij/ide/MacOSApplicationProvider.java index d637ebfce021..798c029e01a8 100644 --- a/platform/platform-impl/src/com/intellij/ide/MacOSApplicationProvider.java +++ b/platform/platform-impl/src/com/intellij/ide/MacOSApplicationProvider.java @@ -23,7 +23,7 @@ import com.intellij.ide.actions.OpenFileAction; import com.intellij.ide.actions.ShowSettingsUtilImpl; import com.intellij.ide.impl.ProjectUtil; import com.intellij.idea.IdeaApplication; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.ex.ActionManagerEx; import com.intellij.openapi.application.ex.ApplicationManagerEx; import com.intellij.openapi.components.ApplicationComponent; @@ -161,7 +161,7 @@ public class MacOSApplicationProvider implements ApplicationComponent { } private static Project getProject() { - return PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()); + return CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()); } } } diff --git a/platform/platform-impl/src/com/intellij/ide/RecentProjectsManagerBase.java b/platform/platform-impl/src/com/intellij/ide/RecentProjectsManagerBase.java index 20689d66fc60..d7caa06e0d05 100644 --- a/platform/platform-impl/src/com/intellij/ide/RecentProjectsManagerBase.java +++ b/platform/platform-impl/src/com/intellij/ide/RecentProjectsManagerBase.java @@ -17,7 +17,7 @@ package com.intellij.ide; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.Separator; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.PersistentStateComponent; @@ -222,7 +222,7 @@ public abstract class RecentProjectsManagerBase implements PersistentStateCompon if (addClearListItem) { AnAction clearListAction = new AnAction(IdeBundle.message("action.clear.list")) { public void actionPerformed(AnActionEvent e) { - final int rc = Messages.showOkCancelDialog(e.getData(PlatformDataKeys.PROJECT), + final int rc = Messages.showOkCancelDialog(e.getData(CommonDataKeys.PROJECT), "Would you like to clear the list of recent projects?", "Clear Recent Projects List", Messages.getQuestionIcon()); diff --git a/platform/platform-impl/src/com/intellij/ide/ReopenProjectAction.java b/platform/platform-impl/src/com/intellij/ide/ReopenProjectAction.java index 2a0dda71f3bc..7a0146807d45 100644 --- a/platform/platform-impl/src/com/intellij/ide/ReopenProjectAction.java +++ b/platform/platform-impl/src/com/intellij/ide/ReopenProjectAction.java @@ -17,6 +17,7 @@ package com.intellij.ide; 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.project.DumbAware; @@ -48,7 +49,7 @@ public class ReopenProjectAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { final int modifiers = e.getModifiers(); final boolean forceOpenInNewFrame = (modifiers & InputEvent.CTRL_MASK) != 0 || (modifiers & InputEvent.SHIFT_MASK) != 0; - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (!new File(myProjectPath).exists()) { if (Messages.showDialog(project, "The path " + FileUtil.toSystemDependentName(myProjectPath) + " does not exist.\n" + "If it is on a removable or network drive, please make sure that the drive is connected.", diff --git a/platform/platform-impl/src/com/intellij/ide/actionMacro/actions/EditMacrosAction.java b/platform/platform-impl/src/com/intellij/ide/actionMacro/actions/EditMacrosAction.java index 11b67d96ebaf..cb0d0ffd4619 100644 --- a/platform/platform-impl/src/com/intellij/ide/actionMacro/actions/EditMacrosAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actionMacro/actions/EditMacrosAction.java @@ -20,7 +20,7 @@ import com.intellij.ide.actionMacro.ActionMacroManager; import com.intellij.ide.actionMacro.EditMacrosDialog; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.project.DumbAware; /** @@ -32,7 +32,7 @@ import com.intellij.openapi.project.DumbAware; */ public class EditMacrosAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { - EditMacrosDialog dialog = new EditMacrosDialog(PlatformDataKeys.PROJECT.getData(e.getDataContext())); + EditMacrosDialog dialog = new EditMacrosDialog(CommonDataKeys.PROJECT.getData(e.getDataContext())); dialog.show(); } diff --git a/platform/platform-impl/src/com/intellij/ide/actionMacro/actions/StartStopMacroRecordingAction.java b/platform/platform-impl/src/com/intellij/ide/actionMacro/actions/StartStopMacroRecordingAction.java index 640a1d53050f..5b2c5414e845 100644 --- a/platform/platform-impl/src/com/intellij/ide/actionMacro/actions/StartStopMacroRecordingAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actionMacro/actions/StartStopMacroRecordingAction.java @@ -21,7 +21,7 @@ import com.intellij.ide.actionMacro.ActionMacroManager; import com.intellij.openapi.actionSystem.ActionPlaces; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.project.DumbAware; /** @@ -49,7 +49,7 @@ public class StartStopMacroRecordingAction extends AnAction implements DumbAware manager.startRecording(IdeBundle.message("macro.noname")); } else { - ActionMacroManager.getInstance().stopRecording(PlatformDataKeys.PROJECT.getData(e.getDataContext())); + ActionMacroManager.getInstance().stopRecording(CommonDataKeys.PROJECT.getData(e.getDataContext())); } } } diff --git a/platform/platform-impl/src/com/intellij/ide/actions/AboutAction.java b/platform/platform-impl/src/com/intellij/ide/actions/AboutAction.java index 59df7c6135cd..51ffc7915107 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/AboutAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/AboutAction.java @@ -18,7 +18,7 @@ package com.intellij.ide.actions; import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.application.ApplicationNamesInfo; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.util.SystemInfo; @@ -34,14 +34,14 @@ public class AboutAction extends AnAction implements DumbAware { } public void actionPerformed(AnActionEvent e) { - Window window = WindowManager.getInstance().suggestParentWindow(e.getData(PlatformDataKeys.PROJECT)); + Window window = WindowManager.getInstance().suggestParentWindow(e.getData(CommonDataKeys.PROJECT)); showAboutDialog(window); } public static void showAbout() { Window window = WindowManager.getInstance().suggestParentWindow( - PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext())); + CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext())); showAboutDialog(window); } diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ActivateToolWindowAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ActivateToolWindowAction.java index e4538eee9bd9..5a409d8769fd 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/ActivateToolWindowAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/ActivateToolWindowAction.java @@ -44,7 +44,7 @@ public class ActivateToolWindowAction extends AnAction implements DumbAware { public void update(AnActionEvent event){ Presentation presentation = event.getPresentation(); - Project project = event.getData(PlatformDataKeys.PROJECT); + Project project = event.getData(CommonDataKeys.PROJECT); if (project == null) { presentation.setEnabled(false); presentation.setVisible(false); @@ -60,7 +60,7 @@ public class ActivateToolWindowAction extends AnAction implements DumbAware { } public void actionPerformed(AnActionEvent e){ - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); ToolWindowManager windowManager = ToolWindowManager.getInstance(project); if (windowManager.isEditorComponentActive() || !myToolWindowId.equals(windowManager.getActiveToolWindowId())) { windowManager.getToolWindow(myToolWindowId).activate(null); diff --git a/platform/platform-impl/src/com/intellij/ide/actions/AssociateFileType.java b/platform/platform-impl/src/com/intellij/ide/actions/AssociateFileType.java index b1f267ea96c7..6e2f1a54e710 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/AssociateFileType.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/AssociateFileType.java @@ -32,7 +32,7 @@ public class AssociateFileType extends AnAction { Presentation presentation = e.getPresentation(); DataContext dataContext = e.getDataContext(); VirtualFile file = PlatformDataKeys.VIRTUAL_FILE.getData(dataContext); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); boolean haveSmthToDo; if (project == null || file == null || file.isDirectory()) { haveSmthToDo = false; diff --git a/platform/platform-impl/src/com/intellij/ide/actions/BackAction.java b/platform/platform-impl/src/com/intellij/ide/actions/BackAction.java index f249b52bb532..e8d4f12696f1 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/BackAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/BackAction.java @@ -18,22 +18,22 @@ package com.intellij.ide.actions; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.fileEditor.ex.IdeDocumentHistory; -import com.intellij.openapi.project.Project; import com.intellij.openapi.project.DumbAware; +import com.intellij.openapi.project.Project; public class BackAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) return; IdeDocumentHistory.getInstance(project).back(); } public void update(AnActionEvent event){ Presentation presentation = event.getPresentation(); - Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); if (project == null || project.isDisposed()) { presentation.setEnabled(false); return; diff --git a/platform/platform-impl/src/com/intellij/ide/actions/BaseShowRecentFilesAction.java b/platform/platform-impl/src/com/intellij/ide/actions/BaseShowRecentFilesAction.java index 3c51473a7696..442d09b8b3bd 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/BaseShowRecentFilesAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/BaseShowRecentFilesAction.java @@ -54,12 +54,12 @@ public abstract class BaseShowRecentFilesAction extends AnAction implements Dumb private static final Color BORDER_COLOR = Gray._135; public void actionPerformed(AnActionEvent e) { - show(PlatformDataKeys.PROJECT.getData(e.getDataContext())); + show(CommonDataKeys.PROJECT.getData(e.getDataContext())); } public void update(AnActionEvent event){ Presentation presentation = event.getPresentation(); - Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); presentation.setEnabled(project != null); } diff --git a/platform/platform-impl/src/com/intellij/ide/actions/BaseToolWindowToggleAction.java b/platform/platform-impl/src/com/intellij/ide/actions/BaseToolWindowToggleAction.java index be79992d9654..61c75d358b7d 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/BaseToolWindowToggleAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/BaseToolWindowToggleAction.java @@ -16,6 +16,7 @@ package com.intellij.ide.actions; 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.actionSystem.ToggleAction; @@ -30,7 +31,7 @@ public abstract class BaseToolWindowToggleAction extends ToggleAction implements @Override public final boolean isSelected(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null || project.isDisposed()) { return false; } @@ -46,7 +47,7 @@ public abstract class BaseToolWindowToggleAction extends ToggleAction implements @Override public final void setSelected(AnActionEvent e, boolean state) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) { return; } @@ -67,7 +68,7 @@ public abstract class BaseToolWindowToggleAction extends ToggleAction implements public final void update(AnActionEvent e) { super.update(e); Presentation presentation = e.getPresentation(); - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) { presentation.setEnabled(false); return; diff --git a/platform/platform-impl/src/com/intellij/ide/actions/CloseAllEditorsAction.java b/platform/platform-impl/src/com/intellij/ide/actions/CloseAllEditorsAction.java index d5461ee71a6d..b0305317d8ea 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/CloseAllEditorsAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/CloseAllEditorsAction.java @@ -19,7 +19,7 @@ package com.intellij.ide.actions; import com.intellij.ide.IdeBundle; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.fileEditor.FileEditorManager; @@ -31,7 +31,7 @@ import com.intellij.openapi.vfs.VirtualFile; public class CloseAllEditorsAction extends AnAction implements DumbAware { public void actionPerformed(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); CommandProcessor commandProcessor = CommandProcessor.getInstance(); commandProcessor.executeCommand( project, new Runnable(){ @@ -64,7 +64,7 @@ public class CloseAllEditorsAction extends AnAction implements DumbAware { else { presentation.setText(IdeBundle.message("action.close.all.editors")); } - Project project = event.getData(PlatformDataKeys.PROJECT); + Project project = event.getData(CommonDataKeys.PROJECT); if (project == null) { presentation.setEnabled(false); return; diff --git a/platform/platform-impl/src/com/intellij/ide/actions/CloseAllEditorsButActiveAction.java b/platform/platform-impl/src/com/intellij/ide/actions/CloseAllEditorsButActiveAction.java index 683e205d644e..4a784216261b 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/CloseAllEditorsButActiveAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/CloseAllEditorsButActiveAction.java @@ -15,10 +15,7 @@ */ package com.intellij.ide.actions; -import com.intellij.openapi.actionSystem.AnAction; -import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; -import com.intellij.openapi.actionSystem.Presentation; +import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx; import com.intellij.openapi.fileEditor.impl.EditorWindow; import com.intellij.openapi.project.DumbAware; @@ -28,12 +25,12 @@ import com.intellij.openapi.vfs.VirtualFile; public class CloseAllEditorsButActiveAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); FileEditorManagerEx fileEditorManager=FileEditorManagerEx.getInstanceEx(project); VirtualFile selectedFile; final EditorWindow window = e.getData(EditorWindow.DATA_KEY); if (window != null){ - window.closeAllExcept(e.getData(PlatformDataKeys.VIRTUAL_FILE)); + window.closeAllExcept(e.getData(CommonDataKeys.VIRTUAL_FILE)); return; } selectedFile = fileEditorManager.getSelectedFiles()[0]; @@ -47,7 +44,7 @@ public class CloseAllEditorsButActiveAction extends AnAction implements DumbAwar public void update(AnActionEvent event){ Presentation presentation = event.getPresentation(); - Project project = event.getData(PlatformDataKeys.PROJECT); + Project project = event.getData(CommonDataKeys.PROJECT); if (project == null) { presentation.setEnabled(false); return; diff --git a/platform/platform-impl/src/com/intellij/ide/actions/CloseEditorsActionBase.java b/platform/platform-impl/src/com/intellij/ide/actions/CloseEditorsActionBase.java index de8714a15fbc..ecf2f41ee3d2 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/CloseEditorsActionBase.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/CloseEditorsActionBase.java @@ -35,7 +35,7 @@ public abstract class CloseEditorsActionBase extends AnAction implements DumbAwa protected ArrayList> getFilesToClose (final AnActionEvent event) { final ArrayList> res = new ArrayList>(); final DataContext dataContext = event.getDataContext(); - final Project project = event.getData(PlatformDataKeys.PROJECT); + final Project project = event.getData(CommonDataKeys.PROJECT); final FileEditorManagerEx editorManager = FileEditorManagerEx.getInstanceEx(project); final EditorWindow editorWindow = EditorWindow.DATA_KEY.getData(dataContext); final EditorWindow[] windows; @@ -63,7 +63,7 @@ public abstract class CloseEditorsActionBase extends AnAction implements DumbAwa protected abstract boolean isFileToClose(EditorComposite editor, EditorWindow window); public void actionPerformed(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final CommandProcessor commandProcessor = CommandProcessor.getInstance(); commandProcessor.executeCommand( project, new Runnable(){ @@ -84,7 +84,7 @@ public abstract class CloseEditorsActionBase extends AnAction implements DumbAwa final EditorWindow editorWindow = EditorWindow.DATA_KEY.getData(dataContext); final boolean inSplitter = editorWindow != null && editorWindow.inSplitter(); presentation.setText(getPresentationText(inSplitter)); - final Project project = event.getData(PlatformDataKeys.PROJECT); + final Project project = event.getData(CommonDataKeys.PROJECT); boolean enabled = (project != null && isActionEnabled(project, event)); if (ActionPlaces.isPopupPlace(event.getPlace())) { presentation.setVisible(enabled); diff --git a/platform/platform-impl/src/com/intellij/ide/actions/CloseProjectAction.java b/platform/platform-impl/src/com/intellij/ide/actions/CloseProjectAction.java index ecbc0f9f1729..01015897fd39 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/CloseProjectAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/CloseProjectAction.java @@ -19,6 +19,7 @@ import com.intellij.ide.RecentProjectsManagerBase; import com.intellij.ide.impl.ProjectUtil; 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.module.ModuleManager; @@ -29,7 +30,7 @@ import com.intellij.projectImport.ProjectAttachProcessor; public class CloseProjectAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); assert project != null; ProjectUtil.closeAndDispose(project); @@ -39,7 +40,7 @@ public class CloseProjectAction extends AnAction implements DumbAware { public void update(AnActionEvent event){ Presentation presentation = event.getPresentation(); - Project project = event.getData(PlatformDataKeys.PROJECT); + Project project = event.getData(CommonDataKeys.PROJECT); presentation.setEnabled(project != null); if (ProjectAttachProcessor.canAttachToProject() && project != null && ModuleManager.getInstance(project).getModules().length > 1) { presentation.setText("Close Pro_jects in Current Window"); diff --git a/platform/platform-impl/src/com/intellij/ide/actions/CustomizeUIAction.java b/platform/platform-impl/src/com/intellij/ide/actions/CustomizeUIAction.java index a04d9048e553..5c713bc25030 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/CustomizeUIAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/CustomizeUIAction.java @@ -18,6 +18,7 @@ package com.intellij.ide.actions; import com.intellij.ide.ui.customization.CustomizationConfigurable; 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.options.ShowSettingsUtil; import com.intellij.openapi.project.Project; @@ -31,7 +32,7 @@ public class CustomizeUIAction extends AnAction { } public void actionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final ShowSettingsUtil util = ShowSettingsUtil.getInstance(); util.editConfigurable(project, new CustomizationConfigurable()); } diff --git a/platform/platform-impl/src/com/intellij/ide/actions/CutAction.java b/platform/platform-impl/src/com/intellij/ide/actions/CutAction.java index 381d6afc8577..4b92484ce894 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/CutAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/CutAction.java @@ -34,7 +34,7 @@ public class CutAction extends AnAction implements DumbAware { Presentation presentation = event.getPresentation(); DataContext dataContext = event.getDataContext(); CutProvider provider = PlatformDataKeys.CUT_PROVIDER.getData(dataContext); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); presentation.setEnabled(project != null && project.isOpen() && provider != null && provider.isCutEnabled(dataContext)); if (event.getPlace().equals(ActionPlaces.EDITOR_POPUP) && provider != null) { presentation.setVisible(provider.isCutVisible(dataContext)); diff --git a/platform/platform-impl/src/com/intellij/ide/actions/DeleteAction.java b/platform/platform-impl/src/com/intellij/ide/actions/DeleteAction.java index 6d9bf9cd688c..89a721d96c3e 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/DeleteAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/DeleteAction.java @@ -62,7 +62,7 @@ public class DeleteAction extends AnAction implements DumbAware { else presentation.setText(IdeBundle.message("action.delete")); DataContext dataContext = event.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { presentation.setEnabled(false); return; diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ExportToTextFileAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ExportToTextFileAction.java index 44d5e0072f5b..3cd7df4fb544 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/ExportToTextFileAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/ExportToTextFileAction.java @@ -23,7 +23,7 @@ import com.intellij.openapi.project.Project; public class ExportToTextFileAction extends AnAction { public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); ExporterToTextFile exporterToTextFile = getExporter(dataContext); if (project == null || exporterToTextFile == null) return; if (!exporterToTextFile.canExport()) return; @@ -51,6 +51,7 @@ public class ExportToTextFileAction extends AnAction { Presentation presentation = event.getPresentation(); DataContext dataContext = event.getDataContext(); ExporterToTextFile exporterToTextFile = getExporter(dataContext); - presentation.setEnabled(PlatformDataKeys.PROJECT.getData(dataContext) != null && exporterToTextFile != null && exporterToTextFile.canExport()); + presentation.setEnabled( + CommonDataKeys.PROJECT.getData(dataContext) != null && exporterToTextFile != null && exporterToTextFile.canExport()); } } diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ForwardAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ForwardAction.java index 17dedb17e0d6..30dc9ef96d45 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/ForwardAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/ForwardAction.java @@ -18,22 +18,22 @@ package com.intellij.ide.actions; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.fileEditor.ex.IdeDocumentHistory; -import com.intellij.openapi.project.Project; import com.intellij.openapi.project.DumbAware; +import com.intellij.openapi.project.Project; public class ForwardAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) return; IdeDocumentHistory.getInstance(project).forward(); } public void update(AnActionEvent event){ Presentation presentation = event.getPresentation(); - Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); if (project == null || project.isDisposed()) { presentation.setEnabled(false); return; diff --git a/platform/platform-impl/src/com/intellij/ide/actions/GotoLineAction.java b/platform/platform-impl/src/com/intellij/ide/actions/GotoLineAction.java index 670e6e9cf242..c7248e35e950 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/GotoLineAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/GotoLineAction.java @@ -17,15 +17,12 @@ package com.intellij.ide.actions; import com.intellij.ide.IdeBundle; import com.intellij.ide.util.GotoLineNumberDialog; -import com.intellij.openapi.actionSystem.AnAction; -import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; -import com.intellij.openapi.actionSystem.Presentation; +import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.fileEditor.ex.IdeDocumentHistory; -import com.intellij.openapi.project.Project; import com.intellij.openapi.project.DumbAware; +import com.intellij.openapi.project.Project; public class GotoLineAction extends AnAction implements DumbAware { public GotoLineAction() { @@ -33,7 +30,7 @@ public class GotoLineAction extends AnAction implements DumbAware { } public void actionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final Editor editor = e.getData(PlatformDataKeys.EDITOR); if (Boolean.TRUE.equals(e.getData(PlatformDataKeys.IS_MODAL_CONTEXT))) { GotoLineNumberDialog dialog = new GotoLineNumberDialog(project, editor); @@ -57,7 +54,7 @@ public class GotoLineAction extends AnAction implements DumbAware { public void update(AnActionEvent event){ Presentation presentation = event.getPresentation(); - Project project = event.getData(PlatformDataKeys.PROJECT); + Project project = event.getData(CommonDataKeys.PROJECT); if (project == null) { presentation.setEnabled(false); presentation.setVisible(false); diff --git a/platform/platform-impl/src/com/intellij/ide/actions/HideAllToolWindowsAction.java b/platform/platform-impl/src/com/intellij/ide/actions/HideAllToolWindowsAction.java index 36605658a0ec..99fb583fd864 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/HideAllToolWindowsAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/HideAllToolWindowsAction.java @@ -18,17 +18,17 @@ package com.intellij.ide.actions; import com.intellij.ide.IdeBundle; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.Presentation; -import com.intellij.openapi.project.Project; import com.intellij.openapi.project.DumbAware; +import com.intellij.openapi.project.Project; import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ex.ToolWindowManagerEx; import com.intellij.openapi.wm.impl.DesktopLayout; public class HideAllToolWindowsAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) { return; } @@ -72,7 +72,7 @@ public class HideAllToolWindowsAction extends AnAction implements DumbAware { public void update(AnActionEvent event) { Presentation presentation = event.getPresentation(); - Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); if (project == null) { presentation.setEnabled(false); return; diff --git a/platform/platform-impl/src/com/intellij/ide/actions/HideSideWindowsAction.java b/platform/platform-impl/src/com/intellij/ide/actions/HideSideWindowsAction.java index ded182a96553..f129f1d9edc4 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/HideSideWindowsAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/HideSideWindowsAction.java @@ -17,17 +17,17 @@ package com.intellij.ide.actions; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.Presentation; -import com.intellij.openapi.project.Project; import com.intellij.openapi.project.DumbAware; +import com.intellij.openapi.project.Project; import com.intellij.openapi.wm.ex.ToolWindowEx; import com.intellij.openapi.wm.ex.ToolWindowManagerEx; public class HideSideWindowsAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) { return; } @@ -42,7 +42,7 @@ public class HideSideWindowsAction extends AnAction implements DumbAware { public void update(AnActionEvent event) { Presentation presentation = event.getPresentation(); - Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); if (project == null) { presentation.setEnabled(false); return; diff --git a/platform/platform-impl/src/com/intellij/ide/actions/HideToolWindowAction.java b/platform/platform-impl/src/com/intellij/ide/actions/HideToolWindowAction.java index 17fea6e3ea3e..7288bf24c01d 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/HideToolWindowAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/HideToolWindowAction.java @@ -17,6 +17,7 @@ package com.intellij.ide.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.actionSystem.Presentation; import com.intellij.openapi.project.Project; @@ -26,7 +27,7 @@ import com.intellij.openapi.wm.ex.ToolWindowManagerEx; public class HideToolWindowAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) { return; } @@ -41,7 +42,7 @@ public class HideToolWindowAction extends AnAction implements DumbAware { public void update(AnActionEvent event) { Presentation presentation = event.getPresentation(); - Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); if (project == null) { presentation.setEnabled(false); return; diff --git a/platform/platform-impl/src/com/intellij/ide/actions/InvalidateCachesAction.java b/platform/platform-impl/src/com/intellij/ide/actions/InvalidateCachesAction.java index 60661916e8f6..65eda17d7470 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/InvalidateCachesAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/InvalidateCachesAction.java @@ -17,7 +17,7 @@ package com.intellij.ide.actions; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ex.ApplicationEx; import com.intellij.openapi.project.DumbAware; @@ -45,7 +45,7 @@ public class InvalidateCachesAction extends AnAction implements DumbAware { options[3] = "Just Restart"; } - int result = Messages.showDialog(e.getData(PlatformDataKeys.PROJECT), + int result = Messages.showDialog(e.getData(CommonDataKeys.PROJECT), "The caches will be invalidated and rebuilt on the next startup.\n" + "WARNING: Local History will be also cleared.\n\n" + "Would you like to continue?\n\n", diff --git a/platform/platform-impl/src/com/intellij/ide/actions/JumpToLastEditAction.java b/platform/platform-impl/src/com/intellij/ide/actions/JumpToLastEditAction.java index 22bdafb3a4fc..2eb782154b7c 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/JumpToLastEditAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/JumpToLastEditAction.java @@ -22,7 +22,7 @@ import com.intellij.openapi.project.DumbAware; public class JumpToLastEditAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) return; IdeDocumentHistory.getInstance(project).navigatePreviousChange(); } @@ -30,7 +30,7 @@ public class JumpToLastEditAction extends AnAction implements DumbAware { public void update(AnActionEvent event){ Presentation presentation = event.getPresentation(); DataContext dataContext = event.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { presentation.setEnabled(false); return; diff --git a/platform/platform-impl/src/com/intellij/ide/actions/JumpToLastWindowAction.java b/platform/platform-impl/src/com/intellij/ide/actions/JumpToLastWindowAction.java index d3caef4a5c74..7271eaa8b833 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/JumpToLastWindowAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/JumpToLastWindowAction.java @@ -18,6 +18,7 @@ package com.intellij.ide.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.actionSystem.Presentation; import com.intellij.openapi.project.Project; @@ -27,7 +28,7 @@ import com.intellij.openapi.wm.ex.ToolWindowManagerEx; public class JumpToLastWindowAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) { return; } @@ -41,7 +42,7 @@ public class JumpToLastWindowAction extends AnAction implements DumbAware { public void update(AnActionEvent event){ Presentation presentation = event.getPresentation(); - Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); if (project == null) { presentation.setEnabled(false); return; diff --git a/platform/platform-impl/src/com/intellij/ide/actions/MinimizeCurrentWindowAction.java b/platform/platform-impl/src/com/intellij/ide/actions/MinimizeCurrentWindowAction.java index b3f6f92818c8..98d13b181d20 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/MinimizeCurrentWindowAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/MinimizeCurrentWindowAction.java @@ -17,6 +17,7 @@ package com.intellij.ide.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.actionSystem.Presentation; import com.intellij.openapi.project.DumbAware; @@ -51,7 +52,7 @@ public class MinimizeCurrentWindowAction extends AnAction implements DumbAware { p.setVisible(SystemInfo.isMac); if (SystemInfo.isMac) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project != null) { JFrame frame = WindowManager.getInstance().getFrame(project); if (frame != null) { diff --git a/platform/platform-impl/src/com/intellij/ide/actions/NextSplitAction.java b/platform/platform-impl/src/com/intellij/ide/actions/NextSplitAction.java index 03973a31b63b..42b48b46f080 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/NextSplitAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/NextSplitAction.java @@ -19,17 +19,17 @@ package com.intellij.ide.actions; import com.intellij.ide.IdeBundle; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx; -import com.intellij.openapi.project.Project; import com.intellij.openapi.project.DumbAware; +import com.intellij.openapi.project.Project; import com.intellij.openapi.wm.ToolWindowManager; public class NextSplitAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); final CommandProcessor commandProcessor = CommandProcessor.getInstance(); commandProcessor.executeCommand( project, new Runnable(){ @@ -42,7 +42,7 @@ public class NextSplitAction extends AnAction implements DumbAware { } public void update(final AnActionEvent event){ - final Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); final Presentation presentation = event.getPresentation(); if (project == null) { presentation.setEnabled(false); diff --git a/platform/platform-impl/src/com/intellij/ide/actions/OccurenceNavigatorActionBase.java b/platform/platform-impl/src/com/intellij/ide/actions/OccurenceNavigatorActionBase.java index f47d02b3ecde..f2314a728913 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/OccurenceNavigatorActionBase.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/OccurenceNavigatorActionBase.java @@ -37,7 +37,7 @@ import java.util.LinkedList; abstract class OccurenceNavigatorActionBase extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) return; OccurenceNavigator navigator = getNavigator(e.getDataContext()); @@ -64,7 +64,7 @@ abstract class OccurenceNavigatorActionBase extends AnAction implements DumbAwar public void update(AnActionEvent event) { Presentation presentation = event.getPresentation(); - Project project = event.getData(PlatformDataKeys.PROJECT); + Project project = event.getData(CommonDataKeys.PROJECT); if (project == null) { presentation.setEnabled(false); // make it invisible only in main menu to avoid initial invisibility in toolbars @@ -139,7 +139,7 @@ abstract class OccurenceNavigatorActionBase extends AnAction implements DumbAwar } } - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return null; } diff --git a/platform/platform-impl/src/com/intellij/ide/actions/OpenFileAction.java b/platform/platform-impl/src/com/intellij/ide/actions/OpenFileAction.java index b0de6b91f189..204f973b692a 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/OpenFileAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/OpenFileAction.java @@ -19,7 +19,7 @@ import com.intellij.ide.IdeBundle; import com.intellij.ide.impl.ProjectUtil; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.application.ApplicationNamesInfo; import com.intellij.openapi.fileChooser.FileChooser; import com.intellij.openapi.fileChooser.FileChooserDescriptor; @@ -48,7 +48,7 @@ import java.util.List; public class OpenFileAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { - @Nullable final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + @Nullable final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); final boolean showFiles = project != null || PlatformProjectOpenProcessor.getInstanceIfItExists() != null; final FileChooserDescriptor descriptor = new OpenProjectFileChooserDescriptor(true) { diff --git a/platform/platform-impl/src/com/intellij/ide/actions/PinActiveTabAction.java b/platform/platform-impl/src/com/intellij/ide/actions/PinActiveTabAction.java index 1a501fad57fe..98b41813223c 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/PinActiveTabAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/PinActiveTabAction.java @@ -34,7 +34,7 @@ public class PinActiveTabAction extends ToggleAction implements DumbAware { */ @Nullable private static VirtualFile getFile(final DataContext context){ - Project project = PlatformDataKeys.PROJECT.getData(context); + Project project = CommonDataKeys.PROJECT.getData(context); if(project == null){ return null; } @@ -103,7 +103,7 @@ public class PinActiveTabAction extends ToggleAction implements DumbAware { } private static EditorWindow getEditorWindow(DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final FileEditorManagerEx fileEditorManager = FileEditorManagerEx.getInstanceEx(project); EditorWindow editorWindow = EditorWindow.DATA_KEY.getData(dataContext); if (editorWindow == null) { diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ResizeToolWindowAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ResizeToolWindowAction.java index e2689b2217f4..9f8d104ebdd2 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/ResizeToolWindowAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/ResizeToolWindowAction.java @@ -18,7 +18,7 @@ package com.intellij.ide.actions; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; @@ -61,7 +61,7 @@ public abstract class ResizeToolWindowAction extends AnAction implements DumbAwa @Override public final void update(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) { setDisabled(e); return; diff --git a/platform/platform-impl/src/com/intellij/ide/actions/RestoreDefaultLayoutAction.java b/platform/platform-impl/src/com/intellij/ide/actions/RestoreDefaultLayoutAction.java index e80f6da40bc5..d3cdd88fbe19 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/RestoreDefaultLayoutAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/RestoreDefaultLayoutAction.java @@ -17,10 +17,10 @@ package com.intellij.ide.actions; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.Presentation; -import com.intellij.openapi.project.Project; import com.intellij.openapi.project.DumbAware; +import com.intellij.openapi.project.Project; import com.intellij.openapi.wm.ex.ToolWindowManagerEx; import com.intellij.openapi.wm.ex.WindowManagerEx; import com.intellij.openapi.wm.impl.DesktopLayout; @@ -30,7 +30,7 @@ import com.intellij.openapi.wm.impl.DesktopLayout; */ public final class RestoreDefaultLayoutAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e){ - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if(project==null){ return; } @@ -40,6 +40,6 @@ public final class RestoreDefaultLayoutAction extends AnAction implements DumbAw public void update(AnActionEvent event){ Presentation presentation = event.getPresentation(); - presentation.setEnabled(PlatformDataKeys.PROJECT.getData(event.getDataContext()) != null); + presentation.setEnabled(CommonDataKeys.PROJECT.getData(event.getDataContext()) != null); } } diff --git a/platform/platform-impl/src/com/intellij/ide/actions/SaveAsDirectoryBasedFormatAction.java b/platform/platform-impl/src/com/intellij/ide/actions/SaveAsDirectoryBasedFormatAction.java index c1fa55bbe05b..0716a52c72c2 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/SaveAsDirectoryBasedFormatAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/SaveAsDirectoryBasedFormatAction.java @@ -18,7 +18,7 @@ package com.intellij.ide.actions; import com.intellij.ide.impl.ProjectUtil; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.components.StorageScheme; import com.intellij.openapi.components.impl.stores.IProjectStore; @@ -42,7 +42,7 @@ import java.util.Collection; public class SaveAsDirectoryBasedFormatAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project instanceof ProjectEx) { final IProjectStore projectStore = ((ProjectEx)project).getStateStore(); if (StorageScheme.DIRECTORY_BASED != projectStore.getStorageScheme()) { @@ -92,7 +92,7 @@ public class SaveAsDirectoryBasedFormatAction extends AnAction implements DumbAw public void update(AnActionEvent e) { final Presentation presentation = e.getPresentation(); - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); boolean visible = project != null; if (project instanceof ProjectEx) { diff --git a/platform/platform-impl/src/com/intellij/ide/actions/SelectAllAction.java b/platform/platform-impl/src/com/intellij/ide/actions/SelectAllAction.java index 684e2fa4c27a..8c9415e175ed 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/SelectAllAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/SelectAllAction.java @@ -17,8 +17,8 @@ package com.intellij.ide.actions; import com.intellij.ide.IdeBundle; 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; import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.editor.Editor; @@ -35,7 +35,7 @@ public class SelectAllAction extends TextComponentEditorAction implements DumbAw @Override public void execute(final Editor editor, DataContext dataContext) { CommandProcessor processor = CommandProcessor.getInstance(); - processor.executeCommand(PlatformDataKeys.PROJECT.getData(dataContext), new Runnable() { + processor.executeCommand(CommonDataKeys.PROJECT.getData(dataContext), new Runnable() { public void run() { editor.getSelectionModel().setSelection(0, editor.getDocument().getTextLength()); } diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ShowContentAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ShowContentAction.java index 60d24a295c60..62ebac620e60 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/ShowContentAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/ShowContentAction.java @@ -18,6 +18,7 @@ package com.intellij.ide.actions; import com.intellij.openapi.actionSystem.ActionManager; 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.project.DumbAware; import com.intellij.openapi.project.Project; @@ -62,7 +63,7 @@ public class ShowContentAction extends AnAction implements DumbAware { private ToolWindow getWindow(AnActionEvent event) { if (myWindow != null) return myWindow; - Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); if (project == null) return null; ToolWindowManager manager = ToolWindowManager.getInstance(project); diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ShowRecentFilesAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ShowRecentFilesAction.java index 2849ed3f3dd2..7726e76c953e 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/ShowRecentFilesAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/ShowRecentFilesAction.java @@ -22,7 +22,7 @@ package com.intellij.ide.actions; import com.intellij.featureStatistics.FeatureUsageTracker; import com.intellij.ide.IdeBundle; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; @@ -32,7 +32,7 @@ import com.intellij.openapi.project.Project; public class ShowRecentFilesAction extends DumbAwareAction { @Override public void actionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project != null) { FeatureUsageTracker.getInstance().triggerFeatureUsed("navigation.recent.files"); Switcher.createAndShowSwitcher(project, IdeBundle.message("title.popup.recent.files"), true).goForward(); diff --git a/platform/platform-impl/src/com/intellij/ide/actions/SplitterActionBase.java b/platform/platform-impl/src/com/intellij/ide/actions/SplitterActionBase.java index 1734c4276776..851c9096a38b 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/SplitterActionBase.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/SplitterActionBase.java @@ -25,7 +25,7 @@ import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx; */ public abstract class SplitterActionBase extends AnAction implements DumbAware { public void update(final AnActionEvent event) { - final Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); final Presentation presentation = event.getPresentation(); boolean enabled; if (project == null) { diff --git a/platform/platform-impl/src/com/intellij/ide/actions/StoreDefaultLayoutAction.java b/platform/platform-impl/src/com/intellij/ide/actions/StoreDefaultLayoutAction.java index 3354befc9f1a..8a0067d3e877 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/StoreDefaultLayoutAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/StoreDefaultLayoutAction.java @@ -17,10 +17,10 @@ package com.intellij.ide.actions; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.Presentation; -import com.intellij.openapi.project.Project; import com.intellij.openapi.project.DumbAware; +import com.intellij.openapi.project.Project; import com.intellij.openapi.wm.ex.ToolWindowManagerEx; import com.intellij.openapi.wm.ex.WindowManagerEx; import com.intellij.openapi.wm.impl.DesktopLayout; @@ -30,7 +30,7 @@ import com.intellij.openapi.wm.impl.DesktopLayout; */ public class StoreDefaultLayoutAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e){ - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if(project==null){ return; } @@ -40,6 +40,6 @@ public class StoreDefaultLayoutAction extends AnAction implements DumbAware { public void update(AnActionEvent event){ Presentation presentation = event.getPresentation(); - presentation.setEnabled(PlatformDataKeys.PROJECT.getData(event.getDataContext()) != null); + presentation.setEnabled(CommonDataKeys.PROJECT.getData(event.getDataContext()) != null); } } diff --git a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java index 674ca68378b1..f92523988cce 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java @@ -147,7 +147,7 @@ public class Switcher extends AnAction implements DumbAware { @NonNls private static final String SWITCHER_TITLE = "Switcher"; public void actionPerformed(AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) return; synchronized (Switcher.class) { diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ToggleDockModeAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ToggleDockModeAction.java index d34eebeb1ca4..9c41674642e9 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/ToggleDockModeAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/ToggleDockModeAction.java @@ -16,11 +16,11 @@ package com.intellij.ide.actions; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.actionSystem.ToggleAction; -import com.intellij.openapi.project.Project; import com.intellij.openapi.project.DumbAware; +import com.intellij.openapi.project.Project; import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindowManager; import com.intellij.openapi.wm.ToolWindowType; @@ -28,7 +28,7 @@ import com.intellij.openapi.wm.ToolWindowType; public class ToggleDockModeAction extends ToggleAction implements DumbAware { public boolean isSelected(AnActionEvent event){ - Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); if (project == null) { return false; } @@ -41,7 +41,7 @@ public class ToggleDockModeAction extends ToggleAction implements DumbAware { } public void setSelected(AnActionEvent event,boolean flag){ - Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); if (project == null) { return; } @@ -62,7 +62,7 @@ public class ToggleDockModeAction extends ToggleAction implements DumbAware { public void update(AnActionEvent event){ super.update(event); Presentation presentation = event.getPresentation(); - Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); if (project == null) { presentation.setEnabled(false); return; diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ToggleFloatingModeAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ToggleFloatingModeAction.java index c27d53d8204c..ce7ac4a2faf4 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/ToggleFloatingModeAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/ToggleFloatingModeAction.java @@ -16,11 +16,11 @@ package com.intellij.ide.actions; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.actionSystem.ToggleAction; -import com.intellij.openapi.project.Project; import com.intellij.openapi.project.DumbAware; +import com.intellij.openapi.project.Project; import com.intellij.openapi.wm.ToolWindowManager; import com.intellij.openapi.wm.ToolWindowType; import com.intellij.openapi.wm.ex.ToolWindowEx; @@ -29,7 +29,7 @@ import com.intellij.openapi.wm.ex.ToolWindowManagerEx; public class ToggleFloatingModeAction extends ToggleAction implements DumbAware { public boolean isSelected(AnActionEvent event){ - Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); if (project == null) { return false; } @@ -42,7 +42,7 @@ public class ToggleFloatingModeAction extends ToggleAction implements DumbAware } public void setSelected(AnActionEvent event,boolean flag){ - Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); if (project == null) { return; } @@ -63,7 +63,7 @@ public class ToggleFloatingModeAction extends ToggleAction implements DumbAware public void update(AnActionEvent event){ super.update(event); Presentation presentation = event.getPresentation(); - Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); if (project == null) { presentation.setEnabled(false); return; diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ToggleReadOnlyAttributeAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ToggleReadOnlyAttributeAction.java index adb23555b31e..ee7dd2bbbda3 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/ToggleReadOnlyAttributeAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/ToggleReadOnlyAttributeAction.java @@ -20,10 +20,7 @@ package com.intellij.ide.actions; import com.intellij.CommonBundle; -import com.intellij.openapi.actionSystem.AnAction; -import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.project.DumbAware; @@ -90,7 +87,7 @@ public class ToggleReadOnlyAttributeAction extends AnAction implements DumbAware } } catch(IOException exc){ - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); Messages.showMessageDialog( project, exc.getMessage(), diff --git a/platform/platform-impl/src/com/intellij/ide/actions/UndoRedoAction.java b/platform/platform-impl/src/com/intellij/ide/actions/UndoRedoAction.java index 0d09446cef7a..a26a2a90c57d 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/UndoRedoAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/UndoRedoAction.java @@ -16,6 +16,7 @@ package com.intellij.ide.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; @@ -76,7 +77,7 @@ public abstract class UndoRedoAction extends DumbAwareAction { project = ((TextEditor)editor).getEditor().getProject(); } else { - project = PlatformDataKeys.PROJECT.getData(dataContext); + project = CommonDataKeys.PROJECT.getData(dataContext); } return project; } diff --git a/platform/platform-impl/src/com/intellij/ide/actions/UnsplitAction.java b/platform/platform-impl/src/com/intellij/ide/actions/UnsplitAction.java index 090f1aeddbd7..3c4c8b536bab 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/UnsplitAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/UnsplitAction.java @@ -24,7 +24,7 @@ import com.intellij.openapi.project.Project; */ public class UnsplitAction extends SplitterActionBase { public void actionPerformed(final AnActionEvent event) { - final Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); final FileEditorManagerEx fileEditorManager = FileEditorManagerEx.getInstanceEx(project); //VirtualFile file = fileEditorManager.getSelectedFiles()[0]; fileEditorManager.unsplitWindow(); diff --git a/platform/platform-impl/src/com/intellij/ide/actions/UnsplitAllAction.java b/platform/platform-impl/src/com/intellij/ide/actions/UnsplitAllAction.java index 548e1482843f..12df75e75656 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/UnsplitAllAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/UnsplitAllAction.java @@ -16,7 +16,7 @@ package com.intellij.ide.actions; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx; import com.intellij.openapi.project.Project; @@ -25,7 +25,7 @@ import com.intellij.openapi.project.Project; */ public final class UnsplitAllAction extends SplitterActionBase { public void actionPerformed(final AnActionEvent event) { - final Project project = event.getData(PlatformDataKeys.PROJECT); + final Project project = event.getData(CommonDataKeys.PROJECT); final FileEditorManagerEx fileEditorManager = FileEditorManagerEx.getInstanceEx(project); //VirtualFile file = fileEditorManager.getSelectedFiles()[0]; fileEditorManager.unsplitAllWindow(); diff --git a/platform/platform-impl/src/com/intellij/ide/diff/VirtualFileDiffElement.java b/platform/platform-impl/src/com/intellij/ide/diff/VirtualFileDiffElement.java index c6acddccce99..cf03cd91496d 100644 --- a/platform/platform-impl/src/com/intellij/ide/diff/VirtualFileDiffElement.java +++ b/platform/platform-impl/src/com/intellij/ide/diff/VirtualFileDiffElement.java @@ -17,6 +17,7 @@ package com.intellij.ide.diff; import com.intellij.ide.presentation.VirtualFilePresentation; import com.intellij.ide.util.PropertiesComponent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.Result; @@ -219,7 +220,7 @@ public class VirtualFileDiffElement extends DiffElement { return new DataProvider() { @Override public Object getData(@NonNls String dataId) { - if (PlatformDataKeys.PROJECT.is(dataId)) { + if (CommonDataKeys.PROJECT.is(dataId)) { return project; } if (PlatformDataKeys.FILE_EDITOR.is(dataId)) { diff --git a/platform/platform-impl/src/com/intellij/ide/errorTreeView/actions/TestErrorViewAction.java b/platform/platform-impl/src/com/intellij/ide/errorTreeView/actions/TestErrorViewAction.java index 64188cd9b4ba..14623be062f2 100644 --- a/platform/platform-impl/src/com/intellij/ide/errorTreeView/actions/TestErrorViewAction.java +++ b/platform/platform-impl/src/com/intellij/ide/errorTreeView/actions/TestErrorViewAction.java @@ -17,7 +17,7 @@ package com.intellij.ide.errorTreeView.actions; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.project.Project; @@ -43,7 +43,7 @@ public abstract class TestErrorViewAction extends AnAction{ private int myMessageCount = 0; public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) { return; } diff --git a/platform/platform-impl/src/com/intellij/ide/impl/DataManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/impl/DataManagerImpl.java index e475b5b47493..7b3b074b1ca4 100644 --- a/platform/platform-impl/src/com/intellij/ide/impl/DataManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/ide/impl/DataManagerImpl.java @@ -228,7 +228,7 @@ public class DataManagerImpl extends DataManager implements ApplicationComponent if (myWindowManager == null) { return dataContext; } - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); Component focusedComponent = myWindowManager.getFocusedComponent(project); if (focusedComponent != null) { dataContext = getDataContext(focusedComponent); @@ -308,7 +308,7 @@ public class DataManagerImpl extends DataManager implements ApplicationComponent } private static final Set ourSafeKeys = new HashSet(Arrays.asList( - PlatformDataKeys.PROJECT.getName(), + CommonDataKeys.PROJECT.getName(), PlatformDataKeys.EDITOR.getName(), PlatformDataKeys.IS_MODAL_CONTEXT.getName(), PlatformDataKeys.CONTEXT_COMPONENT.getName(), diff --git a/platform/platform-impl/src/com/intellij/ide/impl/DataValidator.java b/platform/platform-impl/src/com/intellij/ide/impl/DataValidator.java index c2b0462573ab..17cd751e2064 100644 --- a/platform/platform-impl/src/com/intellij/ide/impl/DataValidator.java +++ b/platform/platform-impl/src/com/intellij/ide/impl/DataValidator.java @@ -15,7 +15,7 @@ */ package com.intellij.ide.impl; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.extensions.Extensions; @@ -70,9 +70,9 @@ public abstract class DataValidator { } static { - ourValidators.put(PlatformDataKeys.VIRTUAL_FILE.getName(), VIRTUAL_FILE_VALIDATOR); - ourValidators.put(PlatformDataKeys.VIRTUAL_FILE_ARRAY.getName(), new ArrayValidator(VIRTUAL_FILE_VALIDATOR)); - ourValidators.put(PlatformDataKeys.PROJECT.getName(), PROJECT_VALIDATOR); + ourValidators.put(CommonDataKeys.VIRTUAL_FILE.getName(), VIRTUAL_FILE_VALIDATOR); + ourValidators.put(CommonDataKeys.VIRTUAL_FILE_ARRAY.getName(), new ArrayValidator(VIRTUAL_FILE_VALIDATOR)); + ourValidators.put(CommonDataKeys.PROJECT.getName(), PROJECT_VALIDATOR); } public static class ArrayValidator extends DataValidator { diff --git a/platform/platform-impl/src/com/intellij/ide/impl/dataRules/FileTextRule.java b/platform/platform-impl/src/com/intellij/ide/impl/dataRules/FileTextRule.java index aa5323f2675a..fe04dc3cb969 100644 --- a/platform/platform-impl/src/com/intellij/ide/impl/dataRules/FileTextRule.java +++ b/platform/platform-impl/src/com/intellij/ide/impl/dataRules/FileTextRule.java @@ -16,6 +16,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.Document; @@ -39,7 +40,7 @@ public class FileTextRule implements GetDataRule { return null; } - final Project project = (Project)dataProvider.getData(PlatformDataKeys.PROJECT.getName()); + final Project project = (Project)dataProvider.getData(CommonDataKeys.PROJECT.getName()); if (project == null) { return null; } diff --git a/platform/platform-impl/src/com/intellij/ide/impl/dataRules/ProjectFileDirectoryRule.java b/platform/platform-impl/src/com/intellij/ide/impl/dataRules/ProjectFileDirectoryRule.java index de5e8b992f79..36433b77ecf3 100644 --- a/platform/platform-impl/src/com/intellij/ide/impl/dataRules/ProjectFileDirectoryRule.java +++ b/platform/platform-impl/src/com/intellij/ide/impl/dataRules/ProjectFileDirectoryRule.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.project.Project; @@ -28,7 +29,7 @@ public class ProjectFileDirectoryRule implements GetDataRule { public Object getData(DataProvider dataProvider) { VirtualFile dir = PlatformDataKeys.PROJECT_FILE_DIRECTORY.getData(dataProvider); if (dir == null) { - final Project project = PlatformDataKeys.PROJECT.getData(dataProvider); + final Project project = CommonDataKeys.PROJECT.getData(dataProvider); if (project != null) { dir = project.getBaseDir(); } diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaWelcomeScreenForm.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaWelcomeScreenForm.java index 2f0afb17c77e..8cb3d7205a0c 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaWelcomeScreenForm.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaWelcomeScreenForm.java @@ -125,7 +125,7 @@ public class DarculaWelcomeScreenForm { DataContext dataContext = DataManager.getInstance().getDataContext(root); int fragment = label.findFragmentAt(e.getX()); if (fragment == SimpleColoredComponent.FRAGMENT_ICON) { - final int rc = Messages.showOkCancelDialog(PlatformDataKeys.PROJECT.getData(dataContext), + final int rc = Messages.showOkCancelDialog(CommonDataKeys.PROJECT.getData(dataContext), "Remove '" + action.getTemplatePresentation().getText() + "' from recent projects list?", "Remove Recent Project", diff --git a/platform/platform-impl/src/com/intellij/internal/ReloadProjectAction.java b/platform/platform-impl/src/com/intellij/internal/ReloadProjectAction.java index ddbeede86ebe..ce24e5e4c9d0 100644 --- a/platform/platform-impl/src/com/intellij/internal/ReloadProjectAction.java +++ b/platform/platform-impl/src/com/intellij/internal/ReloadProjectAction.java @@ -18,10 +18,10 @@ package com.intellij.internal; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; +import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; -import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.impl.ProjectManagerImpl; /** @@ -29,7 +29,7 @@ import com.intellij.openapi.project.impl.ProjectManagerImpl; */ public class ReloadProjectAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project != null) { ((ProjectManagerImpl)ProjectManager.getInstance()).reloadProjectImpl(project, false); } diff --git a/platform/platform-impl/src/com/intellij/internal/ToggleDumbModeAction.java b/platform/platform-impl/src/com/intellij/internal/ToggleDumbModeAction.java index ade225b15cee..14e6d9265f07 100644 --- a/platform/platform-impl/src/com/intellij/internal/ToggleDumbModeAction.java +++ b/platform/platform-impl/src/com/intellij/internal/ToggleDumbModeAction.java @@ -19,7 +19,7 @@ import com.intellij.ide.caches.CacheUpdater; import com.intellij.ide.caches.FileContent; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.project.DumbAware; @@ -42,7 +42,7 @@ public class ToggleDumbModeAction extends AnAction implements DumbAware { } else { myDumb = true; - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) return; CacheUpdater updater = new CacheUpdater() { @@ -73,7 +73,7 @@ public class ToggleDumbModeAction extends AnAction implements DumbAware { @Override public void update(final AnActionEvent e) { final Presentation presentation = e.getPresentation(); - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); presentation.setEnabled(project != null && myDumb == DumbServiceImpl.getInstance(project).isDumb()); if (myDumb) { presentation.setText("Exit dumb mode"); diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/tmp/SendStatisticsAction.java b/platform/platform-impl/src/com/intellij/internal/statistic/tmp/SendStatisticsAction.java index e92c3b55410a..4fddde766229 100755 --- a/platform/platform-impl/src/com/intellij/internal/statistic/tmp/SendStatisticsAction.java +++ b/platform/platform-impl/src/com/intellij/internal/statistic/tmp/SendStatisticsAction.java @@ -16,10 +16,11 @@ package com.intellij.internal.statistic.tmp; import com.intellij.internal.statistic.StatisticsUploadAssistant; -import com.intellij.internal.statistic.connect.*; +import com.intellij.internal.statistic.connect.StatisticsResult; +import com.intellij.internal.statistic.connect.StatisticsService; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; import com.intellij.util.PlatformIcons; @@ -28,7 +29,7 @@ public class SendStatisticsAction extends AnAction { @Override public void actionPerformed(AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project != null) { StatisticsService service = StatisticsUploadAssistant.getStatisticsService(); StatisticsResult result = service.send(); diff --git a/platform/platform-impl/src/com/intellij/internal/validation/TestDialogWithValidationAction.java b/platform/platform-impl/src/com/intellij/internal/validation/TestDialogWithValidationAction.java index 9411b0ab87d1..4ba624d87d5d 100644 --- a/platform/platform-impl/src/com/intellij/internal/validation/TestDialogWithValidationAction.java +++ b/platform/platform-impl/src/com/intellij/internal/validation/TestDialogWithValidationAction.java @@ -17,7 +17,7 @@ package com.intellij.internal.validation; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.project.Project; /** @@ -26,7 +26,7 @@ import com.intellij.openapi.project.Project; public class TestDialogWithValidationAction extends AnAction { @Override public void actionPerformed(AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project != null) { new ValidationTest(project).show(); } diff --git a/platform/platform-impl/src/com/intellij/notification/impl/IdeNotificationArea.java b/platform/platform-impl/src/com/intellij/notification/impl/IdeNotificationArea.java index 0c2877bbb340..97e922ffda81 100644 --- a/platform/platform-impl/src/com/intellij/notification/impl/IdeNotificationArea.java +++ b/platform/platform-impl/src/com/intellij/notification/impl/IdeNotificationArea.java @@ -23,6 +23,7 @@ import com.intellij.notification.EventLog; import com.intellij.notification.LogModel; import com.intellij.notification.Notification; import com.intellij.notification.NotificationType; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.Project; @@ -96,7 +97,7 @@ public class IdeNotificationArea extends JLabel implements CustomStatusBarWidget @Nullable private Project getProject() { - return PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext((Component) myStatusBar)); + return CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext((Component) myStatusBar)); } @NotNull diff --git a/platform/platform-impl/src/com/intellij/notification/impl/actions/NotificationTestAction.java b/platform/platform-impl/src/com/intellij/notification/impl/actions/NotificationTestAction.java index 6456962fbc34..9d7d9475ebe6 100644 --- a/platform/platform-impl/src/com/intellij/notification/impl/actions/NotificationTestAction.java +++ b/platform/platform-impl/src/com/intellij/notification/impl/actions/NotificationTestAction.java @@ -21,7 +21,7 @@ import com.intellij.notification.NotificationType; import com.intellij.notification.Notifications; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; @@ -41,7 +41,7 @@ public class NotificationTestAction extends AnAction implements DumbAware { } public void actionPerformed(final AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); final MessageBus messageBus = project == null ? ApplicationManager.getApplication().getMessageBus() : project.getMessageBus(); final long l = System.currentTimeMillis(); diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/Utils.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/Utils.java index af18882749b9..929d23625756 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/Utils.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/Utils.java @@ -229,7 +229,7 @@ public class Utils{ if (anAction instanceof Separator) { continue; } - final Project project = PlatformDataKeys.PROJECT.getData(context); + final Project project = CommonDataKeys.PROJECT.getData(context); if (project != null && DumbService.getInstance(project).isDumb() && !anAction.isDumbAware()) { continue; } diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/actions/CompareFileWithEditor.java b/platform/platform-impl/src/com/intellij/openapi/diff/actions/CompareFileWithEditor.java index 85d005879f8c..7a8f33bdb088 100644 --- a/platform/platform-impl/src/com/intellij/openapi/diff/actions/CompareFileWithEditor.java +++ b/platform/platform-impl/src/com/intellij/openapi/diff/actions/CompareFileWithEditor.java @@ -30,7 +30,7 @@ import org.jetbrains.annotations.NonNls; public class CompareFileWithEditor extends BaseDiffAction { @Nullable private static Document getEditingDocument(final DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return null; VirtualFile[] selectedFiles = FileEditorManager.getInstance(project).getSelectedFiles(); if (selectedFiles.length == 0) return null; @@ -65,7 +65,7 @@ public class CompareFileWithEditor extends BaseDiffAction { } protected FileEditorContents getDiffData(DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); VirtualFile[] array = PlatformDataKeys.VIRTUAL_FILE_ARRAY.getData(dataContext); Document document = getEditingDocument(dataContext); if (array == null || array.length != 1 || document == null) { diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/actions/CompareFiles.java b/platform/platform-impl/src/com/intellij/openapi/diff/actions/CompareFiles.java index 6336fddac623..66a8bf608f32 100644 --- a/platform/platform-impl/src/com/intellij/openapi/diff/actions/CompareFiles.java +++ b/platform/platform-impl/src/com/intellij/openapi/diff/actions/CompareFiles.java @@ -42,7 +42,7 @@ public class CompareFiles extends BaseDiffAction { } private static boolean isAvailable(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); DiffRequest diffRequest = e.getData(DIFF_REQUEST); if (diffRequest == null) { final VirtualFile[] virtualFiles = e.getData(PlatformDataKeys.VIRTUAL_FILE_ARRAY); @@ -58,7 +58,7 @@ public class CompareFiles extends BaseDiffAction { } protected DiffRequest getDiffData(DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final DiffRequest diffRequest = DIFF_REQUEST.getData(dataContext); if (diffRequest != null) { return diffRequest; diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/actions/MergeActionGroup.java b/platform/platform-impl/src/com/intellij/openapi/diff/actions/MergeActionGroup.java index 89556b2b5a85..02fb68bc09a6 100644 --- a/platform/platform-impl/src/com/intellij/openapi/diff/actions/MergeActionGroup.java +++ b/platform/platform-impl/src/com/intellij/openapi/diff/actions/MergeActionGroup.java @@ -74,7 +74,7 @@ public class MergeActionGroup extends ActionGroup { @Override public void actionPerformed(AnActionEvent e) { - myOperation.perform(PlatformDataKeys.PROJECT.getData(e.getDataContext())); + myOperation.perform(CommonDataKeys.PROJECT.getData(e.getDataContext())); } } } diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/actions/MergeFilesAction.java b/platform/platform-impl/src/com/intellij/openapi/diff/actions/MergeFilesAction.java index 37af6f56e8da..84dc14296518 100644 --- a/platform/platform-impl/src/com/intellij/openapi/diff/actions/MergeFilesAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/diff/actions/MergeFilesAction.java @@ -17,6 +17,7 @@ package com.intellij.openapi.diff.actions; 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.diff.*; @@ -32,7 +33,7 @@ import java.io.IOException; public class MergeFilesAction extends AnAction implements DumbAware { public void update(AnActionEvent e) { DataContext context = e.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(context); + Project project = CommonDataKeys.PROJECT.getData(context); if (project == null){ e.getPresentation().setEnabled(false); return; @@ -58,7 +59,7 @@ public class MergeFilesAction extends AnAction implements DumbAware { String leftText = VfsUtil.loadText(files[0]); String rightText = VfsUtil.loadText(files[2]); - Project project = PlatformDataKeys.PROJECT.getData(context); + Project project = CommonDataKeys.PROJECT.getData(context); final MergeRequest diffData = diffRequestFactory.createMergeRequest(leftText, rightText, originalText, file, project, ActionButtonPresentation.APPLY, ActionButtonPresentation.CANCEL_WITH_PROMPT); diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffSideView.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffSideView.java index 457e16db6c45..cd80e742a281 100644 --- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffSideView.java +++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffSideView.java @@ -86,7 +86,7 @@ public class DiffSideView { DataManager.registerDataProvider(myPanel, new DataProvider() { @Override public Object getData(@NonNls String dataId) { - if (PlatformDataKeys.PROJECT.is(dataId)) {return project;} + if (CommonDataKeys.PROJECT.is(dataId)) {return project;} if (PlatformDataKeys.FILE_EDITOR.is(dataId)) {return fileEditor;} return null; } diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/IndentSelectionAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/IndentSelectionAction.java index 2e668a33f281..10e222fadcb4 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/IndentSelectionAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/IndentSelectionAction.java @@ -23,8 +23,8 @@ package com.intellij.openapi.editor.actions; import com.intellij.codeStyle.CodeStyleFacade; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; @@ -53,7 +53,7 @@ public class IndentSelectionAction extends EditorAction { private static class Handler extends EditorWriteActionHandler { @Override public void executeWriteAction(Editor editor, DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); indentSelection(editor, project); } } 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 29f004fe4ea5..316bee4ede90 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 @@ -49,7 +49,7 @@ public class MultiplePasteAction extends AnAction implements DumbAware { @Override public void actionPerformed(final AnActionEvent e) { final DataContext dataContext = e.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); Component focusedComponent = e.getData(PlatformDataKeys.CONTEXT_COMPONENT); Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/TabAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/TabAction.java index 5064ad11ffed..e0c9a526e7e3 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/TabAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/TabAction.java @@ -25,6 +25,7 @@ package com.intellij.openapi.editor.actions; import com.intellij.codeStyle.CodeStyleFacade; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.command.CommandProcessor; @@ -51,7 +52,7 @@ public class TabAction extends EditorAction { public void executeWriteAction(Editor editor, DataContext dataContext) { CommandProcessor.getInstance().setCurrentCommandGroupId(EditorActionUtil.EDIT_COMMAND_GROUP); CommandProcessor.getInstance().setCurrentCommandName(EditorBundle.message("typing.command.name")); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); insertTabAtCaret(editor, project); } diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/TextComponentEditorAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/TextComponentEditorAction.java index 396fad0d3901..b71f37632ce6 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/TextComponentEditorAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/TextComponentEditorAction.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.editor.actions; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; @@ -41,11 +42,11 @@ public abstract class TextComponentEditorAction extends EditorAction { @Nullable public static Editor getEditorFromContext(final DataContext dataContext) { - final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (editor != null) return editor; final Object data = PlatformDataKeys.CONTEXT_COMPONENT.getData(dataContext); if (data instanceof JTextComponent) { - return new TextComponentEditor(PlatformDataKeys.PROJECT.getData(dataContext), (JTextComponent) data); + return new TextComponentEditor(CommonDataKeys.PROJECT.getData(dataContext), (JTextComponent) data); } return null; } diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/TextEndAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/TextEndAction.java index bfb6dc705b51..4531af8d6dd6 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/TextEndAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/TextEndAction.java @@ -15,8 +15,8 @@ */ package com.intellij.openapi.editor.actions; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.ScrollType; import com.intellij.openapi.editor.ScrollingModel; @@ -45,7 +45,7 @@ public class TextEndAction extends TextComponentEditorAction { scrollingModel.scrollToCaret(ScrollType.CENTER); scrollingModel.enableAnimation(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project != null) { IdeDocumentHistory instance = IdeDocumentHistory.getInstance(project); if (instance != null) { diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/TextStartAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/TextStartAction.java index e6eee142b7c4..d63ca3bc0b41 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/TextStartAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/TextStartAction.java @@ -15,8 +15,8 @@ */ package com.intellij.openapi.editor.actions; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.ScrollType; import com.intellij.openapi.editor.ScrollingModel; @@ -44,7 +44,7 @@ public class TextStartAction extends TextComponentEditorAction { scrollingModel.scrollToCaret(ScrollType.RELATIVE); scrollingModel.enableAnimation(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project != null) { IdeDocumentHistory instance = IdeDocumentHistory.getInstance(project); if (instance != null) { diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/UnindentSelectionAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/UnindentSelectionAction.java index ec72fa01ec3f..231c7e9f14bc 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/UnindentSelectionAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/UnindentSelectionAction.java @@ -25,6 +25,7 @@ package com.intellij.openapi.editor.actions; import com.intellij.codeStyle.CodeStyleFacade; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Document; @@ -46,7 +47,7 @@ public class UnindentSelectionAction extends EditorAction { private static class Handler extends EditorWriteActionHandler { @Override public void executeWriteAction(Editor editor, DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); unindentSelection(editor, project); } diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java index 820f1b57af52..55dc5d16c58b 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java @@ -31,9 +31,9 @@ import com.intellij.ide.ui.UISettings; import com.intellij.ide.util.PropertiesComponent; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.ActionManager; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.IdeActions; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.actionSystem.ex.ActionManagerEx; import com.intellij.openapi.actionSystem.impl.MouseGestureManager; import com.intellij.openapi.application.ApplicationManager; @@ -3976,12 +3976,12 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi @NotNull private DataContext getProjectAwareDataContext(@NotNull final DataContext original) { - if (PlatformDataKeys.PROJECT.getData(original) == myProject) return original; + if (CommonDataKeys.PROJECT.getData(original) == myProject) return original; return new DataContext() { @Override public Object getData(String dataId) { - if (PlatformDataKeys.PROJECT.is(dataId)) { + if (CommonDataKeys.PROJECT.is(dataId)) { return myProject; } return original.getData(dataId); diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/actions/VirtualFileDeleteProvider.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/actions/VirtualFileDeleteProvider.java index b3c25baf150e..3a23ba104c86 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/actions/VirtualFileDeleteProvider.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/actions/VirtualFileDeleteProvider.java @@ -17,8 +17,8 @@ package com.intellij.openapi.fileChooser.actions; import com.intellij.CommonBundle; import com.intellij.ide.DeleteProvider; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationBundle; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.diagnostic.Logger; @@ -39,14 +39,14 @@ public final class VirtualFileDeleteProvider implements DeleteProvider { private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.fileChooser.actions.VirtualFileDeleteProvider"); public boolean canDeleteElement(@NotNull DataContext dataContext) { - final VirtualFile[] files = PlatformDataKeys.VIRTUAL_FILE_ARRAY.getData(dataContext); + final VirtualFile[] files = CommonDataKeys.VIRTUAL_FILE_ARRAY.getData(dataContext); return files != null && files.length > 0; } public void deleteElement(@NotNull DataContext dataContext) { - final VirtualFile[] files = PlatformDataKeys.VIRTUAL_FILE_ARRAY.getData(dataContext); + final VirtualFile[] files = CommonDataKeys.VIRTUAL_FILE_ARRAY.getData(dataContext); if (files == null || files.length == 0) return; - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); String message = createConfirmationMessage(files); int returnValue = Messages.showOkCancelDialog(message, UIBundle.message("delete.dialog.title"), ApplicationBundle.message("button.delete"), diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java index 51ebe7def0b6..2b1a557a6667 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java @@ -445,7 +445,7 @@ public final class EditorTabbedContainer implements Disposable, CloseAction.Clos private class MyDataProvider implements DataProvider { @Override public Object getData(@NonNls final String dataId) { - if (PlatformDataKeys.PROJECT.is(dataId)) { + if (CommonDataKeys.PROJECT.is(dataId)) { return myProject; } if (PlatformDataKeys.VIRTUAL_FILE.is(dataId)) { diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorWindow.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorWindow.java index 4207cab2ca4f..2f020e862644 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorWindow.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorWindow.java @@ -18,6 +18,7 @@ package com.intellij.openapi.fileEditor.impl; import com.intellij.icons.AllIcons; import com.intellij.ide.actions.CloseAction; import com.intellij.ide.ui.UISettings; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataKey; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -561,7 +562,7 @@ public class EditorWindow { final VirtualFile virtualFile = myEditor.getFile(); return virtualFile.isValid() ? virtualFile : null; } - else if (PlatformDataKeys.PROJECT.is(dataId)) { + else if (CommonDataKeys.PROJECT.is(dataId)) { return myEditor.getFileEditorManager().getProject(); } return null; diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java index 90503da69fa9..a9400602ba72 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java @@ -112,7 +112,7 @@ public final class IdeKeyEventDispatcher implements Disposable { if (myState == KeyState.STATE_WAIT_FOR_SECOND_KEYSTROKE) { resetState(); final DataContext dataContext = myContext.getDataContext(); - StatusBar.Info.set(null, dataContext == null ? null : PlatformDataKeys.PROJECT.getData(dataContext)); + StatusBar.Info.set(null, dataContext == null ? null : CommonDataKeys.PROJECT.getData(dataContext)); } } }; @@ -321,7 +321,7 @@ public final class IdeKeyEventDispatcher implements Disposable { if(KeyEvent.KEY_RELEASED==e.getID()){ myFirstKeyStroke=null; setState(KeyState.STATE_INIT); - Project project = PlatformDataKeys.PROJECT.getData(myContext.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(myContext.getDataContext()); StatusBar.Info.set(null, project); return false; } @@ -337,7 +337,7 @@ public final class IdeKeyEventDispatcher implements Disposable { } // finally user had managed to enter the second keystroke, so let it be processed - Project project = PlatformDataKeys.PROJECT.getData(myContext.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(myContext.getDataContext()); StatusBarEx statusBar = (StatusBarEx) WindowManager.getInstance().getStatusBar(project); if (processAction(e, myActionProcessor)) { if (statusBar != null) { @@ -423,7 +423,7 @@ public final class IdeKeyEventDispatcher implements Disposable { myFirstKeyStroke=keyStroke; final ArrayList> secondKeyStrokes = getSecondKeystrokeActions(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); StringBuilder message = new StringBuilder(); message.append(KeyMapBundle.message("prefix.key.pressed.message")); message.append(' '); @@ -449,7 +449,7 @@ public final class IdeKeyEventDispatcher implements Disposable { @Override public void run() { if (myState == KeyState.STATE_WAIT_FOR_SECOND_KEYSTROKE) { - StatusBar.Info.set(null, PlatformDataKeys.PROJECT.getData(oldContext)); + StatusBar.Info.set(null, CommonDataKeys.PROJECT.getData(oldContext)); new SecondaryKeystrokePopup(myFirstKeyStroke, secondKeyStrokes, oldContext).showInBestPositionFor(oldContext); } } @@ -575,7 +575,7 @@ public final class IdeKeyEventDispatcher implements Disposable { public boolean processAction(final InputEvent e, @NotNull ActionProcessor processor) { ActionManagerEx actionManager = ActionManagerEx.getInstanceEx(); - final Project project = PlatformDataKeys.PROJECT.getData(myContext.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(myContext.getDataContext()); final boolean dumb = project != null && DumbService.getInstance(project).isDumb(); List nonDumbAwareAction = new ArrayList(); List actions = myContext.getActions(); diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/FrameWrapper.java b/platform/platform-impl/src/com/intellij/openapi/ui/FrameWrapper.java index 5cb962c73cda..3f0f574d76b5 100644 --- a/platform/platform-impl/src/com/intellij/openapi/ui/FrameWrapper.java +++ b/platform/platform-impl/src/com/intellij/openapi/ui/FrameWrapper.java @@ -17,8 +17,8 @@ package com.intellij.openapi.ui; import com.intellij.ide.DataManager; import com.intellij.openapi.Disposable; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataProvider; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.actionSystem.ex.ActionManagerEx; import com.intellij.openapi.actionSystem.impl.MouseGestureManager; import com.intellij.openapi.application.impl.ApplicationInfoImpl; @@ -98,7 +98,7 @@ public class FrameWrapper implements Disposable, DataProvider { public void setProject(@NotNull final Project project) { myProject = project; - setData(PlatformDataKeys.PROJECT.getName(), project); + setData(CommonDataKeys.PROJECT.getName(), project); ProjectManager.getInstance().addProjectManagerListener(project, myProjectListener); Disposer.register(this, new Disposable() { @Override diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java b/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java index bff6d208005a..c1aca4ad3ea4 100644 --- a/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java @@ -91,7 +91,7 @@ public class DialogWrapperPeerImpl extends DialogWrapperPeer implements FocusTra if (project == null) { //noinspection deprecation - project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()); + project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()); } myProject = project; @@ -682,7 +682,7 @@ public class DialogWrapperPeerImpl extends DialogWrapperPeer implements FocusTra myDimensionServiceKey = dialogWrapper.getDimensionKey(); if (myDimensionServiceKey != null) { - final Project projectGuess = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(this)); + final Project projectGuess = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(this)); location = DimensionService.getInstance().getLocation(myDimensionServiceKey, projectGuess); Dimension size = DimensionService.getInstance().getSize(myDimensionServiceKey, projectGuess); if (size != null) { @@ -953,7 +953,7 @@ public class DialogWrapperPeerImpl extends DialogWrapperPeer implements FocusTra if (myDimensionServiceKey != null && myInitialSize != null && myOpened) { // myInitialSize can be null only if dialog is disposed before first showing - final Project projectGuess = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(MyDialog.this)); + final Project projectGuess = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(MyDialog.this)); // Save location Point location = getLocation(); diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/impl/GlassPaneDialogWrapperPeer.java b/platform/platform-impl/src/com/intellij/openapi/ui/impl/GlassPaneDialogWrapperPeer.java index 79c01eccf5a6..b538143773c7 100644 --- a/platform/platform-impl/src/com/intellij/openapi/ui/impl/GlassPaneDialogWrapperPeer.java +++ b/platform/platform-impl/src/com/intellij/openapi/ui/impl/GlassPaneDialogWrapperPeer.java @@ -19,8 +19,8 @@ import com.intellij.ide.DataManager; import com.intellij.ide.impl.TypeSafeDataProviderAdapter; import com.intellij.ide.ui.UISettings; import com.intellij.openapi.Disposable; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataProvider; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.actionSystem.TypeSafeDataProvider; import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; @@ -79,7 +79,7 @@ public class GlassPaneDialogWrapperPeer extends DialogWrapperPeer implements Foc if (myWindowManager != null) { if (project == null) { - project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()); + project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()); } myProject = project; diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/CheckForUpdateAction.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/CheckForUpdateAction.java index c7b15139569e..d6853173cf21 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/CheckForUpdateAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/CheckForUpdateAction.java @@ -18,7 +18,7 @@ package com.intellij.openapi.updateSettings.impl; import com.intellij.ide.plugins.PluginHostsConfigurable; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; @@ -38,7 +38,7 @@ public class CheckForUpdateAction extends AnAction implements DumbAware { } public void actionPerformed(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); actionPerformed(project, true, null, UpdateSettings.getInstance()); } diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java index d5262cfb6e8c..a7543aeaaba5 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java @@ -17,7 +17,7 @@ package com.intellij.openapi.updateSettings.impl; import com.intellij.ide.DataManager; import com.intellij.ide.IdeBundle; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.application.ApplicationInfo; import com.intellij.openapi.options.BaseConfigurable; import com.intellij.openapi.options.ConfigurationException; @@ -112,7 +112,7 @@ public class UpdateSettingsConfigurable extends BaseConfigurable implements Sear myBtnCheckNow.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(myBtnCheckNow)); + Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(myBtnCheckNow)); UpdateSettings settings = new UpdateSettings(); settings.loadState(UpdateSettings.getInstance().getState()); settings.UPDATE_CHANNEL_TYPE = getSelectedChannelType().getCode(); diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java index 6d7388aa73fa..6f20c236d0e9 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java @@ -24,8 +24,8 @@ import com.intellij.ide.util.PropertiesComponent; import com.intellij.notification.impl.IdeNotificationArea; import com.intellij.openapi.Disposable; import com.intellij.openapi.MnemonicHelper; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataProvider; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.actionSystem.ex.ActionManagerEx; import com.intellij.openapi.actionSystem.impl.MouseGestureManager; import com.intellij.openapi.application.Application; @@ -343,7 +343,7 @@ public class IdeFrameImpl extends JFrame implements IdeFrameEx, DataProvider { } public Object getData(final String dataId) { - if (PlatformDataKeys.PROJECT.is(dataId)) { + if (CommonDataKeys.PROJECT.is(dataId)) { if (myProject != null) { return myProject.isInitialized() ? myProject : null; } diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowWatcher.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowWatcher.java index d6a3c06fd289..c8937d7b0df8 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowWatcher.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowWatcher.java @@ -16,14 +16,13 @@ package com.intellij.openapi.wm.impl; import com.intellij.ide.DataManager; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.wm.FocusWatcher; import com.intellij.openapi.wm.ex.WindowManagerEx; -import com.intellij.util.containers.HashMap; import com.intellij.util.containers.WeakHashMap; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -82,11 +81,11 @@ public final class WindowWatcher implements PropertyChangeListener{ myWindow2Info.put(window,new WindowInfo(window, true)); } myFocusedWindow=window; - final Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(myFocusedWindow)); + final Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(myFocusedWindow)); for (Iterator i = myFocusedWindows.iterator(); i.hasNext();) { final Window w = (Window)i.next(); final DataContext dataContext = DataManager.getInstance().getDataContext(w); - if (project == PlatformDataKeys.PROJECT.getData(dataContext)) { + if (project == CommonDataKeys.PROJECT.getData(dataContext)) { i.remove(); } } @@ -297,7 +296,7 @@ public final class WindowWatcher implements PropertyChangeListener{ } } final DataContext dataContext = DataManager.getInstance().getDataContext(window); - if (project == PlatformDataKeys.PROJECT.getData(dataContext)) { + if (project == CommonDataKeys.PROJECT.getData(dataContext)) { return window; } } diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/AddTestProcessAction.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/AddTestProcessAction.java index 459c07253db4..d7f099c37401 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/AddTestProcessAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/AddTestProcessAction.java @@ -17,7 +17,7 @@ package com.intellij.openapi.wm.impl.status; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.progress.PerformInBackgroundOption; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; @@ -35,7 +35,7 @@ public class AddTestProcessAction extends AnAction implements DumbAware { } public void actionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); new Task.Backgroundable(project, "Test Process", true, PerformInBackgroundOption.DEAF) { public void run(@NotNull final ProgressIndicator indicator) { try { diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/AddTestProcessActionIndefinite.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/AddTestProcessActionIndefinite.java index faee0e029f54..aebdcbac3b31 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/AddTestProcessActionIndefinite.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/AddTestProcessActionIndefinite.java @@ -17,11 +17,11 @@ package com.intellij.openapi.wm.impl.status; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.Task; -import com.intellij.openapi.project.Project; import com.intellij.openapi.project.DumbAware; +import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; @SuppressWarnings({"HardCodedStringLiteral"}) @@ -31,7 +31,7 @@ public class AddTestProcessActionIndefinite extends AnAction implements DumbAwar } public void actionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); new Task.Backgroundable(project, "Test", true) { public void run(@NotNull final ProgressIndicator indicator) { diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/EncodingPanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/EncodingPanel.java index 9cce614d9888..e923b6287354 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/EncodingPanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/EncodingPanel.java @@ -17,6 +17,7 @@ package com.intellij.openapi.wm.impl.status; import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.actionSystem.impl.SimpleDataContext; @@ -206,8 +207,8 @@ public class EncodingPanel extends EditorBasedWidget implements StatusBarWidget. private DataContext getContext() { Editor editor = getEditor(); DataContext parent = DataManager.getInstance().getDataContext((Component)myStatusBar); - return SimpleDataContext.getSimpleContext(PlatformDataKeys.VIRTUAL_FILE.getName(), getSelectedFile(), - SimpleDataContext.getSimpleContext(PlatformDataKeys.PROJECT.getName(), getProject(), + return SimpleDataContext.getSimpleContext(CommonDataKeys.VIRTUAL_FILE.getName(), getSelectedFile(), + SimpleDataContext.getSimpleContext(CommonDataKeys.PROJECT.getName(), getProject(), SimpleDataContext.getSimpleContext(PlatformDataKeys.CONTEXT_COMPONENT.getName(), editor == null ? null : editor.getComponent(), parent) )); } diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/LineSeparatorPanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/LineSeparatorPanel.java index bdf9646f62d8..fa8010f9955d 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/LineSeparatorPanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/LineSeparatorPanel.java @@ -184,7 +184,7 @@ public class LineSeparatorPanel extends EditorBasedWidget implements StatusBarWi return SimpleDataContext.getSimpleContext( PlatformDataKeys.VIRTUAL_FILE_ARRAY.getName(), new VirtualFile[] {getSelectedFile()}, - SimpleDataContext.getSimpleContext(PlatformDataKeys.PROJECT.getName(), + SimpleDataContext.getSimpleContext(CommonDataKeys.PROJECT.getName(), getProject(), SimpleDataContext.getSimpleContext(PlatformDataKeys.CONTEXT_COMPONENT.getName(), editor == null ? null : editor.getComponent(), parent) diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ToggleReadOnlyAttributePanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ToggleReadOnlyAttributePanel.java index c2f27c502692..b01c167917d9 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ToggleReadOnlyAttributePanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ToggleReadOnlyAttributePanel.java @@ -17,7 +17,7 @@ package com.intellij.openapi.wm.impl.status; import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.fileEditor.FileEditorManager; @@ -123,6 +123,6 @@ public class ToggleReadOnlyAttributePanel implements StatusBarWidget.Multiframe, @Nullable private Project getProject() { - return PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext((JComponent) myStatusBar)); + return CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext((JComponent) myStatusBar)); } } diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/DefaultWelcomeScreen.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/DefaultWelcomeScreen.java index 34a6d6f74f37..7f9824ec9a40 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/DefaultWelcomeScreen.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/DefaultWelcomeScreen.java @@ -303,7 +303,7 @@ public class DefaultWelcomeScreen implements WelcomeScreen { DataContext dataContext = DataManager.getInstance().getDataContext(myWelcomePanel); int fragment = actionLabel.findFragmentAt(e.getX()); if (fragment == SimpleColoredComponent.FRAGMENT_ICON) { - final int rc = Messages.showOkCancelDialog(PlatformDataKeys.PROJECT.getData(dataContext), + final int rc = Messages.showOkCancelDialog(CommonDataKeys.PROJECT.getData(dataContext), "Remove '" + action.getTemplatePresentation().getText() + "' from recent projects list?", "Remove Recent Project", diff --git a/platform/platform-impl/src/com/intellij/platform/OpenDirectoryProjectAction.java b/platform/platform-impl/src/com/intellij/platform/OpenDirectoryProjectAction.java index 618afac965ee..32f874b0ca69 100644 --- a/platform/platform-impl/src/com/intellij/platform/OpenDirectoryProjectAction.java +++ b/platform/platform-impl/src/com/intellij/platform/OpenDirectoryProjectAction.java @@ -18,6 +18,7 @@ package com.intellij.platform; import com.intellij.ide.actions.OpenProjectFileChooserDescriptor; 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.fileChooser.*; import com.intellij.openapi.project.DumbAware; @@ -33,7 +34,7 @@ import java.util.List; public class OpenDirectoryProjectAction extends AnAction implements DumbAware { public void actionPerformed(final AnActionEvent e) { final FileChooserDescriptor descriptor = new OpenProjectFileChooserDescriptor(false); - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); FileChooser.chooseFiles(descriptor, project, null, new Consumer>() { @Override diff --git a/platform/platform-impl/src/com/intellij/ui/FocusTrackback.java b/platform/platform-impl/src/com/intellij/ui/FocusTrackback.java index be468c64d779..e2bee681aef6 100644 --- a/platform/platform-impl/src/com/intellij/ui/FocusTrackback.java +++ b/platform/platform-impl/src/com/intellij/ui/FocusTrackback.java @@ -16,8 +16,8 @@ package com.intellij.ui; import com.intellij.ide.DataManager; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; @@ -194,7 +194,7 @@ public class FocusTrackback { DataContext context = myParentWindow == null ? DataManager.getInstance().getDataContext() : DataManager.getInstance().getDataContext(myParentWindow); if (context != null) { - project = PlatformDataKeys.PROJECT.getData(context); + project = CommonDataKeys.PROJECT.getData(context); } mySheduledForRestore = true; diff --git a/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java b/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java index 4c858db93cd8..f73bb95cf773 100644 --- a/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java +++ b/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java @@ -20,8 +20,8 @@ import com.intellij.ide.DataManager; import com.intellij.ide.ui.UISettings; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.CustomShortcutSet; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; @@ -498,7 +498,7 @@ public abstract class SpeedSearchBase extends SpeedSear private void manageSearchPopup(@Nullable SearchPopup searchPopup) { final Project project; if (ApplicationManager.getApplication() != null && !ApplicationManager.getApplication().isDisposed()) { - project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(myComponent)); + project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(myComponent)); } else { project = null; 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 8c6452b06bd5..bdcbc250663c 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java @@ -22,6 +22,7 @@ import com.intellij.ide.IdeEventQueue; import com.intellij.ide.UiActivity; import com.intellij.ide.UiActivityMonitor; import com.intellij.openapi.Disposable; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -946,7 +947,7 @@ public class AbstractPopup implements JBPopup { final Component c = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner(); if (c != null) { final DataContext context = DataManager.getInstance().getDataContext(c); - final Project project = PlatformDataKeys.PROJECT.getData(context); + final Project project = CommonDataKeys.PROJECT.getData(context); if (project != null) { myProjectDisposable = new Disposable() { 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 7a19b238770d..a47f03801151 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java @@ -440,7 +440,7 @@ public class PopupFactoryImpl extends JBPopupFactory { JComponent focusOwner = component instanceof JComponent ? (JComponent)component : null; if (focusOwner == null) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); IdeFrameImpl frame = project == null ? null : ((WindowManagerEx)WindowManager.getInstance()).getFrame(project); focusOwner = frame == null ? null : frame.getRootPane(); if (focusOwner == null) { diff --git a/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java b/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java index 8c53143f14a5..02ea2636031d 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java @@ -16,7 +16,7 @@ package com.intellij.ui.popup; import com.intellij.ide.DataManager; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.popup.*; @@ -88,7 +88,7 @@ public abstract class WizardPopup extends AbstractPopup implements ActionListene scrollPane.setBorder(null); - final Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()); init(project, scrollPane, getPreferredFocusableComponent(), true, true, true, true, null, false, aStep.getTitle(), null, true, null, false, null, null, null, false, null, true, false, true, null, 0f, null, true, false, new Component[0], null, SwingConstants.LEFT, true, Collections.>emptyList(), null, null, false, true, 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 25ecb6da61fc..fcc97247651f 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 @@ -22,6 +22,7 @@ import com.intellij.history.integration.ui.actions.ShowHistoryAction; import com.intellij.history.integration.ui.actions.ShowSelectionHistoryAction; 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.editor.Document; @@ -130,7 +131,7 @@ public class LocalHistoryActionsTest extends LocalHistoryUITestCase { public Object getData(String id) { if (PlatformDataKeys.VIRTUAL_FILE_ARRAY.is(id)) return files; if (PlatformDataKeys.EDITOR.is(id)) return editor; - if (PlatformDataKeys.PROJECT.is(id)) return p; + 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 780aaf8adc69..c9b05517b6dd 100644 --- a/platform/testFramework/src/com/intellij/testFramework/LightPlatformCodeInsightTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/LightPlatformCodeInsightTestCase.java @@ -621,7 +621,7 @@ public abstract class LightPlatformCodeInsightTestCase extends LightPlatformTest if (PlatformDataKeys.EDITOR.is(dataId)) { return getEditor(); } - if (PlatformDataKeys.PROJECT.is(dataId)) { + if (CommonDataKeys.PROJECT.is(dataId)) { return getProject(); } if (LangDataKeys.PSI_FILE.is(dataId)) { diff --git a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java index 6e1d90136aa4..1cdbe4fa91a2 100644 --- a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java @@ -32,6 +32,7 @@ import com.intellij.ide.startup.StartupManagerEx; import com.intellij.ide.startup.impl.StartupManagerImpl; import com.intellij.idea.IdeaLogger; import com.intellij.idea.IdeaTestApplication; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.Application; @@ -705,7 +706,7 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da @Override public Object getData(String dataId) { - if (PlatformDataKeys.PROJECT.is(dataId)) { + if (CommonDataKeys.PROJECT.is(dataId)) { return ourProject; } return null; diff --git a/platform/testFramework/src/com/intellij/testFramework/TestDataProvider.java b/platform/testFramework/src/com/intellij/testFramework/TestDataProvider.java index e9165cacad24..f8bf61ae57a9 100644 --- a/platform/testFramework/src/com/intellij/testFramework/TestDataProvider.java +++ b/platform/testFramework/src/com/intellij/testFramework/TestDataProvider.java @@ -15,6 +15,7 @@ */ package com.intellij.testFramework; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; @@ -45,7 +46,7 @@ public class TestDataProvider implements DataProvider { "If you closed a project in test, please reset IdeaTestApplication.setDataProvider."); } - if (PlatformDataKeys.PROJECT.is(dataId)) { + if (CommonDataKeys.PROJECT.is(dataId)) { return myProject; } else if (PlatformDataKeys.EDITOR.is(dataId) || OpenFileDescriptor.NAVIGATE_IN_EDITOR.is(dataId)) { 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 2be2a8ab10ae..a9087552b916 100644 --- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/HeavyIdeaTestFixtureImpl.java +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/HeavyIdeaTestFixtureImpl.java @@ -20,6 +20,7 @@ import com.intellij.ide.IdeView; import com.intellij.ide.highlighter.ProjectFileType; import com.intellij.ide.startup.impl.StartupManagerImpl; import com.intellij.idea.IdeaTestApplication; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -193,7 +194,7 @@ class HeavyIdeaTestFixtureImpl extends BaseFixture implements HeavyIdeaTestFixtu @Override @Nullable public Object getData(@NonNls String dataId) { - if (PlatformDataKeys.PROJECT.is(dataId)) { + if (CommonDataKeys.PROJECT.is(dataId)) { return myProject; } else if (PlatformDataKeys.EDITOR.is(dataId) || OpenFileDescriptor.NAVIGATE_IN_EDITOR.is(dataId)) { diff --git a/platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java b/platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java index e0063f7d8acd..4571da839d1b 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java @@ -131,7 +131,7 @@ public class AbstractRerunFailedTestsAction extends AnAction implements AnAction private boolean isActive(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return false; TestFrameworkRunningModel model = getModel(); if (model == null || model.getRoot() == null) return false; diff --git a/platform/testRunner/src/com/intellij/execution/testframework/actions/ViewAssertEqualsDiffAction.java b/platform/testRunner/src/com/intellij/execution/testframework/actions/ViewAssertEqualsDiffAction.java index 9c03a18bdc92..fd80ea0154db 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/actions/ViewAssertEqualsDiffAction.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/actions/ViewAssertEqualsDiffAction.java @@ -30,7 +30,7 @@ public class ViewAssertEqualsDiffAction extends AnAction { if (testProxy != null) { final AbstractTestProxy.AssertEqualsDiffViewerProvider diffViewerProvider = testProxy.getDiffViewerProvider(); if (diffViewerProvider != null) { - diffViewerProvider.openDiff(PlatformDataKeys.PROJECT.getData(e.getDataContext())); + diffViewerProvider.openDiff(CommonDataKeys.PROJECT.getData(e.getDataContext())); } } } @@ -39,7 +39,7 @@ public class ViewAssertEqualsDiffAction extends AnAction { final Presentation presentation = e.getPresentation(); final boolean enabled; final DataContext dataContext = e.getDataContext(); - if (PlatformDataKeys.PROJECT.getData(dataContext) == null) { + if (CommonDataKeys.PROJECT.getData(dataContext) == null) { enabled = false; } else { diff --git a/platform/testRunner/src/com/intellij/execution/testframework/autotest/ToggleAutoTestAction.java b/platform/testRunner/src/com/intellij/execution/testframework/autotest/ToggleAutoTestAction.java index b6f3cadfb0ab..d9ba85745999 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/autotest/ToggleAutoTestAction.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/autotest/ToggleAutoTestAction.java @@ -4,6 +4,7 @@ import com.intellij.execution.ui.RunContentDescriptor; import com.intellij.execution.ui.RunContentManager; import com.intellij.icons.AllIcons; 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.project.Project; @@ -19,14 +20,14 @@ public class ToggleAutoTestAction extends ToggleAction { @Override public boolean isSelected(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); RunContentDescriptor descriptor = e.getData(RunContentManager.RUN_CONTENT_DESCRIPTOR); return !(project == null || descriptor == null) && AutoTestManager.getInstance(project).isAutoTestEnabled(descriptor); } @Override public void setSelected(AnActionEvent e, boolean state) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); RunContentDescriptor descriptor = e.getData(RunContentManager.RUN_CONTENT_DESCRIPTOR); if (project != null && descriptor != null) { AutoTestManager.getInstance(project).setAutoTestEnabled(descriptor, state); diff --git a/platform/testRunner/src/com/intellij/execution/testframework/export/ExportTestResultsAction.java b/platform/testRunner/src/com/intellij/execution/testframework/export/ExportTestResultsAction.java index af96da279d8a..f9e58e9751d6 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/export/ExportTestResultsAction.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/export/ExportTestResultsAction.java @@ -22,6 +22,7 @@ import com.intellij.execution.testframework.TestFrameworkRunningModel; import com.intellij.ide.BrowserUtil; import com.intellij.openapi.actionSystem.ActionManager; 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; @@ -98,7 +99,7 @@ public class ExportTestResultsAction extends DumbAwareAction { return false; } - if (PlatformDataKeys.PROJECT.getData(dataContext) == null) { + if (CommonDataKeys.PROJECT.getData(dataContext) == null) { return false; } @@ -107,7 +108,7 @@ public class ExportTestResultsAction extends DumbAwareAction { @Override public void actionPerformed(AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); LOG.assertTrue(project != null); final ExportTestResultsConfiguration config = ExportTestResultsConfiguration.getInstance(project); diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageFilteringRuleProviderImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageFilteringRuleProviderImpl.java index 034b383d29ad..489f4cbc5f31 100644 --- a/platform/usageView/src/com/intellij/usages/impl/UsageFilteringRuleProviderImpl.java +++ b/platform/usageView/src/com/intellij/usages/impl/UsageFilteringRuleProviderImpl.java @@ -110,7 +110,7 @@ public class UsageFilteringRuleProviderImpl implements UsageFilteringRuleProvide @Override public void setSelected(AnActionEvent e, boolean state) { myReadWriteState.setShowReadAccess(state); - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) return; project.getMessageBus().syncPublisher(RULES_CHANGED).run(); } @@ -129,7 +129,7 @@ public class UsageFilteringRuleProviderImpl implements UsageFilteringRuleProvide @Override public void setSelected(AnActionEvent e, boolean state) { myReadWriteState.setShowWriteAccess(state); - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) return; project.getMessageBus().syncPublisher(RULES_CHANGED).run(); } diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java index 371b67b75141..16e9c5226a64 100644 --- a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java +++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java @@ -1429,8 +1429,8 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra public void calcData(final DataKey key, final DataSink sink) { Node node = getSelectedNode(); - if (key == PlatformDataKeys.PROJECT) { - sink.put(PlatformDataKeys.PROJECT, myProject); + if (key == CommonDataKeys.PROJECT) { + sink.put(CommonDataKeys.PROJECT, myProject); } else if (key == USAGE_VIEW_KEY) { sink.put(USAGE_VIEW_KEY, UsageViewImpl.this); diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/actions/StandardVcsGroup.java b/platform/vcs-api/src/com/intellij/openapi/vcs/actions/StandardVcsGroup.java index c8c03bcfaff9..b0fcdc8b2786 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/actions/StandardVcsGroup.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/actions/StandardVcsGroup.java @@ -16,8 +16,8 @@ package com.intellij.openapi.vcs.actions; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DefaultActionGroup; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; @@ -32,7 +32,7 @@ public abstract class StandardVcsGroup extends DefaultActionGroup implements Dum public void update(AnActionEvent e) { Presentation presentation = e.getPresentation(); - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); if (project != null) { final String vcsName = getVcsName(project); presentation.setVisible(vcsName != null && diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/annotate/ShowAllAffectedGenericAction.java b/platform/vcs-api/src/com/intellij/openapi/vcs/annotate/ShowAllAffectedGenericAction.java index 1d18f36cbc43..680341da4a59 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/annotate/ShowAllAffectedGenericAction.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/annotate/ShowAllAffectedGenericAction.java @@ -18,7 +18,7 @@ package com.intellij.openapi.vcs.annotate; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.progress.Task; @@ -56,7 +56,7 @@ public class ShowAllAffectedGenericAction extends AnAction { @Override public void actionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) return; final VcsKey vcsKey = e.getData(VcsDataKeys.VCS); if (vcsKey == null) return; @@ -172,7 +172,7 @@ public class ShowAllAffectedGenericAction extends AnAction { @Override public void update(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final VcsKey vcsKey = e.getData(VcsDataKeys.VCS); if (project == null || vcsKey == null) { e.getPresentation().setEnabled(false); diff --git a/platform/vcs-impl/src/com/intellij/ide/actions/VcsDataWrapper.java b/platform/vcs-impl/src/com/intellij/ide/actions/VcsDataWrapper.java index b354b8a21e3a..13b8872de3e8 100644 --- a/platform/vcs-impl/src/com/intellij/ide/actions/VcsDataWrapper.java +++ b/platform/vcs-impl/src/com/intellij/ide/actions/VcsDataWrapper.java @@ -16,6 +16,7 @@ package com.intellij.ide.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.project.Project; @@ -35,7 +36,7 @@ class VcsDataWrapper { VcsDataWrapper(final AnActionEvent e) { final DataContext dataContext = e.getDataContext(); - myProject = PlatformDataKeys.PROJECT.getData(dataContext); + myProject = CommonDataKeys.PROJECT.getData(dataContext); if (myProject == null || myProject.isDefault()) { myManager = null; myVcses = null; diff --git a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.java b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.java index 87afa455ae77..cae0b4fd3a63 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.java +++ b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.java @@ -512,7 +512,7 @@ public class DirDiffPanel implements Disposable, DataProvider { @Override public Object getData(@NonNls String dataId) { - if (PlatformDataKeys.PROJECT.is(dataId)) { + if (CommonDataKeys.PROJECT.is(dataId)) { return myModel.getProject(); } if (DIR_DIFF_MODEL.is(dataId)) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/RefreshStatuses.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/RefreshStatuses.java index c0ac93c810a5..585d9f3b6169 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/RefreshStatuses.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/RefreshStatuses.java @@ -17,6 +17,7 @@ package com.intellij.openapi.vcs.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.project.Project; import com.intellij.openapi.project.DumbAware; @@ -25,14 +26,14 @@ import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager; public class RefreshStatuses extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project != null) { VcsDirtyScopeManager.getInstance(project).markEverythingDirty(); } } public void update(AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); boolean isEnabled = project != null && ProjectLevelVcsManager.getInstance(project).getAllActiveVcss().length > 0; e.getPresentation().setEnabled(isEnabled); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/ShowMessageHistoryAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/ShowMessageHistoryAction.java index a7079731d343..1d572e50cda5 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/ShowMessageHistoryAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/ShowMessageHistoryAction.java @@ -17,6 +17,7 @@ package com.intellij.openapi.vcs.actions; 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.editor.actions.ContentChooser; @@ -46,7 +47,7 @@ public class ShowMessageHistoryAction extends AnAction implements DumbAware { super.update(e); final DataContext dc = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dc); + final Project project = CommonDataKeys.PROJECT.getData(dc); Object panel = CheckinProjectPanel.PANEL_KEY.getData(dc); if (! (panel instanceof CommitMessageI)) { panel = VcsDataKeys.COMMIT_MESSAGE_CONTROL.getData(dc); @@ -66,7 +67,7 @@ public class ShowMessageHistoryAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { CommitMessageI commitMessageI; final DataContext dc = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dc); + final Project project = CommonDataKeys.PROJECT.getData(dc); final Refreshable panel = CheckinProjectPanel.PANEL_KEY.getData(dc); commitMessageI = (panel instanceof CommitMessageI) ? (CommitMessageI)panel : VcsDataKeys.COMMIT_MESSAGE_CONTROL.getData(dc); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/AbstractMissingFilesAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/AbstractMissingFilesAction.java index 3ac9c49cf5ce..382f0619ef03 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/AbstractMissingFilesAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/AbstractMissingFilesAction.java @@ -24,6 +24,7 @@ package com.intellij.openapi.vcs.changes.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.progress.ProgressManager; import com.intellij.openapi.project.DumbAware; @@ -50,7 +51,7 @@ public abstract class AbstractMissingFilesAction extends AnAction implements Dum } public void actionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final List files = e.getData(ChangesListView.MISSING_FILES_DATA_KEY); if (files == null) return; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/BrowseChangesAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/BrowseChangesAction.java index aabb82a5e7f6..3c74d4817723 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/BrowseChangesAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/BrowseChangesAction.java @@ -19,6 +19,7 @@ package com.intellij.openapi.vcs.changes.actions; import com.intellij.CommonBundle; 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.project.Project; import com.intellij.openapi.project.DumbAware; @@ -34,7 +35,7 @@ import com.intellij.openapi.vfs.VirtualFile; */ public class BrowseChangesAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); VirtualFile vFile = e.getData(PlatformDataKeys.VIRTUAL_FILE); assert vFile != null; AbstractVcs vcs = ProjectLevelVcsManager.getInstance(project).getVcsFor(vFile); @@ -69,7 +70,7 @@ public class BrowseChangesAction extends AnAction implements DumbAware { } private static boolean isActionEnabled(final AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) return false; VirtualFile vFile = e.getData(PlatformDataKeys.VIRTUAL_FILE); if (vFile == null) return false; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/CreatePatchFromChangesAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/CreatePatchFromChangesAction.java index c1efaa8e3c0a..2e0934b8aaf0 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/CreatePatchFromChangesAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/CreatePatchFromChangesAction.java @@ -19,6 +19,7 @@ package com.intellij.openapi.vcs.changes.actions; import com.intellij.icons.AllIcons; 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.progress.ProgressManager; import com.intellij.openapi.project.DumbAware; @@ -48,7 +49,7 @@ public class CreatePatchFromChangesAction extends AnAction implements DumbAware } public void actionPerformed(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); final Change[] changes = e.getData(VcsDataKeys.CHANGES); if ((changes == null) || (changes.length == 0)) return; String commitMessage = null; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/EditAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/EditAction.java index b78d6ce65509..76cfcdd56a0a 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/EditAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/EditAction.java @@ -24,6 +24,7 @@ package com.intellij.openapi.vcs.changes.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.project.Project; import com.intellij.openapi.vcs.*; @@ -37,7 +38,7 @@ import java.util.List; public class EditAction extends AnAction { public void actionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); List files = e.getData(VcsDataKeys.MODIFIED_WITHOUT_EDITING_DATA_KEY); editFilesAndShowErrors(project, files); } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/IgnoreUnversionedAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/IgnoreUnversionedAction.java index 4628b10cb268..0fbc3439550d 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/IgnoreUnversionedAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/IgnoreUnversionedAction.java @@ -24,6 +24,7 @@ package com.intellij.openapi.vcs.changes.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.project.Project; import com.intellij.openapi.vcs.changes.ChangeListManager; @@ -37,7 +38,7 @@ import java.util.List; public class IgnoreUnversionedAction extends AnAction { public void actionPerformed(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) return; if (ChangeListManager.getInstance(project).isFreezedWithNotification(null)) return; final List files = e.getData(ChangesListView.UNVERSIONED_FILES_DATA_KEY); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/IgnoredSettingsAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/IgnoredSettingsAction.java index 421d6b52ab83..75c3d1735c45 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/IgnoredSettingsAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/IgnoredSettingsAction.java @@ -19,6 +19,7 @@ package com.intellij.openapi.vcs.changes.actions; import com.intellij.icons.AllIcons; 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.project.DumbAware; import com.intellij.openapi.project.Project; @@ -35,7 +36,7 @@ public class IgnoredSettingsAction extends AnAction implements DumbAware { } public void actionPerformed(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); if (ChangeListManager.getInstance(project).isFreezedWithNotification(null)) return; IgnoredSettingsDialog.configure(project); } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/MarkFileDirtyAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/MarkFileDirtyAction.java index a8e5716f2e02..6336b434dcf8 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/MarkFileDirtyAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/MarkFileDirtyAction.java @@ -18,6 +18,7 @@ package com.intellij.openapi.vcs.changes.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.project.Project; import com.intellij.openapi.project.DumbAware; @@ -29,7 +30,7 @@ import com.intellij.openapi.vfs.VirtualFile; */ public class MarkFileDirtyAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final VirtualFile file = e.getData(PlatformDataKeys.VIRTUAL_FILE); if (file != null) { VcsDirtyScopeManager.getInstance(project).fileDirty(file); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/MoveChangesToAnotherListAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/MoveChangesToAnotherListAction.java index 031b9be2a1ab..cecbf4c43492 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/MoveChangesToAnotherListAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/MoveChangesToAnotherListAction.java @@ -57,7 +57,7 @@ public class MoveChangesToAnotherListAction extends AnAction implements DumbAwar } private static boolean isEnabled(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) return false; if (! ProjectLevelVcsManager.getInstance(project).hasActiveVcss()) return false; @@ -128,7 +128,7 @@ public class MoveChangesToAnotherListAction extends AnAction implements DumbAwar } public void actionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) return; if (! ProjectLevelVcsManager.getInstance(project).hasActiveVcss()) return; Change[] changes = e.getData(VcsDataKeys.CHANGES); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RefreshAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RefreshAction.java index 7b41615dc3ba..d678d7a1e5b5 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RefreshAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RefreshAction.java @@ -17,6 +17,7 @@ package com.intellij.openapi.vcs.changes.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.fileEditor.FileDocumentManager; import com.intellij.openapi.project.DumbAware; @@ -33,7 +34,7 @@ import org.jetbrains.annotations.NotNull; */ public class RefreshAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) return; doRefresh(project); } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RemoveChangeListAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RemoveChangeListAction.java index a38edbd1df52..5450953ef75d 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RemoveChangeListAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RemoveChangeListAction.java @@ -25,6 +25,7 @@ package com.intellij.openapi.vcs.changes.actions; import com.intellij.openapi.actionSystem.ActionPlaces; 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.project.DumbAware; import com.intellij.openapi.project.Project; @@ -41,7 +42,7 @@ import java.util.List; public class RemoveChangeListAction extends AnAction implements DumbAware { public void update(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); ChangeList[] lists = e.getData(VcsDataKeys.CHANGE_LISTS); final boolean visible = canRemoveChangeLists(project, lists); if (e.getPlace().equals(ActionPlaces.CHANGES_VIEW_POPUP)) @@ -62,7 +63,7 @@ public class RemoveChangeListAction extends AnAction implements DumbAware { } public void actionPerformed(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); final ChangeList[] lists = e.getData(VcsDataKeys.CHANGE_LISTS); assert lists != null; if (! canRemoveChangeLists(project, lists)) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RenameChangeListAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RenameChangeListAction.java index e921979ec08f..f51aeb43cea7 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RenameChangeListAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RenameChangeListAction.java @@ -25,6 +25,7 @@ package com.intellij.openapi.vcs.changes.actions; import com.intellij.openapi.actionSystem.ActionPlaces; 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.project.DumbAware; import com.intellij.openapi.project.Project; @@ -47,7 +48,7 @@ public class RenameChangeListAction extends AnAction implements DumbAware { } public void actionPerformed(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); ChangeList[] lists = e.getData(VcsDataKeys.CHANGE_LISTS); assert lists != null; final LocalChangeList list = ChangeListManager.getInstance(project).findChangeList(lists[0].getName()); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RevertCommittedStuffAbstractAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RevertCommittedStuffAbstractAction.java index 7ee8cb78bbc0..b1213eb35c0f 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RevertCommittedStuffAbstractAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RevertCommittedStuffAbstractAction.java @@ -17,6 +17,7 @@ package com.intellij.openapi.vcs.changes.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.diagnostic.Logger; import com.intellij.openapi.diff.impl.patch.BinaryFilePatch; @@ -56,7 +57,7 @@ abstract class RevertCommittedStuffAbstractAction extends AnAction implements Du } public void actionPerformed(final AnActionEvent e) { - final Project project = e.getRequiredData(PlatformDataKeys.PROJECT); + final Project project = e.getRequiredData(CommonDataKeys.PROJECT); final VirtualFile baseDir = project.getBaseDir(); assert baseDir != null; final Change[] changes = myForPerformConvertor.convert(e); @@ -104,7 +105,7 @@ abstract class RevertCommittedStuffAbstractAction extends AnAction implements Du } public void update(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final Change[] changes = myForUpdateConvertor.convert(e); e.getPresentation().setEnabled(project != null && changes != null && changes.length > 0); } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackAction.java index acece5344511..0e118ecafc32 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackAction.java @@ -25,6 +25,7 @@ package com.intellij.openapi.vcs.changes.actions; import com.intellij.openapi.actionSystem.ActionPlaces; 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.fileEditor.FileDocumentManager; import com.intellij.openapi.progress.ProcessCanceledException; @@ -57,7 +58,7 @@ import static java.util.Arrays.asList; public class RollbackAction extends AnAction implements DumbAware { public void update(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); final boolean visible = project != null && ProjectLevelVcsManager.getInstance(project).hasActiveVcss(); e.getPresentation().setVisible(visible); if (! visible) return; @@ -90,7 +91,7 @@ public class RollbackAction extends AnAction implements DumbAware { } public void actionPerformed(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) { return; } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackDialogAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackDialogAction.java index 76a2840329c3..0a0c4f738f20 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackDialogAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackDialogAction.java @@ -18,6 +18,7 @@ package com.intellij.openapi.vcs.changes.actions; import com.intellij.icons.AllIcons; 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.fileEditor.FileDocumentManager; import com.intellij.openapi.project.DumbAware; @@ -43,7 +44,7 @@ public class RollbackDialogAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { FileDocumentManager.getInstance().saveAllDocuments(); Change[] changes = e.getData(VcsDataKeys.CHANGES); - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); final ChangesBrowser browser = e.getData(ChangesBrowser.DATA_KEY); if (browser != null) { browser.setDataIsDirty(true); @@ -60,7 +61,7 @@ public class RollbackDialogAction extends AnAction implements DumbAware { public void update(AnActionEvent e) { Change[] changes = e.getData(VcsDataKeys.CHANGES); - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); boolean enabled = changes != null && project != null; e.getPresentation().setEnabled(enabled); if (enabled) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/SetDefaultChangeListAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/SetDefaultChangeListAction.java index 97813d604f9e..36d91906af45 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/SetDefaultChangeListAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/SetDefaultChangeListAction.java @@ -26,6 +26,7 @@ import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.ActionPlaces; 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.project.DumbAware; import com.intellij.openapi.project.Project; @@ -53,7 +54,7 @@ public class SetDefaultChangeListAction extends AnAction implements DumbAware { } public void actionPerformed(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); final ChangeList[] lists = e.getData(VcsDataKeys.CHANGE_LISTS); assert lists != null; ChangeListManager.getInstance(project).setDefaultChangeList((LocalChangeList)lists[0]); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ShowChangeAbstractAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ShowChangeAbstractAction.java index c9831bdce4e6..e197535cf0a9 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ShowChangeAbstractAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ShowChangeAbstractAction.java @@ -16,6 +16,7 @@ package com.intellij.openapi.vcs.changes.actions; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.diff.DiffManager; import com.intellij.openapi.diff.DiffRequest; @@ -46,7 +47,7 @@ abstract class ShowChangeAbstractAction extends DumbAwareAction { protected abstract boolean isEnabled(@NotNull ChangeRequestChain chain); public void actionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final ChangeRequestChain chain = e.getData(VcsDataKeys.DIFF_REQUEST_CHAIN); if (project == null || chain == null || !isEnabled(chain)) { return; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ShowDiffAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ShowDiffAction.java index ba76c0114191..a7538ae34af0 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ShowDiffAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ShowDiffAction.java @@ -19,6 +19,7 @@ import com.intellij.icons.AllIcons; 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.application.ModalityState; import com.intellij.openapi.diff.*; @@ -51,7 +52,7 @@ public class ShowDiffAction extends AnAction implements DumbAware { public void update(AnActionEvent e) { Change[] changes = e.getData(VcsDataKeys.CHANGES); - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); e.getPresentation().setEnabled(project != null && canShowDiff(changes)); } @@ -61,7 +62,7 @@ public class ShowDiffAction extends AnAction implements DumbAware { } public void actionPerformed(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) return; if (ChangeListManager.getInstance(project).isFreezedWithNotification(null)) return; final Change[] changes = e.getData(VcsDataKeys.CHANGES); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangeListDetailsAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangeListDetailsAction.java index 734a7fd68289..8c7a32463f0f 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangeListDetailsAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangeListDetailsAction.java @@ -19,6 +19,7 @@ import com.intellij.codeInsight.hint.HintUtil; import com.intellij.ide.DataManager; 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.project.DumbAware; import com.intellij.openapi.project.Project; @@ -42,7 +43,7 @@ import javax.swing.*; */ public class ChangeListDetailsAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final ChangeList[] changeLists = e.getData(VcsDataKeys.CHANGE_LISTS); if (changeLists != null && changeLists.length > 0 && changeLists [0] instanceof CommittedChangeList) { showDetailsPopup(project, (CommittedChangeList) changeLists [0]); @@ -50,7 +51,7 @@ public class ChangeListDetailsAction extends AnAction implements DumbAware { } public void update(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final ChangeList[] changeLists = e.getData(VcsDataKeys.CHANGE_LISTS); e.getPresentation().setEnabled(project != null && changeLists != null && changeLists.length == 1 && changeLists [0] instanceof CommittedChangeList); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ClearCommittedAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ClearCommittedAction.java index cb1db19e86c5..d7c6ebd734d1 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ClearCommittedAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ClearCommittedAction.java @@ -18,6 +18,7 @@ package com.intellij.openapi.vcs.changes.committed; import com.intellij.icons.AllIcons; 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.project.DumbAware; import com.intellij.openapi.project.Project; @@ -36,7 +37,7 @@ public class ClearCommittedAction extends AnAction implements DumbAware { } public void actionPerformed(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); CommittedChangesPanel panel = ChangesViewContentManager.getInstance(project).getActiveComponent(CommittedChangesPanel.class); assert panel != null; if (panel.isInLoad()) return; @@ -46,7 +47,7 @@ public class ClearCommittedAction extends AnAction implements DumbAware { } public void update(final AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); if (project != null) { CommittedChangesPanel panel = ChangesViewContentManager.getInstance(project).getActiveComponent(CommittedChangesPanel.class); RepositoryLocation rl = panel == null ? null : panel.getRepositoryLocation(); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/IncomingChangesIndicator.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/IncomingChangesIndicator.java index 5f806242a3ef..ca751ad50f79 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/IncomingChangesIndicator.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/IncomingChangesIndicator.java @@ -17,6 +17,7 @@ package com.intellij.openapi.vcs.changes.committed; import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; @@ -161,7 +162,7 @@ public class IncomingChangesIndicator { public void consume(final MouseEvent mouseEvent) { if (myStatusBar != null) { DataContext dataContext = DataManager.getInstance().getDataContext((Component) myStatusBar); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project != null) { ToolWindow changesView = ToolWindowManager.getInstance(project).getToolWindow(ChangesViewContentManager.TOOLWINDOW_ID); changesView.show(new Runnable() { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RefreshCommittedAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RefreshCommittedAction.java index 59eae65e73aa..612af6b5f75e 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RefreshCommittedAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RefreshCommittedAction.java @@ -17,6 +17,7 @@ package com.intellij.openapi.vcs.changes.committed; 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.project.DumbAware; import com.intellij.openapi.project.Project; @@ -27,7 +28,7 @@ import com.intellij.openapi.vcs.changes.ui.ChangesViewContentManager; */ public class RefreshCommittedAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); CommittedChangesPanel panel = ChangesViewContentManager.getInstance(project).getActiveComponent(CommittedChangesPanel.class); assert panel != null; if (panel.isInLoad()) return; @@ -40,7 +41,7 @@ public class RefreshCommittedAction extends AnAction implements DumbAware { } public void update(final AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); if (project != null) { CommittedChangesPanel panel = ChangesViewContentManager.getInstance(project).getActiveComponent(CommittedChangesPanel.class); e.getPresentation().setEnabled(panel != null && (! panel.isInLoad())); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RefreshIncomingChangesAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RefreshIncomingChangesAction.java index 84639b6e07c9..9cf8a5af3424 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RefreshIncomingChangesAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RefreshIncomingChangesAction.java @@ -17,6 +17,7 @@ package com.intellij.openapi.vcs.changes.committed; 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.project.DumbAware; import com.intellij.openapi.project.Project; @@ -27,7 +28,7 @@ import com.intellij.util.Consumer; */ public class RefreshIncomingChangesAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); if (project != null) { doRefresh(project); } @@ -47,7 +48,7 @@ public class RefreshIncomingChangesAction extends AnAction implements DumbAware } public void update(final AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); e.getPresentation().setEnabled(project != null && !CommittedChangesCache.getInstance(project).isRefreshingIncomingChanges()); } } \ No newline at end of file diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchAction.java index 5a0f814e2d64..d808fc16cf76 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchAction.java @@ -24,6 +24,7 @@ package com.intellij.openapi.vcs.changes.patch; import com.intellij.openapi.actionSystem.ActionPlaces; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; @@ -69,7 +70,7 @@ public class ApplyPatchAction extends DumbAwareAction { private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.patch.ApplyPatchAction"); public void actionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) return; if (ChangeListManager.getInstance(project).isFreezedWithNotification("Can not apply patch now")) return; @@ -298,7 +299,7 @@ public class ApplyPatchAction extends DumbAwareAction { @Override public void update(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); if (e.getPlace().equals(ActionPlaces.PROJECT_VIEW_POPUP)) { VirtualFile vFile = e.getData(PlatformDataKeys.VIRTUAL_FILE); e.getPresentation().setVisible(project != null && vFile != null && vFile.getFileType() == StdFileTypes.PATCH); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DeleteAlreadyUnshelvedAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DeleteAlreadyUnshelvedAction.java index a0c291a4f40a..34f14e516236 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DeleteAlreadyUnshelvedAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DeleteAlreadyUnshelvedAction.java @@ -17,6 +17,7 @@ package com.intellij.openapi.vcs.changes.shelf; 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.project.Project; @@ -33,7 +34,7 @@ public class DeleteAlreadyUnshelvedAction extends AnAction { @Override public void update(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final Presentation presentation = e.getPresentation(); if (project == null) { presentation.setEnabled(false); @@ -45,7 +46,7 @@ public class DeleteAlreadyUnshelvedAction extends AnAction { } public void actionPerformed(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) { return; } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesAction.java index dc4e69ef6cc8..f48f71b8a57f 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesAction.java @@ -50,7 +50,7 @@ public class DiffShelvedChangesAction extends AnAction implements DumbAware { } public static void showShelvedChangesDiff(final DataContext dc) { - final Project project = PlatformDataKeys.PROJECT.getData(dc); + final Project project = CommonDataKeys.PROJECT.getData(dc); if (project == null) return; if (ChangeListManager.getInstance(project).isFreezedWithNotification(null)) return; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ImportIntoShelfAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ImportIntoShelfAction.java index ca2a750dba85..9cc205b7c715 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ImportIntoShelfAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ImportIntoShelfAction.java @@ -16,6 +16,7 @@ package com.intellij.openapi.vcs.changes.shelf; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.fileChooser.FileChooser; import com.intellij.openapi.fileChooser.FileChooserDescriptor; @@ -46,13 +47,13 @@ public class ImportIntoShelfAction extends DumbAwareAction { @Override public void update(AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); e.getPresentation().setEnabled(project != null); } @Override public void actionPerformed(AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) return; final FileChooserDescriptor descriptor = new FileChooserDescriptor(true, true, false, false, false, true); FileChooser.chooseFiles(descriptor, project, null, new Consumer>() { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/RenameShelvedChangeListAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/RenameShelvedChangeListAction.java index 13b846cea450..242473dc1409 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/RenameShelvedChangeListAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/RenameShelvedChangeListAction.java @@ -17,6 +17,7 @@ package com.intellij.openapi.vcs.changes.shelf; 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.project.Project; import com.intellij.openapi.ui.InputValidator; @@ -30,7 +31,7 @@ import java.util.List; */ public class RenameShelvedChangeListAction extends AnAction { public void actionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final ShelvedChangeList[] changes = e.getData(ShelvedChangesViewManager.SHELVED_CHANGELIST_KEY); final ShelvedChangeList[] recycledChanges = e.getData(ShelvedChangesViewManager.SHELVED_RECYCLED_CHANGELIST_KEY); assert (changes != null) || (recycledChanges != null); @@ -63,7 +64,7 @@ public class RenameShelvedChangeListAction extends AnAction { } public void update(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final ShelvedChangeList[] changes = e.getData(ShelvedChangesViewManager.SHELVED_CHANGELIST_KEY); final ShelvedChangeList[] recycledChanges = e.getData(ShelvedChangesViewManager.SHELVED_RECYCLED_CHANGELIST_KEY); e.getPresentation().setEnabled((project != null) && ((changes != null && changes.length == 1) || diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/RestoreShelvedChange.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/RestoreShelvedChange.java index 5acf2ce07575..226839978f65 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/RestoreShelvedChange.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/RestoreShelvedChange.java @@ -17,6 +17,7 @@ package com.intellij.openapi.vcs.changes.shelf; 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.project.Project; import com.intellij.openapi.vcs.VcsBundle; @@ -28,7 +29,7 @@ public class RestoreShelvedChange extends AnAction { @Override public void update(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final ShelvedChangeList[] recycledChanges = e.getData(ShelvedChangesViewManager.SHELVED_RECYCLED_CHANGELIST_KEY); e.getPresentation().setText(VcsBundle.message("vcs.shelf.action.restore.text")); e.getPresentation().setDescription(VcsBundle.message("vcs.shelf.action.restore.description")); @@ -36,7 +37,7 @@ public class RestoreShelvedChange extends AnAction { } public void actionPerformed(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final ShelvedChangeList[] recycledChanges = e.getData(ShelvedChangesViewManager.SHELVED_RECYCLED_CHANGELIST_KEY); if (recycledChanges != null && recycledChanges.length == 1) { ShelveChangesManager.getInstance(project).restoreList(recycledChanges[0]); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangesViewManager.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangesViewManager.java index 30b5545edd9c..9dae247e2148 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangesViewManager.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangesViewManager.java @@ -524,7 +524,7 @@ public class ShelvedChangesViewManager implements ProjectComponent { private class MyChangesDeleteProvider implements DeleteProvider { public void deleteElement(@NotNull DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return; final ShelvedChangeList[] shelved = SHELVED_CHANGELIST_KEY.getData(dataContext); if (shelved == null || (shelved.length != 1)) return; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShowHideRecycledAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShowHideRecycledAction.java index 9464b086be82..e30388c0b24f 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShowHideRecycledAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShowHideRecycledAction.java @@ -17,6 +17,7 @@ package com.intellij.openapi.vcs.changes.shelf; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; @@ -24,7 +25,7 @@ import com.intellij.openapi.project.Project; public class ShowHideRecycledAction extends AnAction { @Override public void update(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final Presentation presentation = e.getPresentation(); if (project == null) { presentation.setEnabled(false); @@ -37,7 +38,7 @@ public class ShowHideRecycledAction extends AnAction { } public void actionPerformed(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) { return; } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/UnshelveChangesAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/UnshelveChangesAction.java index a009d5ad2446..3f186cab8a2f 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/UnshelveChangesAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/UnshelveChangesAction.java @@ -24,6 +24,7 @@ package com.intellij.openapi.vcs.changes.shelf; 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.diagnostic.Logger; import com.intellij.openapi.fileEditor.FileDocumentManager; @@ -44,7 +45,7 @@ public class UnshelveChangesAction extends AnAction { private final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.shelf.UnshelveChangesAction"); public void actionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) return; final ShelvedChangeList[] changeLists = e.getData(ShelvedChangesViewManager.SHELVED_CHANGELIST_KEY); List changes = e.getData(ShelvedChangesViewManager.SHELVED_CHANGE_KEY); @@ -91,7 +92,7 @@ public class UnshelveChangesAction extends AnAction { @Override public void update(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final ShelvedChangeList[] changes = e.getData(ShelvedChangesViewManager.SHELVED_CHANGELIST_KEY); e.getPresentation().setEnabled(project != null && changes != null); } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/UnshelveWithDialogAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/UnshelveWithDialogAction.java index ba20d0561ca7..629a3747cf58 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/UnshelveWithDialogAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/UnshelveWithDialogAction.java @@ -17,6 +17,7 @@ package com.intellij.openapi.vcs.changes.shelf; 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.fileEditor.FileDocumentManager; import com.intellij.openapi.project.Project; @@ -40,7 +41,7 @@ import java.util.Collections; public class UnshelveWithDialogAction extends AnAction { @Override public void actionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final ShelvedChangeList[] changeLists = e.getData(ShelvedChangesViewManager.SHELVED_CHANGELIST_KEY); if (project == null || changeLists == null || changeLists.length != 1) return; @@ -63,7 +64,7 @@ public class UnshelveWithDialogAction extends AnAction { @Override public void update(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final ShelvedChangeList[] changes = e.getData(ShelvedChangesViewManager.SHELVED_CHANGELIST_KEY); e.getPresentation().setEnabled(project != null && changes != null && changes.length == 1); } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/checkout/CheckoutAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/checkout/CheckoutAction.java index 1d83f5c8d9ee..fbedef497159 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/checkout/CheckoutAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/checkout/CheckoutAction.java @@ -17,6 +17,7 @@ package com.intellij.openapi.vcs.checkout; 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.project.Project; import com.intellij.openapi.project.ProjectManager; @@ -32,7 +33,7 @@ public class CheckoutAction extends AnAction implements DumbAware { } public void actionPerformed(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); project = (project == null) ? ProjectManager.getInstance().getDefaultProject() : project; myProvider.doCheckout(project, ProjectLevelVcsManager.getInstance(project).getCompositeCheckoutListener()); } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java index 71081cc60543..6efd85fbc450 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java @@ -1206,7 +1206,7 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton { return null; } } - else if (PlatformDataKeys.PROJECT.is(dataId)) { + else if (CommonDataKeys.PROJECT.is(dataId)) { return myVcs.getProject(); } else if (VcsDataKeys.VCS_FILE_REVISION.is(dataId)) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/impl/VcsHistoryDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/impl/VcsHistoryDialog.java index 0225e5e5263a..7f61193a6bee 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/impl/VcsHistoryDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/impl/VcsHistoryDialog.java @@ -17,6 +17,7 @@ package com.intellij.openapi.vcs.history.impl; import com.intellij.diff.Block; import com.intellij.diff.FindBlock; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.diagnostic.Logger; @@ -36,6 +37,7 @@ import com.intellij.openapi.vcs.history.*; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.table.TableView; +import com.intellij.util.containers.HashMap; import com.intellij.util.diff.FilesTooBigForDiffException; import com.intellij.util.text.DateFormatUtil; import com.intellij.util.ui.ColumnInfo; @@ -62,7 +64,7 @@ public class VcsHistoryDialog extends DialogWrapper implements DataProvider { private final int mySelectionEnd; // todo equals??? - private final Map myRevisionToContentMap = new com.intellij.util.containers.HashMap(); + private final Map myRevisionToContentMap = new HashMap(); private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.history.impl.VcsHistoryDialog"); private final AbstractVcs myActiveVcs; @@ -439,7 +441,7 @@ public class VcsHistoryDialog extends DialogWrapper implements DataProvider { } public Object getData(@NonNls String dataId) { - if (PlatformDataKeys.PROJECT.is(dataId)) { + if (CommonDataKeys.PROJECT.is(dataId)) { return myProject; } else if (VcsDataKeys.VCS_VIRTUAL_FILE.is(dataId)) { return myFile; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/ShowUpdatedDiffAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/ShowUpdatedDiffAction.java index 428206148e7f..87f37fc968cb 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/ShowUpdatedDiffAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/ShowUpdatedDiffAction.java @@ -52,7 +52,7 @@ public class ShowUpdatedDiffAction extends AnAction implements DumbAware { } private boolean isVisible(final DataContext dc) { - final Project project = PlatformDataKeys.PROJECT.getData(dc); + final Project project = CommonDataKeys.PROJECT.getData(dc); return (project != null) && (VcsDataKeys.LABEL_BEFORE.getData(dc) != null) && (VcsDataKeys.LABEL_AFTER.getData(dc) != null); } @@ -65,7 +65,7 @@ public class ShowUpdatedDiffAction extends AnAction implements DumbAware { final DataContext dc = e.getDataContext(); if ((! isVisible(dc)) || (! isEnabled(dc))) return; - final Project project = PlatformDataKeys.PROJECT.getData(dc); + final Project project = CommonDataKeys.PROJECT.getData(dc); final Iterable> iterable = VcsDataKeys.UPDATE_VIEW_FILES_ITERABLE.getData(dc); final Label before = (Label) VcsDataKeys.LABEL_BEFORE.getData(dc); final Label after = (Label) VcsDataKeys.LABEL_AFTER.getData(dc); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/TestContinuationAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/TestContinuationAction.java index 32f35c48530a..2816c9544213 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/TestContinuationAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/TestContinuationAction.java @@ -17,6 +17,7 @@ package com.intellij.openapi.vcs.update; 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.progress.PerformInBackgroundOption; import com.intellij.openapi.progress.ProgressIndicator; @@ -40,7 +41,7 @@ public class TestContinuationAction extends AnAction { @Override public void actionPerformed(final AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) return; ProgressManager.getInstance().run(new Task.Backgroundable(project, "Test Continuation", true, @@ -122,7 +123,7 @@ public class TestContinuationAction extends AnAction { @Override public void update(AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); e.getPresentation().setEnabled(project != null); } diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/MarkObjectAction.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/MarkObjectAction.java index a4d08501bb3e..79dc05f86793 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/MarkObjectAction.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/MarkObjectAction.java @@ -18,6 +18,7 @@ package com.intellij.xdebugger.impl.actions; import com.intellij.idea.ActionsBundle; import com.intellij.openapi.actionSystem.ActionPlaces; 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.project.Project; @@ -30,7 +31,7 @@ import org.jetbrains.annotations.NotNull; public class MarkObjectAction extends XDebuggerActionBase { @Override public void update(AnActionEvent event) { - Project project = event.getData(PlatformDataKeys.PROJECT); + Project project = event.getData(CommonDataKeys.PROJECT); boolean enabled = false; Presentation presentation = event.getPresentation(); boolean hidden = true; diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/ResumeAction.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/ResumeAction.java index 84814b75ecd3..c669ec2b3298 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/ResumeAction.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/ResumeAction.java @@ -18,6 +18,7 @@ package com.intellij.xdebugger.impl.actions; import com.intellij.execution.actions.ChooseDebugConfigurationPopupAction; import com.intellij.openapi.actionSystem.ActionPlaces; 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.xdebugger.AbstractDebuggerSession; @@ -30,7 +31,7 @@ import org.jetbrains.annotations.NotNull; public class ResumeAction extends XDebuggerActionBase { @Override protected boolean isEnabled(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) return false; boolean haveCurrentSession = false; 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 789b431c9291..9069719c8404 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 @@ -42,7 +42,7 @@ public class ViewBreakpointsAction extends AnAction implements AnAction.Transpar public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return; if (myInitialBreakpoint == null) { @@ -58,7 +58,7 @@ public class ViewBreakpointsAction extends AnAction implements AnAction.Transpar public void update(AnActionEvent event){ Presentation presentation = event.getPresentation(); - Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); if (project == null) { presentation.setEnabled(false); return; diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/SortValuesToggleAction.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/SortValuesToggleAction.java index 12b09cc418c8..ddd1ec4bf159 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/SortValuesToggleAction.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/SortValuesToggleAction.java @@ -16,6 +16,7 @@ package com.intellij.xdebugger.impl.ui.tree.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.project.DumbAware; @@ -36,7 +37,7 @@ public class SortValuesToggleAction extends ToggleAction implements DumbAware { @Override public void setSelected(AnActionEvent e, boolean state) { XDebuggerSettingsManager.getInstance().getDataViewSettings().setSortValues(state); - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project != null) { final XDebugSession[] sessions = XDebuggerManager.getInstance(project).getDebugSessions(); for (XDebugSession session : sessions) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/ui/UiUtils.java b/plugins/InspectionGadgets/src/com/siyeh/ig/ui/UiUtils.java index 0adb02b76f42..711df9f6be27 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/ui/UiUtils.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/ui/UiUtils.java @@ -21,6 +21,7 @@ import com.intellij.ide.DataManager; import com.intellij.ide.util.ClassFilter; import com.intellij.ide.util.TreeClassChooser; import com.intellij.ide.util.TreeClassChooserFactory; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; @@ -80,7 +81,7 @@ public class UiUtils { @Override public void run(AnActionButton button) { final DataContext dataContext = DataManager.getInstance().getDataContext(table); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final int rowIndex; final ListWrappingTableModel tableModel = table.getModel(); if (project == null) { @@ -150,7 +151,7 @@ public class UiUtils { @Override public void run(AnActionButton anActionButton) { final DataContext dataContext = DataManager.getInstance().getDataContext(list); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return; } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/actions/AddAntBuildFile.java b/plugins/ant/src/com/intellij/lang/ant/config/actions/AddAntBuildFile.java index f0082239a5e9..56fdab8314cb 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/actions/AddAntBuildFile.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/actions/AddAntBuildFile.java @@ -34,7 +34,7 @@ import com.intellij.psi.xml.XmlTag; public class AddAntBuildFile extends AnAction { public void actionPerformed(AnActionEvent event) { DataContext dataContext = event.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); VirtualFile file = PlatformDataKeys.VIRTUAL_FILE.getData(dataContext); AntConfiguration antConfiguration = AntConfiguration.getInstance(project); try { @@ -54,7 +54,7 @@ public class AddAntBuildFile extends AnAction { public void update(AnActionEvent e) { final DataContext dataContext = e.getDataContext(); final Presentation presentation = e.getPresentation(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { disable(presentation); return; 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 bbfede6ff6e2..60adc0298525 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 @@ -84,7 +84,7 @@ public class RunTargetAction extends AnAction { final DataContext dataContext = e.getDataContext(); final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null || editor == null) { return null; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/actions/TargetAction.java b/plugins/ant/src/com/intellij/lang/ant/config/actions/TargetAction.java index a30e1eb583e8..73358f639313 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/actions/TargetAction.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/actions/TargetAction.java @@ -53,7 +53,7 @@ public final class TargetAction extends DumbAwareAction { public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return; for (final AntBuildFile buildFile : AntConfiguration.getInstance(project).getBuildFiles()) { diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java index 1534e16bd7cf..5cf28c8f42f8 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java @@ -27,6 +27,7 @@ import com.intellij.lang.ant.config.*; import com.intellij.lang.ant.config.actions.TargetAction; import com.intellij.lang.ant.dom.AntDomFileDescription; import com.intellij.openapi.actionSystem.AnAction; +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; @@ -649,7 +650,7 @@ public class AntConfigurationImpl extends AntConfigurationBase implements Persis ApplicationManager.getApplication().invokeAndWait(new Runnable() { public void run() { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null || project.isDisposed()) { result[0] = false; return; diff --git a/plugins/commander/src/com/intellij/ide/actions/CommanderViewActionGroup.java b/plugins/commander/src/com/intellij/ide/actions/CommanderViewActionGroup.java index 3d3af0ef4c93..76785d068c39 100644 --- a/plugins/commander/src/com/intellij/ide/actions/CommanderViewActionGroup.java +++ b/plugins/commander/src/com/intellij/ide/actions/CommanderViewActionGroup.java @@ -16,6 +16,7 @@ package com.intellij.ide.actions; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.actionSystem.Presentation; @@ -31,7 +32,7 @@ public class CommanderViewActionGroup extends DefaultActionGroup implements Dum public void update(AnActionEvent event){ Presentation presentation = event.getPresentation(); - Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); if (project == null) { presentation.setVisible(false); return; diff --git a/plugins/commander/src/com/intellij/ide/actions/SwapPanelsAction.java b/plugins/commander/src/com/intellij/ide/actions/SwapPanelsAction.java index b6eb908b64f2..97eed35f7071 100644 --- a/plugins/commander/src/com/intellij/ide/actions/SwapPanelsAction.java +++ b/plugins/commander/src/com/intellij/ide/actions/SwapPanelsAction.java @@ -19,6 +19,7 @@ package com.intellij.ide.actions; import com.intellij.ide.commander.Commander; 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.project.Project; @@ -27,7 +28,7 @@ import com.intellij.openapi.wm.ToolWindowManager; public class SwapPanelsAction extends AnAction { public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) { return; } @@ -36,7 +37,7 @@ public class SwapPanelsAction extends AnAction { public void update(AnActionEvent event){ Presentation presentation = event.getPresentation(); - Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); if (project == null) { presentation.setEnabled(false); return; diff --git a/plugins/commander/src/com/intellij/ide/commander/Commander.java b/plugins/commander/src/com/intellij/ide/commander/Commander.java index f0badf4c49a5..b46300dd3611 100644 --- a/plugins/commander/src/com/intellij/ide/commander/Commander.java +++ b/plugins/commander/src/com/intellij/ide/commander/Commander.java @@ -484,7 +484,7 @@ public class Commander extends JPanel implements PersistentStateComponent pluginModules = new ArrayList(); @@ -53,7 +54,7 @@ public class PrepareAllToDeployAction extends PrepareToDeployAction { public void update(AnActionEvent e) { int moduleCount = 0; - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project != null) { for (Module aModule : (ModuleManager.getInstance(project).getModules())) { if (ModuleType.get(aModule) instanceof PluginModuleType) { diff --git a/plugins/devkit/src/build/PrepareToDeployAction.java b/plugins/devkit/src/build/PrepareToDeployAction.java index 3fc828e1565a..19399fdc3a62 100644 --- a/plugins/devkit/src/build/PrepareToDeployAction.java +++ b/plugins/devkit/src/build/PrepareToDeployAction.java @@ -18,6 +18,7 @@ package org.jetbrains.idea.devkit.build; import com.intellij.compiler.server.CompileServerPlugin; 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.ApplicationManager; @@ -77,7 +78,7 @@ public class PrepareToDeployAction extends AnAction { public void actionPerformed(final AnActionEvent e) { final Module module = LangDataKeys.MODULE.getData(e.getDataContext()); if (module != null && ModuleType.get(module) instanceof PluginModuleType) { - doPrepare(Arrays.asList(module), PlatformDataKeys.PROJECT.getData(e.getDataContext())); + doPrepare(Arrays.asList(module), CommonDataKeys.PROJECT.getData(e.getDataContext())); } } diff --git a/plugins/devkit/src/dom/generator/GenerateDomModelAction.java b/plugins/devkit/src/dom/generator/GenerateDomModelAction.java index fb8efd87244c..2819b56f6cff 100644 --- a/plugins/devkit/src/dom/generator/GenerateDomModelAction.java +++ b/plugins/devkit/src/dom/generator/GenerateDomModelAction.java @@ -17,6 +17,7 @@ package org.jetbrains.idea.devkit.dom.generator; 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.project.Project; @@ -26,7 +27,7 @@ import com.intellij.openapi.project.Project; public class GenerateDomModelAction extends AnAction { @Override public void actionPerformed(AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project != null) { new DomGenDialog(project).show(); } diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/export/ExportEclipseProjectsAction.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/export/ExportEclipseProjectsAction.java index a577d6719ec9..f0c6750f8997 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/export/ExportEclipseProjectsAction.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/export/ExportEclipseProjectsAction.java @@ -17,6 +17,7 @@ package org.jetbrains.idea.eclipse.export; 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.diagnostic.Logger; import com.intellij.openapi.module.Module; @@ -54,12 +55,12 @@ public class ExportEclipseProjectsAction extends AnAction implements DumbAware { private static final Logger LOG = Logger.getInstance("#" + ExportEclipseProjectsAction.class.getName()); public void update(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); e.getPresentation().setEnabled(project != null); } public void actionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) return; project.save(); // to flush iml files diff --git a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringActionHandlerImpl.java b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringActionHandlerImpl.java index 1fc2b7c4940b..e5082214c759 100644 --- a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringActionHandlerImpl.java +++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringActionHandlerImpl.java @@ -20,6 +20,7 @@ import com.intellij.codeInsight.hint.HintManager; import com.intellij.ide.util.MemberChooser; import com.intellij.ide.util.MemberChooserBuilder; import com.intellij.openapi.Disposable; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -59,7 +60,7 @@ public class GenerateToStringActionHandlerImpl extends EditorWriteActionHandler private static final Logger logger = Logger.getInstance("#org.jetbrains.generate.tostring.GenerateToStringActionHandlerImpl"); public void executeWriteAction(Editor editor, DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); assert project != null; PsiClass clazz = getSubjectClass(editor, dataContext); diff --git a/plugins/git4idea/src/git4idea/actions/BasicAction.java b/plugins/git4idea/src/git4idea/actions/BasicAction.java index f979de3c2098..a6c6e875abfd 100644 --- a/plugins/git4idea/src/git4idea/actions/BasicAction.java +++ b/plugins/git4idea/src/git4idea/actions/BasicAction.java @@ -17,6 +17,7 @@ package git4idea.actions; import com.intellij.openapi.actionSystem.ActionPlaces; 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.application.ApplicationManager; @@ -53,7 +54,7 @@ public abstract class BasicAction extends DumbAwareAction { */ @Override public void actionPerformed(@NotNull AnActionEvent event) { - final Project project = event.getData(PlatformDataKeys.PROJECT); + final Project project = event.getData(CommonDataKeys.PROJECT); ApplicationManager.getApplication().runWriteAction(new Runnable() { public void run() { FileDocumentManager.getInstance().saveAllDocuments(); @@ -212,7 +213,7 @@ public abstract class BasicAction extends DumbAwareAction { public void update(@NotNull AnActionEvent e) { super.update(e); Presentation presentation = e.getPresentation(); - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) { presentation.setEnabled(false); presentation.setVisible(false); diff --git a/plugins/git4idea/src/git4idea/actions/GitAction.java b/plugins/git4idea/src/git4idea/actions/GitAction.java index 17db5ac4ef99..10f852821f4f 100644 --- a/plugins/git4idea/src/git4idea/actions/GitAction.java +++ b/plugins/git4idea/src/git4idea/actions/GitAction.java @@ -16,6 +16,7 @@ package git4idea.actions; 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.project.DumbAwareAction; @@ -31,7 +32,7 @@ public abstract class GitAction extends DumbAwareAction { @Override public void update(@NotNull AnActionEvent e) { Presentation presentation = e.getPresentation(); - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); if (project == null || project.isDisposed()) { presentation.setEnabled(false); presentation.setVisible(false); diff --git a/plugins/git4idea/src/git4idea/actions/GitInit.java b/plugins/git4idea/src/git4idea/actions/GitInit.java index 76fc9004f281..43f6a7cd8b8a 100644 --- a/plugins/git4idea/src/git4idea/actions/GitInit.java +++ b/plugins/git4idea/src/git4idea/actions/GitInit.java @@ -17,6 +17,7 @@ package git4idea.actions; import com.intellij.notification.NotificationType; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.fileChooser.FileChooser; @@ -51,7 +52,7 @@ import java.util.List; public class GitInit extends DumbAwareAction { public void actionPerformed(final AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) { project = ProjectManager.getInstance().getDefaultProject(); } diff --git a/plugins/git4idea/src/git4idea/actions/GitRepositoryAction.java b/plugins/git4idea/src/git4idea/actions/GitRepositoryAction.java index 15523cc1f65a..b1bedc757578 100644 --- a/plugins/git4idea/src/git4idea/actions/GitRepositoryAction.java +++ b/plugins/git4idea/src/git4idea/actions/GitRepositoryAction.java @@ -17,6 +17,7 @@ package git4idea.actions; import com.intellij.openapi.actionSystem.ActionPlaces; 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; @@ -63,7 +64,7 @@ public abstract class GitRepositoryAction extends DumbAwareAction { } }); DataContext dataContext = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return; } @@ -120,7 +121,7 @@ public abstract class GitRepositoryAction extends DumbAwareAction { } protected static boolean isRebasing(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project != null) { final VirtualFile[] files = e.getData(PlatformDataKeys.VIRTUAL_FILE_ARRAY); if (files != null) { @@ -212,7 +213,7 @@ public abstract class GitRepositoryAction extends DumbAwareAction { } protected boolean isEnabled(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) { return false; } diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/BasePopupAction.java b/plugins/git4idea/src/git4idea/history/wholeTree/BasePopupAction.java index 1f5e937d21e3..f4f505413c6a 100644 --- a/plugins/git4idea/src/git4idea/history/wholeTree/BasePopupAction.java +++ b/plugins/git4idea/src/git4idea/history/wholeTree/BasePopupAction.java @@ -93,7 +93,7 @@ public abstract class BasePopupAction extends DumbAwareAction implements CustomC protected void doAction(MouseEvent e) { final DefaultActionGroup group = createActionGroup(); final DataContext parent = DataManager.getInstance().getDataContext(myPanel.getParent()); - final DataContext dataContext = SimpleDataContext.getSimpleContext(PlatformDataKeys.PROJECT.getName(), myProject, parent); + final DataContext dataContext = SimpleDataContext.getSimpleContext(CommonDataKeys.PROJECT.getName(), myProject, parent); final JBPopup popup = JBPopupFactory.getInstance() .createActionGroupPopup(null, group, dataContext, JBPopupFactory.ActionSelectionAid.SPEEDSEARCH, true, new Runnable() { diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java b/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java index e738e5c7614b..02b2445d21c3 100644 --- a/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java +++ b/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java @@ -2069,7 +2069,7 @@ public class GitLogUI implements Disposable { public void execute(final MouseEvent e) { final DefaultActionGroup group = createActionGroup(); final DataContext parent = DataManager.getInstance().getDataContext(myEqualToHeadr); - final DataContext dataContext = SimpleDataContext.getSimpleContext(PlatformDataKeys.PROJECT.getName(), myProject, parent); + final DataContext dataContext = SimpleDataContext.getSimpleContext(CommonDataKeys.PROJECT.getName(), myProject, parent); final JBPopup popup = JBPopupFactory.getInstance() .createActionGroupPopup(null, group, dataContext, JBPopupFactory.ActionSelectionAid.SPEEDSEARCH, true, new Runnable() { diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/SelectRepositoryAndShowLogAction.java b/plugins/git4idea/src/git4idea/history/wholeTree/SelectRepositoryAndShowLogAction.java index 9d268670e12f..802940842887 100644 --- a/plugins/git4idea/src/git4idea/history/wholeTree/SelectRepositoryAndShowLogAction.java +++ b/plugins/git4idea/src/git4idea/history/wholeTree/SelectRepositoryAndShowLogAction.java @@ -17,6 +17,7 @@ package git4idea.history.wholeTree; 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.ModalityState; import com.intellij.openapi.components.ServiceManager; @@ -71,7 +72,7 @@ public class SelectRepositoryAndShowLogAction extends AnAction { @Override public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); project = project == null ? ProjectManager.getInstance().getDefaultProject() : project; final Project finalProject = project; diff --git a/plugins/git4idea/src/git4idea/update/GitSkippedCommits.java b/plugins/git4idea/src/git4idea/update/GitSkippedCommits.java index f3b167faf340..b230162ce68f 100644 --- a/plugins/git4idea/src/git4idea/update/GitSkippedCommits.java +++ b/plugins/git4idea/src/git4idea/update/GitSkippedCommits.java @@ -15,6 +15,7 @@ */ package git4idea.update; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.CommonShortcuts; import com.intellij.openapi.actionSystem.CustomShortcutSet; import com.intellij.openapi.actionSystem.DefaultActionGroup; @@ -153,7 +154,7 @@ public class GitSkippedCommits extends PanelWithActionsAndCloseButton { @Override public Object getData(String dataId) { - if (PlatformDataKeys.PROJECT.is(dataId)) { + if (CommonDataKeys.PROJECT.is(dataId)) { return myProject; } TreePath selectionPath = myTree.getSelectionPath(); diff --git a/plugins/git4idea/tests/git4idea/history/GitAnnotationsClosedTest.java b/plugins/git4idea/tests/git4idea/history/GitAnnotationsClosedTest.java index 827f6eee69cf..caafb3cdf8ff 100644 --- a/plugins/git4idea/tests/git4idea/history/GitAnnotationsClosedTest.java +++ b/plugins/git4idea/tests/git4idea/history/GitAnnotationsClosedTest.java @@ -16,6 +16,7 @@ package git4idea.history; 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; @@ -201,7 +202,7 @@ public class GitAnnotationsClosedTest extends GitTest { @Nullable @Override public Object getData(@NonNls String dataId) { - if (PlatformDataKeys.PROJECT.is(dataId)) { + if (CommonDataKeys.PROJECT.is(dataId)) { return myProject; } return null; diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubCreateGistAction.java b/plugins/github/src/org/jetbrains/plugins/github/GithubCreateGistAction.java index c3ce3b90c6c7..a2b6876ec2d4 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/GithubCreateGistAction.java +++ b/plugins/github/src/org/jetbrains/plugins/github/GithubCreateGistAction.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.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; @@ -64,7 +65,7 @@ public class GithubCreateGistAction extends DumbAwareAction { @Override public void update(final AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); if (project == null || project.isDefault()) { e.getPresentation().setVisible(false); e.getPresentation().setEnabled(false); @@ -83,7 +84,7 @@ public class GithubCreateGistAction extends DumbAwareAction { @Override public void actionPerformed(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project == null || project.isDefault()) { return; } diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubCreatePullRequestAction.java b/plugins/github/src/org/jetbrains/plugins/github/GithubCreatePullRequestAction.java index 8c0ff6bf621f..6665d0547c9d 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/GithubCreatePullRequestAction.java +++ b/plugins/github/src/org/jetbrains/plugins/github/GithubCreatePullRequestAction.java @@ -16,6 +16,7 @@ package org.jetbrains.plugins.github; 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.components.ServiceManager; @@ -82,7 +83,7 @@ public class GithubCreatePullRequestAction extends DumbAwareAction { } public void update(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final VirtualFile file = e.getData(PlatformDataKeys.VIRTUAL_FILE); if (project == null || project.isDefault()) { setVisibleEnabled(e, false, false); @@ -105,7 +106,7 @@ public class GithubCreatePullRequestAction extends DumbAwareAction { @Override public void actionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final VirtualFile file = e.getData(PlatformDataKeys.VIRTUAL_FILE); if (project == null || project.isDisposed() || !GithubUtil.testGitExecutable(project)) { diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubRebaseAction.java b/plugins/github/src/org/jetbrains/plugins/github/GithubRebaseAction.java index 18402c891c77..9a45646909ee 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/GithubRebaseAction.java +++ b/plugins/github/src/org/jetbrains/plugins/github/GithubRebaseAction.java @@ -16,6 +16,7 @@ package org.jetbrains.plugins.github; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.diagnostic.Logger; @@ -66,7 +67,7 @@ public class GithubRebaseAction extends DumbAwareAction { } public void update(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final VirtualFile file = e.getData(PlatformDataKeys.VIRTUAL_FILE); if (project == null || project.isDefault()) { setVisibleEnabled(e, false, false); @@ -89,7 +90,7 @@ public class GithubRebaseAction extends DumbAwareAction { @Override public void actionPerformed(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final VirtualFile file = e.getData(PlatformDataKeys.VIRTUAL_FILE); if (project == null || project.isDisposed() || !GithubUtil.testGitExecutable(project)) { diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubShowCommitInBrowserFromAnnotateAction.java b/plugins/github/src/org/jetbrains/plugins/github/GithubShowCommitInBrowserFromAnnotateAction.java index 0b02a0bdfe06..88355316891b 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/GithubShowCommitInBrowserFromAnnotateAction.java +++ b/plugins/github/src/org/jetbrains/plugins/github/GithubShowCommitInBrowserFromAnnotateAction.java @@ -16,6 +16,7 @@ package org.jetbrains.plugins.github; 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.fileEditor.FileDocumentManager; @@ -73,7 +74,7 @@ public class GithubShowCommitInBrowserFromAnnotateAction extends GithubShowCommi @Nullable private static EventData calcData(AnActionEvent e, int lineNumber) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); VirtualFile virtualFile = e.getData(PlatformDataKeys.VIRTUAL_FILE); if (project == null || virtualFile == null) { return null; diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/action/AbstractGradleLinkedProjectAction.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/action/AbstractGradleLinkedProjectAction.java index 451fdd97fa6a..8045316d5eee 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/action/AbstractGradleLinkedProjectAction.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/action/AbstractGradleLinkedProjectAction.java @@ -2,6 +2,7 @@ package org.jetbrains.plugins.gradle.action; 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.project.Project; @@ -33,7 +34,7 @@ public abstract class AbstractGradleLinkedProjectAction extends AnAction { @Override public void actionPerformed(AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) { return; } @@ -51,7 +52,7 @@ public abstract class AbstractGradleLinkedProjectAction extends AnAction { return null; } - final Project project = PlatformDataKeys.PROJECT.getData(context); + final Project project = CommonDataKeys.PROJECT.getData(context); if (project == null) { return null; } diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/action/GradleToolWindowHelpAction.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/action/GradleToolWindowHelpAction.java index 6f9dbfb00a86..d8274df4b3a8 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/action/GradleToolWindowHelpAction.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/action/GradleToolWindowHelpAction.java @@ -2,6 +2,7 @@ package org.jetbrains.plugins.gradle.action; import com.intellij.ide.actions.ContextHelpAction; 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.project.Project; @@ -17,7 +18,7 @@ public class GradleToolWindowHelpAction extends ContextHelpAction { @Override public void update(AnActionEvent event) { - final Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); if (project == null) { event.getPresentation().setVisible(false); return; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/NewGroovyClassAction.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/NewGroovyClassAction.java index b23abd29eb32..8f054d2ced30 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/NewGroovyClassAction.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/NewGroovyClassAction.java @@ -88,7 +88,7 @@ public class NewGroovyClassAction extends JavaCreateTemplateInPackageAction classes = PatternConfigurationProducer.collectTestMembers(psiElements); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final List patternConfigurations = collectPatternConfigurations(classes, project); if (patternConfigurations.size() == 1) { final JUnitConfiguration configuration = patternConfigurations.get(0); @@ -83,7 +83,7 @@ public class AddToTestsPatternAction extends AnAction { if (psiElements != null) { final Set foundMembers = PatternConfigurationProducer.collectTestMembers(psiElements); if (foundMembers.isEmpty()) return; - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project != null) { final List foundConfigurations = collectPatternConfigurations(foundMembers, project); if (!foundConfigurations.isEmpty()) { diff --git a/plugins/junit/src/com/intellij/execution/junit/ExcludeFromRunAction.java b/plugins/junit/src/com/intellij/execution/junit/ExcludeFromRunAction.java index 3188508da3d0..c799b4888336 100644 --- a/plugins/junit/src/com/intellij/execution/junit/ExcludeFromRunAction.java +++ b/plugins/junit/src/com/intellij/execution/junit/ExcludeFromRunAction.java @@ -38,7 +38,7 @@ public class ExcludeFromRunAction extends AnAction{ @Override public void actionPerformed(AnActionEvent e) { final DataContext dataContext = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); LOG.assertTrue(project != null); final JUnitConfiguration configuration = (JUnitConfiguration)RunConfiguration.DATA_KEY.getData(dataContext); LOG.assertTrue(configuration != null); @@ -54,7 +54,7 @@ public class ExcludeFromRunAction extends AnAction{ final Presentation presentation = e.getPresentation(); presentation.setVisible(false); final DataContext dataContext = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project != null) { final RunConfiguration configuration = RunConfiguration.DATA_KEY.getData(dataContext); if (configuration instanceof JUnitConfiguration) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigatorPanel.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigatorPanel.java index 34945343ddd4..4f049117a1ed 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigatorPanel.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigatorPanel.java @@ -127,7 +127,7 @@ public class MavenProjectsNavigatorPanel extends SimpleToolWindowPanel implement public Object getData(@NonNls String dataId) { if (PlatformDataKeys.HELP_ID.is(dataId)) return "reference.toolWindows.mavenProjects"; - if (PlatformDataKeys.PROJECT.is(dataId)) return myProject; + if (CommonDataKeys.PROJECT.is(dataId)) return myProject; if (PlatformDataKeys.VIRTUAL_FILE.is(dataId)) return extractVirtualFile(); if (PlatformDataKeys.VIRTUAL_FILE_ARRAY.is(dataId)) return extractVirtualFiles(); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/actions/EditMavenRunConfigurationAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/actions/EditMavenRunConfigurationAction.java index 7a6b9f50f759..b1db53205020 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/actions/EditMavenRunConfigurationAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/actions/EditMavenRunConfigurationAction.java @@ -5,6 +5,7 @@ import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.impl.EditConfigurationsDialog; 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.project.Project; import org.jetbrains.idea.maven.utils.MavenDataKeys; @@ -15,7 +16,7 @@ import org.jetbrains.idea.maven.utils.MavenDataKeys; public class EditMavenRunConfigurationAction extends AnAction { @Override public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); RunnerAndConfigurationSettings settings = MavenDataKeys.RUN_CONFIGURATION.getData(e.getDataContext()); if (settings == null || project == null) return; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/actions/MavenExecuteGoalAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/actions/MavenExecuteGoalAction.java index 0c32b906ee89..99289a194ad4 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/actions/MavenExecuteGoalAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/actions/MavenExecuteGoalAction.java @@ -21,6 +21,7 @@ import com.intellij.notification.NotificationListener; import com.intellij.notification.NotificationType; import com.intellij.notification.Notifications; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.options.ShowSettingsUtil; import com.intellij.openapi.project.DumbAwareAction; @@ -45,7 +46,7 @@ import java.util.List; public class MavenExecuteGoalAction extends DumbAwareAction { @Override public void actionPerformed(final AnActionEvent e) { - final Project project = e.getRequiredData(PlatformDataKeys.PROJECT); + final Project project = e.getRequiredData(CommonDataKeys.PROJECT); ExecuteMavenGoalHistoryService historyService = ExecuteMavenGoalHistoryService.getInstance(project); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/actions/MavenRunConfigurationMenu.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/actions/MavenRunConfigurationMenu.java index 8ae8ffd626b7..4566689ed55e 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/actions/MavenRunConfigurationMenu.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/actions/MavenRunConfigurationMenu.java @@ -20,7 +20,7 @@ public class MavenRunConfigurationMenu extends DefaultActionGroup implements Dum } } - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); final RunnerAndConfigurationSettings settings = MavenDataKeys.RUN_CONFIGURATION.getData(e.getDataContext()); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/actions/RemoveMavenRunConfigurationAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/actions/RemoveMavenRunConfigurationAction.java index f7e2e4dae7d4..9b32cae475c9 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/actions/RemoveMavenRunConfigurationAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/actions/RemoveMavenRunConfigurationAction.java @@ -5,6 +5,7 @@ import com.intellij.execution.RunManagerEx; import com.intellij.execution.RunnerAndConfigurationSettings; 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.project.Project; import org.jetbrains.idea.maven.utils.MavenDataKeys; @@ -17,7 +18,7 @@ import javax.swing.*; public class RemoveMavenRunConfigurationAction extends AnAction { @Override public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); RunnerAndConfigurationSettings settings = MavenDataKeys.RUN_CONFIGURATION.getData(e.getDataContext()); if (settings == null || project == null) return; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/MavenBeforeRunTasksProvider.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/MavenBeforeRunTasksProvider.java index 33f69817a22f..b98fff5cd5d7 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/MavenBeforeRunTasksProvider.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/MavenBeforeRunTasksProvider.java @@ -18,6 +18,7 @@ package org.jetbrains.idea.maven.tasks; import com.intellij.execution.BeforeRunTaskProvider; import com.intellij.execution.configurations.RunConfiguration; import com.intellij.execution.runners.ExecutionEnvironment; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; @@ -154,7 +155,7 @@ public class MavenBeforeRunTasksProvider extends BeforeRunTaskProvider getMavenProjects(DataContext context) { - Project project = PlatformDataKeys.PROJECT.getData(context); + Project project = CommonDataKeys.PROJECT.getData(context); if (project == null) return Collections.emptyList(); VirtualFile[] virtualFiles = PlatformDataKeys.VIRTUAL_FILE_ARRAY.getData(context); diff --git a/plugins/properties/src/com/intellij/ide/favoritesTreeView/ResourcesFavoriteNodeProvider.java b/plugins/properties/src/com/intellij/ide/favoritesTreeView/ResourcesFavoriteNodeProvider.java index e0c0bbf58c82..4b6a574c2024 100644 --- a/plugins/properties/src/com/intellij/ide/favoritesTreeView/ResourcesFavoriteNodeProvider.java +++ b/plugins/properties/src/com/intellij/ide/favoritesTreeView/ResourcesFavoriteNodeProvider.java @@ -26,6 +26,7 @@ import com.intellij.lang.properties.ResourceBundle; import com.intellij.lang.properties.ResourceBundleImpl; import com.intellij.lang.properties.projectView.ResourceBundleNode; import com.intellij.lang.properties.psi.PropertiesFile; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; @@ -44,7 +45,7 @@ public class ResourcesFavoriteNodeProvider extends FavoriteNodeProvider { } public Collection getFavoriteNodes(final DataContext context, final ViewSettings viewSettings) { - final Project project = PlatformDataKeys.PROJECT.getData(context); + final Project project = CommonDataKeys.PROJECT.getData(context); if (project == null) { return null; } diff --git a/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleUtil.java b/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleUtil.java index d87e60af640d..8d567e065d6f 100644 --- a/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleUtil.java +++ b/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleUtil.java @@ -18,6 +18,7 @@ package com.intellij.lang.properties.editor; import com.intellij.lang.properties.IProperty; import com.intellij.lang.properties.ResourceBundle; import com.intellij.lang.properties.psi.PropertiesFile; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -74,7 +75,7 @@ public class ResourceBundleUtil { if (virtualFile instanceof ResourceBundleAsVirtualFile) { return ((ResourceBundleAsVirtualFile)virtualFile).getResourceBundle(); } - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project != null) { final PsiFile psiFile = PsiManager.getInstance(project).findFile(virtualFile); if (psiFile instanceof PropertiesFile) { @@ -92,7 +93,7 @@ public class ResourceBundleUtil { */ @Nullable public static ResourceBundleEditor getEditor(@NotNull DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return null; } diff --git a/plugins/properties/src/com/intellij/lang/properties/projectView/ResourceBundleDeleteProvider.java b/plugins/properties/src/com/intellij/lang/properties/projectView/ResourceBundleDeleteProvider.java index 52306669fa93..7ba44a86c2bd 100644 --- a/plugins/properties/src/com/intellij/lang/properties/projectView/ResourceBundleDeleteProvider.java +++ b/plugins/properties/src/com/intellij/lang/properties/projectView/ResourceBundleDeleteProvider.java @@ -18,6 +18,7 @@ package com.intellij.lang.properties.projectView; import com.intellij.ide.DeleteProvider; import com.intellij.lang.properties.ResourceBundle; import com.intellij.lang.properties.psi.PropertiesFile; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; @@ -46,14 +47,14 @@ class ResourceBundleDeleteProvider implements DeleteProvider { } public void deleteElement(@NotNull DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); List propertiesFiles = myResourceBundle.getPropertiesFiles(project); assert project != null; new SafeDeleteHandler().invoke(project, ContainerUtil.map2Array(propertiesFiles, PsiElement.class, MAPPER), dataContext); } public boolean canDeleteElement(@NotNull DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); return project != null; } } diff --git a/plugins/properties/src/com/intellij/lang/properties/projectView/ResourceBundleMoveProvider.java b/plugins/properties/src/com/intellij/lang/properties/projectView/ResourceBundleMoveProvider.java index 9d96e1333497..a2b1b621f068 100644 --- a/plugins/properties/src/com/intellij/lang/properties/projectView/ResourceBundleMoveProvider.java +++ b/plugins/properties/src/com/intellij/lang/properties/projectView/ResourceBundleMoveProvider.java @@ -17,6 +17,7 @@ package com.intellij.lang.properties.projectView; import com.intellij.lang.properties.ResourceBundle; import com.intellij.lang.properties.psi.PropertiesFile; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.diagnostic.Logger; @@ -56,7 +57,7 @@ public class ResourceBundleMoveProvider extends MoveHandlerDelegate { final ResourceBundle[] bundles = ResourceBundle.ARRAY_DATA_KEY.getData(dataContext); LOG.assertTrue(bundles != null); for (ResourceBundle bundle : bundles) { - List propertiesFiles = bundle.getPropertiesFiles(PlatformDataKeys.PROJECT.getData(dataContext)); + List propertiesFiles = bundle.getPropertiesFiles(CommonDataKeys.PROJECT.getData(dataContext)); for (PropertiesFile propertiesFile : propertiesFiles) { filesOrDirs.add(propertiesFile.getContainingFile()); } diff --git a/plugins/properties/src/com/intellij/lang/properties/refactoring/ResourceBundleRenameHandler.java b/plugins/properties/src/com/intellij/lang/properties/refactoring/ResourceBundleRenameHandler.java index 2eb402aa23a6..d3b39ba7f2fc 100644 --- a/plugins/properties/src/com/intellij/lang/properties/refactoring/ResourceBundleRenameHandler.java +++ b/plugins/properties/src/com/intellij/lang/properties/refactoring/ResourceBundleRenameHandler.java @@ -26,6 +26,7 @@ import com.intellij.lang.properties.editor.ResourceBundleAsVirtualFile; import com.intellij.lang.properties.editor.ResourceBundleEditor; import com.intellij.lang.properties.editor.ResourceBundleUtil; import com.intellij.lang.properties.psi.PropertiesFile; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.diagnostic.Logger; @@ -48,7 +49,7 @@ public class ResourceBundleRenameHandler implements RenameHandler { private static final Logger LOG = Logger.getInstance("#" + ResourceBundleRenameHandler.class.getName()); public boolean isAvailableOnDataContext(DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { return false; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/AbstractIntegrateChangesAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/AbstractIntegrateChangesAction.java index 4d274b413405..ff0f158f32a8 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/AbstractIntegrateChangesAction.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/AbstractIntegrateChangesAction.java @@ -41,7 +41,7 @@ public abstract class AbstractIntegrateChangesAction filesOk = new Ref(Boolean.FALSE); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ImportToRepositoryAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ImportToRepositoryAction.java index dd61104e0fed..defa7bcdc12b 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ImportToRepositoryAction.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ImportToRepositoryAction.java @@ -17,6 +17,7 @@ package org.jetbrains.idea.svn.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.actionSystem.Presentation; import com.intellij.openapi.project.DumbAware; @@ -32,14 +33,14 @@ public class ImportToRepositoryAction extends AnAction implements DumbAware { @Override public void update(final AnActionEvent e) { super.update(e); - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final Presentation presentation = e.getPresentation(); presentation.setEnabled(presentation.isEnabled() && (project == null || (! ProjectLevelVcsManager.getInstance(project).isBackgroundVcsOperationRunning()))); } public void actionPerformed(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) { project = ProjectManager.getInstance().getDefaultProject(); } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/MarkLocallyDeletedTreeConflictResolvedAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/MarkLocallyDeletedTreeConflictResolvedAction.java index e7c148cb3d79..461c202dbae3 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/MarkLocallyDeletedTreeConflictResolvedAction.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/MarkLocallyDeletedTreeConflictResolvedAction.java @@ -17,6 +17,7 @@ package org.jetbrains.idea.svn.actions; 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.progress.ProgressIndicator; @@ -108,7 +109,7 @@ public class MarkLocallyDeletedTreeConflictResolvedAction extends AnAction { public MyLocallyDeletedChecker(final AnActionEvent e) { final DataContext dc = e.getDataContext(); - myProject = PlatformDataKeys.PROJECT.getData(dc); + myProject = CommonDataKeys.PROJECT.getData(dc); if (myProject == null) { myPath = null; myEnabled = false; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShareProjectAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShareProjectAction.java index 99b2e0cc8449..e0dcbab5de3a 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShareProjectAction.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShareProjectAction.java @@ -16,6 +16,7 @@ package org.jetbrains.idea.svn.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; @@ -57,7 +58,7 @@ public class ShareProjectAction extends BasicAction { Presentation presentation = e.getPresentation(); final DataContext dataContext = e.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if ((project == null) || (ProjectLevelVcsManager.getInstance(project).isBackgroundVcsOperationRunning())) { presentation.setEnabled(false); presentation.setVisible(false); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShareWholeProject.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShareWholeProject.java index 46e9710b10e8..8aaf8a3548b1 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShareWholeProject.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShareWholeProject.java @@ -57,7 +57,7 @@ public class ShareWholeProject extends AnAction implements DumbAware { public void execute(final AnActionEvent e) { final DataContext dataContext = e.getDataContext(); - myProject = PlatformDataKeys.PROJECT.getData(dataContext); + myProject = CommonDataKeys.PROJECT.getData(dataContext); if (myProject == null || myProject.isDefault()) { // remain false return; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowAllSubmittedFilesAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowAllSubmittedFilesAction.java index c1835d501875..611bff6e452b 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowAllSubmittedFilesAction.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowAllSubmittedFilesAction.java @@ -17,6 +17,7 @@ package org.jetbrains.idea.svn.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.diagnostic.Logger; import com.intellij.openapi.progress.ProgressManager; @@ -56,7 +57,7 @@ public class ShowAllSubmittedFilesAction extends AnAction implements DumbAware { public void update(AnActionEvent e) { super.update(e); - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) { e.getPresentation().setEnabled(false); return; @@ -66,7 +67,7 @@ public class ShowAllSubmittedFilesAction extends AnAction implements DumbAware { } public void actionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) return; final VcsFileRevision revision = e.getData(VcsDataKeys.VCS_FILE_REVISION); final VirtualFile revisionVirtualFile = e.getData(VcsDataKeys.VCS_VIRTUAL_FILE); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowSvnMapAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowSvnMapAction.java index 2d6efc338cba..bb564d0afa03 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowSvnMapAction.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowSvnMapAction.java @@ -17,6 +17,7 @@ package org.jetbrains.idea.svn.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.actionSystem.Presentation; import com.intellij.openapi.project.DumbAware; @@ -40,7 +41,7 @@ public class ShowSvnMapAction extends AnAction implements DumbAware { @Override public void update(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final Presentation presentation = e.getPresentation(); presentation.setVisible(project != null); @@ -51,7 +52,7 @@ public class ShowSvnMapAction extends AnAction implements DumbAware { } public void actionPerformed(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) { return; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/MergeFromAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/MergeFromAction.java index c4c63a2cee30..ce9cc5a298c5 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/MergeFromAction.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/MergeFromAction.java @@ -16,6 +16,7 @@ package org.jetbrains.idea.svn.dialogs; 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.project.DumbAwareAction; @@ -39,7 +40,7 @@ public class MergeFromAction extends DumbAwareAction { public void actionPerformed(AnActionEvent e) { if (! isEnabled(e)) return; final DataContext dc = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dc); + final Project project = CommonDataKeys.PROJECT.getData(dc); if (project == null) return; final ToolWindowManager manager = ToolWindowManager.getInstance(project); if (manager != null) { @@ -58,14 +59,14 @@ public class MergeFromAction extends DumbAwareAction { @Override public void update(AnActionEvent e) { final DataContext dc = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dc); + final Project project = CommonDataKeys.PROJECT.getData(dc); if (project == null || project.isDefault()) return; e.getPresentation().setVisible(isEnabled(e)); } private boolean isEnabled(AnActionEvent e) { final DataContext dc = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dc); + final Project project = CommonDataKeys.PROJECT.getData(dc); if (project == null || project.isDefault()) return false; final VirtualFile[] files = ProjectLevelVcsManager.getInstance(project).getRootsUnderVcs(SvnVcs.getInstance(project)); return files != null && files.length > 0; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java index b59e2b3a90ac..0100d436ebae 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java @@ -246,7 +246,7 @@ public class PropertiesComponent extends JPanel { } public void actionPerformed(AnActionEvent e) { - Project p = e.getData(PlatformDataKeys.PROJECT); + Project p = e.getData(CommonDataKeys.PROJECT); ToolWindowManager.getInstance(p).unregisterToolWindow(ID); } } @@ -300,7 +300,7 @@ public class PropertiesComponent extends JPanel { } public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); SVNPropertyData propValue = null; try { propValue = myVcs.getFactory(myFile).createPropertyClient() @@ -348,7 +348,7 @@ public class PropertiesComponent extends JPanel { } public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); SetPropertyDialog dialog = new SetPropertyDialog(project, new File[] {myFile}, null, myFile.isDirectory()); dialog.show(); @@ -372,7 +372,7 @@ public class PropertiesComponent extends JPanel { } public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); SetPropertyDialog dialog = new SetPropertyDialog(project, new File[] {myFile}, getSelectedPropertyName(), myFile.isDirectory()); dialog.show(); boolean recursive = false; @@ -416,7 +416,7 @@ public class PropertiesComponent extends JPanel { File f = new File(vf.getPath()); if (!f.equals(myFile)) { setFile(myVcs, f); - Project p = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project p = CommonDataKeys.PROJECT.getData(e.getDataContext()); ToolWindowManager.getInstance(p).getToolWindow(ID).setTitle(f.getName()); } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserComponent.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserComponent.java index bd0ee4098d5f..5081b1ce410a 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserComponent.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserComponent.java @@ -16,6 +16,7 @@ package org.jetbrains.idea.svn.dialogs; import com.intellij.openapi.Disposable; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.fileEditor.OpenFileDescriptor; @@ -268,7 +269,7 @@ public class RepositoryBrowserComponent extends JPanel implements Disposable, Da } final VirtualFile vcsFile = getSelectedVcsFile(); return vcsFile != null ? new OpenFileDescriptor(project, vcsFile) : null; - } else if (PlatformDataKeys.PROJECT.is(dataId)) { + } else if (CommonDataKeys.PROJECT.is(dataId)) { return myVCS.getProject(); } return null; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/MergeSourceDetailsAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/MergeSourceDetailsAction.java index 7614bc7dae73..6281aa0971a9 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/MergeSourceDetailsAction.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/MergeSourceDetailsAction.java @@ -17,6 +17,7 @@ package org.jetbrains.idea.svn.history; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.CustomShortcutSet; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.DumbAware; @@ -45,7 +46,7 @@ public class MergeSourceDetailsAction extends AnAction implements DumbAware { } private boolean enabled(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) return false; final VirtualFile revisionVirtualFile = e.getData(VcsDataKeys.VCS_VIRTUAL_FILE); if (revisionVirtualFile == null) return false; @@ -58,7 +59,7 @@ public class MergeSourceDetailsAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { if (! enabled(e)) return; - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final VcsFileRevision revision = e.getData(VcsDataKeys.VCS_FILE_REVISION); final VirtualFile revisionVirtualFile = e.getData(VcsDataKeys.VCS_VIRTUAL_FILE); SvnMergeSourceDetails.showMe(project, (SvnFileRevision) revision, revisionVirtualFile); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnEditCommitMessageAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnEditCommitMessageAction.java index f45a2942b269..d2b820607ff4 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnEditCommitMessageAction.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnEditCommitMessageAction.java @@ -17,6 +17,7 @@ package org.jetbrains.idea.svn.history; 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.progress.ProgressIndicator; @@ -59,7 +60,7 @@ public class SvnEditCommitMessageAction extends AnAction { final boolean enabled = lists != null && lists.length == 1 && lists[0] instanceof SvnChangeList; if (! enabled) return; final SvnChangeList svnList = (SvnChangeList) lists[0]; - Project project = PlatformDataKeys.PROJECT.getData(dc); + Project project = CommonDataKeys.PROJECT.getData(dc); project = project == null ? ProjectManager.getInstance().getDefaultProject() : project; final Consumer listener = VcsDataKeys.REMOTE_HISTORY_CHANGED_LISTENER.getData(dc); @@ -82,7 +83,7 @@ public class SvnEditCommitMessageAction extends AnAction { final ChangeList[] lists = VcsDataKeys.CHANGE_LISTS.getData(dc); final boolean enabled = lists != null && lists.length == 1 && lists[0] instanceof SvnChangeList; boolean visible = enabled; - Project project = PlatformDataKeys.PROJECT.getData(dc); + Project project = CommonDataKeys.PROJECT.getData(dc); if (project == null) { visible = VcsDataKeys.REMOTE_HISTORY_LOCATION.getData(dc) instanceof SvnRepositoryLocation; } else { diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/SvnTestCase.java b/plugins/svn4idea/testSource/org/jetbrains/idea/SvnTestCase.java index d5a55520adae..00d96b882013 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/SvnTestCase.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/SvnTestCase.java @@ -18,6 +18,7 @@ package org.jetbrains.idea; import com.intellij.execution.process.ProcessOutput; import com.intellij.ide.startup.impl.StartupManagerImpl; 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; @@ -503,7 +504,7 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase { @Nullable @Override public Object getData(@NonNls String dataId) { - if (PlatformDataKeys.PROJECT.is(dataId)) { + if (CommonDataKeys.PROJECT.is(dataId)) { return project; } return null; diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnAnnotationIsClosedTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnAnnotationIsClosedTest.java index c6795b034068..adeee3f9c100 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnAnnotationIsClosedTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnAnnotationIsClosedTest.java @@ -16,6 +16,7 @@ package org.jetbrains.idea.svn; 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; @@ -138,7 +139,7 @@ public class SvnAnnotationIsClosedTest extends Svn17TestCase { @Nullable @Override public Object getData(@NonNls String dataId) { - if (PlatformDataKeys.PROJECT.is(dataId)) { + if (CommonDataKeys.PROJECT.is(dataId)) { return myProject; } return null; @@ -185,7 +186,7 @@ public class SvnAnnotationIsClosedTest extends Svn17TestCase { @Nullable @Override public Object getData(@NonNls String dataId) { - if (PlatformDataKeys.PROJECT.is(dataId)) { + if (CommonDataKeys.PROJECT.is(dataId)) { return myProject; } return null; diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/AssociateWithTaskAction.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/AssociateWithTaskAction.java index bb96e1b2ebd7..35d72f57b2cb 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/AssociateWithTaskAction.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/AssociateWithTaskAction.java @@ -16,6 +16,7 @@ package com.intellij.tasks.actions; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.ToggleAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -46,7 +47,7 @@ public class AssociateWithTaskAction extends ToggleAction implements DumbAware { if (lists == null) { return false; } - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); TaskManager manager = TaskManager.getManager(project); for (ChangeList list : lists) { if (list instanceof LocalChangeList && manager.getAssociatedTask((LocalChangeList)list) == null) { @@ -62,7 +63,7 @@ public class AssociateWithTaskAction extends ToggleAction implements DumbAware { if (lists == null) { return; } - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); TaskManager manager = TaskManager.getManager(project); for (ChangeList list : lists) { if (list instanceof LocalChangeList) { diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/BaseTaskAction.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/BaseTaskAction.java index e616a17b0823..726fa61c244a 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/BaseTaskAction.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/BaseTaskAction.java @@ -18,6 +18,7 @@ package com.intellij.tasks.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.project.DumbAware; import com.intellij.openapi.project.Project; @@ -49,7 +50,7 @@ public abstract class BaseTaskAction extends AnAction implements DumbAware { @Nullable public static Project getProject(@Nullable AnActionEvent event) { - return event == null ? null : PlatformDataKeys.PROJECT.getData(event.getDataContext()); + return event == null ? null : CommonDataKeys.PROJECT.getData(event.getDataContext()); } @Nullable diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/CloseTaskAction.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/CloseTaskAction.java index d984f7efc0cb..a3f15037a6c6 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/CloseTaskAction.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/CloseTaskAction.java @@ -17,6 +17,7 @@ package com.intellij.tasks.actions; 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.project.Project; @@ -35,7 +36,7 @@ import java.util.ArrayList; public class CloseTaskAction extends BaseTaskAction { public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); assert project != null; TaskManagerImpl taskManager = (TaskManagerImpl)TaskManager.getManager(project); LocalTask task = taskManager.getActiveTask(); diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/OpenTaskInBrowserAction.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/OpenTaskInBrowserAction.java index a6fba225323b..9ec20128e9f6 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/OpenTaskInBrowserAction.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/OpenTaskInBrowserAction.java @@ -18,6 +18,7 @@ package com.intellij.tasks.actions; 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.actionSystem.Presentation; import com.intellij.openapi.project.Project; @@ -54,7 +55,7 @@ public class OpenTaskInBrowserAction extends BaseTaskAction { @Nullable private static String getIssueUrl(AnActionEvent event) { - Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); return project == null ? null : TaskManager.getManager(project).getActiveTask().getIssueUrl(); } } diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/SwitchTaskAction.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/SwitchTaskAction.java index ca473ff2e047..cf8b257dc810 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/SwitchTaskAction.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/SwitchTaskAction.java @@ -53,7 +53,7 @@ public class SwitchTaskAction extends BaseTaskAction { @Override public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); assert project != null; ListPopupImpl popup = createPopup(dataContext, null, true); popup.showCenteredInCurrentWindow(project); @@ -62,7 +62,7 @@ public class SwitchTaskAction extends BaseTaskAction { public static ListPopupImpl createPopup(final DataContext dataContext, @Nullable final Runnable onDispose, boolean withTitle) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final Ref shiftPressed = Ref.create(false); final Ref componentRef = Ref.create(); List items = project == null ? Collections.emptyList() : diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/SwitchTaskCombo.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/SwitchTaskCombo.java index 989a5e607ac0..f053f5012969 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/SwitchTaskCombo.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/SwitchTaskCombo.java @@ -79,7 +79,7 @@ public class SwitchTaskCombo extends ComboBoxAction implements DumbAware { @Override public void update(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); Presentation presentation = e.getPresentation(); if (project == null || project.isDisposed() || (ActionPlaces.MAIN_MENU.equals(e.getPlace()) && findFrame(e) == null)) { presentation.setEnabled(false); diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/OpenLocalTerminalAction.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/OpenLocalTerminalAction.java index 8cb28eaa74f3..d8d98440a421 100644 --- a/plugins/terminal/src/org/jetbrains/plugins/terminal/OpenLocalTerminalAction.java +++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/OpenLocalTerminalAction.java @@ -2,6 +2,7 @@ package org.jetbrains.plugins.terminal; 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.project.DumbAware; import com.intellij.openapi.project.Project; @@ -30,7 +31,7 @@ public class OpenLocalTerminalAction extends AnAction implements DumbAware { } public void runLocalTerminal(AnActionEvent event) { - final Project project = event.getData(PlatformDataKeys.PROJECT); + final Project project = event.getData(CommonDataKeys.PROJECT); runLocalTerminal(project); } diff --git a/plugins/testng/testSources/com/theoryinpractice/testng/configuration/ConfigurationsTest.java b/plugins/testng/testSources/com/theoryinpractice/testng/configuration/ConfigurationsTest.java index fae7cec4676c..16276d151d51 100644 --- a/plugins/testng/testSources/com/theoryinpractice/testng/configuration/ConfigurationsTest.java +++ b/plugins/testng/testSources/com/theoryinpractice/testng/configuration/ConfigurationsTest.java @@ -27,6 +27,7 @@ import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.actions.ConfigurationContext; import com.intellij.execution.actions.ConfigurationFromContext; import com.intellij.execution.configurations.RunConfiguration; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.PluginPathManager; @@ -197,7 +198,7 @@ public class ConfigurationsTest { final MapDataContext dataContext = new MapDataContext(); - dataContext.put(PlatformDataKeys.PROJECT, project); + dataContext.put(CommonDataKeys.PROJECT, project); dataContext.put(LangDataKeys.MODULE, ModuleUtil.findModuleForPsiElement(psiClass)); dataContext.put(Location.DATA_KEY, PsiLocation.fromPsiElement(psiClass)); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/FormEditingUtil.java b/plugins/ui-designer/src/com/intellij/uiDesigner/FormEditingUtil.java index faef895aa6d3..3d83737c2d75 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/FormEditingUtil.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/FormEditingUtil.java @@ -17,6 +17,7 @@ package com.intellij.uiDesigner; import com.intellij.lang.properties.PropertiesReferenceManager; import com.intellij.lang.properties.psi.PropertiesFile; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.command.CommandProcessor; @@ -598,7 +599,7 @@ public final class FormEditingUtil { @Nullable public static GuiEditor getActiveEditor(final DataContext context) { - Project project = PlatformDataKeys.PROJECT.getData(context); + Project project = CommonDataKeys.PROJECT.getData(context); if (project == null) { return null; } 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 530ab8b7c1bd..2f432927ab41 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/GenerateMainAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/GenerateMainAction.java @@ -20,6 +20,7 @@ import com.intellij.codeInsight.generation.GenerateMembersUtil; import com.intellij.codeInsight.generation.PsiGenerationInfo; 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.command.CommandProcessor; @@ -53,7 +54,7 @@ public class GenerateMainAction extends AnAction { private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.actions.GenerateMainAction"); public void actionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); assert project != null; final Editor editor = e.getData(PlatformDataKeys.EDITOR); assert editor != null; @@ -133,7 +134,7 @@ public class GenerateMainAction extends AnAction { } private static boolean isActionEnabled(final AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) return false; Editor editor = e.getData(PlatformDataKeys.EDITOR); if (editor == null) return false; diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/AddComponentAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/AddComponentAction.java index f34cb9743da5..ba40d170cd1a 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/AddComponentAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/AddComponentAction.java @@ -18,6 +18,7 @@ package com.intellij.uiDesigner.palette; 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.fileTypes.StdFileTypes; @@ -44,7 +45,7 @@ import java.util.HashMap; */ public class AddComponentAction extends AnAction { public void actionPerformed(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) return; GroupItem groupItem = e.getData(GroupItem.DATA_KEY); PsiFile psiFile = e.getData(LangDataKeys.PSI_FILE); @@ -119,7 +120,7 @@ public class AddComponentAction extends AnAction { } @Override public void update(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); if (e.getData(GroupItem.DATA_KEY) != null || e.getData(ComponentItem.DATA_KEY) != null) { e.getPresentation().setVisible(true); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/DeleteComponentAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/DeleteComponentAction.java index 96c91b19cfeb..cd1fa5a435dc 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/DeleteComponentAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/DeleteComponentAction.java @@ -19,6 +19,7 @@ package com.intellij.uiDesigner.palette; import com.intellij.CommonBundle; 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.project.Project; import com.intellij.openapi.ui.Messages; @@ -29,7 +30,7 @@ import com.intellij.uiDesigner.UIDesignerBundle; */ public class DeleteComponentAction extends AnAction { public void actionPerformed(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); ComponentItem selectedItem = e.getData(ComponentItem.DATA_KEY); GroupItem groupItem = e.getData(GroupItem.DATA_KEY); if (project == null || selectedItem == null || groupItem == null) return; @@ -53,7 +54,7 @@ public class DeleteComponentAction extends AnAction { } @Override public void update(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); ComponentItem selectedItem = e.getData(ComponentItem.DATA_KEY); GroupItem groupItem = e.getData(GroupItem.DATA_KEY); e.getPresentation().setEnabled(project != null && selectedItem != null && groupItem != null && diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/DeleteGroupAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/DeleteGroupAction.java index fbed8fd5ba57..97805920c248 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/DeleteGroupAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/DeleteGroupAction.java @@ -19,6 +19,7 @@ package com.intellij.uiDesigner.palette; import com.intellij.CommonBundle; 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.project.Project; import com.intellij.openapi.ui.Messages; @@ -31,7 +32,7 @@ import java.util.ArrayList; */ public class DeleteGroupAction extends AnAction { public void actionPerformed(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); GroupItem groupToBeRemoved = e.getData(GroupItem.DATA_KEY); if (groupToBeRemoved == null || project == null) return; @@ -51,7 +52,7 @@ public class DeleteGroupAction extends AnAction { } @Override public void update(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); GroupItem groupItem = e.getData(GroupItem.DATA_KEY); ComponentItem selectedItem = e.getData(ComponentItem.DATA_KEY); e.getPresentation().setEnabled(project != null && groupItem != null && !groupItem.isReadOnly() && selectedItem == null); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/EditComponentAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/EditComponentAction.java index 1c208d02babc..e3cacf56bd9d 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/EditComponentAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/EditComponentAction.java @@ -18,6 +18,7 @@ package com.intellij.uiDesigner.palette; 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.diagnostic.Logger; import com.intellij.openapi.project.Project; @@ -33,7 +34,7 @@ public class EditComponentAction extends AnAction { private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.palette.EditComponentAction"); public void actionPerformed(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); ComponentItem selectedItem = e.getData(ComponentItem.DATA_KEY); if (project == null || selectedItem == null || selectedItem.isAnyComponent() || selectedItem.isSpacer()) { return; @@ -66,7 +67,7 @@ public class EditComponentAction extends AnAction { } @Override public void update(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); ComponentItem selectedItem = e.getData(ComponentItem.DATA_KEY); GroupItem groupItem = e.getData(GroupItem.DATA_KEY); e.getPresentation().setEnabled(project != null && diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/EditGroupAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/EditGroupAction.java index b882b9cfd2d3..3bedd33a745a 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/EditGroupAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/EditGroupAction.java @@ -19,6 +19,7 @@ package com.intellij.uiDesigner.palette; import com.intellij.CommonBundle; 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.project.Project; import com.intellij.openapi.ui.Messages; @@ -31,7 +32,7 @@ import java.util.ArrayList; */ public class EditGroupAction extends AnAction { public void actionPerformed(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); GroupItem groupToBeEdited = GroupItem.DATA_KEY.getData(e.getDataContext()); if (groupToBeEdited == null || project == null) return; @@ -63,7 +64,7 @@ public class EditGroupAction extends AnAction { } @Override public void update(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); GroupItem groupItem = GroupItem.DATA_KEY.getData(e.getDataContext()); e.getPresentation().setEnabled(project != null && groupItem != null && !groupItem.isReadOnly()); } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/FormMergerTreeStructureProvider.java b/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/FormMergerTreeStructureProvider.java index b710a078cc59..5c6786eaaa76 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/FormMergerTreeStructureProvider.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/FormMergerTreeStructureProvider.java @@ -22,6 +22,7 @@ import com.intellij.ide.projectView.ViewSettings; import com.intellij.ide.projectView.impl.nodes.BasePsiNode; import com.intellij.ide.util.DeleteHandler; import com.intellij.ide.util.treeView.AbstractTreeNode; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.fileTypes.StdFileTypes; @@ -152,7 +153,7 @@ public class FormMergerTreeStructureProvider implements TreeStructureProvider { } public void deleteElement(@NotNull DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); DeleteHandler.deletePsiElement(myElements, project); } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/UIDesignerFavoriteNodeProvider.java b/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/UIDesignerFavoriteNodeProvider.java index 287d305fe85a..bd8748923762 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/UIDesignerFavoriteNodeProvider.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/UIDesignerFavoriteNodeProvider.java @@ -19,6 +19,7 @@ package com.intellij.uiDesigner.projectView; import com.intellij.ide.favoritesTreeView.FavoriteNodeProvider; import com.intellij.ide.projectView.ViewSettings; import com.intellij.ide.util.treeView.AbstractTreeNode; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.fileTypes.FileType; @@ -46,7 +47,7 @@ import java.util.*; public class UIDesignerFavoriteNodeProvider extends FavoriteNodeProvider { @Nullable public Collection getFavoriteNodes(DataContext context, final ViewSettings viewSettings) { - Project project = PlatformDataKeys.PROJECT.getData(context); + Project project = CommonDataKeys.PROJECT.getData(context); if (project == null) return null; Form[] forms = Form.DATA_KEY.getData(context); if (forms != null) { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/KeyChooserDialog.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/KeyChooserDialog.java index 0d0900fb49b9..5e2abf8519e3 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/KeyChooserDialog.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/KeyChooserDialog.java @@ -18,6 +18,7 @@ package com.intellij.uiDesigner.propertyInspector.editors.string; import com.intellij.ide.DataManager; import com.intellij.lang.properties.IProperty; import com.intellij.lang.properties.psi.PropertiesFile; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; @@ -110,7 +111,7 @@ public final class KeyChooserDialog extends DialogWrapper{ }); // Calculate width for "Key" columns - final Project projectGuess = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(parent)); + final Project projectGuess = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(parent)); final Dimension size = DimensionService.getInstance().getSize(getDimensionServiceKey(), projectGuess); final FontMetrics metrics = myTable.getFontMetrics(myTable.getFont()); int minWidth = 200; diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java index e498ca80211f..4400cd03b09c 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java @@ -28,6 +28,7 @@ import com.intellij.ide.IdeView; import com.intellij.ide.highlighter.JavaHighlightingColors; 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.ApplicationManager; @@ -83,7 +84,7 @@ public class CreateSnapShotAction extends AnAction { @Override public void update(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final IdeView view = e.getData(LangDataKeys.IDE_VIEW); e.getPresentation().setVisible(project != null && view != null && hasDirectoryInPackage(project, view)); } @@ -100,7 +101,7 @@ public class CreateSnapShotAction extends AnAction { } public void actionPerformed(AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final IdeView view = e.getData(LangDataKeys.IDE_VIEW); if (project == null || view == null) { return; diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/ConfigureAssociationsAction.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/ConfigureAssociationsAction.java index 9fa937262c7c..bb446ca525c3 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/ConfigureAssociationsAction.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/ConfigureAssociationsAction.java @@ -17,6 +17,7 @@ package org.intellij.lang.xpath.xslt.associations.impl; 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.project.Project; @@ -28,7 +29,7 @@ class ConfigureAssociationsAction extends AnAction { } public void actionPerformed(final AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) return; final PsiFile file = LangDataKeys.PSI_FILE.getData(e.getDataContext()); 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 df5cfa4b178a..0206666beac2 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 @@ -58,7 +58,7 @@ public abstract class XPathAction extends AnAction { } protected boolean isEnabled(AnActionEvent event, boolean checkAvailable) { - final Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); if (project == null) { // no active project return false; 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 797000b81062..97eacf6e028b 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 @@ -20,6 +20,7 @@ import com.intellij.ide.projectView.PresentationData; import com.intellij.lang.Language; import com.intellij.navigation.ItemPresentation; 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.diagnostic.Logger; @@ -135,7 +136,7 @@ public class XPathEvalAction extends XPathAction { @Override public void actionPerformed(AnActionEvent event) { - final Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(event.getDataContext()); if (project == null) { // no active project LOG.debug("No project"); diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/EditContextDialog.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/EditContextDialog.java index e2c0c59124c1..c488410b7083 100644 --- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/EditContextDialog.java +++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/EditContextDialog.java @@ -18,6 +18,7 @@ package org.intellij.plugins.xpathView.ui; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.ide.DataManager; import com.intellij.javaee.ExternalResourceManager; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.fileTypes.LanguageFileType; @@ -139,7 +140,7 @@ public class EditContextDialog extends DialogWrapper { Collections.sort(allURIs); final DataContext dataContext = DataManager.getInstance().getDataContext(myNamespaceTable); - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); final AddNamespaceDialog dlg = new AddNamespaceDialog(project, myUnresolvedPrefixes, allURIs, AddNamespaceDialog.Mode.EDITABLE); dlg.show(); if (dlg.isOK()) { 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 bae589cc01d0..67ef74de7da9 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 @@ -20,6 +20,7 @@ import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; 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.fileEditor.FileEditorManager; @@ -51,7 +52,7 @@ public class OpenOutputAction extends AnAction { return Charset.forName("UTF-8"); } }; - FileEditorManager.getInstance(PlatformDataKeys.PROJECT.getData(e.getDataContext())).openFile(file, true); + FileEditorManager.getInstance(CommonDataKeys.PROJECT.getData(e.getDataContext())).openFile(file, true); } catch (UnsupportedEncodingException e1) { throw new AssertionError(e); } diff --git a/samples/actions/src/myActions/HelloWorldAction.java b/samples/actions/src/myActions/HelloWorldAction.java index cc3623b0f132..2439b72ce1db 100644 --- a/samples/actions/src/myActions/HelloWorldAction.java +++ b/samples/actions/src/myActions/HelloWorldAction.java @@ -23,7 +23,7 @@ import com.intellij.openapi.ui.Messages; public class HelloWorldAction extends AnAction { public void actionPerformed(AnActionEvent event) { - // Project project = event.getData(PlatformDataKeys.PROJECT); + // Project project = event.getData(com.intellij.openapi.actionSystem.CommonDataKeys.PROJECT); Messages.showMessageDialog("Hello World!", "Information", Messages.getInformationIcon()); } } diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/AddDomElementAction.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/AddDomElementAction.java index 6cb6fc8d25c3..31629d52f5fa 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/AddDomElementAction.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/AddDomElementAction.java @@ -115,7 +115,7 @@ public abstract class AddDomElementAction extends AnAction { @NotNull public AnAction[] getChildren(@Nullable AnActionEvent e) { - Project project = e == null ? null : PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = e == null ? null : CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project == null) return AnAction.EMPTY_ARRAY; DomCollectionChildDescription[] descriptions = getDomCollectionChildDescriptions(e); diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/EnterBetweenXmlTagsHandler.java b/xml/impl/src/com/intellij/codeInsight/editorActions/EnterBetweenXmlTagsHandler.java index 6637befbded8..9a3e9d64e954 100644 --- a/xml/impl/src/com/intellij/codeInsight/editorActions/EnterBetweenXmlTagsHandler.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/EnterBetweenXmlTagsHandler.java @@ -16,6 +16,7 @@ package com.intellij.codeInsight.editorActions; import com.intellij.codeInsight.editorActions.enter.EnterHandlerDelegateAdapter; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; @@ -37,7 +38,7 @@ import org.jetbrains.annotations.NotNull; public class EnterBetweenXmlTagsHandler extends EnterHandlerDelegateAdapter { public Result preprocessEnter(@NotNull final PsiFile file, @NotNull final Editor editor, @NotNull final Ref caretOffset, @NotNull final Ref caretAdvance, @NotNull final DataContext dataContext, final EditorActionHandler originalHandler) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (file instanceof XmlFile && isBetweenXmlTags(project, editor, file, caretOffset.get().intValue())) { originalHandler.execute(editor, dataContext); diff --git a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaAction.java b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaAction.java index 22c7bbb7a5df..5d63a20ba533 100644 --- a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaAction.java +++ b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaAction.java @@ -19,6 +19,7 @@ import com.intellij.javaee.ExternalResourceManager; import com.intellij.openapi.actionSystem.ActionPlaces; 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.fileEditor.FileDocumentManager; @@ -62,7 +63,7 @@ public class GenerateInstanceDocumentFromSchemaAction extends AnAction { } public void actionPerformed(AnActionEvent e) { - final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); final VirtualFile file = PlatformDataKeys.VIRTUAL_FILE.getData(e.getDataContext()); final GenerateInstanceDocumentFromSchemaDialog dialog = new GenerateInstanceDocumentFromSchemaDialog(project, file); diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/validation/ValidateAction.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/validation/ValidateAction.java index ae84e2e4396e..b26720638da4 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/validation/ValidateAction.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/validation/ValidateAction.java @@ -19,6 +19,7 @@ package org.intellij.plugins.relaxNG.validation; import com.intellij.ide.errorTreeView.NewErrorTreeViewPanel; 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.ApplicationManager; @@ -95,7 +96,7 @@ public class ValidateAction extends AnAction { if (file == null) { return false; } - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) { return false; }