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

do not show run configuration settings if show settings enabled via edit run configuration from choose configuration popup on run/debug

Browse Source
This commit is contained in:
Alexey Pegov
2010-11-10 13:55:48 +03:00
parent 9a4c04296a
commit 9545e356a5
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java
+7 -2
View File
@@ -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()));
platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java
+1 -1
View File
@@ -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);
}
}