From 415bd344625b2d03f76bf26d9e71f29bdd4847b8 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Wed, 19 Feb 2014 20:01:21 +0100
Subject: [PATCH] ConsoleExecuteActionHandler renamed to
 ProcessBackedConsoleExecuteActionHandler

---
 .../execution/console/ConsoleExecuteAction.java      |  3 ++-
 .../runners/AbstractConsoleRunnerWithHistory.java    | 12 ++++++------
 ...=> ProcessBackedConsoleExecuteActionHandler.java} |  4 ++--
 .../groovy/console/GroovyShellActionBase.java        |  6 +++---
 .../console/PydevConsoleExecuteActionHandler.java    |  4 ++--
 .../jetbrains/python/console/PydevConsoleRunner.java |  4 ++--
 6 files changed, 17 insertions(+), 16 deletions(-)
 rename platform/lang-impl/src/com/intellij/execution/runners/{ConsoleExecuteActionHandler.java => ProcessBackedConsoleExecuteActionHandler.java} (90%)

diff --git a/platform/lang-impl/src/com/intellij/execution/console/ConsoleExecuteAction.java b/platform/lang-impl/src/com/intellij/execution/console/ConsoleExecuteAction.java
index 08a5d36162f6..6013e51b34bb 100644
--- a/platform/lang-impl/src/com/intellij/execution/console/ConsoleExecuteAction.java
+++ b/platform/lang-impl/src/com/intellij/execution/console/ConsoleExecuteAction.java
@@ -18,6 +18,7 @@ package com.intellij.execution.console;
 import com.intellij.codeInsight.lookup.Lookup;
 import com.intellij.codeInsight.lookup.LookupManager;
 import com.intellij.execution.process.ConsoleHistoryModel;
+import com.intellij.execution.runners.ProcessBackedConsoleExecuteActionHandler;
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.EmptyAction;
@@ -49,7 +50,7 @@ public class ConsoleExecuteAction extends DumbAwareAction {
    * to remove in IDEA 14
    */
   public static ConsoleExecuteAction createAction(@NotNull final LanguageConsoleImpl languageConsole,
-                                                  @NotNull com.intellij.execution.runners.ConsoleExecuteActionHandler consoleExecuteActionHandler) {
+                                                  @NotNull ProcessBackedConsoleExecuteActionHandler consoleExecuteActionHandler) {
     final ConsoleExecuteActionHandler handler = consoleExecuteActionHandler;
     return new ConsoleExecuteAction(languageConsole, new ConsoleExecuteActionHandler(handler.myPreserveMarkup) {
       @Override
diff --git a/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java b/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java
index 89bb4b54c3fa..e50a6e6a579e 100644
--- a/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java
+++ b/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java
@@ -58,7 +58,7 @@ public abstract class AbstractConsoleRunnerWithHistory<T extends LanguageConsole
 
   private final Project myProject;
 
-  private ConsoleExecuteActionHandler myConsoleExecuteActionHandler;
+  private ProcessBackedConsoleExecuteActionHandler myConsoleExecuteActionHandler;
 
   public AbstractConsoleRunnerWithHistory(@NotNull Project project, @NotNull String consoleTitle, @Nullable String workingDir) {
     myProject = project;
@@ -251,12 +251,12 @@ public abstract class AbstractConsoleRunnerWithHistory<T extends LanguageConsole
    */
   public static AnAction createConsoleExecAction(@NotNull LanguageConsoleView console,
                                                  @NotNull ProcessHandler processHandler,
-                                                 @NotNull ConsoleExecuteActionHandler consoleExecuteActionHandler) {
+                                                 @NotNull ProcessBackedConsoleExecuteActionHandler consoleExecuteActionHandler) {
     return createConsoleExecAction(console, consoleExecuteActionHandler);
   }
 
   public static AnAction createConsoleExecAction(@NotNull LanguageConsoleView console,
-                                                 @NotNull ConsoleExecuteActionHandler consoleExecuteActionHandler) {
+                                                 @NotNull ProcessBackedConsoleExecuteActionHandler consoleExecuteActionHandler) {
     return new ConsoleExecuteAction(console, consoleExecuteActionHandler, consoleExecuteActionHandler.getEmptyExecuteAction(),
                                     consoleExecuteActionHandler);
   }
@@ -268,12 +268,12 @@ public abstract class AbstractConsoleRunnerWithHistory<T extends LanguageConsole
    */
   public static AnAction createConsoleExecAction(LanguageConsoleImpl languageConsole,
                                                  ProcessHandler processHandler,
-                                                 ConsoleExecuteActionHandler consoleExecuteActionHandler) {
+                                                 ProcessBackedConsoleExecuteActionHandler consoleExecuteActionHandler) {
     return ConsoleExecuteAction.createAction(languageConsole, consoleExecuteActionHandler);
   }
 
   @NotNull
-  protected abstract ConsoleExecuteActionHandler createConsoleExecuteActionHandler();
+  protected abstract ProcessBackedConsoleExecuteActionHandler createConsoleExecuteActionHandler();
 
   public T getConsoleView() {
     return myConsoleView;
@@ -295,7 +295,7 @@ public abstract class AbstractConsoleRunnerWithHistory<T extends LanguageConsole
     return myProcessHandler;
   }
 
-  public ConsoleExecuteActionHandler getConsoleExecuteActionHandler() {
+  public ProcessBackedConsoleExecuteActionHandler getConsoleExecuteActionHandler() {
     return myConsoleExecuteActionHandler;
   }
 }
diff --git a/platform/lang-impl/src/com/intellij/execution/runners/ConsoleExecuteActionHandler.java b/platform/lang-impl/src/com/intellij/execution/runners/ProcessBackedConsoleExecuteActionHandler.java
similarity index 90%
rename from platform/lang-impl/src/com/intellij/execution/runners/ConsoleExecuteActionHandler.java
rename to platform/lang-impl/src/com/intellij/execution/runners/ProcessBackedConsoleExecuteActionHandler.java
index 324c4de88211..eb94b36be8fd 100644
--- a/platform/lang-impl/src/com/intellij/execution/runners/ConsoleExecuteActionHandler.java
+++ b/platform/lang-impl/src/com/intellij/execution/runners/ProcessBackedConsoleExecuteActionHandler.java
@@ -29,10 +29,10 @@ import java.nio.charset.Charset;
 /**
  * @author traff
  */
-public class ConsoleExecuteActionHandler extends BaseConsoleExecuteActionHandler implements Condition<LanguageConsoleImpl> {
+public class ProcessBackedConsoleExecuteActionHandler extends BaseConsoleExecuteActionHandler implements Condition<LanguageConsoleImpl> {
   private volatile ProcessHandler myProcessHandler;
 
-  public ConsoleExecuteActionHandler(ProcessHandler processHandler, boolean preserveMarkup) {
+  public ProcessBackedConsoleExecuteActionHandler(ProcessHandler processHandler, boolean preserveMarkup) {
     super(preserveMarkup);
 
     myProcessHandler = processHandler;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyShellActionBase.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyShellActionBase.java
index e9d51510d059..92f29c0a1cc1 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyShellActionBase.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyShellActionBase.java
@@ -23,7 +23,7 @@ import com.intellij.execution.console.LanguageConsoleView;
 import com.intellij.execution.console.LanguageConsoleViewImpl;
 import com.intellij.execution.process.OSProcessHandler;
 import com.intellij.execution.runners.AbstractConsoleRunnerWithHistory;
-import com.intellij.execution.runners.ConsoleExecuteActionHandler;
+import com.intellij.execution.runners.ProcessBackedConsoleExecuteActionHandler;
 import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
@@ -240,8 +240,8 @@ public abstract class GroovyShellActionBase extends DumbAwareAction {
 
     @NotNull
     @Override
-    protected ConsoleExecuteActionHandler createConsoleExecuteActionHandler() {
-      ConsoleExecuteActionHandler handler = new ConsoleExecuteActionHandler(getProcessHandler(), false) {
+    protected ProcessBackedConsoleExecuteActionHandler createConsoleExecuteActionHandler() {
+      ProcessBackedConsoleExecuteActionHandler handler = new ProcessBackedConsoleExecuteActionHandler(getProcessHandler(), false) {
         @Override
         public void processLine(@NotNull String line) {
           super.processLine(myShellRunner.transformUserInput(line));
diff --git a/python/src/com/jetbrains/python/console/PydevConsoleExecuteActionHandler.java b/python/src/com/jetbrains/python/console/PydevConsoleExecuteActionHandler.java
index 809d957b7be1..48bc723ddc1a 100644
--- a/python/src/com/jetbrains/python/console/PydevConsoleExecuteActionHandler.java
+++ b/python/src/com/jetbrains/python/console/PydevConsoleExecuteActionHandler.java
@@ -19,7 +19,7 @@ import com.intellij.codeInsight.hint.HintManager;
 import com.intellij.execution.console.LanguageConsoleImpl;
 import com.intellij.execution.console.LanguageConsoleView;
 import com.intellij.execution.process.ProcessHandler;
-import com.intellij.execution.runners.ConsoleExecuteActionHandler;
+import com.intellij.execution.runners.ProcessBackedConsoleExecuteActionHandler;
 import com.intellij.openapi.application.Result;
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.editor.Editor;
@@ -43,7 +43,7 @@ import org.jetbrains.annotations.Nullable;
 /**
  * @author traff
  */
-public class PydevConsoleExecuteActionHandler extends ConsoleExecuteActionHandler implements ConsoleCommunicationListener {
+public class PydevConsoleExecuteActionHandler extends ProcessBackedConsoleExecuteActionHandler implements ConsoleCommunicationListener {
   private final LanguageConsoleView myConsoleView;
 
   private String myInMultilineStringState = null;
diff --git a/python/src/com/jetbrains/python/console/PydevConsoleRunner.java b/python/src/com/jetbrains/python/console/PydevConsoleRunner.java
index e7952a3c01ad..fb284493443f 100644
--- a/python/src/com/jetbrains/python/console/PydevConsoleRunner.java
+++ b/python/src/com/jetbrains/python/console/PydevConsoleRunner.java
@@ -28,7 +28,7 @@ import com.intellij.execution.process.ProcessAdapter;
 import com.intellij.execution.process.ProcessEvent;
 import com.intellij.execution.process.ProcessOutputTypes;
 import com.intellij.execution.runners.AbstractConsoleRunnerWithHistory;
-import com.intellij.execution.runners.ConsoleExecuteActionHandler;
+import com.intellij.execution.runners.ProcessBackedConsoleExecuteActionHandler;
 import com.intellij.execution.ui.RunContentDescriptor;
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.*;
@@ -568,7 +568,7 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
 
   @NotNull
   @Override
-  protected ConsoleExecuteActionHandler createConsoleExecuteActionHandler() {
+  protected ProcessBackedConsoleExecuteActionHandler createConsoleExecuteActionHandler() {
     myConsoleExecuteActionHandler =
       new PydevConsoleExecuteActionHandler(getConsoleView(), getProcessHandler(), myPydevConsoleCommunication);
     myConsoleExecuteActionHandler.setEnabled(false);