From 9545e356a5c5f359ba3554acf4b00fbbe956266c Mon Sep 17 00:00:00 2001 From: Alexey Pegov Date: Wed, 10 Nov 2010 13:55:48 +0300 Subject: [PATCH] do not show run configuration settings if show settings enabled via edit run configuration from choose configuration popup on run/debug --- .../src/com/intellij/execution/ProgramRunnerUtil.java | 9 +++++++-- .../execution/actions/ChooseRunConfigurationAction.java | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java b/platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java index f974986590be..61e535774ca6 100644 --- a/platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java +++ b/platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java @@ -48,7 +48,7 @@ public class ProgramRunnerUtil { } public static void executeConfiguration(@NotNull final Project project, @NotNull final RunnerAndConfigurationSettings configuration, - @NotNull final Executor executor) { + @NotNull final Executor executor, final boolean showSettings) { ProgramRunner runner = getRunner(executor.getId(), configuration); if (runner == null) { LOG.error("Runner MUST not be null! Cannot find runner for " + executor.getId() + " and " + configuration.getConfiguration().getFactory().getName()); @@ -58,7 +58,7 @@ public class ProgramRunnerUtil { return; } - if (!RunManagerImpl.canRunConfiguration(configuration, executor) || RunManagerImpl.isEditBeforeRun(configuration)) { + if (!RunManagerImpl.canRunConfiguration(configuration, executor) || (showSettings && RunManagerImpl.isEditBeforeRun(configuration))) { final boolean result = RunDialog.editConfiguration(project, configuration, "Edit configuration", executor.getActionName(), executor.getIcon()); if (!result) { return; @@ -84,6 +84,11 @@ public class ProgramRunnerUtil { } } + public static void executeConfiguration(@NotNull final Project project, @NotNull final RunnerAndConfigurationSettings configuration, + @NotNull final Executor executor) { + executeConfiguration(project, configuration, executor, true); + } + public static Icon getConfigurationIcon(final Project project, final RunnerAndConfigurationSettings settings, final boolean invalid) { final RunManager runManager = RunManager.getInstance(project); return getConfigurationIcon(settings, invalid, runManager.isTemporary(settings.getConfiguration())); diff --git a/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java b/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java index b8beb5b94ec6..95485e768ff4 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java +++ b/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java @@ -220,7 +220,7 @@ public class ChooseRunConfigurationAction extends AnAction { PropertiesComponent.getInstance().setValue("run.configuration.edit.ad", Boolean.toString(true)); if (RunDialog.editConfiguration(project, configuration, "Edit configuration settings", executor.getActionName(), executor.getIcon())) { RunManagerEx.getInstanceEx(project).setSelectedConfiguration(configuration); - ProgramRunnerUtil.executeConfiguration(project, configuration, executor); + ProgramRunnerUtil.executeConfiguration(project, configuration, executor, false); } }