diff --git a/org.eclipse.tm.terminal/README.txt b/org.eclipse.tm.terminal/README.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/org.eclipse.tm.terminal/build.properties b/org.eclipse.tm.terminal/build.properties index ae43822406a..b28ad83adf8 100644 --- a/org.eclipse.tm.terminal/build.properties +++ b/org.eclipse.tm.terminal/build.properties @@ -1,28 +1,27 @@ -################################################################################ -# Copyright (c) 2006 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Wind River Systems, Inc. - initial API and implementation -# Ted Williams (Wind River) - refactored into org.eclipse.tm.terminal -# Michael Scharf (Wind River) - separated into core, serial and view plugins -# Martin Oberhuber (Wind River) - fix copyrights, legal docs, missing files -################################################################################ +############################################################################### +# Copyright (c) 2003, 2006 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 +# http://www.eclipse.org/legal/epl-v10.html +# +# Initial Contributors: +# The following Wind River employees contributed to the Terminal component +# that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, +# Helmut Haigermoser and Ted Williams. +# +# Contributors: +# Michael Scharf (Wind River) - split into core, view and connector plugins +# Martin Oberhuber (Wind River) - fixed copyright headers and beautified +############################################################################### bin.includes = .,\ - src/,\ META-INF/,\ plugin.xml,\ - .classpath,\ - .project,\ - build.properties,\ plugin.properties,\ - schema/,\ - .settings/,\ .options source.. = src/ output.. = bin/ +src.includes = schema/,\ + src/ \ No newline at end of file diff --git a/org.eclipse.tm.terminal/plugin.properties b/org.eclipse.tm.terminal/plugin.properties index 9729533eb89..312232ce9ad 100644 --- a/org.eclipse.tm.terminal/plugin.properties +++ b/org.eclipse.tm.terminal/plugin.properties @@ -1,6 +1,18 @@ -########################################################################## -# Copyright 2004 Wind River Systems, Inc. All rights reserved. -########################################################################## - +############################################################################### +# Copyright (c) 2003, 2006 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 +# http://www.eclipse.org/legal/epl-v10.html +# +# Initial Contributors: +# The following Wind River employees contributed to the Terminal component +# that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, +# Helmut Haigermoser and Ted Williams. +# +# Contributors: +# Michael Scharf (Wind River) - split into core, view and connector plugins +# Martin Oberhuber (Wind River) - fixed copyright headers and beautified +############################################################################### pluginName = Terminal providerName = Eclipse.org diff --git a/org.eclipse.tm.terminal/plugin.xml b/org.eclipse.tm.terminal/plugin.xml index 7223dede489..70efdce83c2 100644 --- a/org.eclipse.tm.terminal/plugin.xml +++ b/org.eclipse.tm.terminal/plugin.xml @@ -1,9 +1,25 @@ + - + diff --git a/org.eclipse.tm.terminal/schema/terminalConnector.exsd b/org.eclipse.tm.terminal/schema/terminalConnector.exsd index c6848fc8623..8d240a11d9e 100644 --- a/org.eclipse.tm.terminal/schema/terminalConnector.exsd +++ b/org.eclipse.tm.terminal/schema/terminalConnector.exsd @@ -6,7 +6,7 @@ - [Enter description of this extension point.] + @@ -62,7 +62,7 @@ - [Enter the first release in which this extension point appears.] + @@ -71,7 +71,7 @@ - [Enter extension point usage example here.] + @@ -80,7 +80,7 @@ - [Enter API information here.] + @@ -89,7 +89,7 @@ - [Enter information about supplied implementation of this extension point.] + @@ -98,7 +98,16 @@ - + Copyright (c) 2006 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 +http://www.eclipse.org/legal/epl-v10.html + +Contributors: +Michael Scharf (Wind River) - initial API and implementation +Martin Oberhuber (Wind River) - fixed copyright headers and beautified + diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ISettingsPage.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ISettingsPage.java index 7a7f751f98a..facce2c4bea 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ISettingsPage.java +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ISettingsPage.java @@ -1,13 +1,13 @@ /******************************************************************************* * Copyright (c) 2006 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 - * http://www.eclipse.org/legal/epl-v10.html + * 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 + * http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Contributors: + * Michael Scharf (Wind River) - initial API and implementation + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ package org.eclipse.tm.terminal; @@ -26,18 +26,22 @@ public interface ISettingsPage { * @param parent */ void createControl(Composite parent); + /** * Called before the page is shown. Loads the state from the {@link ITerminalConnector}. */ void loadSettings(); + /** * Called when the OK button is pressed. */ void saveSettings(); + /** * @return true if the */ boolean validateSettings(); + /** * @return a name of the connection type. Used in a tab page title or drop * down to select the connection. diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ISettingsStore.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ISettingsStore.java index ba6602be0a6..cc6e149a5cb 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ISettingsStore.java +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ISettingsStore.java @@ -1,23 +1,21 @@ /******************************************************************************* * Copyright (c) 2006 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 - * http://www.eclipse.org/legal/epl-v10.html + * 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 + * http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Contributors: + * Michael Scharf (Wind River) - initial API and implementation + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ package org.eclipse.tm.terminal; /** * A simple interface to a store to persist the state of a connection. * - * - *

Not to be implemented. + *

TODO Not to be implemented. * @author Michael Scharf - * */ public interface ISettingsStore { /** @@ -25,12 +23,14 @@ public interface ISettingsStore { * @return value */ String get(String key); + /** * @param key * @param defaultValue * @return the value or the fecaault */ String get(String key, String defaultValue); + /** * Save a string value * @param key diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ITerminalConnector.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ITerminalConnector.java index 9dd88afb6fd..073eccaf6d6 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ITerminalConnector.java +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ITerminalConnector.java @@ -1,13 +1,13 @@ /******************************************************************************* * Copyright (c) 2006 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 - * http://www.eclipse.org/legal/epl-v10.html + * 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 + * http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Contributors: + * Michael Scharf (Wind River) - initial API and implementation + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ package org.eclipse.tm.terminal; @@ -20,24 +20,26 @@ import java.io.OutputStream; * via org.eclipse.tm.terminal.terminalConnector extension point. * * @author Michael Scharf - * */ public interface ITerminalConnector { /** * @return an ID of this connector. Typically getClass().getName() */ String getId(); + /** * @return true if the contribution is functioning (e.g. all external libraries are * installed). This was added for the serial support, because it requires the java comm * library, which is installed in the lib/ext directory of the */ boolean isInstalled(); + /** * Connect using the current state of the settings. * @param control Used to inform the UI about state changes and messages from the connection. */ void connect(ITerminalControl control); + /** * Disconnect if connected. Else do nothing. */ @@ -60,6 +62,7 @@ public interface ITerminalConnector { * @return a stream with data coming from the remote site. */ OutputStream getOutputStream(); + /** * @return a stream to write to the remote site. */ diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ITerminalControl.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ITerminalControl.java index 434008acc6e..53f9460b7e7 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ITerminalControl.java +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ITerminalControl.java @@ -1,13 +1,13 @@ /******************************************************************************* * Copyright (c) 2006 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 - * http://www.eclipse.org/legal/epl-v10.html + * 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 + * http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Contributors: + * Michael Scharf (Wind River) - initial API and implementation + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ package org.eclipse.tm.terminal; @@ -18,7 +18,6 @@ import org.eclipse.swt.widgets.Shell; * *

Not to be implemented by clients. * @author Michael Scharf - * */ public interface ITerminalControl { @@ -26,6 +25,7 @@ public interface ITerminalControl { * @return the current state of the connection */ TerminalState getState(); + /** * @param state */ @@ -44,11 +44,13 @@ public interface ITerminalControl { * TODO: Michael Scharf: Is this really needed? (use {@link #displayTextInTerminal(String)} */ void displayTextInTerminal(String text); + /** * Write a string directly to the terminal. * @param txt */ void writeToTerminal(String txt); + /** * Set the title of the terminal view. * @param title diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/Logger.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/Logger.java index 7a2a0e061c6..22490ef356c 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/Logger.java +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/Logger.java @@ -1,15 +1,16 @@ /******************************************************************************* - * Copyright (c) 2006 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 - * http://www.eclipse.org/legal/epl-v10.html + * Copyright (c) 2005, 2006 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 + * http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Contributors: + * Fran Litterio (Wind River) - initial API and implementation + * Ted Williams (Wind River) - refactored into org.eclipse namespace + * Michael Scharf (Wind River) - split into core, view and connector plugins + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ - package org.eclipse.tm.terminal; import java.io.File; diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/TerminalConnectorExtension.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/TerminalConnectorExtension.java index d73bc2b4f12..a641e57dc5e 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/TerminalConnectorExtension.java +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/TerminalConnectorExtension.java @@ -1,13 +1,13 @@ /******************************************************************************* * Copyright (c) 2006 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 - * http://www.eclipse.org/legal/epl-v10.html + * 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 + * http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Contributors: + * Michael Scharf (Wind River) - initial API and implementation + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ package org.eclipse.tm.terminal; diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/TerminalState.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/TerminalState.java index a227ecfa1b3..effa0ff6cfd 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/TerminalState.java +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/TerminalState.java @@ -1,13 +1,13 @@ /******************************************************************************* * Copyright (c) 2006 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 - * http://www.eclipse.org/legal/epl-v10.html + * 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 + * http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Contributors: + * Michael Scharf (Wind River) - initial API and implementation + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ package org.eclipse.tm.terminal; @@ -22,23 +22,28 @@ public class TerminalState { * The terminal is not connected. */ public final static TerminalState CLOSED=new TerminalState("CLOSED"); //$NON-NLS-1$ + /** * TODO: Michael Scharf: it's not clear to me what the meaning of the open state is */ 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$ + /** * The terminal is connected. */ public final static TerminalState CONNECTED=new TerminalState("CONNECTED"); //$NON-NLS-1$ private final String fState; + public TerminalState(String state) { fState = state; } + public String toString() { return fState; } diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/control/ITerminalListener.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/control/ITerminalListener.java index 972c2a7068c..d05e8884608 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/control/ITerminalListener.java +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/control/ITerminalListener.java @@ -1,19 +1,18 @@ /******************************************************************************* * Copyright (c) 2006 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 - * http://www.eclipse.org/legal/epl-v10.html + * 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 + * http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Contributors: + * Michael Scharf (Wind River) - initial API and implementation + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ package org.eclipse.tm.terminal.control; import org.eclipse.tm.terminal.TerminalState; - /** * Provided by a view implementation. * @author Michael Scharf @@ -25,6 +24,7 @@ public interface ITerminalListener { * @param state */ void setState(TerminalState state); + /** * Set the title of the terminal. * @param title diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/control/ITerminalViewControl.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/control/ITerminalViewControl.java index 77f4e9955c4..ac33802ae2c 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/control/ITerminalViewControl.java +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/control/ITerminalViewControl.java @@ -1,13 +1,13 @@ /******************************************************************************* * Copyright (c) 2006 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 - * http://www.eclipse.org/legal/epl-v10.html + * 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 + * http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Contributors: + * Michael Scharf (Wind River) - initial API and implementation + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ package org.eclipse.tm.terminal.control; diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/control/TerminalViewControlFactory.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/control/TerminalViewControlFactory.java index 808ce9e9381..8866b03fea4 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/control/TerminalViewControlFactory.java +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/control/TerminalViewControlFactory.java @@ -1,13 +1,13 @@ /******************************************************************************* * Copyright (c) 2006 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 - * http://www.eclipse.org/legal/epl-v10.html + * 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 + * http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Contributors: + * Michael Scharf (Wind River) - initial API and implementation + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ package org.eclipse.tm.terminal.control; diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/ITerminalControlForText.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/ITerminalControlForText.java index 36f542cd92e..72e72bc93f2 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/ITerminalControlForText.java +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/ITerminalControlForText.java @@ -1,13 +1,13 @@ /******************************************************************************* * Copyright (c) 2006 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 - * http://www.eclipse.org/legal/epl-v10.html + * 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 + * http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Contributors: + * Michael Scharf (Wind River) - initial API and implementation + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ package org.eclipse.tm.terminal.internal.control; diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalControl.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalControl.java index 4c743ffc798..f12eb123562 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalControl.java +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalControl.java @@ -1,15 +1,19 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2003, 2006 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 * http://www.eclipse.org/legal/epl-v10.html - * + * + * Initial Contributors: + * The following Wind River employees contributed to the Terminal component + * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, + * Helmut Haigermoser and Ted Williams. + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Michael Scharf (Wind River) - split into core, view and connector plugins + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ - package org.eclipse.tm.terminal.internal.control; import java.io.IOException; @@ -102,6 +106,7 @@ public class TerminalControl implements ITerminalControlForText, ITerminalContro public ITerminalConnector[] getConnectors() { return fConnectors; } + /* (non-Javadoc) * @see org.eclipse.tm.terminal.ITerminalControl#copy() */ @@ -241,6 +246,7 @@ public class TerminalControl implements ITerminalControlForText, ITerminalContro // fConnector=null; } } + // TODO private void waitForConnect() { Logger.log("entered."); //$NON-NLS-1$ diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalMessages.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalMessages.java index f8a1a6f16fe..69bb8d99550 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalMessages.java +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalMessages.java @@ -1,17 +1,18 @@ /******************************************************************************* * Copyright (c) 2006 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 - * http://www.eclipse.org/legal/epl-v10.html + * 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 + * http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Contributors: + * Michael Scharf (Wind River) - initial API and implementation + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ package org.eclipse.tm.terminal.internal.control; import org.eclipse.osgi.util.NLS; + public class TerminalMessages extends NLS { static { NLS.initializeMessages(TerminalMessages.class.getName(), TerminalMessages.class); diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalMessages.properties b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalMessages.properties index ceea6affc96..70f4295454b 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalMessages.properties +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalMessages.properties @@ -1,13 +1,18 @@ ############################################################################### -# Copyright (c) 2006 Wind River Systems, Inc. and others. +# Copyright (c) 2003, 2006 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 # http://www.eclipse.org/legal/epl-v10.html -# +# +# Initial Contributors: +# The following Wind River employees contributed to the Terminal component +# that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, +# Helmut Haigermoser and Ted Williams. +# # Contributors: -# Wind River Systems, Inc. - initial implementation -# +# Michael Scharf (Wind River) - split into core, view and connector plugins +# Martin Oberhuber (Wind River) - fixed copyright headers and beautified ############################################################################### TerminalError = Terminal Error SocketError = Socket Error diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalPlugin.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalPlugin.java index 6acd3c46a4c..74a106e291a 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalPlugin.java +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalPlugin.java @@ -1,15 +1,19 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2003, 2006 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 * http://www.eclipse.org/legal/epl-v10.html - * + * + * Initial Contributors: + * The following Wind River employees contributed to the Terminal component + * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, + * Helmut Haigermoser and Ted Williams. + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Michael Scharf (Wind River) - split into core, view and connector plugins + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ - package org.eclipse.tm.terminal.internal.control; import org.eclipse.core.runtime.Platform; diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalText.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalText.java index e946bc2bafa..f3605985025 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalText.java +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalText.java @@ -1,15 +1,19 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2003, 2006 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 * http://www.eclipse.org/legal/epl-v10.html - * + * + * Initial Contributors: + * The following Wind River employees contributed to the Terminal component + * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, + * Helmut Haigermoser and Ted Williams. + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Michael Scharf (Wind River) - split into core, view and connector plugins + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ - package org.eclipse.tm.terminal.internal.control; import java.io.IOException; diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/ITelnetSettings.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/ITelnetSettings.java index 61d3c9a8eb3..9fdb0e20d72 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/ITelnetSettings.java +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/ITelnetSettings.java @@ -1,3 +1,14 @@ +/******************************************************************************* + * Copyright (c) 2006 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Michael Scharf (Wind River) - initial API and implementation + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified + *******************************************************************************/ package org.eclipse.tm.terminal.internal.telnet; import org.eclipse.tm.terminal.ISettingsStore; diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/NetworkPortMap.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/NetworkPortMap.java index f864c802031..f6be3eb1641 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/NetworkPortMap.java +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/NetworkPortMap.java @@ -1,34 +1,36 @@ /******************************************************************************* * Copyright (c) 2006 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 - * http://www.eclipse.org/legal/epl-v10.html + * 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 + * http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Contributors: + * Michael Scharf (Wind River) - initial API and implementation + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ - package org.eclipse.tm.terminal.internal.telnet; import java.util.ArrayList; import java.util.List; public class NetworkPortMap { - public static final String PROP_NAMETGTCONST = "tgtcons"; //$NON-NLS-1$ + public static final String PROP_NAMETGTCONS = "tgtcons"; //$NON-NLS-1$ public static final String PROP_NAMETELNET = "telnet"; //$NON-NLS-1$ public static final String PROP_VALUENET = "1233"; //$NON-NLS-1$ - public static final String PROP_VALUETGTCONST = "1232"; //$NON-NLS-1$ + public static final String PROP_VALUETGTCONS = "1232"; //$NON-NLS-1$ public static final String PROP_VALUETELNET = "23"; //$NON-NLS-1$ + String[][] fPortMap=new String[][] { // portName, port - {PROP_NAMETGTCONST, PROP_VALUETGTCONST}, + {PROP_NAMETGTCONS, PROP_VALUETGTCONS}, {PROP_NAMETELNET, PROP_VALUETELNET} }; + public String getDefaultNetworkPort() { return PROP_VALUETELNET; } + public String findPortName(String strPort) { for (int i = 0; i < fPortMap.length; i++) { if(fPortMap[i][1].equals(strPort)) @@ -36,6 +38,7 @@ public class NetworkPortMap { } return null; } + public String findPort(String strPortName) { for (int i = 0; i < fPortMap.length; i++) { if(fPortMap[i][0].equals(strPortName)) @@ -43,6 +46,7 @@ public class NetworkPortMap { } return null; } + public List getNameTable() { List names=new ArrayList(); for (int i = 0; i < fPortMap.length; i++) { diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetCodes.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetCodes.java index da29a14ef35..08058c0a75e 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetCodes.java +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetCodes.java @@ -1,15 +1,17 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2005, 2006 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 * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Fran Litterio (Wind River) - initial API and implementation + * Helmut Haigermoser (Wind River) - repackaged + * Ted Williams (Wind River) - repackaged into org.eclipse namespace + * Michael Scharf (Wind River) - split into core, view and connector plugins + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ - package org.eclipse.tm.terminal.internal.telnet; /** diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetConnectWorker.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetConnectWorker.java index e4b967926ba..b9f952fb7e1 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetConnectWorker.java +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetConnectWorker.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright (c) 2005, 2006 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Initial Contributors: + * The following Wind River employees contributed to the Terminal component + * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, + * Helmut Haigermoser and Ted Williams. + * + * Contributors: + * Michael Scharf (Wind River) - extracted from TerminalControl + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified + *******************************************************************************/ package org.eclipse.tm.terminal.internal.telnet; import java.net.ConnectException; diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetConnection.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetConnection.java index a5b32c9802c..b9b019d7065 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetConnection.java +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetConnection.java @@ -1,15 +1,17 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2005, 2006 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 * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Fran Litterio (Wind River) - initial API and implementation + * Helmut Haigermoser (Wind River) - repackaged + * Ted Williams (Wind River) - repackaged into org.eclipse namespace + * Michael Scharf (Wind River) - split into core, view and connector plugins + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ - package org.eclipse.tm.terminal.internal.telnet; import java.io.IOException; diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetConnector.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetConnector.java index dbbeb176736..82e852f006e 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetConnector.java +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetConnector.java @@ -1,6 +1,14 @@ -/** +/******************************************************************************* + * Copyright (c) 2006 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 + * http://www.eclipse.org/legal/epl-v10.html * - */ + * Contributors: + * Michael Scharf (Wind River) - initial API and implementation + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified + *******************************************************************************/ package org.eclipse.tm.terminal.internal.telnet; import java.io.IOException; diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetMessages.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetMessages.java index 793ec7e7202..dc50f268576 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetMessages.java +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetMessages.java @@ -1,15 +1,14 @@ /******************************************************************************* * Copyright (c) 2006 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 - * http://www.eclipse.org/legal/epl-v10.html + * 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 + * http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Contributors: + * Michael Scharf (Wind River) - initial API and implementation + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ - package org.eclipse.tm.terminal.internal.telnet; import org.eclipse.osgi.util.NLS; diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetMessages.properties b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetMessages.properties index 1ad647e083e..1a5f8e9e594 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetMessages.properties +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetMessages.properties @@ -1,13 +1,18 @@ ############################################################################### -# Copyright (c) 2006 Wind River Systems, Inc. and others. +# Copyright (c) 2005, 2006 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 # http://www.eclipse.org/legal/epl-v10.html -# +# +# Initial Contributors: +# The following Wind River employees contributed to the Terminal component +# that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, +# Helmut Haigermoser and Ted Williams. +# # Contributors: -# Wind River Systems, Inc. - initial implementation -# +# Michael Scharf (Wind River) - split into core, view and connector plugins +# Martin Oberhuber (Wind River) - fixed copyright headers and beautified ############################################################################### CONNTYPE_NETWORK = Network PORT = Port diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetOption.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetOption.java index 5e6ebb4eeeb..0398937d3ce 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetOption.java +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetOption.java @@ -1,16 +1,17 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2005, 2006 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 * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Fran Litterio (Wind River) - initial API and implementation + * Helmut Haigermoser (Wind River) - repackaged + * Ted Williams (Wind River) - repackaged into org.eclipse namespace + * Michael Scharf (Wind River) - split into core, view and connector plugins + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ - - package org.eclipse.tm.terminal.internal.telnet; import java.io.IOException; diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetProperties.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetProperties.java index 2903698a223..92f20f0ebd2 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetProperties.java +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetProperties.java @@ -1,19 +1,16 @@ /******************************************************************************* * Copyright (c) 2006 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 - * http://www.eclipse.org/legal/epl-v10.html + * 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 + * http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Contributors: + * Michael Scharf (Wind River) - initial API and implementation + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ - package org.eclipse.tm.terminal.internal.telnet; - - public class TelnetProperties { private final NetworkPortMap fNetworkPortMap; private final String fDefaultHost; @@ -23,7 +20,6 @@ public class TelnetProperties { fNetworkPortMap = new NetworkPortMap(); fDefaultNetworkPort = fNetworkPortMap.getDefaultNetworkPort(); fDefaultHost = ""; //$NON-NLS-1$ - } public String getDefaultHost() { diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetSettings.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetSettings.java index 99ad8576234..29dce415be1 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetSettings.java +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetSettings.java @@ -1,15 +1,14 @@ /******************************************************************************* * Copyright (c) 2006 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 - * http://www.eclipse.org/legal/epl-v10.html + * 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 + * http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Contributors: + * Michael Scharf (Wind River) - initial API and implementation + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ - package org.eclipse.tm.terminal.internal.telnet; import org.eclipse.tm.terminal.ISettingsStore; @@ -56,14 +55,12 @@ public class TelnetSettings implements ITelnetSettings { fTimeout = store.get("Timeout","10");//$NON-NLS-1$ //$NON-NLS-2$ } - public void save(ISettingsStore store) { store.put("Host", fHost);//$NON-NLS-1$ store.put("NetworkPort", fNetworkPort);//$NON-NLS-1$ store.put("Timeout", fTimeout);//$NON-NLS-1$ } - public TelnetProperties getProperties() { return fProperties; } diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetSettingsPage.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetSettingsPage.java index 203e851c82a..f6d41dac88e 100644 --- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetSettingsPage.java +++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetSettingsPage.java @@ -1,15 +1,19 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2005, 2006 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 * http://www.eclipse.org/legal/epl-v10.html - * + * + * Initial Contributors: + * The following Wind River employees contributed to the Terminal component + * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, + * Helmut Haigermoser and Ted Williams. + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Michael Scharf (Wind River) - refactored out of TerminalSettingsDlg + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ - package org.eclipse.tm.terminal.internal.telnet; import java.util.Collections;