@@ -3,7 +3,6 @@ */ package com.intellij.openapi.editor.actions; -import com.intellij.openapi.actionSystem.DataConstants; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; @@ -87,7 +86,7 @@ class MoveStatementHandler extends EditorActionHandler { if (editor.isOneLineMode()) { return false; } - final Project project = (Project)dataContext.getData(DataConstants.PROJECT); + final Project project = editor.getProject(); final PsiDocumentManager documentManager = PsiDocumentManager.getInstance(project); final Document document = editor.getDocument(); final PsiFile file = documentManager.getPsiFile(document);
@@ -15,7 +15,6 @@ */ package com.intellij.util; -import com.intellij.openapi.actionSystem.DataConstants; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -31,7 +30,7 @@ public class OpenSourceUtil { } public static void openSourcesFrom(DataProvider context, boolean requestFocus) { - navigate((Navigatable[])context.getData(DataConstants.NAVIGATABLE_ARRAY), requestFocus); + navigate(PlatformDataKeys.NAVIGATABLE_ARRAY.getData(context), requestFocus); } public static void navigate(final Navigatable[] navigatables, final boolean requestFocus) {
@@ -1,7 +1,6 @@ package com.intellij.openapi.editor.impl; import com.intellij.ide.ui.UISettings; -import com.intellij.openapi.actionSystem.DataConstants; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.actionSystem.ex.DataConstantsEx; import com.intellij.openapi.application.ApplicationManager; @@ -35,9 +34,11 @@ public class EditorComponentImpl extends JComponent implements Scrollable, DataP public Object getData(String dataId) { if (myEditor.isRendererMode()) return null; + /* if (DataConstants.EDITOR.equals(dataId)) { return myEditor; } + */ if (DataConstantsEx.DELETE_ELEMENT_PROVIDER.equals(dataId)) { return myEditor.getDeleteProvider(); }