From eae9d198302e083396c8a6fe91e8710aa8b85ab6 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Thu, 14 Oct 2010 11:50:02 +0400
Subject: [PATCH] IDEA-56088: gwt: provide development mode runner integrated
 within IDEA

---
 .../intellij/execution/runners/RunContentBuilder.java    | 6 +++---
 .../util/io/socketConnection/impl/ResponseProcessor.java | 9 +++++----
 .../com/intellij/xdebugger/impl/ui/XDebugSessionTab.java | 3 ++-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java b/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java
index c4869ac56c9d..c832b4051e12 100644
--- a/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java
+++ b/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java
@@ -153,10 +153,11 @@ public class RunContentBuilder implements LogConsoleManager, Disposable  {
                                                       IconLoader.getIcon("/debugger/console.png"),
                                                       console.getPreferredFocusableComponent());
 
-    addAdditionalConsoleEditorActions(ui, console, consoleContent);
+    addAdditionalConsoleEditorActions(console, consoleContent);
+    ui.addContent(consoleContent, 0, PlaceInGrid.bottom, false);
   }
 
-  public static void addAdditionalConsoleEditorActions(final RunnerLayoutUi ui, final ExecutionConsole console, final Content consoleContent) {
+  public static void addAdditionalConsoleEditorActions(final ExecutionConsole console, final Content consoleContent) {
     final DefaultActionGroup consoleActions = new DefaultActionGroup();
     if (console instanceof ConsoleView) {
       AnAction[] actions = ((ConsoleView)console).createConsoleActions();
@@ -166,7 +167,6 @@ public class RunContentBuilder implements LogConsoleManager, Disposable  {
     }
 
     consoleContent.setActions(consoleActions, ActionPlaces.UNKNOWN, console.getComponent());
-    ui.addContent(consoleContent, 0, PlaceInGrid.bottom, false);
   }
 
   public void addLogConsole(final String name, final String path, final long skippedContent) {
diff --git a/platform/platform-impl/src/com/intellij/util/io/socketConnection/impl/ResponseProcessor.java b/platform/platform-impl/src/com/intellij/util/io/socketConnection/impl/ResponseProcessor.java
index 5e0c7ca7756f..90b242961dd4 100644
--- a/platform/platform-impl/src/com/intellij/util/io/socketConnection/impl/ResponseProcessor.java
+++ b/platform/platform-impl/src/com/intellij/util/io/socketConnection/impl/ResponseProcessor.java
@@ -1,6 +1,5 @@
 package com.intellij.util.io.socketConnection.impl;
 
-import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.MultiValuesMap;
@@ -14,7 +13,9 @@ import gnu.trove.TObjectProcedure;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * @author nik
@@ -29,8 +30,8 @@ public class ResponseProcessor<R extends AbstractResponse> {
   private Thread myThread;
   private final Alarm myTimeoutAlarm;
 
-  public ResponseProcessor(Disposable parentDisposable) {
-    myTimeoutAlarm = new Alarm(Alarm.ThreadToUse.SHARED_THREAD, parentDisposable);
+  public ResponseProcessor(SocketConnection<?, R> connection) {
+    myTimeoutAlarm = new Alarm(Alarm.ThreadToUse.SHARED_THREAD, connection);
   }
 
   public void startReading(final ResponseReader<R> reader) {
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java
index dcd84e4df2e9..9fcb8225f43a 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java
@@ -190,7 +190,8 @@ public class XDebugSessionTab extends DebuggerSessionTabBase {
       }, consoleContent);
     }
     session.getDebugProcess().registerAdditionalContent(myUi);
-    RunContentBuilder.addAdditionalConsoleEditorActions(myUi, myConsole, consoleContent);
+    RunContentBuilder.addAdditionalConsoleEditorActions(myConsole, consoleContent);
+    myUi.addContent(consoleContent, 0, PlaceInGrid.bottom, false);
 
     if (ApplicationManager.getApplication().isUnitTestMode()) {
       return myRunContentDescriptor;