From 093ea5c106c5bb102cfb3b2dc7bda6d788294681 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 24 May 2011 19:01:42 +0400 Subject: [PATCH] remove unneeded code --- .../python/refactoring/FileDataContext.java | 35 ------------------- .../refactoring/PyExtractMethodTest.java | 3 +- 2 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 python/testSrc/com/jetbrains/python/refactoring/FileDataContext.java diff --git a/python/testSrc/com/jetbrains/python/refactoring/FileDataContext.java b/python/testSrc/com/jetbrains/python/refactoring/FileDataContext.java deleted file mode 100644 index 0a396ea426df..000000000000 --- a/python/testSrc/com/jetbrains/python/refactoring/FileDataContext.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.jetbrains.python.refactoring; - -import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.actionSystem.LangDataKeys; -import com.intellij.openapi.actionSystem.PlatformDataKeys; -import com.intellij.psi.PsiFile; -import org.jetbrains.annotations.NonNls; -import org.jetbrains.annotations.Nullable; - -/** - * @author oleg -*/ -public class FileDataContext implements DataContext { - private final PsiFile myFile; - - public FileDataContext(final PsiFile file) { - myFile = file; - } - - @Override - @Nullable - public Object getData(@NonNls String dataId) { - if (LangDataKeys.LANGUAGE.is(dataId)) { - return myFile.getLanguage(); - } - if (PlatformDataKeys.PROJECT.is(dataId)) { - return myFile.getProject(); - } - if (LangDataKeys.PSI_FILE.is(dataId)) { - return myFile; - } - - throw new IllegalArgumentException("Data not supported: " + dataId); - } -} \ No newline at end of file diff --git a/python/testSrc/com/jetbrains/python/refactoring/PyExtractMethodTest.java b/python/testSrc/com/jetbrains/python/refactoring/PyExtractMethodTest.java index db676d63b99b..dabbf42061bf 100644 --- a/python/testSrc/com/jetbrains/python/refactoring/PyExtractMethodTest.java +++ b/python/testSrc/com/jetbrains/python/refactoring/PyExtractMethodTest.java @@ -1,6 +1,7 @@ package com.jetbrains.python.refactoring; import com.intellij.lang.LanguageRefactoringSupport; +import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.refactoring.RefactoringActionHandler; import com.jetbrains.python.PythonLanguage; import com.jetbrains.python.fixtures.LightMarkedTestCase; @@ -19,7 +20,7 @@ public class PyExtractMethodTest extends LightMarkedTestCase { try { System.setProperty(PyExtractMethodUtil.NAME, name); try { - handler.invoke(myFixture.getProject(), myFixture.getEditor(), myFixture.getFile(), new FileDataContext(myFixture.getFile())); + handler.invoke(myFixture.getProject(), myFixture.getEditor(), myFixture.getFile(), ((EditorEx) myFixture.getEditor()).getDataContext()); } catch (Exception e) { if (result.endsWith(".py")) { // expected output file, not an exception