MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

simplify getting project from AnActionEvent

Browse Source
This commit is contained in:
Konstantin Bulenkov
2016-05-24 01:52:46 +02:00
parent e60091b527
commit 68804b6bee
3 changed files with 43 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/coverage-common/src/com/intellij/coverage/actions/GenerateCoverageReportAction.java
+7 -4
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2016 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,14 +24,17 @@ import com.intellij.codeInspection.export.ExportToHTMLDialog;
import com.intellij.coverage.CoverageDataManager;
import com.intellij.coverage.CoverageEngine;
import com.intellij.coverage.CoverageSuitesBundle;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.actionSystem.Presentation;
import com.intellij.openapi.project.Project;
public class GenerateCoverageReportAction extends AnAction {
public void actionPerformed(final AnActionEvent e) {
final DataContext dataContext = e.getDataContext();
final Project project = CommonDataKeys.PROJECT.getData(dataContext);
final Project project = e.getProject();
assert project != null;
final CoverageDataManager coverageDataManager = CoverageDataManager.getInstance(project);
final CoverageSuitesBundle currentSuite = coverageDataManager.getCurrentSuitesBundle();
@@ -53,7 +56,7 @@ public class GenerateCoverageReportAction extends AnAction {
final Presentation presentation = e.getPresentation();
presentation.setEnabled(false);
presentation.setVisible(false);
final Project project = CommonDataKeys.PROJECT.getData(dataContext);
final Project project = e.getProject();
if (project != null) {
final CoverageSuitesBundle currentSuite = CoverageDataManager.getInstance(project).getCurrentSuitesBundle();
if (currentSuite != null) {
plugins/coverage-common/src/com/intellij/coverage/actions/ShowCoveringTestsAction.java
+19 -4
View File
@@ -1,3 +1,19 @@
/*
* Copyright 2000-2016 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/*
* User: anna
* Date: 29-May-2008
@@ -28,7 +44,6 @@ import com.intellij.rt.coverage.data.LineData;
import com.intellij.ui.popup.NotLookupOrSearchCondition;
import com.intellij.util.ArrayUtil;
import com.intellij.util.PlatformIcons;
import com.intellij.util.Processor;
import com.intellij.util.containers.HashSet;
import org.jetbrains.annotations.Nullable;
@@ -53,9 +68,9 @@ public class ShowCoveringTestsAction extends AnAction {
public void actionPerformed(final AnActionEvent e) {
final DataContext context = e.getDataContext();
final Project project = CommonDataKeys.PROJECT.getData(context);
final Project project = e.getProject();
LOG.assertTrue(project != null);
final Editor editor = CommonDataKeys.EDITOR.getData(context);
final Editor editor = e.getData(CommonDataKeys.EDITOR);
LOG.assertTrue(editor != null);
final CoverageSuitesBundle currentSuite = CoverageDataManager.getInstance(project).getCurrentSuitesBundle();
@@ -146,7 +161,7 @@ public class ShowCoveringTestsAction extends AnAction {
final Presentation presentation = e.getPresentation();
presentation.setEnabled(false);
if (myLineData != null && myLineData.getStatus() != LineCoverage.NONE) {
final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext());
final Project project = e.getProject();
if (project != null) {
final File[] files = getTraceFiles(project);
if (files != null && files.length > 0) {
plugins/coverage-common/src/com/intellij/coverage/actions/SwitchCoverageSuiteAction.java
+17 -9
View File
@@ -1,11 +1,22 @@
/*
* Copyright 2000-2016 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.coverage.actions;
import com.intellij.coverage.CoverageDataManager;
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;
/**
* @author ven
@@ -13,13 +24,10 @@ import com.intellij.openapi.project.Project;
public class SwitchCoverageSuiteAction extends AnAction {
public void actionPerformed(AnActionEvent e) {
final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext());
new CoverageSuiteChooserDialog(project).show();
new CoverageSuiteChooserDialog(e.getProject()).show();
}
public void update(AnActionEvent e) {
super.update(e);
Project project = CommonDataKeys.PROJECT.getData(e.getDataContext());
e.getPresentation().setEnabled(project != null);
e.getPresentation().setEnabled(e.getProject() != null);
}
}