From 84202ee9a30d22c7edba2ffef8fd946d91930d21 Mon Sep 17 00:00:00 2001 From: Dmitry Trofimov Date: Wed, 31 Dec 2014 01:26:27 +0100 Subject: [PATCH] Revert async terminal process creation as it doesn't work for toolwindow initialization (IDEA-134741). --- .../terminal/AbstractTerminalRunner.java | 32 +++++-------------- 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/AbstractTerminalRunner.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/AbstractTerminalRunner.java index 868cccf4ca17..a30ff9b42828 100644 --- a/plugins/terminal/src/org/jetbrains/plugins/terminal/AbstractTerminalRunner.java +++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/AbstractTerminalRunner.java @@ -9,7 +9,6 @@ import com.intellij.execution.ui.RunContentDescriptor; import com.intellij.execution.ui.actions.CloseAction; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.*; -import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; @@ -177,30 +176,15 @@ public abstract class AbstractTerminalRunner { public abstract String runningTargetName(); - public void openSessionInDirectory(final @NotNull TerminalWidget terminalWidget, final @Nullable String directory) { + public void openSessionInDirectory(@NotNull TerminalWidget terminalWidget, @Nullable String directory) { // Create Server process - ApplicationManager.getApplication().executeOnPooledThread(new Runnable() { - @Override - public void run() { - try { - final T process = createProcess(directory); + try { + final T process = createProcess(directory); - UIUtil.invokeLaterIfNeeded(new Runnable() { - @Override - public void run() { - createAndStartSession(terminalWidget, createTtyConnector(process)); - } - }); - } - catch (final Exception e) { - UIUtil.invokeLaterIfNeeded(new Runnable() { - @Override - public void run() { - Messages.showErrorDialog(e.getMessage(), "Can't Open " + runningTargetName()); - } - }); - } - } - }); + createAndStartSession(terminalWidget, createTtyConnector(process)); + } + catch (Exception e) { + Messages.showErrorDialog(e.getMessage(), "Can't Open " + runningTargetName()); + } } }