diff --git a/platform/platform-impl/src/com/intellij/ide/impl/dataRules/CopyProviderRule.java b/platform/platform-impl/src/com/intellij/ide/impl/dataRules/CopyProviderRule.java index 96ab24ca33da..5068ebec966b 100644 --- a/platform/platform-impl/src/com/intellij/ide/impl/dataRules/CopyProviderRule.java +++ b/platform/platform-impl/src/com/intellij/ide/impl/dataRules/CopyProviderRule.java @@ -17,14 +17,15 @@ package com.intellij.ide.impl.dataRules; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.ex.EditorEx; public class CopyProviderRule implements GetDataRule { public Object getData(DataProvider dataProvider) { - final EditorEx editor = (EditorEx)dataProvider.getData(PlatformDataKeys.EDITOR.getName()); - if (editor == null) { - return null; + final Editor editor = PlatformDataKeys.EDITOR.getData(dataProvider); + if (editor instanceof EditorEx) { + return ((EditorEx) editor).getCopyProvider(); } - return editor.getCopyProvider(); + return null; } } diff --git a/platform/platform-impl/src/com/intellij/ide/impl/dataRules/CutProviderRule.java b/platform/platform-impl/src/com/intellij/ide/impl/dataRules/CutProviderRule.java index 5b38e67fc029..e9dd25b4924c 100644 --- a/platform/platform-impl/src/com/intellij/ide/impl/dataRules/CutProviderRule.java +++ b/platform/platform-impl/src/com/intellij/ide/impl/dataRules/CutProviderRule.java @@ -17,14 +17,15 @@ package com.intellij.ide.impl.dataRules; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.ex.EditorEx; public class CutProviderRule implements GetDataRule { public Object getData(DataProvider dataProvider) { - final EditorEx editor = (EditorEx)dataProvider.getData(PlatformDataKeys.EDITOR.getName()); - if (editor == null) { - return null; + final Editor editor = PlatformDataKeys.EDITOR.getData(dataProvider); + if (editor instanceof EditorEx) { + return ((EditorEx) editor).getCutProvider(); } - return editor.getCutProvider(); + return null; } } diff --git a/platform/platform-impl/src/com/intellij/ide/impl/dataRules/PasteProviderRule.java b/platform/platform-impl/src/com/intellij/ide/impl/dataRules/PasteProviderRule.java index 646ae5adc07b..02c42a0e7c33 100644 --- a/platform/platform-impl/src/com/intellij/ide/impl/dataRules/PasteProviderRule.java +++ b/platform/platform-impl/src/com/intellij/ide/impl/dataRules/PasteProviderRule.java @@ -17,15 +17,15 @@ package com.intellij.ide.impl.dataRules; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.ex.EditorEx; public class PasteProviderRule implements GetDataRule { public Object getData(DataProvider dataProvider) { - final EditorEx editor = (EditorEx)dataProvider.getData(PlatformDataKeys.EDITOR.getName()); - if (editor == null) { - return null; + final Editor editor = PlatformDataKeys.EDITOR.getData(dataProvider); + if (editor instanceof EditorEx) { + return ((EditorEx) editor).getPasteProvider(); } - - return editor.getPasteProvider(); + return null; } }