From 344bb2d4a4aa5baea5f213f005b98ffbf4e5030c Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Tue, 1 Oct 2013 22:24:31 +0200 Subject: [PATCH] fix yellow code producing by CommonDataKeys --- .../jetbrains/python/actions/ExecuteInConsoleAction.java | 6 +++--- .../jetbrains/python/hierarchy/PyTypeHierachyProvider.java | 3 ++- .../changeSignature/PyChangeSignatureHandler.java | 3 ++- .../refactoring/classes/PyClassRefactoringHandler.java | 3 ++- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/python/src/com/jetbrains/python/actions/ExecuteInConsoleAction.java b/python/src/com/jetbrains/python/actions/ExecuteInConsoleAction.java index c7fc47a2777b..8b9d4691178a 100644 --- a/python/src/com/jetbrains/python/actions/ExecuteInConsoleAction.java +++ b/python/src/com/jetbrains/python/actions/ExecuteInConsoleAction.java @@ -49,7 +49,7 @@ public class ExecuteInConsoleAction extends AnAction { } public void actionPerformed(AnActionEvent e) { - Editor editor = PlatformDataKeys.EDITOR.getData(e.getDataContext()); + Editor editor = CommonDataKeys.EDITOR.getData(e.getDataContext()); if (editor != null) { final String selectionText = getSelectionText(editor); if (selectionText != null) { @@ -93,7 +93,7 @@ public class ExecuteInConsoleAction extends AnAction { } private static void execute(final AnActionEvent e, final String selectionText) { - final Editor editor = PlatformDataKeys.EDITOR.getData(e.getDataContext()); + final Editor editor = CommonDataKeys.EDITOR.getData(e.getDataContext()); Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); Module module = e.getData(LangDataKeys.MODULE); @@ -133,7 +133,7 @@ public class ExecuteInConsoleAction extends AnAction { } public void update(AnActionEvent e) { - Editor editor = PlatformDataKeys.EDITOR.getData(e.getDataContext()); + Editor editor = CommonDataKeys.EDITOR.getData(e.getDataContext()); Presentation presentation = e.getPresentation(); boolean enabled = false; diff --git a/python/src/com/jetbrains/python/hierarchy/PyTypeHierachyProvider.java b/python/src/com/jetbrains/python/hierarchy/PyTypeHierachyProvider.java index 460a5f30e23b..dd064dda8bb8 100644 --- a/python/src/com/jetbrains/python/hierarchy/PyTypeHierachyProvider.java +++ b/python/src/com/jetbrains/python/hierarchy/PyTypeHierachyProvider.java @@ -3,6 +3,7 @@ package com.jetbrains.python.hierarchy; 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; @@ -25,7 +26,7 @@ public class PyTypeHierachyProvider implements HierarchyProvider { public PsiElement getTarget(@NotNull DataContext dataContext) { PsiElement element = LangDataKeys.PSI_ELEMENT.getData(dataContext); if (element == null) { - final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); final PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); if (editor != null && file != null) { element = file.findElementAt(editor.getCaretModel().getOffset()); diff --git a/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureHandler.java b/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureHandler.java index 57732af7293f..44336da71c71 100644 --- a/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureHandler.java +++ b/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureHandler.java @@ -1,5 +1,6 @@ package com.jetbrains.python.refactoring.changeSignature; +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 class PyChangeSignatureHandler implements ChangeSignatureHandler { @Override public void invoke(@NotNull Project project, @NotNull PsiElement[] elements, @Nullable DataContext dataContext) { if (elements.length != 1) return; - Editor editor = dataContext == null ? null : PlatformDataKeys.EDITOR.getData(dataContext); + Editor editor = dataContext == null ? null : CommonDataKeys.EDITOR.getData(dataContext); invokeOnElement(project, elements[0], editor); } diff --git a/python/src/com/jetbrains/python/refactoring/classes/PyClassRefactoringHandler.java b/python/src/com/jetbrains/python/refactoring/classes/PyClassRefactoringHandler.java index 2fdb73f94843..ed0fadc79945 100644 --- a/python/src/com/jetbrains/python/refactoring/classes/PyClassRefactoringHandler.java +++ b/python/src/com/jetbrains/python/refactoring/classes/PyClassRefactoringHandler.java @@ -1,5 +1,6 @@ package com.jetbrains.python.refactoring.classes; +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 @@ public abstract class PyClassRefactoringHandler implements RefactoringActionHand public void invoke(@NotNull Project project, @NotNull PsiElement[] elements, DataContext dataContext) { final PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); - final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); + final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); doRefactor(project, elements[0], elements[elements.length - 1], editor, file, dataContext); }