mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-31 21:05:37 +02:00
Merge "Bug 528470 - Can't retrieve an active console if connection is removed"
This commit is contained in:
commit
7cbc345a31
2 changed files with 14 additions and 1 deletions
|
@ -0,0 +1,11 @@
|
||||||
|
package org.eclipse.remote.console;
|
||||||
|
|
||||||
|
import org.eclipse.remote.core.IRemoteConnection;
|
||||||
|
|
||||||
|
public interface ITerminalConsole {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return The {@link IRemoteConnection} associated to this {@link ITerminalConsole}
|
||||||
|
*/
|
||||||
|
public IRemoteConnection getConnection();
|
||||||
|
}
|
|
@ -13,6 +13,7 @@ package org.eclipse.remote.internal.console;
|
||||||
import org.eclipse.core.runtime.IProgressMonitor;
|
import org.eclipse.core.runtime.IProgressMonitor;
|
||||||
import org.eclipse.core.runtime.IStatus;
|
import org.eclipse.core.runtime.IStatus;
|
||||||
import org.eclipse.core.runtime.Status;
|
import org.eclipse.core.runtime.Status;
|
||||||
|
import org.eclipse.remote.console.ITerminalConsole;
|
||||||
import org.eclipse.remote.core.IRemoteConnection;
|
import org.eclipse.remote.core.IRemoteConnection;
|
||||||
import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
|
import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
|
||||||
import org.eclipse.ui.console.AbstractConsole;
|
import org.eclipse.ui.console.AbstractConsole;
|
||||||
|
@ -20,7 +21,7 @@ import org.eclipse.ui.console.IConsoleView;
|
||||||
import org.eclipse.ui.part.IPageBookViewPage;
|
import org.eclipse.ui.part.IPageBookViewPage;
|
||||||
import org.eclipse.ui.progress.UIJob;
|
import org.eclipse.ui.progress.UIJob;
|
||||||
|
|
||||||
public class TerminalConsole extends AbstractConsole {
|
public class TerminalConsole extends AbstractConsole implements ITerminalConsole {
|
||||||
private final String encoding;
|
private final String encoding;
|
||||||
private final TerminalConsoleConnector terminalConnector;
|
private final TerminalConsoleConnector terminalConnector;
|
||||||
private final int index;
|
private final int index;
|
||||||
|
@ -36,6 +37,7 @@ public class TerminalConsole extends AbstractConsole {
|
||||||
return terminalConnector;
|
return terminalConnector;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public IRemoteConnection getConnection() {
|
public IRemoteConnection getConnection() {
|
||||||
return terminalConnector.getConnection();
|
return terminalConnector.getConnection();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue