From 10633e6ac95970854d5f7bf5de3730f4e1352dc5 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Sun, 1 Feb 2009 12:40:23 +0000 Subject: [PATCH] [262996] get rid of TerminalState.OPENED --- .../tm/internal/terminal/serial/SerialConnectWorker.java | 3 ++- .../internal/terminal/actions/TerminalActionNewTerminal.java | 2 +- .../org/eclipse/tm/internal/terminal/view/TerminalView.java | 3 ++- .../tm/internal/terminal/view/TerminalViewConnection.java | 3 ++- .../org/eclipse/tm/internal/terminal/view/ViewMessages.java | 4 ++-- .../eclipse/tm/internal/terminal/view/ViewMessages.properties | 4 ++-- .../eclipse/tm/internal/terminal/emulator/VT100Emulator.java | 3 ++- .../tm/internal/terminal/provisional/api/TerminalState.java | 3 ++- 8 files changed, 15 insertions(+), 10 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 2fd0d9c03d2..673f1111e13 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2008 Wind River Systems, Inc. and others. + * Copyright (c) 2003, 2009 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -17,6 +17,7 @@ * Martin Oberhuber (Wind River) - [208029] COM port not released after quick disconnect/reconnect * Martin Oberhuber (Wind River) - [206884] Update Terminal Ownership ID to "org.eclipse.tm.terminal.serial" * Martin Oberhuber (Wind River) - [221184] Redesign Serial Terminal Ownership Handling + * Michael Scharf (Wind River) - [262996] get rid of TerminalState.OPENED *******************************************************************************/ package org.eclipse.tm.internal.terminal.serial; diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionNewTerminal.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionNewTerminal.java index e1376916401..7c3770f5e3b 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionNewTerminal.java +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionNewTerminal.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2005, 2008 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at 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 ed116cbd20e..0ab125ae1f4 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2008 Wind River Systems, Inc. and others. + * Copyright (c) 2003, 2009 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -23,6 +23,7 @@ * Michael Scharf (Wind River) - [240023] Get rid of the terminal's "Pin" button * Michael Scharf (Wind River) - [196454] Initial connection settings dialog should not be blank * Michael Scharf (Wind River) - [241096] Secondary terminals in same view do not observe the "invert colors" Preference + * Michael Scharf (Wind River) - [262996] get rid of TerminalState.OPENED *******************************************************************************/ package org.eclipse.tm.internal.terminal.view; 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 973136a5d2c..f919cf1faeb 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 Wind River Systems, Inc. and others. + * Copyright (c) 2008, 2009 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -8,6 +8,7 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation * Michael Scharf (Wind River) - [240097] Allow paste with the middle mouse button + * Michael Scharf (Wind River) - [262996] get rid of TerminalState.OPENED *******************************************************************************/ /** * diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.java index 989acc6091f..2e1beb1e515 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.java +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2008 Wind River Systems, Inc. and others. + * Copyright (c) 2003, 2009 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,6 +15,7 @@ * Martin Oberhuber (Wind River) - fixed copyright headers and beautified * Michael Scharf (Wind River) - [240023] Get rid of the terminal's "Pin" button * Martin Oberhuber (Wind River) - [206917] Add validation for Terminal Settings + * Martin Oberhuber (Wind River) - [262996] get rid of TerminalState.OPENED *******************************************************************************/ package org.eclipse.tm.internal.terminal.view; @@ -43,7 +44,6 @@ public class ViewMessages extends NLS { public static String STATE_CONNECTED; public static String STATE_CONNECTING; - public static String STATE_OPENED; public static String STATE_CLOSED; public static String CANNOT_INITIALIZE; diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.properties b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.properties index 4b9c6e0cdd7..e7a350c1688 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.properties +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2003, 2008 Wind River Systems, Inc. and others. +# Copyright (c) 2003, 2009 Wind River Systems, Inc. and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -15,6 +15,7 @@ # Martin Oberhuber (Wind River) - fixed copyright headers and beautified # Michael Scharf (Wind River) - [240023] Get rid of the terminal's "Pin" button # Martin Oberhuber (Wind River) - [206917] Add validation for Terminal Settings +# Martin Oberhuber (Wind River) - [262996] get rid of TerminalState.OPENED ############################################################################### NO_CONNECTION_SELECTED = No Connection Selected PROP_TITLE = Terminal @@ -35,7 +36,6 @@ NETWORKTIMEOUT = Network timeout (seconds): STATE_CONNECTED = CONNECTED STATE_CONNECTING = CONNECTING... -STATE_OPENED = OPENED STATE_CLOSED = CLOSED CANNOT_INITIALIZE = Cannot initialize {0}:\n{1} 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 4604ca4c435..0ed683b3c65 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2008 Wind River Systems, Inc. and others. + * Copyright (c) 2003, 2009 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,6 +15,7 @@ * Martin Oberhuber (Wind River) - fixed copyright headers and beautified * Michael Scharf (Wind River) - [209746] There are cases where some colors not displayed correctly * Martin Oberhuber (Wind River) - [168197] Fix Terminal for CDC-1.1/Foundation-1.1 + * Michael Scharf (Wind River) - [262996] get rid of TerminalState.OPENED *******************************************************************************/ package org.eclipse.tm.internal.terminal.emulator; 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 fe1b48c642f..56375bc58e2 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2006, 2009 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -8,6 +8,7 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation * Martin Oberhuber (Wind River) - fixed copyright headers and beautified + * Michael Scharf (Wind River) - [262996] get rid of TerminalState.OPENED *******************************************************************************/ package org.eclipse.tm.internal.terminal.provisional.api;