diff --git a/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteGroupHeader.java b/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteGroupHeader.java index 72f197fa38b8..c98caefa3f75 100644 --- a/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteGroupHeader.java +++ b/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteGroupHeader.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. @@ -159,7 +159,7 @@ public class PaletteGroupHeader extends JCheckBox implements DataProvider { @Nullable public Object getData(String dataId) { Object data = myPaletteWindow.getData(dataId); if (data != null) return data; - Project project = PlatformDataKeys.PROJECT.getData(myPaletteWindow); + Project project = CommonDataKeys.PROJECT.getData(myPaletteWindow); return myGroup.getData(project, dataId); } diff --git a/java/java-impl/src/com/intellij/ide/hierarchy/call/JavaCallHierarchyProvider.java b/java/java-impl/src/com/intellij/ide/hierarchy/call/JavaCallHierarchyProvider.java index 5c95175adce6..20caeb65d34f 100644 --- a/java/java-impl/src/com/intellij/ide/hierarchy/call/JavaCallHierarchyProvider.java +++ b/java/java-impl/src/com/intellij/ide/hierarchy/call/JavaCallHierarchyProvider.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,17 +15,15 @@ */ package com.intellij.ide.hierarchy.call; -import com.intellij.ide.hierarchy.HierarchyProvider; -import com.intellij.ide.hierarchy.HierarchyBrowser; import com.intellij.ide.hierarchy.CallHierarchyBrowserBase; +import com.intellij.ide.hierarchy.HierarchyBrowser; +import com.intellij.ide.hierarchy.HierarchyProvider; import com.intellij.openapi.actionSystem.CommonDataKeys; +import com.intellij.openapi.actionSystem.DataContext; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiMethod; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.actionSystem.PlatformDataKeys; -import com.intellij.openapi.actionSystem.LangDataKeys; -import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; /** @@ -34,7 +32,7 @@ import org.jetbrains.annotations.NotNull; public class JavaCallHierarchyProvider implements HierarchyProvider { @Override public PsiElement getTarget(@NotNull final DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return null; final PsiElement element = CommonDataKeys.PSI_ELEMENT.getData(dataContext); diff --git a/java/java-impl/src/com/intellij/ide/macro/ClasspathEntryMacro.java b/java/java-impl/src/com/intellij/ide/macro/ClasspathEntryMacro.java index 5ee1126b6f09..b28334802f24 100644 --- a/java/java-impl/src/com/intellij/ide/macro/ClasspathEntryMacro.java +++ b/java/java-impl/src/com/intellij/ide/macro/ClasspathEntryMacro.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. @@ -18,7 +18,6 @@ package com.intellij.ide.macro; import com.intellij.ide.IdeBundle; import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.vfs.VirtualFile; @@ -36,7 +35,7 @@ public final class ClasspathEntryMacro extends Macro { } public String expand(final DataContext dataContext) { - final Project project = PlatformDataKeys.PROJECT.getData(dataContext); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) return null; final VirtualFile file = CommonDataKeys.VIRTUAL_FILE.getData(dataContext); if (file == null) return null; diff --git a/platform/lang-api/src/com/intellij/codeInsight/actions/CodeInsightAction.java b/platform/lang-api/src/com/intellij/codeInsight/actions/CodeInsightAction.java index 5b002f6dc6d7..014aa668faf1 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/actions/CodeInsightAction.java +++ b/platform/lang-api/src/com/intellij/codeInsight/actions/CodeInsightAction.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. @@ -35,7 +35,7 @@ public abstract class CodeInsightAction extends AnAction { @Override public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project != null) { Editor editor = getEditor(dataContext, project); actionPerformedImpl(project, editor); @@ -78,7 +78,7 @@ public abstract class CodeInsightAction extends AnAction { Presentation presentation = event.getPresentation(); DataContext dataContext = event.getDataContext(); - Project project = PlatformDataKeys.PROJECT.getData(dataContext); + Project project = CommonDataKeys.PROJECT.getData(dataContext); if (project == null) { presentation.setEnabled(false); return; diff --git a/platform/lang-api/src/com/intellij/openapi/project/ProjectUtil.java b/platform/lang-api/src/com/intellij/openapi/project/ProjectUtil.java index 5b010ed86190..5fcd7d50515f 100644 --- a/platform/lang-api/src/com/intellij/openapi/project/ProjectUtil.java +++ b/platform/lang-api/src/com/intellij/openapi/project/ProjectUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 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. @@ -16,8 +16,8 @@ package com.intellij.openapi.project; import com.intellij.ide.DataManager; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.fileEditor.UniqueVFilePathBuilder; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.InternalFileType; @@ -119,7 +119,7 @@ public class ProjectUtil { if (openProjects.length > 0) project = openProjects[0]; if (project == null) { DataContext dataContext = component == null ? DataManager.getInstance().getDataContext() : DataManager.getInstance().getDataContext(component); - project = PlatformDataKeys.PROJECT.getData(dataContext); + project = CommonDataKeys.PROJECT.getData(dataContext); } if (project == null) { project = ProjectManager.getInstance().getDefaultProject(); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/AbstractCreateFormAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/AbstractCreateFormAction.java index 5a63ed8d5705..b0da25f4290f 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/AbstractCreateFormAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/AbstractCreateFormAction.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. @@ -18,10 +18,7 @@ package com.intellij.uiDesigner.actions; import com.intellij.ide.IdeView; import com.intellij.ide.actions.CreateElementActionBase; -import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.LangDataKeys; -import com.intellij.openapi.actionSystem.PlatformDataKeys; -import com.intellij.openapi.actionSystem.Presentation; +import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ProjectFileIndex; @@ -49,7 +46,7 @@ public abstract class AbstractCreateFormAction extends CreateElementActionBase i public void update(final AnActionEvent e) { super.update(e); - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); final Presentation presentation = e.getPresentation(); if (presentation.isEnabled()) { final IdeView view = e.getData(LangDataKeys.IDE_VIEW); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/ReloadCustomComponentsAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/ReloadCustomComponentsAction.java index 37218e054a4e..6c1da3da7e2a 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/ReloadCustomComponentsAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/ReloadCustomComponentsAction.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. @@ -24,6 +24,7 @@ package com.intellij.uiDesigner.actions; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.fileEditor.FileEditor; import com.intellij.openapi.fileEditor.FileEditorManager; @@ -38,7 +39,7 @@ import com.intellij.uiDesigner.radComponents.RadErrorComponent; public class ReloadCustomComponentsAction extends AnAction { public void actionPerformed(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) return; LoaderFactory.getInstance(project).clearClassLoaderCache(); final FileEditor[] fileEditors = FileEditorManager.getInstance(project).getAllEditors(); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/AddGroupAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/AddGroupAction.java index 4bef6a40ee31..2d388652188f 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/AddGroupAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/AddGroupAction.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. @@ -19,6 +19,7 @@ package com.intellij.uiDesigner.palette; import com.intellij.CommonBundle; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; @@ -31,7 +32,7 @@ import java.util.ArrayList; */ public class AddGroupAction extends AnAction { public void actionPerformed(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); + Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) return; // Ask group name final String groupName = Messages.showInputDialog( diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/convert/ConvertSchemaAction.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/convert/ConvertSchemaAction.java index 9ae107994aa4..7aa3b2b795a0 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/convert/ConvertSchemaAction.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/convert/ConvertSchemaAction.java @@ -45,7 +45,7 @@ public class ConvertSchemaAction extends AnAction { public void update(AnActionEvent e) { final VirtualFile[] files = e.getData(CommonDataKeys.VIRTUAL_FILE_ARRAY); - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (files != null && project != null) { final SchemaType type = getInputType(project, files); e.getPresentation().setEnabled(type != null); @@ -95,7 +95,7 @@ public class ConvertSchemaAction extends AnAction { public void actionPerformed(AnActionEvent e) { final VirtualFile file = e.getData(CommonDataKeys.VIRTUAL_FILE); - final Project project = e.getData(PlatformDataKeys.PROJECT); + final Project project = e.getData(CommonDataKeys.PROJECT); if (file != null && project != null) { final VirtualFile[] files = e.getData(CommonDataKeys.VIRTUAL_FILE_ARRAY); assert files != null;