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

IDEA-56088: gwt: provide development mode runner integrated within IDEA

Browse Source
This commit is contained in:
nik
2010-10-14 11:51:06 +04:00
parent 4027169d22
commit eae9d19830
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java
+3 -3
View File
@@ -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) {
platform/platform-impl/src/com/intellij/util/io/socketConnection/impl/ResponseProcessor.java
+5 -4
View File
@@ -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) {
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java
+2 -1
View File
@@ -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;