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

Use correct jediterm jar that includes pty related classes

Browse Source
This commit is contained in:
Dmitry Trofimov
2016-10-09 13:55:06 +02:00
parent 1d99dbead9
commit 86f8185f00
3 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/terminal/lib/jediterm-pty-2.2.jar
BIN
View File
Binary file not shown.
plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalSystemSettingsProvider.java
+2 -2
View File
@@ -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 {
plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
+1 -25
View File
@@ -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<PtyProcess
return new PtyProcessTtyConnector(process, myDefaultCharset);
}
public static class PtyProcessTtyConnector extends ProcessTtyConnector {
private PtyProcess myProcess;
public PtyProcessTtyConnector(PtyProcess process, Charset charset) {
super(process, charset);
this.myProcess = process;
}
protected void resizeImmediately() {
if(this.getPendingTermSize() != null && this.getPendingPixelSize() != null) {
this.myProcess.setWinSize(new WinSize(this.getPendingTermSize().width, this.getPendingTermSize().height, this.getPendingPixelSize().width, this.getPendingPixelSize().height));
}
}
public boolean isConnected() {
return this.myProcess.isRunning();
}
public String getName() {
return "Local";
}
}
@Override
public String runningTargetName() {
return "Local Terminal";