From 995e7f012e0bb8aa727bca2ea1f7b666ebccbc61 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Sun, 3 Nov 2013 23:40:08 +0100 Subject: [PATCH] PlatformDataKeys -> CommonDataKeys --- .../intellij/openapi/editor/actionSystem/EditorAction.java | 6 +++--- .../editor/actionSystem/EditorWriteActionHandler.java | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorAction.java b/platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorAction.java index f465cda20a8b..333316779758 100644 --- a/platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorAction.java +++ b/platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -125,14 +125,14 @@ public abstract class EditorAction extends AnAction implements DumbAware { } private static DataContext getProjectAwareDataContext(final Editor editor, @NotNull final DataContext original) { - if (PlatformDataKeys.PROJECT.getData(original) == editor.getProject()) { + if (CommonDataKeys.PROJECT.getData(original) == editor.getProject()) { return original; } return new DataContext() { @Override public Object getData(String dataId) { - if (PlatformDataKeys.PROJECT.is(dataId)) { + if (CommonDataKeys.PROJECT.is(dataId)) { return editor.getProject(); } return original.getData(dataId); diff --git a/platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorWriteActionHandler.java b/platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorWriteActionHandler.java index 7b1b8d960005..235214be85a9 100644 --- a/platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorWriteActionHandler.java +++ b/platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorWriteActionHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,6 +15,7 @@ */ package com.intellij.openapi.editor.actionSystem; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; @@ -30,7 +31,7 @@ public abstract class EditorWriteActionHandler extends EditorActionHandler { if (editor.isViewer()) return; if (dataContext != null) { - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project != null && !FileDocumentManager.getInstance().requestWriting(editor.getDocument(), project)) return; }