From 9d59d4087afc2eaeba38279a3634cc799cad1e10 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Thu, 7 Dec 2006 10:26:20 +0000 Subject: [PATCH] [cleanup] fix terminal copyright headers and beautify --- .../org.eclipse.tm.terminal.serial/plugin.xml | 9 ++------- .../META-INF/MANIFEST.MF | 6 +++--- .../build.properties | 11 +++++++++++ .../plugin.properties | 12 ++++++++++++ .../org.eclipse.tm.terminal.ssh/plugin.xml | 11 +++++++++++ .../eclipse/tm/terminal/ssh/ISshSettings.java | 14 +++++++------- .../eclipse/tm/terminal/ssh/SshConnection.java | 18 ++++++++++-------- .../eclipse/tm/terminal/ssh/SshConnector.java | 14 +++++++------- .../eclipse/tm/terminal/ssh/SshMessages.java | 15 +++++++-------- .../tm/terminal/ssh/SshMessages.properties | 6 +++--- .../eclipse/tm/terminal/ssh/SshSettings.java | 14 +++++++------- .../tm/terminal/ssh/SshSettingsPage.java | 15 +++++++-------- terminal/org.eclipse.tm.terminal/plugin.xml | 9 ++------- 13 files changed, 89 insertions(+), 65 deletions(-) create mode 100644 terminal/org.eclipse.tm.terminal.ssh/plugin.properties diff --git a/terminal/org.eclipse.tm.terminal.serial/plugin.xml b/terminal/org.eclipse.tm.terminal.serial/plugin.xml index a22dd5267b3..0f946359b8a 100644 --- a/terminal/org.eclipse.tm.terminal.serial/plugin.xml +++ b/terminal/org.eclipse.tm.terminal.serial/plugin.xml @@ -1,19 +1,14 @@ diff --git a/terminal/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF b/terminal/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF index 70d4627d44a..93a5c73c72f 100644 --- a/terminal/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF +++ b/terminal/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF @@ -1,13 +1,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Terminal ssh +Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tm.terminal.ssh;singleton:=true Bundle-Version: 0.0.9.qualifier -Bundle-Vendor: Eclipse.org +Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.tm.terminal, - com.jcraft.jsch + com.jcraft.jsch;bundle-version="[0.1.28,2.0.0)" Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/terminal/org.eclipse.tm.terminal.ssh/build.properties b/terminal/org.eclipse.tm.terminal.ssh/build.properties index 79520983559..8146c0864c7 100644 --- a/terminal/org.eclipse.tm.terminal.ssh/build.properties +++ b/terminal/org.eclipse.tm.terminal.ssh/build.properties @@ -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 +############################################################################### source.. = src/ output.. = bin/ bin.includes = META-INF/,\ diff --git a/terminal/org.eclipse.tm.terminal.ssh/plugin.properties b/terminal/org.eclipse.tm.terminal.ssh/plugin.properties new file mode 100644 index 00000000000..cf3b0f905fa --- /dev/null +++ b/terminal/org.eclipse.tm.terminal.ssh/plugin.properties @@ -0,0 +1,12 @@ +############################################################################### +# 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: +# Martin Oberhuber (Wind River) - initial API and implementation +############################################################################### +pluginName = Terminal ssh +providerName = Eclipse.org diff --git a/terminal/org.eclipse.tm.terminal.ssh/plugin.xml b/terminal/org.eclipse.tm.terminal.ssh/plugin.xml index fe2bdfdf100..4a1617f11ae 100644 --- a/terminal/org.eclipse.tm.terminal.ssh/plugin.xml +++ b/terminal/org.eclipse.tm.terminal.ssh/plugin.xml @@ -1,5 +1,16 @@ + diff --git a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/ISshSettings.java b/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/ISshSettings.java index d982c4254d9..bad3964c9dc 100644 --- a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/ISshSettings.java +++ b/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/ISshSettings.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: - * Michael Scharf (Wind River) - 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.ssh; diff --git a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/SshConnection.java b/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/SshConnection.java index 7c08b06f3ba..2db4d66949a 100644 --- a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/SshConnection.java +++ b/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/SshConnection.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: - * Michael Scharf (Wind River) - 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.ssh; @@ -84,6 +84,7 @@ class SshConnection extends Thread { } } + /** * Read the data from the ssh connection and display it in the terminal. * @param in @@ -135,7 +136,8 @@ class SshConnection extends Thread { }); } } - private void connectFailed(String terminalText, String msg) { + + private void connectFailed(String terminalText, String msg) { Logger.log(terminalText); fControl.displayTextInTerminal(terminalText); fControl.setState(TerminalState.CLOSED); diff --git a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/SshConnector.java b/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/SshConnector.java index a04f088fcce..ab35879cfce 100644 --- a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/SshConnector.java +++ b/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/SshConnector.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: - * Michael Scharf (Wind River) - 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.ssh; diff --git a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/SshMessages.java b/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/SshMessages.java index aa7287632c3..347c39430ed 100644 --- a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/SshMessages.java +++ b/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/SshMessages.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: - * Michael Scharf (Wind River) - 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.ssh; import org.eclipse.osgi.util.NLS; diff --git a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/SshMessages.properties b/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/SshMessages.properties index eb4b86a7054..1928a323e49 100644 --- a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/SshMessages.properties +++ b/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/SshMessages.properties @@ -4,10 +4,10 @@ # 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 -# +# Michael Scharf (Wind River) - initial API and implementation +# Martin Oberhuber (Wind River) - fixed copyright headers and beautified ############################################################################### CONNTYPE = SSH HOST = Host diff --git a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/SshSettings.java b/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/SshSettings.java index abfe1134366..30026bcef04 100644 --- a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/SshSettings.java +++ b/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/SshSettings.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: - * Michael Scharf (Wind River) - 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.ssh; diff --git a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/SshSettingsPage.java b/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/SshSettingsPage.java index 6b310d7ef7a..f97691e78fe 100644 --- a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/SshSettingsPage.java +++ b/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/SshSettingsPage.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: - * Michael Scharf (Wind River) - 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.ssh; import org.eclipse.swt.SWT; diff --git a/terminal/org.eclipse.tm.terminal/plugin.xml b/terminal/org.eclipse.tm.terminal/plugin.xml index 70efdce83c2..9be93ce975a 100644 --- a/terminal/org.eclipse.tm.terminal/plugin.xml +++ b/terminal/org.eclipse.tm.terminal/plugin.xml @@ -1,19 +1,14 @@