From 86f8185f004b4f705cc86a937be01d26f7e92e51 Mon Sep 17 00:00:00 2001 From: Dmitry Trofimov Date: Sun, 9 Oct 2016 13:54:01 +0200 Subject: [PATCH] Use correct jediterm jar that includes pty related classes --- plugins/terminal/lib/jediterm-pty-2.2.jar | Bin 256546 -> 260763 bytes .../JBTerminalSystemSettingsProvider.java | 4 +-- .../terminal/LocalTerminalDirectRunner.java | 26 +----------------- 3 files changed, 3 insertions(+), 27 deletions(-) diff --git a/plugins/terminal/lib/jediterm-pty-2.2.jar b/plugins/terminal/lib/jediterm-pty-2.2.jar index 5bbc389b2302b7dcf569dd694ee83300a456a769..ca2aa5eb4288d2dbfe934d7188e336f7c37a2b2c 100644 GIT binary patch delta 13583 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

jTV1P%kCG<2lXYX^s8V#E_84 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 diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalSystemSettingsProvider.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalSystemSettingsProvider.java index b49d52f5ca2e..c1cb26720339 100644 --- a/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalSystemSettingsProvider.java +++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalSystemSettingsProvider.java @@ -31,7 +31,7 @@ import com.intellij.openapi.options.FontSize; import com.intellij.openapi.util.registry.Registry; import com.intellij.util.containers.HashMap; import com.intellij.util.messages.MessageBusConnection; -import com.jediterm.terminal.ProcessTtyConnector; +import com.jediterm.pty.PtyProcessTtyConnector; import com.jediterm.terminal.TerminalColor; import com.jediterm.terminal.TextStyle; import com.jediterm.terminal.TtyConnector; @@ -139,7 +139,7 @@ public class JBTerminalSystemSettingsProvider extends DefaultTabbedSettingsProvi @Override public String tabName(TtyConnector ttyConnector, String sessionName) { //for local terminal use name from settings - if (ttyConnector instanceof ProcessTtyConnector) { + if (ttyConnector instanceof PtyProcessTtyConnector) { return TerminalOptionsProvider.getInstance().getTabName(); } else { diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java index 53766b003395..a4c6f5846b1e 100644 --- a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java +++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java @@ -31,10 +31,9 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.ArrayUtil; import com.intellij.util.concurrency.AppExecutorUtil; import com.intellij.util.containers.HashMap; -import com.jediterm.terminal.ProcessTtyConnector; +import com.jediterm.pty.PtyProcessTtyConnector; import com.jediterm.terminal.TtyConnector; import com.pty4j.PtyProcess; -import com.pty4j.WinSize; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -142,29 +141,6 @@ public class LocalTerminalDirectRunner extends AbstractTerminalRunner