From 94ed15c9f4be2a8cca80cc96d92e418f61e7577b Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Tue, 1 Oct 2013 22:18:39 +0200 Subject: [PATCH] fix yellow code producing by CommonDataKeys --- .../python/newProject/PythonNewDirectoryProjectAction.java | 3 ++- .../python-rest/src/com/jetbrains/rest/RestPythonUtil.java | 3 ++- python/src/com/jetbrains/pyqt/CompileQrcAction.java | 3 ++- .../com/jetbrains/python/actions/CreatePackageAction.java | 5 +++-- .../jetbrains/python/actions/ExecuteInConsoleAction.java | 4 ++-- .../jetbrains/python/console/PyOpenDebugConsoleAction.java | 5 +++-- .../jetbrains/python/console/RunPythonConsoleAction.java | 5 +++-- .../python/packaging/setupPy/CreateSetupPyAction.java | 3 ++- python/src/com/jetbrains/python/sdk/PythonSdkType.java | 7 ++++--- .../jetbrains/python/sdk/flavors/VirtualEnvSdkFlavor.java | 3 ++- 10 files changed, 25 insertions(+), 16 deletions(-) diff --git a/python/ide/src/com/jetbrains/python/newProject/PythonNewDirectoryProjectAction.java b/python/ide/src/com/jetbrains/python/newProject/PythonNewDirectoryProjectAction.java index 1919be622ea3..ac9275d0a25c 100644 --- a/python/ide/src/com/jetbrains/python/newProject/PythonNewDirectoryProjectAction.java +++ b/python/ide/src/com/jetbrains/python/newProject/PythonNewDirectoryProjectAction.java @@ -16,6 +16,7 @@ package com.jetbrains.python.newProject; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.project.Project; @@ -40,7 +41,7 @@ public class PythonNewDirectoryProjectAction extends NewDirectoryProjectAction { private boolean myInstallFramework; 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/python/python-rest/src/com/jetbrains/rest/RestPythonUtil.java b/python/python-rest/src/com/jetbrains/rest/RestPythonUtil.java index af8696d1b11a..27710fd70036 100644 --- a/python/python-rest/src/com/jetbrains/rest/RestPythonUtil.java +++ b/python/python-rest/src/com/jetbrains/rest/RestPythonUtil.java @@ -1,6 +1,7 @@ package com.jetbrains.rest; 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.Presentation; @@ -25,7 +26,7 @@ public class RestPythonUtil { public static Presentation updateSphinxQuickStartRequiredAction(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) { Module module = e.getData(LangDataKeys.MODULE); if (module == null) { diff --git a/python/src/com/jetbrains/pyqt/CompileQrcAction.java b/python/src/com/jetbrains/pyqt/CompileQrcAction.java index 25d4172acaeb..c4846d22fd24 100644 --- a/python/src/com/jetbrains/pyqt/CompileQrcAction.java +++ b/python/src/com/jetbrains/pyqt/CompileQrcAction.java @@ -8,6 +8,7 @@ import com.intellij.execution.process.ProcessHandler; import com.intellij.execution.process.ProcessTerminatedListener; 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.fileChooser.FileChooserDescriptorFactory; @@ -27,7 +28,7 @@ import javax.swing.*; public class CompileQrcAction extends AnAction { @Override public void actionPerformed(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); VirtualFile[] vFiles = e.getData(PlatformDataKeys.VIRTUAL_FILE_ARRAY); assert vFiles != null; Module module = e.getData(LangDataKeys.MODULE); diff --git a/python/src/com/jetbrains/python/actions/CreatePackageAction.java b/python/src/com/jetbrains/python/actions/CreatePackageAction.java index eb75a165208a..5dae2f6292ee 100644 --- a/python/src/com/jetbrains/python/actions/CreatePackageAction.java +++ b/python/src/com/jetbrains/python/actions/CreatePackageAction.java @@ -8,6 +8,7 @@ import com.intellij.ide.fileTemplates.FileTemplateManager; import com.intellij.ide.fileTemplates.FileTemplateUtil; import com.intellij.ide.util.DirectoryChooserUtil; 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.diagnostic.Logger; @@ -32,7 +33,7 @@ public class CreatePackageAction extends DumbAwareAction { if (view == null) { return; } - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final PsiDirectory directory = DirectoryChooserUtil.getOrChooseDirectory(view); if (directory == null) return; @@ -90,7 +91,7 @@ public class CreatePackageAction extends DumbAwareAction { } private static boolean isEnabled(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); final IdeView ideView = e.getData(LangDataKeys.IDE_VIEW); if (project == null || ideView == null) { return false; diff --git a/python/src/com/jetbrains/python/actions/ExecuteInConsoleAction.java b/python/src/com/jetbrains/python/actions/ExecuteInConsoleAction.java index 7886697724cc..c7fc47a2777b 100644 --- a/python/src/com/jetbrains/python/actions/ExecuteInConsoleAction.java +++ b/python/src/com/jetbrains/python/actions/ExecuteInConsoleAction.java @@ -94,7 +94,7 @@ public class ExecuteInConsoleAction extends AnAction { private static void execute(final AnActionEvent e, final String selectionText) { final Editor editor = PlatformDataKeys.EDITOR.getData(e.getDataContext()); - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); Module module = e.getData(LangDataKeys.MODULE); findCodeExecutor(e, new Consumer() { @@ -227,7 +227,7 @@ public class ExecuteInConsoleAction extends AnAction { } private static boolean canFindConsole(AnActionEvent e) { - Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); + Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); if (project != null) { Collection descriptors = getConsoles(project); return descriptors.size() > 0; diff --git a/python/src/com/jetbrains/python/console/PyOpenDebugConsoleAction.java b/python/src/com/jetbrains/python/console/PyOpenDebugConsoleAction.java index cbc5bde76cd4..a05f1e048416 100644 --- a/python/src/com/jetbrains/python/console/PyOpenDebugConsoleAction.java +++ b/python/src/com/jetbrains/python/console/PyOpenDebugConsoleAction.java @@ -5,6 +5,7 @@ import com.intellij.execution.process.ProcessHandler; import com.intellij.execution.ui.RunContentDescriptor; 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; @@ -31,14 +32,14 @@ public class PyOpenDebugConsoleAction extends AnAction implements DumbAware { public void update(final AnActionEvent e) { e.getPresentation().setVisible(false); e.getPresentation().setEnabled(true); - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project != null) { e.getPresentation().setVisible(getConsoles(project).size() > 0); } } public void actionPerformed(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project != null) { selectRunningProcess(e.getDataContext(), project, new Consumer() { @Override diff --git a/python/src/com/jetbrains/python/console/RunPythonConsoleAction.java b/python/src/com/jetbrains/python/console/RunPythonConsoleAction.java index 9c0f82915e1e..c2e5edb4d0ba 100644 --- a/python/src/com/jetbrains/python/console/RunPythonConsoleAction.java +++ b/python/src/com/jetbrains/python/console/RunPythonConsoleAction.java @@ -6,6 +6,7 @@ import com.google.common.collect.Collections2; import com.google.common.collect.Maps; 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.fileEditor.FileDocumentManager; @@ -45,7 +46,7 @@ public class RunPythonConsoleAction extends AnAction implements DumbAware { public void update(final AnActionEvent e) { e.getPresentation().setVisible(true); e.getPresentation().setEnabled(false); - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (project != null) { Pair sdkAndModule = findPythonSdkAndModule(project, e.getData(LangDataKeys.MODULE)); if (sdkAndModule.first != null) { @@ -55,7 +56,7 @@ public class RunPythonConsoleAction extends AnAction implements DumbAware { } public void actionPerformed(final AnActionEvent e) { - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); runPythonConsole(project, e.getData(LangDataKeys.MODULE)); } diff --git a/python/src/com/jetbrains/python/packaging/setupPy/CreateSetupPyAction.java b/python/src/com/jetbrains/python/packaging/setupPy/CreateSetupPyAction.java index 9fcd9c49c149..4cd9e421cb12 100644 --- a/python/src/com/jetbrains/python/packaging/setupPy/CreateSetupPyAction.java +++ b/python/src/com/jetbrains/python/packaging/setupPy/CreateSetupPyAction.java @@ -8,6 +8,7 @@ import com.intellij.ide.fileTemplates.actions.CreateFromTemplateAction; import com.intellij.ide.fileTemplates.ui.CreateFromTemplateDialog; import com.intellij.ide.util.PropertiesComponent; 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; @@ -55,7 +56,7 @@ public class CreateSetupPyAction extends CreateFromTemplateAction { @Override public AttributesDefaults getAttributesDefaults(DataContext dataContext) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); final AttributesDefaults defaults = new AttributesDefaults("setup.py").withFixedName(true); if (project != null) { defaults.add("Package_name", project.getName()); diff --git a/python/src/com/jetbrains/python/sdk/PythonSdkType.java b/python/src/com/jetbrains/python/sdk/PythonSdkType.java index 31bf6d9a1d50..7847ae8dc8a1 100644 --- a/python/src/com/jetbrains/python/sdk/PythonSdkType.java +++ b/python/src/com/jetbrains/python/sdk/PythonSdkType.java @@ -9,6 +9,7 @@ import com.intellij.ide.DataManager; import com.intellij.notification.Notification; import com.intellij.notification.NotificationListener; import com.intellij.notification.NotificationType; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; @@ -235,7 +236,7 @@ public class PythonSdkType extends SdkType { } public void showCustomCreateUI(SdkModel sdkModel, final JComponent parentComponent, final Consumer sdkCreatedCallback) { - Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(parentComponent)); + Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(parentComponent)); InterpreterPathChooser.show(project, sdkModel.getSdks(), RelativePoint.getCenterOf(parentComponent), true, new NullableConsumer() { @Override public void consume(@Nullable Sdk sdk) { @@ -477,10 +478,10 @@ public class PythonSdkType extends SdkType { ownerComponent = ownerComponentRef.get(); } if (ownerComponent != null) { - project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(ownerComponent)); + project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(ownerComponent)); } else { - project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()); + project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()); } setupSdkPaths(sdk, project, ownerComponent); } diff --git a/python/src/com/jetbrains/python/sdk/flavors/VirtualEnvSdkFlavor.java b/python/src/com/jetbrains/python/sdk/flavors/VirtualEnvSdkFlavor.java index f57a2ab44b5e..df126d6c233d 100644 --- a/python/src/com/jetbrains/python/sdk/flavors/VirtualEnvSdkFlavor.java +++ b/python/src/com/jetbrains/python/sdk/flavors/VirtualEnvSdkFlavor.java @@ -1,6 +1,7 @@ package com.jetbrains.python.sdk.flavors; 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.util.SystemInfo; @@ -32,7 +33,7 @@ public class VirtualEnvSdkFlavor extends CPythonSdkFlavor { @Override public Collection suggestHomePaths() { - final Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()); + final Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()); List candidates = new ArrayList(); if (project != null) { VirtualFile rootDir = project.getBaseDir();