From 577cef9f1861d2e708ba1099a578895692f90983 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Tue, 29 Apr 2014 22:48:43 +0400 Subject: [PATCH] cleanup --- .../codeInsight/actions/CodeInsightAction.java | 18 ++++++++---------- .../ide/actions/CreateElementActionBase.java | 9 +++------ .../intellij/analysis/BaseAnalysisAction.java | 4 ++-- .../action/RearrangeCodeAction.java | 8 +++----- 4 files changed, 16 insertions(+), 23 deletions(-) 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 014aa668faf1..1cbd57ad710d 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-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -25,8 +25,8 @@ import com.intellij.openapi.editor.actionSystem.DocCommandGroupId; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiUtilBase; -import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * @author Dmitry Avdeev @@ -34,10 +34,9 @@ import org.jetbrains.annotations.NotNull; public abstract class CodeInsightAction extends AnAction { @Override public void actionPerformed(AnActionEvent e) { - DataContext dataContext = e.getDataContext(); - Project project = CommonDataKeys.PROJECT.getData(dataContext); + Project project = e.getProject(); if (project != null) { - Editor editor = getEditor(dataContext, project); + Editor editor = getEditor(e.getDataContext(), project); actionPerformedImpl(project, editor); } } @@ -74,17 +73,16 @@ public abstract class CodeInsightAction extends AnAction { } @Override - public void update(AnActionEvent event) { - Presentation presentation = event.getPresentation(); - DataContext dataContext = event.getDataContext(); + public void update(AnActionEvent e) { + Presentation presentation = e.getPresentation(); - Project project = CommonDataKeys.PROJECT.getData(dataContext); + Project project = e.getProject(); if (project == null) { presentation.setEnabled(false); return; } - Editor editor = getEditor(dataContext, project); + Editor editor = getEditor(e.getDataContext(), project); if (editor == null) { presentation.setEnabled(false); return; diff --git a/platform/lang-api/src/com/intellij/ide/actions/CreateElementActionBase.java b/platform/lang-api/src/com/intellij/ide/actions/CreateElementActionBase.java index 1f2034a0c807..cfee9818c139 100644 --- a/platform/lang-api/src/com/intellij/ide/actions/CreateElementActionBase.java +++ b/platform/lang-api/src/com/intellij/ide/actions/CreateElementActionBase.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -23,7 +23,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.InputValidator; import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiElement; -import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -63,14 +62,12 @@ public abstract class CreateElementActionBase extends AnAction { @Override public final void actionPerformed(final AnActionEvent e) { - final DataContext dataContext = e.getDataContext(); - - final IdeView view = LangDataKeys.IDE_VIEW.getData(dataContext); + final IdeView view = e.getData(LangDataKeys.IDE_VIEW); if (view == null) { return; } - final Project project = CommonDataKeys.PROJECT.getData(dataContext); + final Project project = e.getProject(); final PsiDirectory dir = view.getOrChooseDirectory(); if (dir == null) return; diff --git a/platform/lang-impl/src/com/intellij/analysis/BaseAnalysisAction.java b/platform/lang-impl/src/com/intellij/analysis/BaseAnalysisAction.java index 96f096d183a0..aaebe0d7892c 100644 --- a/platform/lang-impl/src/com/intellij/analysis/BaseAnalysisAction.java +++ b/platform/lang-impl/src/com/intellij/analysis/BaseAnalysisAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -58,7 +58,7 @@ public abstract class BaseAnalysisAction extends AnAction { public void update(AnActionEvent event) { Presentation presentation = event.getPresentation(); final DataContext dataContext = event.getDataContext(); - final Project project = CommonDataKeys.PROJECT.getData(dataContext); + final Project project = event.getProject(); final boolean dumbMode = project == null || DumbService.getInstance(project).isDumb(); presentation.setEnabled(!dumbMode && getInspectionScope(dataContext) != null); } diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/RearrangeCodeAction.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/RearrangeCodeAction.java index 9d7b7a55d0ea..8f29bba1a17c 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/RearrangeCodeAction.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/RearrangeCodeAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 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,8 +18,6 @@ package com.intellij.application.options.codeStyle.arrangement.action; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonDataKeys; -import com.intellij.openapi.actionSystem.LangDataKeys; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.editor.Document; @@ -52,12 +50,12 @@ public class RearrangeCodeAction extends AnAction { @Override public void actionPerformed(AnActionEvent e) { - final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext()); + final Project project = e.getProject(); if (project == null) { return; } - final Editor editor = CommonDataKeys.EDITOR.getData(e.getDataContext()); + final Editor editor = e.getData(CommonDataKeys.EDITOR); if (editor == null) { return; }