From 4f3c46baeceffa1b5d2b7c02ad063ecdb36b6043 Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Sun, 8 Jul 2012 11:23:08 +0200 Subject: [PATCH] AppCode:Run Configurations: executable target support (OC-3083) AppCode:Instruments: refactored runner, now uses same base as a normal runner, tests support (OC-2373) --- .../com/intellij/execution/runners/ExecutionEnvironment.java | 3 ++- .../execution/actions/RunConfigurationsComboBoxAction.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironment.java b/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironment.java index 7dbe431fa8c0..58385f88e55f 100644 --- a/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironment.java +++ b/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironment.java @@ -25,13 +25,14 @@ import com.intellij.execution.ui.RunContentDescriptor; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.UserDataHolderBase; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; -public class ExecutionEnvironment { +public class ExecutionEnvironment extends UserDataHolderBase { @Nullable private final Project myProject; @NotNull private RunProfile myRunProfile; diff --git a/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java b/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java index f9f6d8c663fa..2496c1a8e981 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java +++ b/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java @@ -99,6 +99,10 @@ public class RunConfigurationsComboBoxAction extends ComboBoxAction implements D String name = settings.getName(); if (target != DefaultExecutionTarget.INSTANCE) { name += " | " + target.getDisplayName(); + } else { + if (!settings.canRunOn(target)) { + name += " | Nothing to run on"; + } } presentation.setText(name, false); setConfigurationIcon(presentation, settings, project);