mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-09 18:56:02 +02:00
NEW - bug 262996: [terminal] get rid of the State.OPEN
https://bugs.eclipse.org/bugs/show_bug.cgi?id=262996
This commit is contained in:
parent
115745f558
commit
2f20846ffe
5 changed files with 1 additions and 17 deletions
|
@ -122,7 +122,6 @@ public class SerialConnectWorker extends Thread {
|
||||||
final String strID = getOwnershipId();
|
final String strID = getOwnershipId();
|
||||||
SerialPort serialPort = null;
|
SerialPort serialPort = null;
|
||||||
try {
|
try {
|
||||||
fControl.setState(TerminalState.OPENED);
|
|
||||||
ISerialSettings s=fConn.getSerialSettings();
|
ISerialSettings s=fConn.getSerialSettings();
|
||||||
portName=s.getSerialPort();
|
portName=s.getSerialPort();
|
||||||
try {
|
try {
|
||||||
|
|
|
@ -307,8 +307,7 @@ public class TerminalView extends ViewPart implements ITerminalView, ITerminalVi
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isConnecting() {
|
private boolean isConnecting() {
|
||||||
return fCtlTerminal.getState()==TerminalState.CONNECTING
|
return fCtlTerminal.getState()==TerminalState.CONNECTING;
|
||||||
|| fCtlTerminal.getState()==TerminalState.OPENED;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onTerminalDisconnect() {
|
public void onTerminalDisconnect() {
|
||||||
|
|
|
@ -146,8 +146,6 @@ class TerminalViewConnection implements ITerminalViewConnection {
|
||||||
return ViewMessages.STATE_CONNECTED;
|
return ViewMessages.STATE_CONNECTED;
|
||||||
} else if(state==TerminalState.CONNECTING) {
|
} else if(state==TerminalState.CONNECTING) {
|
||||||
return ViewMessages.STATE_CONNECTING;
|
return ViewMessages.STATE_CONNECTING;
|
||||||
} else if(state==TerminalState.OPENED) {
|
|
||||||
return ViewMessages.STATE_OPENED;
|
|
||||||
} else if(state==TerminalState.CLOSED) {
|
} else if(state==TerminalState.CLOSED) {
|
||||||
return ViewMessages.STATE_CLOSED;
|
return ViewMessages.STATE_CLOSED;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -232,13 +232,6 @@ public class VT100Emulator implements ControlListener {
|
||||||
// */
|
// */
|
||||||
public void processText() {
|
public void processText() {
|
||||||
try {
|
try {
|
||||||
// If the status bar is showing "OPENED", change it to "CONNECTED".
|
|
||||||
|
|
||||||
if (terminal.getState()==TerminalState.OPENED) {
|
|
||||||
// TODO Why????
|
|
||||||
terminal.setState(TerminalState.CONNECTED);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Find the width and height of the terminal, and resize it to display an
|
// Find the width and height of the terminal, and resize it to display an
|
||||||
// integral number of lines and columns.
|
// integral number of lines and columns.
|
||||||
|
|
||||||
|
|
|
@ -29,11 +29,6 @@ public class TerminalState {
|
||||||
*/
|
*/
|
||||||
public final static TerminalState CLOSED=new TerminalState("CLOSED"); //$NON-NLS-1$
|
public final static TerminalState CLOSED=new TerminalState("CLOSED"); //$NON-NLS-1$
|
||||||
|
|
||||||
/**
|
|
||||||
* FIXME Get rid of this state it is equivalent to CONNECTING.
|
|
||||||
*/
|
|
||||||
public final static TerminalState OPENED=new TerminalState("OPENED"); //$NON-NLS-1$
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The terminal is about to connect.
|
* The terminal is about to connect.
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Add table
Reference in a new issue