From 857a989729ff5827629756089f8d5225cef809a4 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Thu, 12 Feb 2009 14:39:17 +0300 Subject: [PATCH] pass parent to actions toolbar in order to enable context shortcuts (IDEADEV-34751) --- .../intellij/execution/junit2/ui/ConsolePanel.java | 2 +- .../junit2/ui/actions/JUnitToolbarPanel.java | 19 +++++++++++++------ .../junit2/ui/actions/RerunFailedTestsAction.java | 5 ++++- .../testng/ui/actions/RerunFailedTestsAction.java | 4 +++- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/plugins/junit/src/com/intellij/execution/junit2/ui/ConsolePanel.java b/plugins/junit/src/com/intellij/execution/junit2/ui/ConsolePanel.java index 794d4ae8bd..026b8eec28 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/ui/ConsolePanel.java +++ b/plugins/junit/src/com/intellij/execution/junit2/ui/ConsolePanel.java @@ -95,7 +95,7 @@ class ConsolePanel extends JPanel implements LogConsoleManager, Disposable { myPrinter = printer; myLeftPane = ScrollPaneFactory.createScrollPane(); myStatisticsPanel = new StatisticsPanel(); - myToolbarPanel = new JUnitToolbarPanel(properties, runnerSettings, configurationSettings); + myToolbarPanel = new JUnitToolbarPanel(properties, runnerSettings, configurationSettings, this); myStatusLine = new StatusLine(); myTreeView = new JUnitTestTreeView(); final Splitter splitter = createSplitter(PROPORTION_PROPERTY, DEFAULT_PROPORTION); diff --git a/plugins/junit/src/com/intellij/execution/junit2/ui/actions/JUnitToolbarPanel.java b/plugins/junit/src/com/intellij/execution/junit2/ui/actions/JUnitToolbarPanel.java index b575509a88..1faf343742 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/ui/actions/JUnitToolbarPanel.java +++ b/plugins/junit/src/com/intellij/execution/junit2/ui/actions/JUnitToolbarPanel.java @@ -23,7 +23,10 @@ import com.intellij.execution.configurations.RunnerSettings; import com.intellij.execution.junit2.TestProxy; import com.intellij.execution.junit2.ui.model.JUnitAdapter; import com.intellij.execution.junit2.ui.model.JUnitRunningModel; -import com.intellij.execution.testframework.*; +import com.intellij.execution.testframework.TestConsoleProperties; +import com.intellij.execution.testframework.TestFrameworkRunningModel; +import com.intellij.execution.testframework.TestsUIUtil; +import com.intellij.execution.testframework.ToolbarPanel; import com.intellij.execution.testframework.actions.ScrollToTestSourceAction; import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.project.Project; @@ -32,6 +35,8 @@ import com.intellij.psi.PsiClass; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NonNls; +import javax.swing.*; + public class JUnitToolbarPanel extends ToolbarPanel { @NonNls protected static final String TEST_SUITE_CLASS_NAME = "junit.framework.TestSuite"; private RerunFailedTestsAction myRerunFailedTestsAction; @@ -39,16 +44,18 @@ public class JUnitToolbarPanel extends ToolbarPanel { public JUnitToolbarPanel(final TestConsoleProperties properties, final RunnerSettings runnerSettings, - final ConfigurationPerRunnerSettings configurationSettings) { - super(properties, runnerSettings, configurationSettings); + final ConfigurationPerRunnerSettings configurationSettings, + final JComponent parentComponent) { + super(properties, runnerSettings, configurationSettings, parentComponent); } protected void appendAdditionalActions(final DefaultActionGroup actionGroup, final TestConsoleProperties properties, final RunnerSettings runnerSettings, - final ConfigurationPerRunnerSettings configurationSettings) { + final ConfigurationPerRunnerSettings configurationSettings, + JComponent parent) { myTrackCoverageAction = new TrackCoverageAction(properties); actionGroup.add(myTrackCoverageAction); - myRerunFailedTestsAction = new RerunFailedTestsAction(); - myRerunFailedTestsAction.init((JavaAwareTestConsoleProperties)properties, runnerSettings, configurationSettings); + myRerunFailedTestsAction = new RerunFailedTestsAction(parent); + myRerunFailedTestsAction.init(properties, runnerSettings, configurationSettings); actionGroup.add(myRerunFailedTestsAction); } diff --git a/plugins/junit/src/com/intellij/execution/junit2/ui/actions/RerunFailedTestsAction.java b/plugins/junit/src/com/intellij/execution/junit2/ui/actions/RerunFailedTestsAction.java index 6c5ddd0355..ee53f52cd6 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/ui/actions/RerunFailedTestsAction.java +++ b/plugins/junit/src/com/intellij/execution/junit2/ui/actions/RerunFailedTestsAction.java @@ -27,13 +27,16 @@ import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.module.Module; import org.jetbrains.annotations.NotNull; +import javax.swing.*; + /** * @author Alexey */ public class RerunFailedTestsAction extends AbstractRerunFailedTestsAction { - public RerunFailedTestsAction() { + public RerunFailedTestsAction(JComponent parent) { copyFrom(ActionManager.getInstance().getAction("RerunFailedTests")); + registerCustomShortcutSet(getShortcutSet(), parent); } @Override diff --git a/plugins/testng/src/com/theoryinpractice/testng/ui/actions/RerunFailedTestsAction.java b/plugins/testng/src/com/theoryinpractice/testng/ui/actions/RerunFailedTestsAction.java index 05bc9b68cd..1810d6f2de 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/ui/actions/RerunFailedTestsAction.java +++ b/plugins/testng/src/com/theoryinpractice/testng/ui/actions/RerunFailedTestsAction.java @@ -22,13 +22,15 @@ import com.theoryinpractice.testng.configuration.TestNGConfiguration; import com.theoryinpractice.testng.configuration.TestNGRunnableState; import org.jetbrains.annotations.NotNull; +import javax.swing.*; import java.util.ArrayList; import java.util.Collection; import java.util.Map; public class RerunFailedTestsAction extends AbstractRerunFailedTestsAction { - public RerunFailedTestsAction() { + public RerunFailedTestsAction(JComponent parent) { copyFrom(ActionManager.getInstance().getAction("RerunFailedTests")); + registerCustomShortcutSet(getShortcutSet(), parent); } @Override -- 2.11.4.GIT