From b73d54f1fb12ff1c4550a98ec6d30c1b00ab436f Mon Sep 17 00:00:00 2001
From: Roman Chernyatchik <roman.chernyatchik@jetbrains.com>
Date: Sat, 22 Oct 2011 20:48:48 +0400
Subject: [PATCH] RunnerMediator: send ctrl-break before closing stream (last
 change was incorrect and should be reverted)

---
 .../com/intellij/execution/RunConfigurationExtension.java    | 3 +--
 .../execution/configuration/AbstractRunConfiguration.java    | 5 -----
 .../configuration/RunConfigurationExtensionBase.java         | 2 +-
 .../configuration/RunConfigurationExtensionsManager.java     | 4 ++--
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/java/execution/impl/src/com/intellij/execution/RunConfigurationExtension.java b/java/execution/impl/src/com/intellij/execution/RunConfigurationExtension.java
index a3066bd63554..2353f470ff43 100644
--- a/java/execution/impl/src/com/intellij/execution/RunConfigurationExtension.java
+++ b/java/execution/impl/src/com/intellij/execution/RunConfigurationExtension.java
@@ -22,7 +22,6 @@
  */
 package com.intellij.execution;
 
-import com.intellij.execution.configuration.AbstractRunConfiguration;
 import com.intellij.execution.configuration.RunConfigurationExtensionBase;
 import com.intellij.execution.configurations.GeneralCommandLine;
 import com.intellij.execution.configurations.JavaParameters;
@@ -45,7 +44,7 @@ public abstract class RunConfigurationExtension extends RunConfigurationExtensio
   protected void patchCommandLine(@NotNull RunConfigurationBase configuration,
                                   RunnerSettings runnerSettings,
                                   @NotNull GeneralCommandLine cmdLine,
-                                  @NotNull AbstractRunConfiguration.RunnerType type)  throws ExecutionException {}
+                                  @NotNull String runnerId)  throws ExecutionException {}
 
   @Override
   protected boolean isEnabledFor(@NotNull RunConfigurationBase applicableConfiguration, @Nullable RunnerSettings runnerSettings) {
diff --git a/platform/lang-api/src/com/intellij/execution/configuration/AbstractRunConfiguration.java b/platform/lang-api/src/com/intellij/execution/configuration/AbstractRunConfiguration.java
index 8401725189fc..0a21fc63d03e 100644
--- a/platform/lang-api/src/com/intellij/execution/configuration/AbstractRunConfiguration.java
+++ b/platform/lang-api/src/com/intellij/execution/configuration/AbstractRunConfiguration.java
@@ -33,9 +33,4 @@ public abstract class AbstractRunConfiguration extends ModuleBasedConfiguration<
   public void setPassParentEnvs(final boolean passParentEnvs) {
     myPassParentEnvs = passParentEnvs;
   }
-
-  public enum RunnerType {
-    RUN,
-    DEBUG
-  }
 }
diff --git a/platform/lang-api/src/com/intellij/execution/configuration/RunConfigurationExtensionBase.java b/platform/lang-api/src/com/intellij/execution/configuration/RunConfigurationExtensionBase.java
index 8135fbb214d3..3b792865ba51 100644
--- a/platform/lang-api/src/com/intellij/execution/configuration/RunConfigurationExtensionBase.java
+++ b/platform/lang-api/src/com/intellij/execution/configuration/RunConfigurationExtensionBase.java
@@ -65,7 +65,7 @@ public abstract class RunConfigurationExtensionBase<T extends RunConfigurationBa
 
   protected abstract void patchCommandLine(@NotNull final T configuration,
                                            RunnerSettings runnerSettings, @NotNull final GeneralCommandLine cmdLine,
-                                           @NotNull final AbstractRunConfiguration.RunnerType type) throws ExecutionException;
+                                           @NotNull final String runnerId) throws ExecutionException;
 
   /**
    * Validate extensions after general configuration validation passed
diff --git a/platform/lang-api/src/com/intellij/execution/configuration/RunConfigurationExtensionsManager.java b/platform/lang-api/src/com/intellij/execution/configuration/RunConfigurationExtensionsManager.java
index 28305a75e286..56933d623bce 100644
--- a/platform/lang-api/src/com/intellij/execution/configuration/RunConfigurationExtensionsManager.java
+++ b/platform/lang-api/src/com/intellij/execution/configuration/RunConfigurationExtensionsManager.java
@@ -135,10 +135,10 @@ public class RunConfigurationExtensionsManager<U extends RunConfigurationBase, T
   public void patchCommandLine(@NotNull final U configuration,
                                final RunnerSettings runnerSettings,
                                @NotNull final GeneralCommandLine cmdLine,
-                               @NotNull final AbstractRunConfiguration.RunnerType type) throws ExecutionException {
+                               @NotNull final String runnerId) throws ExecutionException {
     // only for enabled extensions
     for (T extension : getEnabledExtensions(configuration, runnerSettings)) {
-      extension.patchCommandLine(configuration, runnerSettings, cmdLine, type);
+      extension.patchCommandLine(configuration, runnerSettings, cmdLine, runnerId);
     }
   }