diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
commit | d76e3920c56d37c942092b7dca20fcaded81c0a5 (patch) | |
tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java | |
parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
parent | 1aa2e09bdbd413eacb677e9fa4b50630530d0656 (diff) | |
download | idea-d76e3920c56d37c942092b7dca20fcaded81c0a5.tar.gz |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java
Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f
Diffstat (limited to 'platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java')
-rw-r--r-- | platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java b/platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java index 9be02ae51271..30f8599e2aaf 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java @@ -69,7 +69,7 @@ public class AbstractRerunFailedTestsAction extends AnAction implements AnAction protected ExecutionEnvironment myEnvironment; private final JComponent myParent; - + @SuppressWarnings("UnusedDeclaration") public AbstractRerunFailedTestsAction() { //We call this constructor with a little help from reflection. myParent = null; @@ -83,6 +83,7 @@ public class AbstractRerunFailedTestsAction extends AnAction implements AnAction registerCustomShortcutSet(getShortcutSet(), myParent); } + @Override public void dispose() { registry.remove(this); } @@ -127,6 +128,7 @@ public class AbstractRerunFailedTestsAction extends AnAction implements AnAction return candidates.get(0); } + @Override public final void update(AnActionEvent e) { AbstractRerunFailedTestsAction action = findActualAction(); e.getPresentation().setEnabled(action.isActive(e)); @@ -167,6 +169,7 @@ public class AbstractRerunFailedTestsAction extends AnAction implements AnAction return Filter.FAILED_OR_INTERRUPTED; } + @Override public void actionPerformed(AnActionEvent e) { findActualAction().showPopup(e); } @@ -225,6 +228,7 @@ public class AbstractRerunFailedTestsAction extends AnAction implements AnAction .setResizable(false) .setRequestFocus(true) .setItemChoosenCallback(new Runnable() { + @Override public void run() { final Object value = list.getSelectedValue(); if (value instanceof Executor) { @@ -237,12 +241,11 @@ public class AbstractRerunFailedTestsAction extends AnAction implements AnAction private void performAction(ProgramRunner runner, MyRunProfile profile, Executor executor) { try { - final ExecutionEnvironment environment = - new ExecutionEnvironmentBuilder(myEnvironment).setRunnerId(runner.getRunnerId()) - .setExecutor(executor) - .setRunProfile(profile) - .build(); - runner.execute(environment); + new ExecutionEnvironmentBuilder(myEnvironment) + .runner(runner) + .executor(executor) + .runProfile(profile) + .buildAndExecute(); } catch (ExecutionException e1) { LOG.error(e1); @@ -291,58 +294,71 @@ public class AbstractRerunFailedTestsAction extends AnAction implements AnAction } + @Override public void checkConfiguration() throws RuntimeConfigurationException { } ///////////////////////////////////Delegates + @Override public void readExternal(final Element element) throws InvalidDataException { myConfiguration.readExternal(element); } + @Override public void writeExternal(final Element element) throws WriteExternalException { myConfiguration.writeExternal(element); } + @Override @NotNull public SettingsEditor<? extends RunConfiguration> getConfigurationEditor() { return myConfiguration.getConfigurationEditor(); } + @Override @NotNull public ConfigurationType getType() { return myConfiguration.getType(); } + @Override public ConfigurationPerRunnerSettings createRunnerSettings(final ConfigurationInfoProvider provider) { return myConfiguration.createRunnerSettings(provider); } + @Override public SettingsEditor<ConfigurationPerRunnerSettings> getRunnerSettingsEditor(final ProgramRunner runner) { return myConfiguration.getRunnerSettingsEditor(runner); } + @Override public RunConfiguration clone() { return myConfiguration.clone(); } + @Override public int getUniqueID() { return myConfiguration.getUniqueID(); } + @Override public LogFileOptions getOptionsForPredefinedLogFile(PredefinedLogFile predefinedLogFile) { return myConfiguration.getOptionsForPredefinedLogFile(predefinedLogFile); } + @Override public ArrayList<PredefinedLogFile> getPredefinedLogFiles() { return myConfiguration.getPredefinedLogFiles(); } + @Override public ArrayList<LogFileOptions> getAllLogFiles() { return myConfiguration.getAllLogFiles(); } + @Override public ArrayList<LogFileOptions> getLogFiles() { return myConfiguration.getLogFiles(); } } -}
\ No newline at end of file +} |