NEW - bug 262996: [terminal] get rid of the State.OPEN

https://bugs.eclipse.org/bugs/show_bug.cgi?id=262996

5 files changed, 1 insertions, 17 deletions

diff --git a/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialConnectWorker.java b/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialConnectWorker.java
index 4d9584d5a..2fd0d9c03 100644
--- a/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialConnectWorker.java
+++ b/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialConnectWorker.java
@@ -122,7 +122,6 @@ public class SerialConnectWorker extends Thread {
 		final String strID = getOwnershipId();
 		SerialPort serialPort = null;
 		try {
-			fControl.setState(TerminalState.OPENED);
 			ISerialSettings s=fConn.getSerialSettings();
 			portName=s.getSerialPort();
 			try {
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java
index fafd0b12d..ed116cbd2 100644
--- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java
+++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java
@@ -307,8 +307,7 @@ public class TerminalView extends ViewPart implements ITerminalView, ITerminalVi
 	}
 
 	private boolean isConnecting() {
-		return fCtlTerminal.getState()==TerminalState.CONNECTING
-		    || fCtlTerminal.getState()==TerminalState.OPENED;
+		return fCtlTerminal.getState()==TerminalState.CONNECTING;
 	}
 
 	public void onTerminalDisconnect() {
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewConnection.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewConnection.java
index eb719309e..973136a5d 100644
--- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewConnection.java
+++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewConnection.java
@@ -146,8 +146,6 @@ class TerminalViewConnection implements ITerminalViewConnection {
 			return ViewMessages.STATE_CONNECTED;
 		} else if(state==TerminalState.CONNECTING) {
 			return ViewMessages.STATE_CONNECTING;
-		} else if(state==TerminalState.OPENED) {
-			return ViewMessages.STATE_OPENED;
 		} else if(state==TerminalState.CLOSED) {
 			return ViewMessages.STATE_CLOSED;
 		} else {
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java
index d1dd6cee6..4604ca4c4 100644
--- a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java
+++ b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java
@@ -232,13 +232,6 @@ public class VT100Emulator implements ControlListener {
 //	 */
 	public void processText() {
 		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
 			// integral number of lines and columns.
 
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalState.java b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalState.java
index 5c7112c1c..fe1b48c64 100644
--- a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalState.java
+++ b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalState.java
@@ -30,11 +30,6 @@ public class TerminalState {
 	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.
 	 */
 	public final static TerminalState CONNECTING=new TerminalState("CONNECTING..."); //$NON-NLS-1$