mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-21 21:52:10 +02:00
Code Issues Wiki Activity

Bug 559474: Format all TM.terminal code to CDT standard

Browse source 
This is applying the per-project code formatting rules that would
be applied on save in the JDT editor

See also Bug 540373

Change-Id: Id04c972c3b3cb0a6ed1ab8581185359b7cf43f91
This commit is contained in:
Jonah Graham 2020-01-31 11:02:25 -05:00
parent 213770265a
commit c58c28b9cc
243 changed files with 8230 additions and 7835 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
terminal/features/org.eclipse.tm.terminal.connector.cdtserial.feature/build.properties
View file

@ -1,13 +1,13 @@
################################################################################
# Copyright (c) 2006, 2018 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 2.0
# which accompanies this distribution, and is available at
# https://www.eclipse.org/legal/epl-2.0/
#
# Contributors:
# Michael Scharf (Wind River) - initial API and implementation
# Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
# https://www.eclipse.org/legal/epl-2.0/
#
# Contributors:
# Michael Scharf (Wind River) - initial API and implementation
# Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license
################################################################################
bin.includes = feature.xml,\
feature.properties,\

16
terminal/features/org.eclipse.tm.terminal.connector.cdtserial.sdk.feature/build.properties
View file

@ -1,13 +1,13 @@
################################################################################
# Copyright (c) 2006, 2018 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 2.0
# which accompanies this distribution, and is available at
# https://www.eclipse.org/legal/epl-2.0/
#
# Contributors:
# Michael Scharf (Wind River) - initial API and implementation
# Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
# https://www.eclipse.org/legal/epl-2.0/
#
# Contributors:
# Michael Scharf (Wind River) - initial API and implementation
# Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license
################################################################################
bin.includes = feature.xml,\
feature.properties,\

16
terminal/features/org.eclipse.tm.terminal.connector.local.feature/build.properties
View file

@ -1,13 +1,13 @@
################################################################################
# Copyright (c) 2006, 2018 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 2.0
# which accompanies this distribution, and is available at
# https://www.eclipse.org/legal/epl-2.0/
#
# Contributors:
# Michael Scharf (Wind River) - initial API and implementation
# Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
# https://www.eclipse.org/legal/epl-2.0/
#
# Contributors:
# Michael Scharf (Wind River) - initial API and implementation
# Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license
################################################################################
bin.includes = feature.xml,\
feature.properties,\

2
terminal/features/org.eclipse.tm.terminal.connector.local.feature/feature.properties
View file

@ -6,7 +6,7 @@
# https://www.eclipse.org/legal/epl-2.0/
#
# SPDX-License-Identifier: EPL-2.0
#
#
# Contributors:
# Martin Oberhuber (Wind River) - initial API and implementation
###############################################################################

16
terminal/features/org.eclipse.tm.terminal.connector.local.sdk.feature/build.properties
View file

@ -1,13 +1,13 @@
################################################################################
# Copyright (c) 2006, 2018 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 2.0
# which accompanies this distribution, and is available at
# https://www.eclipse.org/legal/epl-2.0/
#
# Contributors:
# Michael Scharf (Wind River) - initial API and implementation
# Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
# https://www.eclipse.org/legal/epl-2.0/
#
# Contributors:
# Michael Scharf (Wind River) - initial API and implementation
# Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license
################################################################################
bin.includes = feature.xml,\
feature.properties,\

2
terminal/features/org.eclipse.tm.terminal.connector.local.sdk.feature/feature.properties
View file

@ -6,7 +6,7 @@
# https://www.eclipse.org/legal/epl-2.0/
#
# SPDX-License-Identifier: EPL-2.0
#
#
# Contributors:
# Martin Oberhuber (Wind River) - initial API and implementation
###############################################################################

4
terminal/features/org.eclipse.tm.terminal.connector.ssh.feature/build.properties
View file

@ -6,10 +6,10 @@
# https://www.eclipse.org/legal/epl-2.0/
#
# SPDX-License-Identifier: EPL-2.0
#
#
# Contributors:
# Michael Scharf (Wind River) - initial API and implementation
# Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license
# Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license
###############################################################################
bin.includes = feature.xml,\
feature.properties

2
terminal/features/org.eclipse.tm.terminal.connector.ssh.feature/feature.properties
View file

@ -6,7 +6,7 @@
# https://www.eclipse.org/legal/epl-2.0/
#
# SPDX-License-Identifier: EPL-2.0
#
#
# Contributors:
# Martin Oberhuber (Wind River) - initial API and implementation
###############################################################################

4
terminal/features/org.eclipse.tm.terminal.connector.ssh.sdk.feature/build.properties
View file

@ -6,10 +6,10 @@
# https://www.eclipse.org/legal/epl-2.0/
#
# SPDX-License-Identifier: EPL-2.0
#
#
# Contributors:
# Michael Scharf (Wind River) - initial API and implementation
# Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license
# Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license
###############################################################################
bin.includes = feature.xml,\
feature.properties,\

2
terminal/features/org.eclipse.tm.terminal.connector.ssh.sdk.feature/feature.properties
View file

@ -6,7 +6,7 @@
# https://www.eclipse.org/legal/epl-2.0/
#
# SPDX-License-Identifier: EPL-2.0
#
#
# Contributors:
# Martin Oberhuber (Wind River) - initial API and implementation
###############################################################################

16
terminal/features/org.eclipse.tm.terminal.connector.telnet.feature/build.properties
View file

@ -1,13 +1,13 @@
################################################################################
# Copyright (c) 2006, 2018 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 2.0
# which accompanies this distribution, and is available at
# https://www.eclipse.org/legal/epl-2.0/
#
# Contributors:
# Michael Scharf (Wind River) - initial API and implementation
# Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
# https://www.eclipse.org/legal/epl-2.0/
#
# Contributors:
# Michael Scharf (Wind River) - initial API and implementation
# Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license
################################################################################
bin.includes = feature.xml,\
feature.properties,\

2
terminal/features/org.eclipse.tm.terminal.connector.telnet.feature/feature.properties
View file

@ -6,7 +6,7 @@
# https://www.eclipse.org/legal/epl-2.0/
#
# SPDX-License-Identifier: EPL-2.0
#
#
# Contributors:
# Martin Oberhuber (Wind River) - initial API and implementation
###############################################################################

16
terminal/features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/build.properties
View file

@ -1,13 +1,13 @@
################################################################################
# Copyright (c) 2006, 2018 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 2.0
# which accompanies this distribution, and is available at
# https://www.eclipse.org/legal/epl-2.0/
#
# Contributors:
# Michael Scharf (Wind River) - initial API and implementation
# Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
# https://www.eclipse.org/legal/epl-2.0/
#
# Contributors:
# Michael Scharf (Wind River) - initial API and implementation
# Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license
################################################################################
bin.includes = feature.xml,\
feature.properties,\

2
terminal/features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/feature.properties
View file

@ -6,7 +6,7 @@
# https://www.eclipse.org/legal/epl-2.0/
#
# SPDX-License-Identifier: EPL-2.0
#
#
# Contributors:
# Martin Oberhuber (Wind River) - initial API and implementation
###############################################################################

14
terminal/features/org.eclipse.tm.terminal.control.feature/build.properties
View file

@ -1,13 +1,13 @@
################################################################################
# Copyright (c) 2006, 2018 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 2.0
# which accompanies this distribution, and is available at
# https://www.eclipse.org/legal/epl-2.0/
#
# Contributors:
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
# https://www.eclipse.org/legal/epl-2.0/
#
# Contributors:
# Michael Scharf (Wind River) - initial API and implementation
# Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license
# Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license
################################################################################
bin.includes = feature.xml,\
feature.properties

2
terminal/features/org.eclipse.tm.terminal.control.feature/feature.properties
View file

@ -6,7 +6,7 @@
# https://www.eclipse.org/legal/epl-2.0/
#
# SPDX-License-Identifier: EPL-2.0
#
#
# Contributors:
# Martin Oberhuber (Wind River) - initial API and implementation
###############################################################################

14
terminal/features/org.eclipse.tm.terminal.control.sdk.feature/build.properties
View file

@ -1,13 +1,13 @@
################################################################################
# Copyright (c) 2006, 2018 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 2.0
# which accompanies this distribution, and is available at
# https://www.eclipse.org/legal/epl-2.0/
#
# Contributors:
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
# https://www.eclipse.org/legal/epl-2.0/
#
# Contributors:
# Michael Scharf (Wind River) - initial API and implementation
# Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license
# Uwe Stieber (Wind River) - Bug 434937 - Releng: The Terminal Features have an incorrect license
################################################################################
bin.includes = feature.xml,\
feature.properties,\

2
terminal/features/org.eclipse.tm.terminal.control.sdk.feature/feature.properties
View file

@ -6,7 +6,7 @@
# https://www.eclipse.org/legal/epl-2.0/
#
# SPDX-License-Identifier: EPL-2.0
#
#
# Contributors:
# Martin Oberhuber (Wind River) - initial API and implementation
###############################################################################

7
terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/activator/Activator.java
View file

@ -69,13 +69,13 @@ public class Activator extends AbstractUIPlugin {
}
@Override
public void start(BundleContext context) throws Exception {
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
}
@Override
public void stop(BundleContext context) throws Exception {
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
}
@ -114,7 +114,8 @@ public class Activator extends AbstractUIPlugin {
if (exception instanceof CoreException) {
log(((CoreException) exception).getStatus());
} else {
log(new Status(IStatus.ERROR, plugin.getBundle().getSymbolicName(), exception.getLocalizedMessage(), exception));
log(new Status(IStatus.ERROR, plugin.getBundle().getSymbolicName(), exception.getLocalizedMessage(),
exception));
}
}

9
terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/controls/SerialSettingsPage.java
View file

@ -246,13 +246,10 @@ public class SerialSettingsPage extends AbstractSettingsPage {
settings.setStopBits(StopBits.fromStringIndex(stopBitsCombo.getSelectionIndex()));
dialogSettings.put(SerialSettings.PORT_NAME_ATTR, portCombo.getText());
dialogSettings.put(SerialSettings.BAUD_RATE_ATTR,
BaudRate.getStrings()[baudRateCombo.getSelectionIndex()]);
dialogSettings.put(SerialSettings.BYTE_SIZE_ATTR,
ByteSize.getStrings()[byteSizeCombo.getSelectionIndex()]);
dialogSettings.put(SerialSettings.BAUD_RATE_ATTR, BaudRate.getStrings()[baudRateCombo.getSelectionIndex()]);
dialogSettings.put(SerialSettings.BYTE_SIZE_ATTR, ByteSize.getStrings()[byteSizeCombo.getSelectionIndex()]);
dialogSettings.put(SerialSettings.PARITY_ATTR, Parity.getStrings()[parityCombo.getSelectionIndex()]);
dialogSettings.put(SerialSettings.STOP_BITS_ATTR,
StopBits.getStrings()[stopBitsCombo.getSelectionIndex()]);
dialogSettings.put(SerialSettings.STOP_BITS_ATTR, StopBits.getStrings()[stopBitsCombo.getSelectionIndex()]);
}
@Override

4
terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/activator/UIPlugin.java
View file

@ -81,7 +81,7 @@ public class UIPlugin extends AbstractUIPlugin {
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
@Override
public void start(BundleContext context) throws Exception {
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
}
@ -90,7 +90,7 @@ public class UIPlugin extends AbstractUIPlugin {
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
@Override
public void stop(BundleContext context) throws Exception {
public void stop(BundleContext context) throws Exception {
plugin = null;
scopedPreferences = null;
traceHandler = null;

81
terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/controls/LocalWizardConfigurationPanel.java
View file

@ -44,18 +44,18 @@ public class LocalWizardConfigurationPanel extends AbstractExtendedConfiguration
*
* @param container The configuration panel container or <code>null</code>.
*/
public LocalWizardConfigurationPanel(IConfigurationPanelContainer container) {
super(container);
}
public LocalWizardConfigurationPanel(IConfigurationPanelContainer container) {
super(container);
}
/* (non-Javadoc)
* @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite)
*/
/* (non-Javadoc)
* @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite)
*/
@Override
public void setupPanel(Composite parent) {
Composite panel = new Composite(parent, SWT.NONE);
panel.setLayout(new GridLayout());
panel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
public void setupPanel(Composite parent) {
Composite panel = new Composite(parent, SWT.NONE);
panel.setLayout(new GridLayout());
panel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
// Create the encoding selection combo
createEncodingUI(panel, false);
@ -66,13 +66,14 @@ public class LocalWizardConfigurationPanel extends AbstractExtendedConfiguration
setEncoding("UTF-8"); //$NON-NLS-1$
} else {
String encoding = WorkbenchEncoding.getWorkbenchDefaultEncoding();
if (encoding != null && !"".equals(encoding)) setEncoding(encoding); //$NON-NLS-1$
if (encoding != null && !"".equals(encoding)) //$NON-NLS-1$
setEncoding(encoding);
}
// Fill the rest of the panel with a label to be able to
// set a height and width hint for the dialog
Label label = new Label(panel, SWT.HORIZONTAL);
GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);
Label label = new Label(panel, SWT.HORIZONTAL);
GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);
layoutData.widthHint = 300;
layoutData.heightHint = 80;
label.setLayoutData(layoutData);
@ -82,36 +83,39 @@ public class LocalWizardConfigurationPanel extends AbstractExtendedConfiguration
resource = getSelectionResource();
}
setControl(panel);
}
setControl(panel);
}
/* (non-Javadoc)
* @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#setupData(java.util.Map)
*/
@Override
public void setupData(Map<String, Object> data) {
if (data == null) return;
if (data == null)
return;
String value = (String)data.get(ITerminalsConnectorConstants.PROP_ENCODING);
if (value != null) setEncoding(value);
}
String value = (String) data.get(ITerminalsConnectorConstants.PROP_ENCODING);
if (value != null)
setEncoding(value);
}
/* (non-Javadoc)
* @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#extractData(java.util.Map)
*/
@Override
public void extractData(Map<String, Object> data) {
// set the terminal connector id for local terminal
data.put(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID, "org.eclipse.tm.terminal.connector.local.LocalConnector"); //$NON-NLS-1$
// set the terminal connector id for local terminal
data.put(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID,
"org.eclipse.tm.terminal.connector.local.LocalConnector"); //$NON-NLS-1$
// Store the encoding
// Store the encoding
data.put(ITerminalsConnectorConstants.PROP_ENCODING, getEncoding());
Bundle bundle = Platform.getBundle("org.eclipse.core.resources"); //$NON-NLS-1$
if (bundle != null && bundle.getState() != Bundle.UNINSTALLED && bundle.getState() != Bundle.STOPPING) {
// if we have a IResource selection use the location for working directory
if (resource instanceof org.eclipse.core.resources.IResource){
String dir = ((org.eclipse.core.resources.IResource)resource).getProject().getLocation().toString();
if (resource instanceof org.eclipse.core.resources.IResource) {
String dir = ((org.eclipse.core.resources.IResource) resource).getProject().getLocation().toString();
data.put(ITerminalsConnectorConstants.PROP_PROCESS_WORKING_DIR, dir);
}
}
@ -121,21 +125,21 @@ public class LocalWizardConfigurationPanel extends AbstractExtendedConfiguration
* @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#fillSettingsForHost(java.lang.String)
*/
@Override
protected void fillSettingsForHost(String host){
protected void fillSettingsForHost(String host) {
}
/* (non-Javadoc)
* @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#saveSettingsForHost(boolean)
*/
@Override
protected void saveSettingsForHost(boolean add){
protected void saveSettingsForHost(boolean add) {
}
/* (non-Javadoc)
* @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#isValid()
*/
@Override
public boolean isValid(){
public boolean isValid() {
return true;
}
@ -143,16 +147,16 @@ public class LocalWizardConfigurationPanel extends AbstractExtendedConfiguration
* @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#doSaveWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String)
*/
@Override
public void doSaveWidgetValues(IDialogSettings settings, String idPrefix) {
public void doSaveWidgetValues(IDialogSettings settings, String idPrefix) {
// Save the encodings widget values
doSaveEncodingsWidgetValues(settings, idPrefix);
}
}
/* (non-Javadoc)
* @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#doRestoreWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String)
*/
@Override
public void doRestoreWidgetValues(IDialogSettings settings, String idPrefix) {
public void doRestoreWidgetValues(IDialogSettings settings, String idPrefix) {
// Restore the encodings widget values
doRestoreEncodingsWidgetValues(settings, idPrefix);
}
@ -161,17 +165,17 @@ public class LocalWizardConfigurationPanel extends AbstractExtendedConfiguration
* @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#getHostFromSettings()
*/
@Override
protected String getHostFromSettings() {
protected String getHostFromSettings() {
return null;
}
}
/* (non-Javadoc)
* @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#isWithHostList()
*/
@Override
public boolean isWithHostList() {
return false;
}
public boolean isWithHostList() {
return false;
}
/**
* Returns the IResource from the current selection
@ -184,11 +188,12 @@ public class LocalWizardConfigurationPanel extends AbstractExtendedConfiguration
if (selection instanceof IStructuredSelection && !selection.isEmpty()) {
Object element = ((IStructuredSelection) selection).getFirstElement();
if (element instanceof org.eclipse.core.resources.IResource){
return ((org.eclipse.core.resources.IResource)element);
if (element instanceof org.eclipse.core.resources.IResource) {
return ((org.eclipse.core.resources.IResource) element);
}
if (element instanceof IAdaptable) {
return (org.eclipse.core.resources.IResource) ((IAdaptable) element).getAdapter(org.eclipse.core.resources.IResource.class);
return (org.eclipse.core.resources.IResource) ((IAdaptable) element)
.getAdapter(org.eclipse.core.resources.IResource.class);
}
}
return null;

141
terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalLauncherDelegate.java
View file

@ -104,7 +104,8 @@ public class LocalLauncherDelegate extends AbstractLauncherDelegate {
} else {
encoding = WorkbenchEncoding.getWorkbenchDefaultEncoding();
}
if (encoding != null && !"".equals(encoding)) properties.put(ITerminalsConnectorConstants.PROP_ENCODING, encoding); //$NON-NLS-1$
if (encoding != null && !"".equals(encoding)) //$NON-NLS-1$
properties.put(ITerminalsConnectorConstants.PROP_ENCODING, encoding);
}
// For local terminals, force a new terminal tab each time it is launched,
@ -115,9 +116,11 @@ public class LocalLauncherDelegate extends AbstractLauncherDelegate {
// Initialize the local terminal working directory.
// By default, start the local terminal in the users home directory
String initialCwd = org.eclipse.tm.terminal.view.ui.activator.UIPlugin.getScopedPreferences().getString(IPreferenceKeys.PREF_LOCAL_TERMINAL_INITIAL_CWD);
String initialCwd = org.eclipse.tm.terminal.view.ui.activator.UIPlugin.getScopedPreferences()
.getString(IPreferenceKeys.PREF_LOCAL_TERMINAL_INITIAL_CWD);
String cwd = null;
if (initialCwd == null || IPreferenceKeys.PREF_INITIAL_CWD_USER_HOME.equals(initialCwd) || "".equals(initialCwd.trim())) { //$NON-NLS-1$
if (initialCwd == null || IPreferenceKeys.PREF_INITIAL_CWD_USER_HOME.equals(initialCwd)
|| "".equals(initialCwd.trim())) { //$NON-NLS-1$
cwd = System.getProperty("user.home"); //$NON-NLS-1$
} else if (IPreferenceKeys.PREF_INITIAL_CWD_ECLIPSE_HOME.equals(initialCwd)) {
String eclipseHomeLocation = System.getProperty("eclipse.home.location"); //$NON-NLS-1$
@ -126,16 +129,18 @@ public class LocalLauncherDelegate extends AbstractLauncherDelegate {
URI uri = URIUtil.fromString(eclipseHomeLocation);
File f = URIUtil.toFile(uri);
cwd = f.getAbsolutePath();
} catch (URISyntaxException ex) { /* ignored on purpose */ }
} catch (URISyntaxException ex) {
/* ignored on purpose */ }
}
} else if (IPreferenceKeys.PREF_INITIAL_CWD_ECLIPSE_WS.equals(initialCwd)) {
Bundle bundle = Platform.getBundle("org.eclipse.core.resources"); //$NON-NLS-1$
if (bundle != null && bundle.getState() != Bundle.UNINSTALLED && bundle.getState() != Bundle.STOPPING) {
if (org.eclipse.core.resources.ResourcesPlugin.getWorkspace() != null
&& org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRoot() != null
&& org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRoot().getLocation() != null) {
cwd = org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRoot().getLocation().toOSString();
}
if (org.eclipse.core.resources.ResourcesPlugin.getWorkspace() != null
&& org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRoot() != null
&& org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRoot().getLocation() != null) {
cwd = org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRoot().getLocation()
.toOSString();
}
}
} else {
try {
@ -161,28 +166,39 @@ public class LocalLauncherDelegate extends AbstractLauncherDelegate {
// If the current selection resolved to an folder, default the working directory
// to that folder and update the terminal title
ISelectionService service = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();
if ((service != null && service.getSelection() != null) || properties.containsKey(ITerminalsConnectorConstants.PROP_SELECTION)) {
ISelection selection = (ISelection)properties.get(ITerminalsConnectorConstants.PROP_SELECTION);
if (selection == null) selection = service.getSelection();
if ((service != null && service.getSelection() != null)
|| properties.containsKey(ITerminalsConnectorConstants.PROP_SELECTION)) {
ISelection selection = (ISelection) properties.get(ITerminalsConnectorConstants.PROP_SELECTION);
if (selection == null)
selection = service.getSelection();
if (selection instanceof IStructuredSelection && !selection.isEmpty()) {
String dir = null;
Iterator<?> iter = ((IStructuredSelection)selection).iterator();
Iterator<?> iter = ((IStructuredSelection) selection).iterator();
while (iter.hasNext()) {
Object element = iter.next();
Bundle bundle = Platform.getBundle("org.eclipse.core.resources"); //$NON-NLS-1$
if (bundle != null && bundle.getState() != Bundle.UNINSTALLED && bundle.getState() != Bundle.STOPPING) {
if (bundle != null && bundle.getState() != Bundle.UNINSTALLED
&& bundle.getState() != Bundle.STOPPING) {
// If the element is not an IResource, try to adapt to IResource
if (!(element instanceof org.eclipse.core.resources.IResource)) {
Object adapted = element instanceof IAdaptable ? ((IAdaptable)element).getAdapter(org.eclipse.core.resources.IResource.class) : null;
if (adapted == null) adapted = Platform.getAdapterManager().getAdapter(element, org.eclipse.core.resources.IResource.class);
if (adapted != null) element = adapted;
Object adapted = element instanceof IAdaptable
? ((IAdaptable) element).getAdapter(org.eclipse.core.resources.IResource.class)
: null;
if (adapted == null)
adapted = Platform.getAdapterManager().getAdapter(element,
org.eclipse.core.resources.IResource.class);
if (adapted != null)
element = adapted;
}
if (element instanceof org.eclipse.core.resources.IResource && ((org.eclipse.core.resources.IResource)element).exists()) {
IPath location = ((org.eclipse.core.resources.IResource)element).getLocation();
if (location == null) continue;
if (location.toFile().isFile()) location = location.removeLastSegments(1);
if (element instanceof org.eclipse.core.resources.IResource
&& ((org.eclipse.core.resources.IResource) element).exists()) {
IPath location = ((org.eclipse.core.resources.IResource) element).getLocation();
if (location == null)
continue;
if (location.toFile().isFile())
location = location.removeLastSegments(1);
if (location.toFile().isDirectory() && location.toFile().canRead()) {
dir = location.toFile().getAbsolutePath();
break;
@ -190,7 +206,7 @@ public class LocalLauncherDelegate extends AbstractLauncherDelegate {
}
if (element instanceof IPath || element instanceof File) {
File f = element instanceof IPath ? ((IPath)element).toFile() : (File)element;
File f = element instanceof IPath ? ((IPath) element).toFile() : (File) element;
if (f.isDirectory() && f.canRead()) {
dir = f.getAbsolutePath();
break;
@ -225,14 +241,16 @@ public class LocalLauncherDelegate extends AbstractLauncherDelegate {
private String getTerminalTitle(Map<String, Object> properties) {
// Try to see if the user set a title explicitly via the properties map.
String title = getDefaultTerminalTitle(properties);
if (title != null) return title;
if (title != null)
return title;
try {
String hostname = InetAddress.getLocalHost().getHostName();
if (hostname != null && !"".equals(hostname.trim())) { //$NON-NLS-1$
return hostname;
}
} catch (UnknownHostException e) { /* ignored on purpose */ }
} catch (UnknownHostException e) {
/* ignored on purpose */ }
return "Local"; //$NON-NLS-1$
}
@ -245,7 +263,7 @@ public class LocalLauncherDelegate extends AbstractLauncherDelegate {
if (IMementoHandler.class.equals(adapter)) {
return mementoHandler;
}
return super.getAdapter(adapter);
return super.getAdapter(adapter);
}
/**
@ -264,7 +282,8 @@ public class LocalLauncherDelegate extends AbstractLauncherDelegate {
}
}
if (shell == null) {
shell = org.eclipse.tm.terminal.view.ui.activator.UIPlugin.getScopedPreferences().getString(IPreferenceKeys.PREF_LOCAL_TERMINAL_DEFAULT_SHELL_UNIX);
shell = org.eclipse.tm.terminal.view.ui.activator.UIPlugin.getScopedPreferences()
.getString(IPreferenceKeys.PREF_LOCAL_TERMINAL_DEFAULT_SHELL_UNIX);
if (shell == null || "".equals(shell)) { //$NON-NLS-1$
if (System.getenv("SHELL") != null && !"".equals(System.getenv("SHELL").trim())) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
shell = System.getenv("SHELL").trim(); //$NON-NLS-1$
@ -280,13 +299,14 @@ public class LocalLauncherDelegate extends AbstractLauncherDelegate {
/* (non-Javadoc)
* @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#createTerminalConnector(java.util.Map)
*/
@Override
@Override
public ITerminalConnector createTerminalConnector(Map<String, Object> properties) {
Assert.isNotNull(properties);
// Check for the terminal connector id
String connectorId = (String)properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID);
if (connectorId == null) connectorId = "org.eclipse.tm.terminal.connector.local.LocalConnector"; //$NON-NLS-1$
String connectorId = (String) properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID);
if (connectorId == null)
connectorId = "org.eclipse.tm.terminal.connector.local.LocalConnector"; //$NON-NLS-1$
// Extract the process properties using defaults
String image;
@ -295,17 +315,19 @@ public class LocalLauncherDelegate extends AbstractLauncherDelegate {
File defaultShell = defaultShell();
image = defaultShell.isAbsolute() ? defaultShell.getAbsolutePath() : defaultShell.getPath();
} else {
image = (String)properties.get(ITerminalsConnectorConstants.PROP_PROCESS_PATH);
image = (String) properties.get(ITerminalsConnectorConstants.PROP_PROCESS_PATH);
}
String arguments = (String)properties.get(ITerminalsConnectorConstants.PROP_PROCESS_ARGS);
String arguments = (String) properties.get(ITerminalsConnectorConstants.PROP_PROCESS_ARGS);
if (arguments == null && !Platform.OS_WIN32.equals(Platform.getOS())) {
arguments = org.eclipse.tm.terminal.view.ui.activator.UIPlugin.getScopedPreferences().getString(IPreferenceKeys.PREF_LOCAL_TERMINAL_DEFAULT_SHELL_UNIX_ARGS);
arguments = org.eclipse.tm.terminal.view.ui.activator.UIPlugin.getScopedPreferences()
.getString(IPreferenceKeys.PREF_LOCAL_TERMINAL_DEFAULT_SHELL_UNIX_ARGS);
}
// Determine if a PTY will be used
boolean isUsingPTY = (properties.get(ITerminalsConnectorConstants.PROP_PROCESS_OBJ) == null && PTY.isSupported(PTY.Mode.TERMINAL))
|| properties.get(ITerminalsConnectorConstants.PROP_PTY_OBJ) instanceof PTY;
boolean isUsingPTY = (properties.get(ITerminalsConnectorConstants.PROP_PROCESS_OBJ) == null
&& PTY.isSupported(PTY.Mode.TERMINAL))
|| properties.get(ITerminalsConnectorConstants.PROP_PTY_OBJ) instanceof PTY;
boolean localEcho = false;
if (!properties.containsKey(ITerminalsConnectorConstants.PROP_LOCAL_ECHO)
@ -315,7 +337,7 @@ public class LocalLauncherDelegate extends AbstractLauncherDelegate {
localEcho = !isUsingPTY;
}
} else {
localEcho = ((Boolean)properties.get(ITerminalsConnectorConstants.PROP_LOCAL_ECHO)).booleanValue();
localEcho = ((Boolean) properties.get(ITerminalsConnectorConstants.PROP_LOCAL_ECHO)).booleanValue();
}
String lineSeparator = null;
@ -323,28 +345,32 @@ public class LocalLauncherDelegate extends AbstractLauncherDelegate {
|| !(properties.get(ITerminalsConnectorConstants.PROP_LINE_SEPARATOR) instanceof String)) {
// No line separator will be set if a PTY is used
if (!isUsingPTY) {
lineSeparator = Platform.OS_WIN32.equals(Platform.getOS()) ? ILineSeparatorConstants.LINE_SEPARATOR_CRLF : ILineSeparatorConstants.LINE_SEPARATOR_LF;
lineSeparator = Platform.OS_WIN32.equals(Platform.getOS()) ? ILineSeparatorConstants.LINE_SEPARATOR_CRLF
: ILineSeparatorConstants.LINE_SEPARATOR_LF;
}
} else {
lineSeparator = (String)properties.get(ITerminalsConnectorConstants.PROP_LINE_SEPARATOR);
lineSeparator = (String) properties.get(ITerminalsConnectorConstants.PROP_LINE_SEPARATOR);
}
Process process = (Process)properties.get(ITerminalsConnectorConstants.PROP_PROCESS_OBJ);
PTY pty = (PTY)properties.get(ITerminalsConnectorConstants.PROP_PTY_OBJ);
ITerminalServiceOutputStreamMonitorListener[] stdoutListeners = (ITerminalServiceOutputStreamMonitorListener[])properties.get(ITerminalsConnectorConstants.PROP_STDOUT_LISTENERS);
ITerminalServiceOutputStreamMonitorListener[] stderrListeners = (ITerminalServiceOutputStreamMonitorListener[])properties.get(ITerminalsConnectorConstants.PROP_STDERR_LISTENERS);
String workingDir = (String)properties.get(ITerminalsConnectorConstants.PROP_PROCESS_WORKING_DIR);
Process process = (Process) properties.get(ITerminalsConnectorConstants.PROP_PROCESS_OBJ);
PTY pty = (PTY) properties.get(ITerminalsConnectorConstants.PROP_PTY_OBJ);
ITerminalServiceOutputStreamMonitorListener[] stdoutListeners = (ITerminalServiceOutputStreamMonitorListener[]) properties
.get(ITerminalsConnectorConstants.PROP_STDOUT_LISTENERS);
ITerminalServiceOutputStreamMonitorListener[] stderrListeners = (ITerminalServiceOutputStreamMonitorListener[]) properties
.get(ITerminalsConnectorConstants.PROP_STDERR_LISTENERS);
String workingDir = (String) properties.get(ITerminalsConnectorConstants.PROP_PROCESS_WORKING_DIR);
String[] envp = null;
if (properties.containsKey(ITerminalsConnectorConstants.PROP_PROCESS_ENVIRONMENT) &&
properties.get(ITerminalsConnectorConstants.PROP_PROCESS_ENVIRONMENT) != null &&
properties.get(ITerminalsConnectorConstants.PROP_PROCESS_ENVIRONMENT) instanceof String[]){
envp = (String[])properties.get(ITerminalsConnectorConstants.PROP_PROCESS_ENVIRONMENT);
if (properties.containsKey(ITerminalsConnectorConstants.PROP_PROCESS_ENVIRONMENT)
&& properties.get(ITerminalsConnectorConstants.PROP_PROCESS_ENVIRONMENT) != null
&& properties.get(ITerminalsConnectorConstants.PROP_PROCESS_ENVIRONMENT) instanceof String[]) {
envp = (String[]) properties.get(ITerminalsConnectorConstants.PROP_PROCESS_ENVIRONMENT);
}
// Set the ECLIPSE_HOME and ECLIPSE_WORKSPACE environment variables
List<String> envpList = new ArrayList<String>();
if (envp != null) envpList.addAll(Arrays.asList(envp));
if (envp != null)
envpList.addAll(Arrays.asList(envp));
// ECLIPSE_HOME
String eclipseHomeLocation = System.getProperty("eclipse.home.location"); //$NON-NLS-1$
@ -353,21 +379,23 @@ public class LocalLauncherDelegate extends AbstractLauncherDelegate {
URI uri = URIUtil.fromString(eclipseHomeLocation);
File f = URIUtil.toFile(uri);
envpList.add("ECLIPSE_HOME=" + f.getAbsolutePath()); //$NON-NLS-1$
} catch (URISyntaxException e) { /* ignored on purpose */ }
} catch (URISyntaxException e) {
/* ignored on purpose */ }
}
// ECLIPSE_WORKSPACE
Bundle bundle = Platform.getBundle("org.eclipse.core.resources"); //$NON-NLS-1$
if (bundle != null && bundle.getState() != Bundle.UNINSTALLED && bundle.getState() != Bundle.STOPPING) {
if (org.eclipse.core.resources.ResourcesPlugin.getWorkspace() != null
&& org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRoot() != null
&& org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRoot().getLocation() != null) {
envpList.add("ECLIPSE_WORKSPACE=" + org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRoot().getLocation().toOSString()); //$NON-NLS-1$
}
if (org.eclipse.core.resources.ResourcesPlugin.getWorkspace() != null
&& org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRoot() != null
&& org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRoot().getLocation() != null) {
envpList.add("ECLIPSE_WORKSPACE=" + org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRoot() //$NON-NLS-1$
.getLocation().toOSString());
}
}
// Convert back into a string array
envp = envpList.toArray(new String[envpList.size()]);
// Convert back into a string array
envp = envpList.toArray(new String[envpList.size()]);
Assert.isTrue(image != null || process != null);
@ -389,7 +417,8 @@ public class LocalLauncherDelegate extends AbstractLauncherDelegate {
if (properties.containsKey(ITerminalsConnectorConstants.PROP_PROCESS_MERGE_ENVIRONMENT)) {
Object value = properties.get(ITerminalsConnectorConstants.PROP_PROCESS_MERGE_ENVIRONMENT);
processSettings.setMergeWithNativeEnvironment(value instanceof Boolean ? ((Boolean)value).booleanValue() : false);
processSettings
.setMergeWithNativeEnvironment(value instanceof Boolean ? ((Boolean) value).booleanValue() : false);
}
// And save the settings to the store

8
terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalLauncherHandler.java
View file

@ -46,10 +46,12 @@ public class LocalLauncherHandler extends AbstractHandler {
if (!(selection instanceof IStructuredSelection)) {
IEditorInput input = HandlerUtil.getActiveEditorInput(event);
if (input instanceof IPathEditorInput) {
IPath path = ((IPathEditorInput)input).getPath();
IPath path = ((IPathEditorInput) input).getPath();
if (path != null) {
if (path.toFile().isFile()) path = path.removeLastSegments(1);
if (path.toFile().isDirectory() && path.toFile().canRead()) selection = new StructuredSelection(path);
if (path.toFile().isFile())
path = path.removeLastSegments(1);
if (path.toFile().isDirectory() && path.toFile().canRead())
selection = new StructuredSelection(path);
}
}
}

43
terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessConnector.java
View file

@ -113,7 +113,7 @@ public class ProcessConnector extends AbstractStreamsConnector {
pty = new PTY(PTY.Mode.TERMINAL);
// Initialize the terminal size
VT100Emulator text = ((VT100TerminalControl)control).getTerminalText();
VT100Emulator text = ((VT100TerminalControl) control).getTerminalText();
text.fontChanged();
} catch (IOException e) {
// PTY not supported
@ -129,13 +129,13 @@ public class ProcessConnector extends AbstractStreamsConnector {
command.append(arguments.trim());
}
File workingDir =null;
if (settings.getWorkingDir()!=null){
File workingDir = null;
if (settings.getWorkingDir() != null) {
workingDir = new File(settings.getWorkingDir());
}
String[] envp = null;
if (settings.getEnvironment()!=null){
if (settings.getEnvironment() != null) {
envp = settings.getEnvironment();
}
@ -165,7 +165,8 @@ public class ProcessConnector extends AbstractStreamsConnector {
}
// Execute the process
process = ProcessFactory.getFactory().exec(argv.toArray(new String[argv.size()]), envp, workingDir, pty);
process = ProcessFactory.getFactory().exec(argv.toArray(new String[argv.size()]), envp, workingDir,
pty);
} else {
// No PTY -> just execute via the standard Java Runtime implementation.
process = Runtime.getRuntime().exec(command.toString(), envp, workingDir);
@ -177,11 +178,9 @@ public class ProcessConnector extends AbstractStreamsConnector {
lineSeparator = System.getProperty("line.separator"); //$NON-NLS-1$
if ("\r".equals(lineSeparator)) { //$NON-NLS-1$
lineSeparator = ILineSeparatorConstants.LINE_SEPARATOR_CR;
}
else if ("\n".equals(lineSeparator)) { //$NON-NLS-1$
} else if ("\n".equals(lineSeparator)) { //$NON-NLS-1$
lineSeparator = ILineSeparatorConstants.LINE_SEPARATOR_LF;
}
else {
} else {
lineSeparator = ILineSeparatorConstants.LINE_SEPARATOR_CRLF;
}
}
@ -196,7 +195,8 @@ public class ProcessConnector extends AbstractStreamsConnector {
control.setVT100LineWrapping(true);
// connect the streams
connectStreams(control, process.getOutputStream(), process.getInputStream(), (pty == null ? process.getErrorStream() : null), settings.isLocalEcho(), lineSeparator);
connectStreams(control, process.getOutputStream(), process.getInputStream(),
(pty == null ? process.getErrorStream() : null), settings.isLocalEcho(), lineSeparator);
// Set the terminal control state to CONNECTED
control.setState(TerminalState.CONNECTED);
@ -209,7 +209,8 @@ public class ProcessConnector extends AbstractStreamsConnector {
disconnect();
// Lookup the tab item
CTabItem item = ConsoleManager.getInstance().findConsole(control);
if (item != null) item.dispose();
if (item != null)
item.dispose();
// Get the error message from the exception
String msg = e.getLocalizedMessage() != null ? e.getLocalizedMessage() : ""; //$NON-NLS-1$
Assert.isNotNull(msg);
@ -225,10 +226,10 @@ public class ProcessConnector extends AbstractStreamsConnector {
private static String getTermVariable(String[] envp) {
if (envp != null && !Platform.OS_WIN32.equals(Platform.getOS()))
for (String var : envp)
if (var.startsWith("TERM=")) //$NON-NLS-1$
return var.substring(5);
return "xterm"; //$NON-NLS-1$
}
if (var.startsWith("TERM=")) //$NON-NLS-1$
return var.substring(5);
return "xterm"; //$NON-NLS-1$
}
/* (non-Javadoc)
* @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#isLocalEcho()
@ -252,7 +253,10 @@ public class ProcessConnector extends AbstractStreamsConnector {
if (!isWindows) {
// Destroy the process first, except on windows (Bug 465674)
if (process != null) { process.destroy(); process = null; }
if (process != null) {
process.destroy();
process = null;
}
}
// Dispose the streams
@ -260,7 +264,10 @@ public class ProcessConnector extends AbstractStreamsConnector {
if (isWindows) {
// On Windows destroy the process after closing streams
if (process != null) { process.destroy(); process = null; }
if (process != null) {
process.destroy();
process = null;
}
}
// Set the terminal control state to CLOSED.
@ -274,7 +281,7 @@ public class ProcessConnector extends AbstractStreamsConnector {
*/
@Override
public void setDefaultSettings() {
settings.load(new NullSettingsStore());
settings.load(new NullSettingsStore());
}
/* (non-Javadoc)

36
terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessLauncherDelegate.java
View file

@ -72,26 +72,29 @@ public class ProcessLauncherDelegate extends AbstractLauncherDelegate {
Assert.isNotNull(properties);
// Check for the terminal connector id
String connectorId = (String)properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID);
if (connectorId == null) connectorId = "org.eclipse.tm.terminal.connector.process.ProcessConnector"; //$NON-NLS-1$
String connectorId = (String) properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID);
if (connectorId == null)
connectorId = "org.eclipse.tm.terminal.connector.process.ProcessConnector"; //$NON-NLS-1$
// Extract the process properties
String image = (String)properties.get(ITerminalsConnectorConstants.PROP_PROCESS_PATH);
String arguments = (String)properties.get(ITerminalsConnectorConstants.PROP_PROCESS_ARGS);
Process process = (Process)properties.get(ITerminalsConnectorConstants.PROP_PROCESS_OBJ);
PTY pty = (PTY)properties.get(ITerminalsConnectorConstants.PROP_PTY_OBJ);
String image = (String) properties.get(ITerminalsConnectorConstants.PROP_PROCESS_PATH);
String arguments = (String) properties.get(ITerminalsConnectorConstants.PROP_PROCESS_ARGS);
Process process = (Process) properties.get(ITerminalsConnectorConstants.PROP_PROCESS_OBJ);
PTY pty = (PTY) properties.get(ITerminalsConnectorConstants.PROP_PTY_OBJ);
Object value = properties.get(ITerminalsConnectorConstants.PROP_LOCAL_ECHO);
boolean localEcho = value instanceof Boolean ? ((Boolean)value).booleanValue() : false;
String lineSeparator = (String)properties.get(ITerminalsConnectorConstants.PROP_LINE_SEPARATOR);
ITerminalServiceOutputStreamMonitorListener[] stdoutListeners = (ITerminalServiceOutputStreamMonitorListener[])properties.get(ITerminalsConnectorConstants.PROP_STDOUT_LISTENERS);
ITerminalServiceOutputStreamMonitorListener[] stderrListeners = (ITerminalServiceOutputStreamMonitorListener[])properties.get(ITerminalsConnectorConstants.PROP_STDERR_LISTENERS);
String workingDir = (String)properties.get(ITerminalsConnectorConstants.PROP_PROCESS_WORKING_DIR);
boolean localEcho = value instanceof Boolean ? ((Boolean) value).booleanValue() : false;
String lineSeparator = (String) properties.get(ITerminalsConnectorConstants.PROP_LINE_SEPARATOR);
ITerminalServiceOutputStreamMonitorListener[] stdoutListeners = (ITerminalServiceOutputStreamMonitorListener[]) properties
.get(ITerminalsConnectorConstants.PROP_STDOUT_LISTENERS);
ITerminalServiceOutputStreamMonitorListener[] stderrListeners = (ITerminalServiceOutputStreamMonitorListener[]) properties
.get(ITerminalsConnectorConstants.PROP_STDERR_LISTENERS);
String workingDir = (String) properties.get(ITerminalsConnectorConstants.PROP_PROCESS_WORKING_DIR);
String[] envp = null;
if (properties.containsKey(ITerminalsConnectorConstants.PROP_PROCESS_ENVIRONMENT) &&
properties.get(ITerminalsConnectorConstants.PROP_PROCESS_ENVIRONMENT) != null &&
properties.get(ITerminalsConnectorConstants.PROP_PROCESS_ENVIRONMENT) instanceof String[]){
envp = (String[])properties.get(ITerminalsConnectorConstants.PROP_PROCESS_ENVIRONMENT);
if (properties.containsKey(ITerminalsConnectorConstants.PROP_PROCESS_ENVIRONMENT)
&& properties.get(ITerminalsConnectorConstants.PROP_PROCESS_ENVIRONMENT) != null
&& properties.get(ITerminalsConnectorConstants.PROP_PROCESS_ENVIRONMENT) instanceof String[]) {
envp = (String[]) properties.get(ITerminalsConnectorConstants.PROP_PROCESS_ENVIRONMENT);
}
Assert.isTrue(image != null || process != null);
@ -114,7 +117,8 @@ public class ProcessLauncherDelegate extends AbstractLauncherDelegate {
if (properties.containsKey(ITerminalsConnectorConstants.PROP_PROCESS_MERGE_ENVIRONMENT)) {
value = properties.get(ITerminalsConnectorConstants.PROP_PROCESS_MERGE_ENVIRONMENT);
processSettings.setMergeWithNativeEnvironment(value instanceof Boolean ? ((Boolean)value).booleanValue() : false);
processSettings
.setMergeWithNativeEnvironment(value instanceof Boolean ? ((Boolean) value).booleanValue() : false);
}
// And save the settings to the store

125
terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessMonitor.java
View file

@ -13,7 +13,6 @@ package org.eclipse.tm.terminal.connector.process;
import org.eclipse.core.runtime.Assert;
/**
* Process monitor implementation.
*/
@ -27,82 +26,84 @@ public class ProcessMonitor {
// Flag to mark the monitor disposed
private boolean disposed;
/**
* Constructor.
*
* @param processConnector The parent process connector. Must not be <code>null</code>.
*/
public ProcessMonitor(ProcessConnector processConnector) {
super();
/**
* Constructor.
*
* @param processConnector The parent process connector. Must not be <code>null</code>.
*/
public ProcessMonitor(ProcessConnector processConnector) {
super();
Assert.isNotNull(processConnector);
Assert.isNotNull(processConnector);
this.processConnector = processConnector;
// Query the monitored process for easier access
this.process = processConnector.getProcess();
}
}
/**
* Dispose the process monitor.
*/
/**
* Dispose the process monitor.
*/
public void dispose() {
// Set the disposed status
disposed = true;
// Not initialized -> return immediately
if (thread == null) return;
// Set the disposed status
disposed = true;
// Not initialized -> return immediately
if (thread == null)
return;
// Copy the reference
final Thread oldThread = thread;
// Unlink the monitor from the thread
thread = null;
// And interrupt the writer thread
oldThread.interrupt();
}
// Copy the reference
final Thread oldThread = thread;
// Unlink the monitor from the thread
thread = null;
// And interrupt the writer thread
oldThread.interrupt();
}
/**
* Starts the terminal output stream monitor.
*/
public void startMonitoring() {
// If already initialized -> return immediately
if (thread != null) return;
/**
* Starts the terminal output stream monitor.
*/
public void startMonitoring() {
// If already initialized -> return immediately
if (thread != null)
return;
// Create a new runnable which is constantly reading from the stream
Runnable runnable = new Runnable() {
@Override
// Create a new runnable which is constantly reading from the stream
Runnable runnable = new Runnable() {
@Override
public void run() {
monitorProcess();
}
};
monitorProcess();
}
};
// Create the monitor thread
thread = new Thread(runnable, "Terminal Process Monitor Thread"); //$NON-NLS-1$
// Create the monitor thread
thread = new Thread(runnable, "Terminal Process Monitor Thread"); //$NON-NLS-1$
// Configure the monitor thread
thread.setDaemon(true);
// Configure the monitor thread
thread.setDaemon(true);
// Start the processing
thread.start();
}
// Start the processing
thread.start();
}
/**
* Monitors the associated system process, waiting for it to terminate,
* and notifies the associated process monitor's.
*/
/**
* Monitors the associated system process, waiting for it to terminate,
* and notifies the associated process monitor's.
*/
public void monitorProcess() {
// If already disposed -> return immediately
if (disposed) return;
// If already disposed -> return immediately
if (disposed)
return;
try {
// Wait for the monitored process to terminate
process.waitFor();
} catch (InterruptedException ie) {
// clear interrupted state
Thread.interrupted();
} finally {
// Dispose the parent process connector
if (!disposed)
processConnector.disconnect();
}
}
try {
// Wait for the monitored process to terminate
process.waitFor();
} catch (InterruptedException ie) {
// clear interrupted state
Thread.interrupted();
} finally {
// Dispose the parent process connector
if (!disposed)
processConnector.disconnect();
}
}
}

28
terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessSettings.java
View file

@ -113,7 +113,8 @@ public class ProcessSettings {
public void setPTY(PTY pty) {
this.pty = pty;
// If the PTY is set to "null", the local echo will be set to "true"
if (pty == null) setLocalEcho(true);
if (pty == null)
setLocalEcho(true);
}
/**
@ -265,15 +266,18 @@ public class ProcessSettings {
image = store.get("Path", null);//$NON-NLS-1$
arguments = store.get("Arguments", null); //$NON-NLS-1$
localEcho = Boolean.parseBoolean(store.get("LocalEcho", Boolean.FALSE.toString())); //$NON-NLS-1$
mergeWithNativeEnvironment = Boolean.parseBoolean(store.get("MergeWithNativeEnvironment", Boolean.FALSE.toString())); //$NON-NLS-1$
mergeWithNativeEnvironment = Boolean
.parseBoolean(store.get("MergeWithNativeEnvironment", Boolean.FALSE.toString())); //$NON-NLS-1$
lineSeparator = store.get("LineSeparator", null); //$NON-NLS-1$
workingDir = store.get("WorkingDir", null); //$NON-NLS-1$
if (store instanceof SettingsStore) {
process = (Process)((SettingsStore)store).getSettings().get("Process"); //$NON-NLS-1$
pty = (PTY)((SettingsStore)store).getSettings().get("PTY"); //$NON-NLS-1$
stdoutListeners = (ITerminalServiceOutputStreamMonitorListener[])((SettingsStore)store).getSettings().get("StdOutListeners"); //$NON-NLS-1$
stderrListeners = (ITerminalServiceOutputStreamMonitorListener[])((SettingsStore)store).getSettings().get("StdErrListeners"); //$NON-NLS-1$
environment = (String[])((SettingsStore)store).getSettings().get("Environment"); //$NON-NLS-1$
process = (Process) ((SettingsStore) store).getSettings().get("Process"); //$NON-NLS-1$
pty = (PTY) ((SettingsStore) store).getSettings().get("PTY"); //$NON-NLS-1$
stdoutListeners = (ITerminalServiceOutputStreamMonitorListener[]) ((SettingsStore) store).getSettings()
.get("StdOutListeners"); //$NON-NLS-1$
stderrListeners = (ITerminalServiceOutputStreamMonitorListener[]) ((SettingsStore) store).getSettings()
.get("StdErrListeners"); //$NON-NLS-1$
environment = (String[]) ((SettingsStore) store).getSettings().get("Environment"); //$NON-NLS-1$
}
}
@ -291,11 +295,11 @@ public class ProcessSettings {
store.put("LineSeparator", lineSeparator); //$NON-NLS-1$
store.put("WorkingDir", workingDir); //$NON-NLS-1$
if (store instanceof SettingsStore) {
((SettingsStore)store).getSettings().put("Process", process); //$NON-NLS-1$
((SettingsStore)store).getSettings().put("PTY", pty); //$NON-NLS-1$
((SettingsStore)store).getSettings().put("StdOutListeners", stdoutListeners); //$NON-NLS-1$
((SettingsStore)store).getSettings().put("StdErrListeners", stderrListeners); //$NON-NLS-1$
((SettingsStore)store).getSettings().put("Environment", environment); //$NON-NLS-1$
((SettingsStore) store).getSettings().put("Process", process); //$NON-NLS-1$
((SettingsStore) store).getSettings().put("PTY", pty); //$NON-NLS-1$
((SettingsStore) store).getSettings().put("StdOutListeners", stdoutListeners); //$NON-NLS-1$
((SettingsStore) store).getSettings().put("StdErrListeners", stderrListeners); //$NON-NLS-1$
((SettingsStore) store).getSettings().put("Environment", environment); //$NON-NLS-1$
}
}
}

15
terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessSettingsPage.java
View file

@ -69,7 +69,8 @@ public class ProcessSettingsPage extends AbstractSettingsPage {
// The entry fields shall be properly aligned
Composite panel = new Composite(composite, SWT.NONE);
GridLayout layout = new GridLayout(2, false);
layout.marginWidth = 0; layout.marginHeight = 0;
layout.marginWidth = 0;
layout.marginHeight = 0;
panel.setLayout(layout);
panel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@ -80,7 +81,8 @@ public class ProcessSettingsPage extends AbstractSettingsPage {
// Text field and browse button are aligned it their own panel
Composite innerPanel = new Composite(panel, SWT.NONE);
layout = new GridLayout(2, false);
layout.marginWidth = 0; layout.marginHeight = 0;
layout.marginWidth = 0;
layout.marginHeight = 0;
innerPanel.setLayout(layout);
innerPanel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@ -127,7 +129,8 @@ public class ProcessSettingsPage extends AbstractSettingsPage {
*/
protected void onBrowseButtonSelected(SelectionEvent e) {
// Determine the shell
Shell shell = e != null ? e.widget.getDisplay().getActiveShell() : PlatformUI.getWorkbench().getDisplay().getActiveShell();
Shell shell = e != null ? e.widget.getDisplay().getActiveShell()
: PlatformUI.getWorkbench().getDisplay().getActiveShell();
// create a standard file dialog
FileDialog dialog = new FileDialog(shell, SWT.OPEN);
@ -141,7 +144,8 @@ public class ProcessSettingsPage extends AbstractSettingsPage {
IPath filePath = new Path(selectedFile);
// If the selected file points to an directory, use the directory as is
IPath filterPath = filePath.toFile().isDirectory() ? filePath : filePath.removeLastSegments(1);
String filterFileName = filePath.toFile().isDirectory() || !filePath.toFile().exists() ? null : filePath.lastSegment();
String filterFileName = filePath.toFile().isDirectory() || !filePath.toFile().exists() ? null
: filePath.lastSegment();
if (!filterPath.isEmpty()) {
dialog.setFilterPath(filterPath.toString());
@ -152,7 +156,8 @@ public class ProcessSettingsPage extends AbstractSettingsPage {
} else {
Bundle bundle = Platform.getBundle("org.eclipse.core.resources"); //$NON-NLS-1$
if (bundle != null && bundle.getState() != Bundle.UNINSTALLED && bundle.getState() != Bundle.STOPPING) {
dialog.setFilterPath(org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRoot().getLocation().toOSString());
dialog.setFilterPath(
org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRoot().getLocation().toOSString());
}
}

4
terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/activator/UIPlugin.java
View file

@ -69,7 +69,7 @@ public class UIPlugin extends AbstractUIPlugin {
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
@Override
public void start(BundleContext context) throws Exception {
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
}
@ -78,7 +78,7 @@ public class UIPlugin extends AbstractUIPlugin {
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
@Override
public void stop(BundleContext context) throws Exception {
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
}

1
terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/help/IContextHelpIds.java
View file

@ -13,7 +13,6 @@ package org.eclipse.tm.terminal.connector.process.help;
import org.eclipse.tm.terminal.connector.process.activator.UIPlugin;
/**
* Context help id definitions.
*/

12
terminal/plugins/org.eclipse.tm.terminal.connector.remote/src/org/eclipse/tm/terminal/connector/remote/IRemoteSettings.java
View file

@ -1,9 +1,9 @@
/*******************************************************************************
* Copyright (c) 2015, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*******************************************************************************/
package org.eclipse.tm.terminal.connector.remote;
@ -13,14 +13,14 @@ public interface IRemoteSettings {
/**
* Get the connection type ID for the connection (e.g. local, ssh, etc.)
*
*
* @return connection type ID.
*/
String getConnectionTypeId();
/**
* Get the connection name for the target system.
*
*
* @return connection name
*/
String getConnectionName();

12
terminal/plugins/org.eclipse.tm.terminal.connector.remote/src/org/eclipse/tm/terminal/connector/remote/IRemoteTerminalParser.java
View file

@ -1,9 +1,9 @@
/*******************************************************************************
* Copyright (c) 2015, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*******************************************************************************/
package org.eclipse.tm.terminal.connector.remote;
@ -16,7 +16,7 @@ public interface IRemoteTerminalParser {
/**
* Initialize the remote shell. This method will be called after the connection has been initialized. Implementors can assume
* that the connection is open when this is called.
*
*
* @param connection
* terminal shell connection
* @return IRemoteProcess a remote process corresponding to the remote shell
@ -28,7 +28,7 @@ public interface IRemoteTerminalParser {
/**
* Parse the input stream. This method will be called with a buffer of characters read from the input stream. If the method
* returns true, the characters will be displayed in the terminal view, otherwise they will be ignored.
*
*
* @param buf
* buffer containing characters from the terminal input stream
* @return true if the characters should be displayed in the terminal

16
terminal/plugins/org.eclipse.tm.terminal.connector.remote/src/org/eclipse/tm/terminal/connector/remote/controls/RemoteWizardConfigurationPanel.java
View file

@ -50,7 +50,7 @@ public class RemoteWizardConfigurationPanel extends AbstractExtendedConfiguratio
/*
* (non-Javadoc)
*
*
* @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite)
*/
@Override
@ -88,7 +88,7 @@ public class RemoteWizardConfigurationPanel extends AbstractExtendedConfiguratio
/*
* (non-Javadoc)
*
*
* @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#setupData(java.util.Map)
*/
@Override
@ -117,7 +117,7 @@ public class RemoteWizardConfigurationPanel extends AbstractExtendedConfiguratio
/*
* (non-Javadoc)
*
*
* @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#extractData(java.util.Map)
*/
@Override
@ -141,7 +141,7 @@ public class RemoteWizardConfigurationPanel extends AbstractExtendedConfiguratio
/*
* (non-Javadoc)
*
*
* @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#fillSettingsForHost(java.lang.String)
*/
@Override
@ -150,7 +150,7 @@ public class RemoteWizardConfigurationPanel extends AbstractExtendedConfiguratio
/*
* (non-Javadoc)
*
*
* @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#saveSettingsForHost(boolean)
*/
@Override
@ -159,7 +159,7 @@ public class RemoteWizardConfigurationPanel extends AbstractExtendedConfiguratio
/*
* (non-Javadoc)
*
*
* @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#isValid()
*/
@Override
@ -169,7 +169,7 @@ public class RemoteWizardConfigurationPanel extends AbstractExtendedConfiguratio
/*
* (non-Javadoc)
*
*
* @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#doSaveWidgetValues(org.eclipse.jface.dialogs.
* IDialogSettings, java.lang.String)
*/
@ -181,7 +181,7 @@ public class RemoteWizardConfigurationPanel extends AbstractExtendedConfiguratio
/*
* (non-Javadoc)
*
*
* @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#getHostFromSettings()
*/
@Override

20
terminal/plugins/org.eclipse.tm.terminal.connector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/Activator.java
View file

@ -1,9 +1,9 @@
/*******************************************************************************
* Copyright (c) 2015, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*******************************************************************************/
package org.eclipse.tm.terminal.connector.remote.internal;
@ -45,7 +45,7 @@ public class Activator extends Plugin {
/**
* Returns the shared instance
*
*
* @return the shared instance
*/
public static Activator getDefault() {
@ -54,7 +54,7 @@ public class Activator extends Plugin {
/**
* Returns an image descriptor for the image file at the given plug-in relative path.
*
*
* @param path
* the path
* @return the image descriptor
@ -65,7 +65,7 @@ public class Activator extends Plugin {
/**
* Create log entry from an IStatus
*
*
* @param status
* status to log
*/
@ -75,7 +75,7 @@ public class Activator extends Plugin {
/**
* Create log entry from a string
*
*
* @param msg
* message to log
*/
@ -85,7 +85,7 @@ public class Activator extends Plugin {
/**
* Create log entry from a Throwable
*
*
* @param e
* throwable to log
*/
@ -97,7 +97,7 @@ public class Activator extends Plugin {
/**
* Generate a unique identifier
*
*
* @return unique identifier string
*/
public static String getUniqueIdentifier() {

21
terminal/plugins/org.eclipse.tm.terminal.connector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/ArgumentParser.java
View file

@ -6,7 +6,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@ -103,7 +103,8 @@ public class ArgumentParser {
* string. Allows escaping.
*/
iterator.next(); // Skip quote
quoted_reader: while ((iterator.current() != CharacterIterator.DONE) && (iterator.current() != '"')) {
quoted_reader: while ((iterator.current() != CharacterIterator.DONE)
&& (iterator.current() != '"')) {
char innerChar = iterator.current();
switch (innerChar) {
case '\\':
@ -177,7 +178,7 @@ public class ArgumentParser {
/**
* Convert all tokens in a full command line that can be executed in a
* shell.
*
*
* @param fullEscape
* If every special character shall be escaped. If false, only
* white spaces are escaped and the shell will interpret the
@ -254,7 +255,7 @@ public class ArgumentParser {
/**
* Returns a List of all entries of the command line.
*
*
* @return The Array
*/
public String[] getTokenArray() {
@ -263,7 +264,7 @@ public class ArgumentParser {
/**
* Returns a List of all entries of the command line.
*
*
* @return The List
*/
public List<String> getTokenList() {
@ -273,7 +274,7 @@ public class ArgumentParser {
/**
* Returns the command of the command line, assuming that the first entry is
* always the command.
*
*
* @return The command or null if the command lines has no command nor
* arguments.
*/
@ -287,7 +288,7 @@ public class ArgumentParser {
/**
* Returns the command of the command line, assuming that the first entry is
* always the command.
*
*
* @return The command or null if the command lines has no command nor
* arguments.
* @param fullEscape
@ -305,7 +306,7 @@ public class ArgumentParser {
/**
* Returns a list of all arguments, assuming that the first entry is the
* command name.
*
*
* @return The Array or null if the command lines has no command nor
* arguments.
*/
@ -319,7 +320,7 @@ public class ArgumentParser {
/**
* Returns a list of all arguments, assuming that the first entry is the
* command name.
*
*
* @return The List or null if the command lines has no command nor
* arguments.
*/
@ -332,7 +333,7 @@ public class ArgumentParser {
/**
* Returns the total number of entries.
*
*
* @return the total number of entries
*/
public int getSize() {

18
terminal/plugins/org.eclipse.tm.terminal.connector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/RemoteConnectionManager.java
View file

@ -64,7 +64,7 @@ public class RemoteConnectionManager extends Job {
/*
* (non-Javadoc)
*
*
* @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
*/
@Override
@ -79,15 +79,15 @@ public class RemoteConnectionManager extends Job {
remoteConnection = connType.getConnection(connector.getRemoteSettings().getConnectionName());
}
if (remoteConnection == null) {
return new Status(IStatus.ERROR, Activator.getUniqueIdentifier(),
NLS.bind(Messages.RemoteConnectionManager_0, connector.getRemoteSettings().getConnectionName()));
return new Status(IStatus.ERROR, Activator.getUniqueIdentifier(), NLS
.bind(Messages.RemoteConnectionManager_0, connector.getRemoteSettings().getConnectionName()));
}
if (!remoteConnection.isOpen()) {
remoteConnection.open(monitor);
if (!remoteConnection.isOpen()) {
return new Status(IStatus.ERROR, Activator.getUniqueIdentifier(),
NLS.bind(Messages.RemoteConnectionManager_1, connector.getRemoteSettings().getConnectionName()));
return new Status(IStatus.ERROR, Activator.getUniqueIdentifier(), NLS.bind(
Messages.RemoteConnectionManager_1, connector.getRemoteSettings().getConnectionName()));
}
}
@ -104,7 +104,8 @@ public class RemoteConnectionManager extends Job {
String terminalShellCommand = prefs.get(IRemoteTerminalConstants.PREF_TERMINAL_SHELL_COMMAND, ""); //$NON-NLS-1$
if ("".equals(terminalShellCommand) //$NON-NLS-1$
&& remoteConnection.hasService(IRemoteCommandShellService.class)) {
IRemoteCommandShellService cmdShellSvc = remoteConnection.getService(IRemoteCommandShellService.class);
IRemoteCommandShellService cmdShellSvc = remoteConnection
.getService(IRemoteCommandShellService.class);
synchronized (this) {
remoteProcess = cmdShellSvc.getCommandShell(IRemoteProcessBuilder.ALLOCATE_PTY);
}
@ -117,7 +118,8 @@ public class RemoteConnectionManager extends Job {
.getProcessBuilder(new ArgumentParser(terminalShellCommand).getTokenList());
remoteProcess = processBuilder.start(IRemoteProcessBuilder.ALLOCATE_PTY);
} else {
return new Status(IStatus.ERROR, Activator.getUniqueIdentifier(), Messages.RemoteConnectionManager_2);
return new Status(IStatus.ERROR, Activator.getUniqueIdentifier(),
Messages.RemoteConnectionManager_2);
}
}
@ -164,7 +166,7 @@ public class RemoteConnectionManager extends Job {
/**
* Read the data from the connection and display it in the terminal.
*
*
* @param in
* @throws IOException
*/

12
terminal/plugins/org.eclipse.tm.terminal.connector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/RemoteConnector.java
View file

@ -38,7 +38,7 @@ public class RemoteConnector extends TerminalConnectorImpl {
/*
* (non-Javadoc)
*
*
* @see
* org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#connect(org.eclipse.tm.internal.terminal.
* provisional.api.ITerminalControl)
@ -53,7 +53,7 @@ public class RemoteConnector extends TerminalConnectorImpl {
/*
* (non-Javadoc)
*
*
* @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#doDisconnect()
*/
@Override
@ -67,7 +67,7 @@ public class RemoteConnector extends TerminalConnectorImpl {
/*
* (non-Javadoc)
*
*
* @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#getSettingsSummary()
*/
@Override
@ -77,7 +77,7 @@ public class RemoteConnector extends TerminalConnectorImpl {
/**
* Return the Remote Settings.
*
*
* @return the settings for a concrete connection.
*/
public IRemoteSettings getRemoteSettings() {
@ -86,7 +86,7 @@ public class RemoteConnector extends TerminalConnectorImpl {
/*
* (non-Javadoc)
*
*
* @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#getTerminalToRemoteStream()
*/
@Override
@ -119,7 +119,7 @@ public class RemoteConnector extends TerminalConnectorImpl {
/*
* (non-Javadoc)
*
*
* @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#setTerminalSize(int, int)
*/
@Override

8
terminal/plugins/org.eclipse.tm.terminal.connector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/RemoteSettings.java
View file

@ -1,9 +1,9 @@
/*******************************************************************************
* Copyright (c) 2015, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*******************************************************************************/
package org.eclipse.tm.terminal.connector.remote.internal;

6
terminal/plugins/org.eclipse.tm.terminal.connector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/RemoteSettingsPage.java
View file

@ -40,7 +40,8 @@ public class RemoteSettingsPage extends AbstractSettingsPage {
if (fTerminalSettings != null && fRemoteConnectionWidget != null && !fRemoteConnectionWidget.isDisposed()) {
if (fRemoteConnectionWidget.getConnection() != null) {
if (fRemoteConnectionWidget.getConnection().getConnectionType() != null) {
fTerminalSettings.setConnectionTypeId(fRemoteConnectionWidget.getConnection().getConnectionType().getId());
fTerminalSettings
.setConnectionTypeId(fRemoteConnectionWidget.getConnection().getConnectionType().getId());
}
fTerminalSettings.setConnectionName(fRemoteConnectionWidget.getConnection().getName());
}
@ -50,7 +51,8 @@ public class RemoteSettingsPage extends AbstractSettingsPage {
@Override
public void loadSettings() {
if (fTerminalSettings != null && fRemoteConnectionWidget != null && !fRemoteConnectionWidget.isDisposed()) {
fRemoteConnectionWidget.setConnection(fTerminalSettings.getConnectionTypeId(), fTerminalSettings.getConnectionName());
fRemoteConnectionWidget.setConnection(fTerminalSettings.getConnectionTypeId(),
fTerminalSettings.getConnectionName());
}
}

5
terminal/plugins/org.eclipse.tm.terminal.connector.remote/src/org/eclipse/tm/terminal/connector/remote/launcher/RemoteLauncherDelegate.java
View file

@ -98,7 +98,8 @@ public class RemoteLauncherDelegate extends AbstractLauncherDelegate {
private String getTerminalTitle(Map<String, Object> properties) {
// Try to see if the user set a title explicitly via the properties map.
String title = getDefaultTerminalTitle(properties);
if (title != null) return title;
if (title != null)
return title;
String connection = (String) properties.get(IRemoteSettings.CONNECTION_NAME);
@ -107,7 +108,7 @@ public class RemoteLauncherDelegate extends AbstractLauncherDelegate {
String date = format.format(new Date(System.currentTimeMillis()));
return NLS.bind(Messages.RemoteLauncherDelegate_terminalTitle, new String[] { connection, date });
}
return Messages.RemoteLauncherDelegate_terminalTitle_default;
}

10
terminal/plugins/org.eclipse.tm.terminal.connector.remote/src/org/eclipse/tm/terminal/connector/remote/launcher/RemoteMementoHandler.java
View file

@ -26,7 +26,7 @@ public class RemoteMementoHandler implements IMementoHandler {
/*
* (non-Javadoc)
*
*
* @see org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler#saveState(org.eclipse.ui.IMemento, java.util.Map)
*/
@Override
@ -37,14 +37,15 @@ public class RemoteMementoHandler implements IMementoHandler {
// Do not write the terminal title to the memento -> needs to
// be recreated at the time of restoration.
memento.putString(IRemoteSettings.CONNECTION_NAME, (String) properties.get(IRemoteSettings.CONNECTION_NAME));
memento.putString(IRemoteSettings.CONNECTION_TYPE_ID, (String) properties.get(IRemoteSettings.CONNECTION_TYPE_ID));
memento.putString(IRemoteSettings.CONNECTION_TYPE_ID,
(String) properties.get(IRemoteSettings.CONNECTION_TYPE_ID));
memento.putString(ITerminalsConnectorConstants.PROP_ENCODING,
(String) properties.get(ITerminalsConnectorConstants.PROP_ENCODING));
}
/*
* (non-Javadoc)
*
*
* @see org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler#restoreState(org.eclipse.ui.IMemento, java.util.Map)
*/
@Override
@ -55,6 +56,7 @@ public class RemoteMementoHandler implements IMementoHandler {
// Restore the terminal properties from the memento
properties.put(IRemoteSettings.CONNECTION_NAME, memento.getString(IRemoteSettings.CONNECTION_NAME));
properties.put(IRemoteSettings.CONNECTION_TYPE_ID, memento.getString(IRemoteSettings.CONNECTION_TYPE_ID));
properties.put(ITerminalsConnectorConstants.PROP_ENCODING, memento.getString(ITerminalsConnectorConstants.PROP_ENCODING));
properties.put(ITerminalsConnectorConstants.PROP_ENCODING,
memento.getString(ITerminalsConnectorConstants.PROP_ENCODING));
}
}

2
terminal/plugins/org.eclipse.tm.terminal.connector.remote/src/org/eclipse/tm/terminal/connector/remote/nls/Messages.java
View file

@ -23,7 +23,7 @@ public class Messages extends NLS {
public static String RemoteTerminalPreferencePage_0;
public static String TERMINAL_EXCEPTION;
public static String RemoteLauncherDelegate_terminalTitle;
public static String RemoteLauncherDelegate_terminalTitle_default;

24
terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/activator/UIPlugin.java
View file

@ -70,28 +70,28 @@ public class UIPlugin extends AbstractUIPlugin {
return traceHandler;
}
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
//<copied code from org.eclipse.team.cvs.ssh2/CVSSSH2Plugin (Copyright IBM)>
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
/* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
@SuppressWarnings("unchecked")
@Override
public void start(BundleContext context) throws Exception {
@Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
tracker = new ServiceTracker(getBundle().getBundleContext(), IJSchService.class.getName(), null);
tracker.open();
tracker = new ServiceTracker(getBundle().getBundleContext(), IJSchService.class.getName(), null);
tracker.open();
}
/* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
@Override
public void stop(BundleContext context) throws Exception {
public void stop(BundleContext context) throws Exception {
try {
SshConnection.shutdown();
tracker.close();
@ -106,13 +106,13 @@ public class UIPlugin extends AbstractUIPlugin {
* @return An instance of IJSchService, or <code>null</code> if no
* IJschService service is available.
*/
public IJSchService getJSchService() {
return (IJSchService)tracker.getService();
}
public IJSchService getJSchService() {
return (IJSchService) tracker.getService();
}
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
//<copied code from org.eclipse.team.cvs.ssh2/CVSSSH2Plugin (Copyright IBM)>
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
/* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#initializeImageRegistry(org.eclipse.jface.resource.ImageRegistry)

5
terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/ISshConstants.java
View file

@ -10,17 +10,16 @@
* Contributors:
* IBM Corporation - initial API and implementation
* Martin Oberhuber (Wind River) - extracted from various team.cvs plugins
* Martin Oberhuber (Wind River) - [175686] Adapted to new IJSchService API
* Martin Oberhuber (Wind River) - [175686] Adapted to new IJSchService API
*******************************************************************************/
package org.eclipse.tm.terminal.connector.ssh.connector;
/**
* Defines the constants used by the terminal.ssh Plugin
*/
public interface ISshConstants {
// These are from cvs.ui.IHelpContextIds
// These are from cvs.ui.IHelpContextIds
public static final String CVSUIPREFIX = "org.eclipse.team.cvs.ui."; //$NON-NLS-1$
public static final String HELP_USER_VALIDATION_DIALOG = CVSUIPREFIX + "user_validation_dialog_context"; //$NON-NLS-1$
public static final String HELP_KEYBOARD_INTERACTIVE_DIALOG = CVSUIPREFIX + "keyboard_interactive_dialog_context"; //$NON-NLS-1$

30
terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/ISshSettings.java
View file

@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2006, 2018 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 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* Contributors:
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* Contributors:
* Michael Scharf (Wind River) - initial API and implementation
* Martin Oberhuber (Wind River) - fixed copyright headers and beautified
* Johnson Ma (Wind River) - [218880] Add UI setting for ssh keepalives
@ -18,26 +18,26 @@ public interface ISshSettings {
public static int DEFAULT_SSH_PORT = 22;
/**
/**
* Get the host name or IP address of remote system to connect.
* @return host name or IP address of the remote system.
*/
*/
String getHost();
/**
* Get the login name for connecting to the remote system.
* @return remote login name
*/
*/
String getUser();
/**
* Get the password for connecting to the remote system.
* May be empty if connecting via SSH public key authentication
* (with or without passphrase).
* @return password to use
*/
* @return password to use
*/
String getPassword();
/**
* Get the timeout (in seconds) after which the SSH connection is assumed dead.
* @return timeout (in seconds) for the SSH connection.
@ -47,9 +47,9 @@ public interface ISshSettings {
/**
* Get the keepalive interval (in seconds).
* After this time of inactivity, the SSH connector will send a message to the
* remote system in order to avoid timeouts on the remote. A maximum of 6
* keepalive messages will be sent if enabled. When set to 0, the keepalive
* feature is disabled.
* remote system in order to avoid timeouts on the remote. A maximum of 6
* keepalive messages will be sent if enabled. When set to 0, the keepalive
* feature is disabled.
* @return interval (in seconds) for keepalive messages.
*/
int getKeepalive();

303
terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/KeyboardInteractiveDialog.java
View file

@ -33,161 +33,164 @@ import org.eclipse.ui.PlatformUI;
* A dialog for keyboad-interactive authentication for the ssh2 connection.
*/
public class KeyboardInteractiveDialog extends TrayDialog {
// widgets
private Text[] texts;
// widgets
private Text[] texts;
protected String domain;
protected String destination;
protected String name;
protected String instruction;
protected String lang;
protected String[] prompt;
protected boolean[] echo;
private String message;
private String[] result;
protected String domain;
protected String destination;
protected String name;
protected String instruction;
protected String lang;
protected String[] prompt;
protected boolean[] echo;
private String message;
private String[] result;
/**
* Creates a nwe KeyboardInteractiveDialog.
*
* @param parentShell the parent shell
* @param connectionId an id for the connection
* @param destination the location
* @param name the name
* @param instruction the instruction
* @param prompt the titles for textfields
* @param echo '*' should be used or not
*/
public KeyboardInteractiveDialog(Shell parentShell,
String connectionId,
String destination,
String name,
String instruction,
String[] prompt,
boolean[] echo){
super(parentShell);
this.domain=connectionId;
this.destination=destination;
this.name=name;
this.instruction=instruction;
this.prompt=prompt;
this.echo=echo;
this.message=NLS.bind(SshMessages.KeyboardInteractiveDialog_message, new String[] { destination+(name!=null && name.length()>0 ? ": "+name : "") }); //NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-2$
}
/**
* @see Window#configureShell
*/
@Override
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
newShell.setText(message);
}
/**
* @see Window#create
*/
@Override
public void create() {
super.create();
if(texts.length>0){
texts[0].setFocus();
}
}
/**
* @see Dialog#createDialogArea
*/
@Override
protected Control createDialogArea(Composite parent) {
Composite main=new Composite(parent, SWT.NONE);
GridLayout layout=new GridLayout();
layout.numColumns=3;
main.setLayout(layout);
main.setLayoutData(new GridData(GridData.FILL_BOTH));
/**
* Creates a nwe KeyboardInteractiveDialog.
*
* @param parentShell the parent shell
* @param connectionId an id for the connection
* @param destination the location
* @param name the name
* @param instruction the instruction
* @param prompt the titles for textfields
* @param echo '*' should be used or not
*/
public KeyboardInteractiveDialog(Shell parentShell, String connectionId, String destination, String name,
String instruction, String[] prompt, boolean[] echo) {
super(parentShell);
this.domain = connectionId;
this.destination = destination;
this.name = name;
this.instruction = instruction;
this.prompt = prompt;
this.echo = echo;
this.message = NLS.bind(SshMessages.KeyboardInteractiveDialog_message,
new String[] { destination + (name != null && name.length() > 0 ? ": " + name : "") }); //NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-2$
}
// set F1 help
PlatformUI.getWorkbench().getHelpSystem().setHelp(main, ISshConstants.HELP_KEYBOARD_INTERACTIVE_DIALOG);
/**
* @see Window#configureShell
*/
@Override
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
newShell.setText(message);
}
if (message!=null) {
Label messageLabel=new Label(main, SWT.WRAP);
messageLabel.setText(message);
GridData data=new GridData(GridData.FILL_HORIZONTAL);
data.horizontalSpan=3;
messageLabel.setLayoutData(data);
}
if(domain!=null){
Label label = new Label(main, SWT.WRAP);
label.setText(NLS.bind(SshMessages.KeyboardInteractiveDialog_labelConnection, new String[] { domain }));
GridData data=new GridData(GridData.FILL_HORIZONTAL);
data.horizontalSpan=3;
label.setLayoutData(data);
}
if (instruction!=null && instruction.length()>0) {
Label messageLabel=new Label(main, SWT.WRAP);
messageLabel.setText(instruction);
GridData data=new GridData(GridData.FILL_HORIZONTAL);
data.horizontalSpan=3;
messageLabel.setLayoutData(data);
}
createPasswordFields(main);
return main;
}
/**
* Creates the widgets that represent the entry area.
*
* @param parent the parent of the widgets
*/
@SuppressWarnings("unused")
protected void createPasswordFields(Composite parent) {
texts=new Text[prompt.length];
/**
* @see Window#create
*/
@Override
public void create() {
super.create();
if (texts.length > 0) {
texts[0].setFocus();
}
}
for(int i=0; i<prompt.length; i++){
new Label(parent, SWT.NONE).setText(prompt[i]);
texts[i]=new Text(parent, SWT.BORDER);
GridData data=new GridData(GridData.FILL_HORIZONTAL);
data.widthHint=convertHorizontalDLUsToPixels(IDialogConstants.ENTRY_FIELD_WIDTH);
texts[i].setLayoutData(data);
/**
* @see Dialog#createDialogArea
*/
@Override
protected Control createDialogArea(Composite parent) {
Composite main = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout();
layout.numColumns = 3;
main.setLayout(layout);
main.setLayoutData(new GridData(GridData.FILL_BOTH));
if(!echo[i]){
texts[i].setEchoChar('*');
}
new Label(parent, SWT.NONE);
}
// set F1 help
PlatformUI.getWorkbench().getHelpSystem().setHelp(main, ISshConstants.HELP_KEYBOARD_INTERACTIVE_DIALOG);
}
/**
* Returns the entered values, or null
* if the user cancelled.
*
* @return the entered values
*/
public String[] getResult() {
return result;
}
/**
* Notifies that the ok button of this dialog has been pressed.
* <p>
* The default implementation of this framework method sets
* this dialog's return code to <code>Window.OK</code>
* and closes the dialog. Subclasses may override.
* </p>
*/
@Override
protected void okPressed() {
result=new String[prompt.length];
for(int i=0; i<texts.length; i++){
result[i]=texts[i].getText();
}
super.okPressed();
}
/**
* Notifies that the cancel button of this dialog has been pressed.
* <p>
* The default implementation of this framework method sets
* this dialog's return code to <code>Window.CANCEL</code>
* and closes the dialog. Subclasses may override.
* </p>
*/
@Override
protected void cancelPressed() {
result=null;
super.cancelPressed();
}
if (message != null) {
Label messageLabel = new Label(main, SWT.WRAP);
messageLabel.setText(message);
GridData data = new GridData(GridData.FILL_HORIZONTAL);
data.horizontalSpan = 3;
messageLabel.setLayoutData(data);
}
if (domain != null) {
Label label = new Label(main, SWT.WRAP);
label.setText(NLS.bind(SshMessages.KeyboardInteractiveDialog_labelConnection, new String[] { domain }));
GridData data = new GridData(GridData.FILL_HORIZONTAL);
data.horizontalSpan = 3;
label.setLayoutData(data);
}
if (instruction != null && instruction.length() > 0) {
Label messageLabel = new Label(main, SWT.WRAP);
messageLabel.setText(instruction);
GridData data = new GridData(GridData.FILL_HORIZONTAL);
data.horizontalSpan = 3;
messageLabel.setLayoutData(data);
}
createPasswordFields(main);
return main;
}
/**
* Creates the widgets that represent the entry area.
*
* @param parent the parent of the widgets
*/
@SuppressWarnings("unused")
protected void createPasswordFields(Composite parent) {
texts = new Text[prompt.length];
for (int i = 0; i < prompt.length; i++) {
new Label(parent, SWT.NONE).setText(prompt[i]);
texts[i] = new Text(parent, SWT.BORDER);
GridData data = new GridData(GridData.FILL_HORIZONTAL);
data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.ENTRY_FIELD_WIDTH);
texts[i].setLayoutData(data);
if (!echo[i]) {
texts[i].setEchoChar('*');
}
new Label(parent, SWT.NONE);
}
}
/**
* Returns the entered values, or null
* if the user cancelled.
*
* @return the entered values
*/
public String[] getResult() {
return result;
}
/**
* Notifies that the ok button of this dialog has been pressed.
* <p>
* The default implementation of this framework method sets
* this dialog's return code to <code>Window.OK</code>
* and closes the dialog. Subclasses may override.
* </p>
*/
@Override
protected void okPressed() {
result = new String[prompt.length];
for (int i = 0; i < texts.length; i++) {
result[i] = texts[i].getText();
}
super.okPressed();
}
/**
* Notifies that the cancel button of this dialog has been pressed.
* <p>
* The default implementation of this framework method sets
* this dialog's return code to <code>Window.CANCEL</code>
* and closes the dialog. Subclasses may override.
* </p>
*/
@Override
protected void cancelPressed() {
result = null;
super.cancelPressed();
}
}

197
terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshConnection.java
View file

@ -54,8 +54,9 @@ public class SshConnection extends Thread {
private final SshConnector fConn;
private Session fSession;
private boolean fDisconnectHasBeenCalled;
protected SshConnection(SshConnector conn,ITerminalControl control) {
super("SshConnection-"+fgNo++); //$NON-NLS-1$
protected SshConnection(SshConnector conn, ITerminalControl control) {
super("SshConnection-" + fgNo++); //$NON-NLS-1$
fControl = control;
fConn = conn;
fControl.setState(TerminalState.CONNECTING);
@ -72,19 +73,20 @@ public class SshConnection extends Thread {
* the Jsch config (for instance, in order to switch off strict
* host key checking or in order to add specific ciphers).
*/
protected Session createSession(String username, String password, String hostname, int port, UserInfo wrapperUI, IProgressMonitor monitor) throws JSchException {
IJSchService service = UIPlugin.getDefault().getJSchService();
if (service == null)
return null;
Session session = service.createSession(hostname, port, username);
//session.setTimeout(getSshTimeoutInMillis());
session.setTimeout(0); //never time out on the session
session.setServerAliveCountMax(6); //give up after 6 tries (remote will be dead after 30 min)
if (password != null)
protected Session createSession(String username, String password, String hostname, int port, UserInfo wrapperUI,
IProgressMonitor monitor) throws JSchException {
IJSchService service = UIPlugin.getDefault().getJSchService();
if (service == null)
return null;
Session session = service.createSession(hostname, port, username);
//session.setTimeout(getSshTimeoutInMillis());
session.setTimeout(0); //never time out on the session
session.setServerAliveCountMax(6); //give up after 6 tries (remote will be dead after 30 min)
if (password != null)
session.setPassword(password);
session.setUserInfo(wrapperUI);
return session;
}
session.setUserInfo(wrapperUI);
return session;
}
public static void shutdown() {
//TODO: Store all Jsch sessions in a pool and disconnect them on shutdown
@ -95,7 +97,7 @@ public class SshConnection extends Thread {
//----------------------------------------------------------------------
@Override
public void run() {
public void run() {
boolean connectSucceeded = false;
String host = ""; //$NON-NLS-1$
int port = ISshSettings.DEFAULT_SSH_PORT;
@ -107,32 +109,31 @@ public class SshConnection extends Thread {
String password = fConn.getSshSettings().getPassword();
port = fConn.getSshSettings().getPort();
UserInfo ui=new MyUserInfo(null, user, password);
UserInfo ui = new MyUserInfo(null, user, password);
Session session = createSession(user, password, host, port,
ui, new NullProgressMonitor());
Session session = createSession(user, password, host, port, ui, new NullProgressMonitor());
synchronized (this) {
fSession = session;
}
//java.util.Hashtable config=new java.util.Hashtable();
//config.put("StrictHostKeyChecking", "no");
//session.setConfig(config);
//ui.aboutToConnect();
if (nKeepalive > 0) {
session.setServerAliveInterval(nKeepalive); //default is 5 minutes
}
// dont try to connect if disconnect has been requested already
//java.util.Hashtable config=new java.util.Hashtable();
//config.put("StrictHostKeyChecking", "no");
//session.setConfig(config);
//ui.aboutToConnect();
if (nKeepalive > 0) {
session.setServerAliveInterval(nKeepalive); //default is 5 minutes
}
// dont try to connect if disconnect has been requested already
synchronized (this) {
if (fDisconnectHasBeenCalled)
return;
}
session.connect(nTimeout); // making connection with timeout.
session.connect(nTimeout); // making connection with timeout.
// if we got disconnected, do not continue
if(!isSessionConnected())
if (!isSessionConnected())
return;
ChannelShell channel=(ChannelShell) session.openChannel("shell"); //$NON-NLS-1$
ChannelShell channel = (ChannelShell) session.openChannel("shell"); //$NON-NLS-1$
channel.setPtyType("xterm"); //$NON-NLS-1$
// TERM=xterm implies VT100 line wrapping mode
fControl.setVT100LineWrapping(true);
@ -195,18 +196,19 @@ public class SshConnection extends Thread {
void disconnect() {
interrupt();
synchronized (this) {
fDisconnectHasBeenCalled=true;
if(fSession!=null) {
fDisconnectHasBeenCalled = true;
if (fSession != null) {
try {
fSession.disconnect();
} catch (Exception e) {
// Ignore NPE due to bug in JSch if disconnecting
// while not yet authenticated
}
fSession=null;
fSession = null;
}
}
}
/**
* Read the data from the ssh connection and display it in the terminal.
* @param in
@ -214,45 +216,47 @@ public class SshConnection extends Thread {
*/
private void readDataForever(InputStream in) throws IOException {
// read the data
byte bytes[]=new byte[32*1024];
byte bytes[] = new byte[32 * 1024];
int n;
// read until the thread gets interrupted....
while( (n=in.read(bytes))!=-1) {
fControl.getRemoteToTerminalOutputStream().write(bytes,0,n);
while ((n = in.read(bytes)) != -1) {
fControl.getRemoteToTerminalOutputStream().write(bytes, 0, n);
}
}
protected static Display getStandardDisplay() {
Display display = Display.getCurrent();
if( display==null ) {
display = Display.getDefault();
}
return display;
}
Display display = Display.getCurrent();
if (display == null) {
display = Display.getDefault();
}
return display;
}
private class MyUserInfo implements UserInfo, UIKeyboardInteractive {
/* default */ final String fConnectionId;
/* default */ final String fUser;
private String fPassword;
private String fPassphrase;
private int fAttemptCount;
private class MyUserInfo implements UserInfo, UIKeyboardInteractive {
/* default */ final String fConnectionId;
/* default */ final String fUser;
private String fPassword;
private String fPassphrase;
private int fAttemptCount;
public MyUserInfo(String connectionId, String user, String password) {
fConnectionId = connectionId;
fUser = user;
fPassword = password;
}
@Override
public String getPassword() {
public String getPassword() {
return fPassword;
}
@Override
public boolean promptYesNo(final String str) {
public boolean promptYesNo(final String str) {
//need to switch to UI thread for prompting
final boolean[] retval = new boolean[1];
Display.getDefault().syncExec(new Runnable() {
@Override
public void run() {
public void run() {
// [168197] Replace JFace MessagDialog by SWT MessageBox
//retval[0] = MessageDialog.openQuestion(null, SshMessages.WARNING, str);
if (isSessionConnected()) {
@ -267,11 +271,12 @@ public class SshConnection extends Thread {
});
return retval[0];
}
private String promptSecret(final String message) {
final String[] retval = new String[1];
getStandardDisplay().syncExec(new Runnable() {
@Override
public void run() {
public void run() {
if (isSessionConnected()) {
UserValidationDialog uvd = new UserValidationDialog(null, fConnectionId, fUser, message);
uvd.setUsernameMutable(false);
@ -287,29 +292,33 @@ public class SshConnection extends Thread {
});
return retval[0];
}
@Override
public String getPassphrase() {
public String getPassphrase() {
return fPassphrase;
}
@Override
public boolean promptPassphrase(String message) {
public boolean promptPassphrase(String message) {
fPassphrase = promptSecret(message);
return (fPassphrase!=null);
return (fPassphrase != null);
}
@Override
public boolean promptPassword(final String message) {
public boolean promptPassword(final String message) {
String _password = promptSecret(message);
if (_password!=null) {
fPassword=_password;
return true;
}
if (_password != null) {
fPassword = _password;
return true;
}
return false;
}
@Override
public void showMessage(final String message) {
public void showMessage(final String message) {
Display.getDefault().syncExec(new Runnable() {
@Override
public void run() {
public void run() {
// [168197] Replace JFace MessagDialog by SWT MessageBox
// MessageDialog.openInformation(null, SshMessages.INFO, message);
if (isSessionConnected()) {
@ -321,50 +330,50 @@ public class SshConnection extends Thread {
}
});
}
@Override
public String[] promptKeyboardInteractive(final String destination,
final String name, final String instruction,
final String[] prompt, final boolean[] echo)
{
if (prompt.length == 0) {
// No need to prompt, just return an empty String array
return new String[0];
}
try{
if (fAttemptCount == 0 && fPassword != null && prompt.length == 1 && prompt[0].trim().equalsIgnoreCase("password:")) { //$NON-NLS-1$
// Return the provided password the first time but always prompt on subsequent tries
fAttemptCount++;
return new String[] { fPassword };
}
final String[][] finResult = new String[1][];
getStandardDisplay().syncExec(new Runnable() {
@Override
public void run() {
if (isSessionConnected()) {
KeyboardInteractiveDialog dialog = new KeyboardInteractiveDialog(null, fConnectionId, destination, name, instruction, prompt, echo);
public String[] promptKeyboardInteractive(final String destination, final String name, final String instruction,
final String[] prompt, final boolean[] echo) {
if (prompt.length == 0) {
// No need to prompt, just return an empty String array
return new String[0];
}
try {
if (fAttemptCount == 0 && fPassword != null && prompt.length == 1
&& prompt[0].trim().equalsIgnoreCase("password:")) { //$NON-NLS-1$
// Return the provided password the first time but always prompt on subsequent tries
fAttemptCount++;
return new String[] { fPassword };
}
final String[][] finResult = new String[1][];
getStandardDisplay().syncExec(new Runnable() {
@Override
public void run() {
if (isSessionConnected()) {
KeyboardInteractiveDialog dialog = new KeyboardInteractiveDialog(null, fConnectionId,
destination, name, instruction, prompt, echo);
dialog.open();
finResult[0] = dialog.getResult();
} else {
finResult[0] = null; // indicate cancel to JSch
}
}
});
String[] result=finResult[0];
if (result == null)
return null; // cancelled
if (result.length == 1 && prompt.length == 1 && prompt[0].trim().equalsIgnoreCase("password:")) { //$NON-NLS-1$
fPassword = result[0];
}
fAttemptCount++;
}
});
String[] result = finResult[0];
if (result == null)
return null; // cancelled
if (result.length == 1 && prompt.length == 1 && prompt[0].trim().equalsIgnoreCase("password:")) { //$NON-NLS-1$
fPassword = result[0];
}
fAttemptCount++;
return result;
}
catch(OperationCanceledException e){
} catch (OperationCanceledException e) {
return null;
}
}
}
}
private void connectFailed(String terminalText, String msg) {
private void connectFailed(String terminalText, String msg) {
Logger.log(terminalText);
fControl.displayTextInTerminal(terminalText);
// fControl.setMsg(msg);

52
terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshConnector.java
View file

@ -36,24 +36,29 @@ public class SshConnector extends TerminalConnectorImpl {
private final SshSettings fSettings;
private int fWidth;
private int fHeight;
public SshConnector() {
this(new SshSettings());
}
public SshConnector(SshSettings settings) {
fSettings=settings;
fSettings = settings;
}
@Override
public void initialize() throws Exception {
fJsch=new JSch();
public void initialize() throws Exception {
fJsch = new JSch();
}
@Override
public void connect(ITerminalControl control) {
public void connect(ITerminalControl control) {
super.connect(control);
fConnection = new SshConnection(this,control);
fConnection = new SshConnection(this, control);
fConnection.start();
}
@Override
synchronized public void doDisconnect() {
synchronized public void doDisconnect() {
fConnection.disconnect();
if (getInputStream() != null) {
try {
@ -71,28 +76,34 @@ public class SshConnector extends TerminalConnectorImpl {
}
}
}
@Override
public void setTerminalSize(int newWidth, int newHeight) {
if(fChannel!=null && (newWidth!=fWidth || newHeight!=fHeight)) {
public void setTerminalSize(int newWidth, int newHeight) {
if (fChannel != null && (newWidth != fWidth || newHeight != fHeight)) {
//avoid excessive communications due to change size requests by caching previous size
fChannel.setPtySize(newWidth, newHeight, 8*newWidth, 8*newHeight);
fWidth=newWidth;
fHeight=newHeight;
fChannel.setPtySize(newWidth, newHeight, 8 * newWidth, 8 * newHeight);
fWidth = newWidth;
fHeight = newHeight;
}
}
public InputStream getInputStream() {
return fInputStream;
}
@Override
public OutputStream getTerminalToRemoteStream() {
public OutputStream getTerminalToRemoteStream() {
return fOutputStream;
}
void setInputStream(InputStream inputStream) {
fInputStream = inputStream;
}
void setOutputStream(OutputStream outputStream) {
fOutputStream = outputStream;
}
/**
* Return the SSH Settings.
*
@ -102,31 +113,38 @@ public class SshConnector extends TerminalConnectorImpl {
public ISshSettings getSshSettings() {
return fSettings;
}
@Override
public void setDefaultSettings() {
fSettings.load(new NullSettingsStore());
}
@Override
public String getSettingsSummary() {
public String getSettingsSummary() {
return fSettings.getSummary();
}
@Override
public void load(ISettingsStore store) {
public void load(ISettingsStore store) {
fSettings.load(store);
}
@Override
public void save(ISettingsStore store) {
public void save(ISettingsStore store) {
fSettings.save(store);
}
protected JSch getJsch() {
return fJsch;
}
ChannelShell getChannel() {
return fChannel;
}
void setChannel(ChannelShell channel) {
fChannel = channel;
fWidth=-1;
fHeight=-1;
fWidth = -1;
fHeight = -1;
}
}

4
terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshMessages.java
View file

@ -59,7 +59,7 @@ public class SshMessages extends NLS {
public static String java_net_SocketException;
public static String java_net_NoRouteToHostException;
// <Copied from org.eclipse.team.cvs.core / CVSCommunicationException (c) IBM 2000, 2007>
// <Copied from org.eclipse.team.cvs.core / CVSCommunicationException (c) IBM 2000, 2007>
public static String getMessageFor(Throwable throwable) {
String message = getMessage(getMessageKey(throwable));
@ -96,4 +96,4 @@ public class SshMessages extends NLS {
// </Copied from org.eclipse.team.cvs.core / Policy>
}
}

4
terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshMessages.properties
View file

@ -8,7 +8,7 @@
# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Michael Scharf (Wind River) - initial API and implementation
# Michael Scharf (Wind River) - initial API and implementation
# Martin Oberhuber (Wind River) - fixed copyright headers and beautified
# Johnson Ma (Wind River) - [218880] Add UI setting for ssh keepalives
# Martin Oberhuber (Wind River) - [206919] Improve SSH Terminal Error Reporting (Adopting code from org.eclipse.team.cvs.core)
@ -52,4 +52,4 @@ java_net_UnknownHostException=Cannot locate host: {0}
java_net_ConnectException=Cannot connect to host: {0}
java_net_SocketException=Socket Exception: {0}
java_net_NoRouteToHostException={0}
#</Copied> from org.eclipse.team.cvs.core
#</Copied> from org.eclipse.team.cvs.core

39
terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshSettings.java
View file

@ -19,14 +19,15 @@ package org.eclipse.tm.terminal.connector.ssh.connector;
import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
public class SshSettings implements ISshSettings {
protected String fHost;
protected String fUser;
protected String fPassword;
protected String fPort;
protected String fTimeout;
protected String fKeepalive;
protected String fHost;
protected String fUser;
protected String fPassword;
protected String fPort;
protected String fTimeout;
protected String fKeepalive;
@Override
public String getHost() {
public String getHost() {
return fHost;
}
@ -35,16 +36,16 @@ public class SshSettings implements ISshSettings {
}
@Override
public String getSummary() {
String settings = getUser()+'@'+getHost();
if(getPort()!=ISshSettings.DEFAULT_SSH_PORT) {
public String getSummary() {
String settings = getUser() + '@' + getHost();
if (getPort() != ISshSettings.DEFAULT_SSH_PORT) {
settings += ":" + getPort(); //$NON-NLS-1$
}
return settings;
}
@Override
public void load(ISettingsStore store) {
public void load(ISettingsStore store) {
fHost = store.get("Host", "");//$NON-NLS-1$ //$NON-NLS-2$
fUser = store.get("User", "");//$NON-NLS-1$ //$NON-NLS-2$
// ISettingsStore providers have to make sure that
@ -57,7 +58,7 @@ public class SshSettings implements ISshSettings {
}
@Override
public void save(ISettingsStore store) {
public void save(ISettingsStore store) {
store.put("Host", fHost);//$NON-NLS-1$
store.put("User", fUser);//$NON-NLS-1$
store.put("Port", fPort);//$NON-NLS-1$
@ -68,15 +69,15 @@ public class SshSettings implements ISshSettings {
store.put("Keepalive", fKeepalive);//$NON-NLS-1$
}
@Override
public int getTimeout() {
public int getTimeout() {
try {
return Integer.parseInt(fTimeout);
} catch (NumberFormatException numberFormatException) {
return 10;
}
}
public String getTimeoutString() {
return fTimeout;
}
@ -86,13 +87,14 @@ public class SshSettings implements ISshSettings {
}
@Override
public int getKeepalive() {
public int getKeepalive() {
try {
return Integer.parseInt(fKeepalive);
} catch (NumberFormatException numberFormatException) {
return 300;
}
}
public String getKeepaliveString() {
return fKeepalive;
}
@ -102,15 +104,16 @@ public class SshSettings implements ISshSettings {
}
@Override
public String getUser() {
public String getUser() {
return fUser;
}
public void setUser(String user) {
fUser = user;
}
@Override
public int getPort() {
public int getPort() {
try {
return Integer.parseInt(fPort);
} catch (NumberFormatException numberFormatException) {
@ -127,7 +130,7 @@ public class SshSettings implements ISshSettings {
}
@Override
public String getPassword() {
public String getPassword() {
return fPassword;
}

61
terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshSettingsPage.java
View file

@ -37,10 +37,11 @@ public class SshSettingsPage extends AbstractSettingsPage {
private Text fPassword;
public SshSettingsPage(SshSettings settings) {
fTerminalSettings=settings;
fTerminalSettings = settings;
}
@Override
public void saveSettings() {
public void saveSettings() {
fTerminalSettings.setHost(fHostText.getText());
fTerminalSettings.setUser(fUser.getText());
fTerminalSettings.setPassword(fPassword.getText());
@ -50,23 +51,25 @@ public class SshSettingsPage extends AbstractSettingsPage {
}
@Override
public void loadSettings() {
if(fTerminalSettings!=null) {
fHostText.setText(get(fTerminalSettings.getHost(),""));//$NON-NLS-1$
fTimeout.setText(get(fTerminalSettings.getTimeoutString(),"0"));//$NON-NLS-1$
fKeepalive.setText(get(fTerminalSettings.getKeepaliveString(),"300"));//$NON-NLS-1$
fUser.setText(get(fTerminalSettings.getUser(),""));//$NON-NLS-1$
public void loadSettings() {
if (fTerminalSettings != null) {
fHostText.setText(get(fTerminalSettings.getHost(), ""));//$NON-NLS-1$
fTimeout.setText(get(fTerminalSettings.getTimeoutString(), "0"));//$NON-NLS-1$
fKeepalive.setText(get(fTerminalSettings.getKeepaliveString(), "300"));//$NON-NLS-1$
fUser.setText(get(fTerminalSettings.getUser(), ""));//$NON-NLS-1$
fPort.setText(get(fTerminalSettings.getPortString(), String.valueOf(ISshSettings.DEFAULT_SSH_PORT)));
fPassword.setText(get(fTerminalSettings.getPassword(),""));//$NON-NLS-1$
fPassword.setText(get(fTerminalSettings.getPassword(), ""));//$NON-NLS-1$
}
}
String get(String value, String def) {
if(value==null || value.length()==0)
if (value == null || value.length() == 0)
return def;
return value;
}
@Override
public boolean validateSettings() {
public boolean validateSettings() {
String message = null;
int messageType = IMessageProvider.NONE;
boolean valid = true;
@ -75,7 +78,10 @@ public class SshSettingsPage extends AbstractSettingsPage {
String m = "Please enter a host IP or name."; //$NON-NLS-1$
int mt = IMessageProvider.INFORMATION;
updateControlDecoration(fHostText, m, mt);
if (mt > messageType) { message = m; messageType = mt; }
if (mt > messageType) {
message = m;
messageType = mt;
}
valid = false;
} else {
@ -85,7 +91,10 @@ public class SshSettingsPage extends AbstractSettingsPage {
String m = "Please enter a username."; //$NON-NLS-1$
int mt = IMessageProvider.INFORMATION;
updateControlDecoration(fUser, m, mt);
if (mt > messageType) { message = m; messageType = mt; }
if (mt > messageType) {
message = m;
messageType = mt;
}
valid = false;
} else {
@ -97,7 +106,10 @@ public class SshSettingsPage extends AbstractSettingsPage {
String m = "Invalid network port. Must be between 0 and 65535."; //$NON-NLS-1$
int mt = IMessageProvider.ERROR;
updateControlDecoration(fPort, m, mt);
if (mt > messageType) { message = m; messageType = mt; }
if (mt > messageType) {
message = m;
messageType = mt;
}
valid = false;
} else {
@ -108,7 +120,10 @@ public class SshSettingsPage extends AbstractSettingsPage {
String m = "Invalid timeout. Must be greater than 0."; //$NON-NLS-1$
int mt = IMessageProvider.ERROR;
updateControlDecoration(fTimeout, m, mt);
if (mt > messageType) { message = m; messageType = mt; }
if (mt > messageType) {
message = m;
messageType = mt;
}
valid = false;
} else {
@ -119,7 +134,10 @@ public class SshSettingsPage extends AbstractSettingsPage {
String m = "Invalid keep alive. Must be greater than 0."; //$NON-NLS-1$
int mt = IMessageProvider.ERROR;
updateControlDecoration(fKeepalive, m, mt);
if (mt > messageType) { message = m; messageType = mt; }
if (mt > messageType) {
message = m;
messageType = mt;
}
valid = false;
} else {
@ -132,8 +150,9 @@ public class SshSettingsPage extends AbstractSettingsPage {
setMessage(message, messageType);
return valid;
}
@Override
public void createControl(Composite parent) {
public void createControl(Composite parent) {
Composite composite = new Composite(parent, SWT.NONE);
GridLayout gridLayout = new GridLayout(2, false);
GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
@ -144,13 +163,14 @@ public class SshSettingsPage extends AbstractSettingsPage {
fHostText = createTextField(composite, SshMessages.HOST);
fUser = createTextField(composite, SshMessages.USER);
fPassword = createTextField(composite, SshMessages.PASSWORD,SWT.PASSWORD);
fPassword = createTextField(composite, SshMessages.PASSWORD, SWT.PASSWORD);
fTimeout = createTextField(composite, SshMessages.TIMEOUT);
fKeepalive = createTextField(composite, SshMessages.KEEPALIVE);
fKeepalive.setToolTipText(SshMessages.KEEPALIVE_Tooltip);
fPort = createTextField(composite, SshMessages.PORT);
loadSettings();
}
private Text createTextField(Composite composite, String labelTxt, int textOptions) {
GridData gridData;
// Add label
@ -159,17 +179,18 @@ public class SshSettingsPage extends AbstractSettingsPage {
// Add control
gridData = new GridData(GridData.FILL_HORIZONTAL);
final Text text= new Text(composite, SWT.BORDER | textOptions);
final Text text = new Text(composite, SWT.BORDER | textOptions);
text.setLayoutData(gridData);
text.addModifyListener(new ModifyListener() {
@Override
public void modifyText(ModifyEvent e) {
public void modifyText(ModifyEvent e) {
fireListeners(text);
}
});
createControlDecoration(text);
return text;
}
private Text createTextField(Composite composite, String labelTxt) {
return createTextField(composite, labelTxt, 0);
}

32
terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/UserValidationDialog.java
View file

@ -62,26 +62,28 @@ public class UserValidationDialog extends TrayDialog {
*/
public UserValidationDialog(Shell parentShell, String location, String defaultName, String message) {
super(parentShell);
setShellStyle(getShellStyle() | SWT.RESIZE);
setShellStyle(getShellStyle() | SWT.RESIZE);
this.defaultUsername = defaultName;
this.domain = location;
this.message = message;
}
/**
* @see Window#configureShell
*/
@Override
protected void configureShell(Shell newShell) {
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
newShell.setText(SshMessages.UserValidationDialog_required);
// set F1 help
PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, ISshConstants.HELP_USER_VALIDATION_DIALOG);
PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, ISshConstants.HELP_USER_VALIDATION_DIALOG);
}
/**
* @see Window#create
*/
@Override
public void create() {
public void create() {
super.create();
// add some default values
usernameField.setText(defaultUsername);
@ -100,7 +102,7 @@ public class UserValidationDialog extends TrayDialog {
* @see Dialog#createDialogArea
*/
@Override
protected Control createDialogArea(Composite parent) {
protected Control createDialogArea(Composite parent) {
Composite top = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout();
layout.numColumns = 2;
@ -142,7 +144,8 @@ public class UserValidationDialog extends TrayDialog {
if (isUsernameMutable) {
label.setText(NLS.bind(SshMessages.UserValidationDialog_labelUser, new String[] { domain }));
} else {
label.setText(NLS.bind(SshMessages.UserValidationDialog_labelPassword, (new Object[]{defaultUsername, domain})));
label.setText(NLS.bind(SshMessages.UserValidationDialog_labelPassword,
(new Object[] { defaultUsername, domain })));
}
data = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
data.horizontalSpan = 2;
@ -152,7 +155,7 @@ public class UserValidationDialog extends TrayDialog {
createUsernameFields(main);
createPasswordFields(main);
if(domain != null) {
if (domain != null) {
allowCachingButton = new Button(main, SWT.CHECK);
allowCachingButton.setText(SshMessages.UserValidationDialog_6);
data = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
@ -160,7 +163,7 @@ public class UserValidationDialog extends TrayDialog {
allowCachingButton.setLayoutData(data);
allowCachingButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
public void widgetSelected(SelectionEvent e) {
allowCaching = allowCachingButton.getSelection();
}
});
@ -175,7 +178,8 @@ public class UserValidationDialog extends TrayDialog {
warningComposite.setLayoutData(data);
Label warningLabel = new Label(warningComposite, SWT.NONE);
warningLabel.setImage(getImage(DLG_IMG_MESSAGE_WARNING));
warningLabel.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_BEGINNING));
warningLabel.setLayoutData(
new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_BEGINNING));
Label warningText = new Label(warningComposite, SWT.WRAP);
warningText.setText(SshMessages.UserValidationDialog_7);
data = new GridData(GridData.FILL_HORIZONTAL);
@ -183,7 +187,7 @@ public class UserValidationDialog extends TrayDialog {
warningText.setLayoutData(data);
}
Dialog.applyDialogFont(parent);
Dialog.applyDialogFont(parent);
return main;
}
@ -202,6 +206,7 @@ public class UserValidationDialog extends TrayDialog {
data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.ENTRY_FIELD_WIDTH);
passwordField.setLayoutData(data);
}
/**
* Creates the three widgets that represent the user name entry area.
*
@ -255,12 +260,13 @@ public class UserValidationDialog extends TrayDialog {
* </p>
*/
@Override
protected void okPressed() {
protected void okPressed() {
password = passwordField.getText();
username = usernameField.getText();
super.okPressed();
}
/**
* Sets whether or not the username field should be mutable.
* This method must be called before create(), otherwise it
@ -276,8 +282,8 @@ public class UserValidationDialog extends TrayDialog {
* @see org.eclipse.jface.dialogs.Dialog#close()
*/
@Override
public boolean close() {
if(keyLockImage != null) {
public boolean close() {
if (keyLockImage != null) {
keyLockImage.dispose();
}
return super.close();

116
terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/controls/SshWizardConfigurationPanel.java
View file

@ -50,7 +50,7 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa
private static final String SAVE_USER = "saveUser"; //$NON-NLS-1$
private static final String SAVE_PASSWORD = "savePassword"; //$NON-NLS-1$
private SshSettings sshSettings;
private SshSettings sshSettings;
private ISettingsPage sshSettingsPage;
private Button userButton;
private Button passwordButton;
@ -61,8 +61,8 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa
* @param container The configuration panel container or <code>null</code>.
*/
public SshWizardConfigurationPanel(IConfigurationPanelContainer container) {
super(container);
}
super(container);
}
/* (non-Javadoc)
* @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite)
@ -75,7 +75,8 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa
panel.setLayoutData(data);
// Create the host selection combo
if (isWithoutSelection()) createHostsUI(panel, true);
if (isWithoutSelection())
createHostsUI(panel, true);
SshConnector conn = new SshConnector();
sshSettings = (SshSettings) conn.getSshSettings();
@ -84,7 +85,7 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa
sshSettingsPage = new SshSettingsPage(sshSettings);
if (sshSettingsPage instanceof AbstractSettingsPage) {
((AbstractSettingsPage)sshSettingsPage).setHasControlDecoration(true);
((AbstractSettingsPage) sshSettingsPage).setHasControlDecoration(true);
}
sshSettingsPage.createControl(panel);
@ -92,7 +93,8 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa
sshSettingsPage.addListener(new ISettingsPage.Listener() {
@Override
public void onSettingsPageChanged(Control control) {
if (getContainer() != null) getContainer().validate();
if (getContainer() != null)
getContainer().validate();
}
});
@ -110,34 +112,42 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa
*/
@Override
public void setupData(Map<String, Object> data) {
if (data == null || sshSettings == null || sshSettingsPage == null) return;
if (data == null || sshSettings == null || sshSettingsPage == null)
return;
String value = (String)data.get(ITerminalsConnectorConstants.PROP_IP_HOST);
if (value != null) sshSettings.setHost(value);
String value = (String) data.get(ITerminalsConnectorConstants.PROP_IP_HOST);
if (value != null)
sshSettings.setHost(value);
Object v = data.get(ITerminalsConnectorConstants.PROP_IP_PORT);
value = v != null ? v.toString() : null;
if (value != null) sshSettings.setPort(value);
if (value != null)
sshSettings.setPort(value);
v = data.get(ITerminalsConnectorConstants.PROP_TIMEOUT);
value = v != null ? v.toString() : null;
if (value != null) sshSettings.setTimeout(value);
if (value != null)
sshSettings.setTimeout(value);
v = data.get(ITerminalsConnectorConstants.PROP_SSH_KEEP_ALIVE);
value = v != null ? v.toString() : null;
if (value != null) sshSettings.setKeepalive(value);
if (value != null)
sshSettings.setKeepalive(value);
value = (String)data.get(ITerminalsConnectorConstants.PROP_SSH_PASSWORD);
if (value != null) sshSettings.setPassword(value);
value = (String) data.get(ITerminalsConnectorConstants.PROP_SSH_PASSWORD);
if (value != null)
sshSettings.setPassword(value);
value = (String)data.get(ITerminalsConnectorConstants.PROP_SSH_USER);
if (value != null) sshSettings.setUser(value);
value = (String) data.get(ITerminalsConnectorConstants.PROP_SSH_USER);
if (value != null)
sshSettings.setUser(value);
value = (String)data.get(ITerminalsConnectorConstants.PROP_ENCODING);
if (value != null) setEncoding(value);
value = (String) data.get(ITerminalsConnectorConstants.PROP_ENCODING);
if (value != null)
setEncoding(value);
sshSettingsPage.loadSettings();
}
}
/**
* Returns the default user name.
@ -151,7 +161,8 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa
ITerminalContextPropertiesProvider provider = TerminalContextPropertiesProviderFactory.getProvider(element);
if (provider != null) {
Object user = provider.getProperty(element, IContextPropertiesConstants.PROP_DEFAULT_USER);
if (user instanceof String) return ((String) user).trim();
if (user instanceof String)
return ((String) user).trim();
}
}
@ -163,20 +174,22 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa
*/
@Override
public void extractData(Map<String, Object> data) {
if (data == null) return;
if (data == null)
return;
// set the terminal connector id for ssh
data.put(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID, "org.eclipse.tm.terminal.connector.ssh.SshConnector"); //$NON-NLS-1$
// set the terminal connector id for ssh
data.put(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID,
"org.eclipse.tm.terminal.connector.ssh.SshConnector"); //$NON-NLS-1$
sshSettingsPage.saveSettings();
data.put(ITerminalsConnectorConstants.PROP_IP_HOST,sshSettings.getHost());
sshSettingsPage.saveSettings();
data.put(ITerminalsConnectorConstants.PROP_IP_HOST, sshSettings.getHost());
data.put(ITerminalsConnectorConstants.PROP_IP_PORT, Integer.valueOf(sshSettings.getPort()));
data.put(ITerminalsConnectorConstants.PROP_TIMEOUT, Integer.valueOf(sshSettings.getTimeout()));
data.put(ITerminalsConnectorConstants.PROP_SSH_KEEP_ALIVE, Integer.valueOf(sshSettings.getKeepalive()));
data.put(ITerminalsConnectorConstants.PROP_SSH_PASSWORD, sshSettings.getPassword());
data.put(ITerminalsConnectorConstants.PROP_SSH_USER, sshSettings.getUser());
data.put(ITerminalsConnectorConstants.PROP_ENCODING, getEncoding());
}
}
/* (non-Javadoc)
* @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#fillSettingsForHost(java.lang.String)
@ -185,8 +198,8 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa
protected void fillSettingsForHost(String host) {
boolean saveUser = true;
boolean savePassword = false;
if (host != null && host.length() != 0){
if (hostSettingsMap.containsKey(host)){
if (host != null && host.length() != 0) {
if (hostSettingsMap.containsKey(host)) {
Map<String, String> hostSettings = hostSettingsMap.get(host);
if (hostSettings.get(ITerminalsConnectorConstants.PROP_IP_HOST) != null) {
sshSettings.setHost(hostSettings.get(ITerminalsConnectorConstants.PROP_IP_HOST));
@ -206,7 +219,7 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa
if (hostSettings.get(SAVE_PASSWORD) != null) {
savePassword = new Boolean(hostSettings.get(SAVE_PASSWORD)).booleanValue();
}
if (!savePassword){
if (!savePassword) {
sshSettings.setPassword(""); //$NON-NLS-1$
} else {
String password = accessSecurePassword(sshSettings.getHost());
@ -218,7 +231,8 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa
String encoding = hostSettings.get(ITerminalsConnectorConstants.PROP_ENCODING);
if (encoding == null || "null".equals(encoding)) { //$NON-NLS-1$
String defaultEncoding = getSelectionEncoding();
encoding = defaultEncoding != null && !"".equals(defaultEncoding.trim()) ? defaultEncoding.trim() : "ISO-8859-1"; //$NON-NLS-1$ //$NON-NLS-2$
encoding = defaultEncoding != null && !"".equals(defaultEncoding.trim()) ? defaultEncoding.trim() //$NON-NLS-1$
: "ISO-8859-1"; //$NON-NLS-1$
}
setEncoding(encoding);
} else {
@ -238,10 +252,10 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa
* @see org.eclipse.tm.terminal.view.ui.panels.AbstractExtendedConfigurationPanel#doSaveWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String)
*/
@Override
public void doSaveWidgetValues(IDialogSettings settings, String idPrefix) {
saveSettingsForHost(true);
super.doSaveWidgetValues(settings, idPrefix);
}
public void doSaveWidgetValues(IDialogSettings settings, String idPrefix) {
saveSettingsForHost(true);
super.doSaveWidgetValues(settings, idPrefix);
}
/* (non-Javadoc)
* @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#saveSettingsForHost(boolean)
@ -252,20 +266,20 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa
boolean savePassword = passwordButton.getSelection();
String host = getHostFromSettings();
if (host != null && host.length() != 0) {
if (hostSettingsMap.containsKey(host)){
if (hostSettingsMap.containsKey(host)) {
Map<String, String> hostSettings = hostSettingsMap.get(host);
hostSettings.put(ITerminalsConnectorConstants.PROP_IP_HOST, sshSettings.getHost());
hostSettings.put(ITerminalsConnectorConstants.PROP_IP_PORT, Integer.toString(sshSettings.getPort()));
hostSettings.put(ITerminalsConnectorConstants.PROP_TIMEOUT, Integer.toString(sshSettings.getTimeout()));
hostSettings.put(ITerminalsConnectorConstants.PROP_SSH_KEEP_ALIVE, Integer.toString(sshSettings.getKeepalive()));
hostSettings.put(ITerminalsConnectorConstants.PROP_SSH_KEEP_ALIVE,
Integer.toString(sshSettings.getKeepalive()));
if (saveUser) {
if (sshSettings.getUser() != null) {
hostSettings.put(ITerminalsConnectorConstants.PROP_SSH_USER, sshSettings.getUser());
} else {
hostSettings.remove(ITerminalsConnectorConstants.PROP_SSH_USER);
}
}
else {
} else {
hostSettings.remove(ITerminalsConnectorConstants.PROP_SSH_USER);
}
@ -280,18 +294,20 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa
hostSettings.put(SAVE_USER, Boolean.toString(saveUser));
hostSettings.put(SAVE_PASSWORD, Boolean.toString(savePassword));
if (savePassword && sshSettings.getPassword() != null && sshSettings.getPassword().length() != 0){
if (savePassword && sshSettings.getPassword() != null && sshSettings.getPassword().length() != 0) {
saveSecurePassword(host, sshSettings.getPassword());
}
// maybe unchecked the password button - so try to remove a saved password - if any
if (!savePassword) removeSecurePassword(host);
if (!savePassword)
removeSecurePassword(host);
} else if (add) {
Map<String, String> hostSettings = new HashMap<String, String>();
hostSettings.put(ITerminalsConnectorConstants.PROP_IP_HOST, sshSettings.getHost());
hostSettings.put(ITerminalsConnectorConstants.PROP_IP_PORT, Integer.toString(sshSettings.getPort()));
hostSettings.put(ITerminalsConnectorConstants.PROP_TIMEOUT, Integer.toString(sshSettings.getTimeout()));
hostSettings.put(ITerminalsConnectorConstants.PROP_SSH_KEEP_ALIVE, Integer.toString(sshSettings.getKeepalive()));
hostSettings.put(ITerminalsConnectorConstants.PROP_SSH_KEEP_ALIVE,
Integer.toString(sshSettings.getKeepalive()));
if (saveUser) {
if (sshSettings.getUser() != null) {
hostSettings.put(ITerminalsConnectorConstants.PROP_SSH_USER, sshSettings.getUser());
@ -302,7 +318,7 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa
hostSettings.put(SAVE_PASSWORD, Boolean.toString(savePassword));
hostSettingsMap.put(host, hostSettings);
if (savePassword && sshSettings.getPassword() != null && sshSettings.getPassword().length() != 0){
if (savePassword && sshSettings.getPassword() != null && sshSettings.getPassword().length() != 0) {
saveSecurePassword(host, sshSettings.getPassword());
}
}
@ -328,8 +344,8 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa
if (node != null) {
try {
node.put("password", password, true); //$NON-NLS-1$
}
catch (StorageException ex) { /* ignored on purpose */ }
} catch (StorageException ex) {
/* ignored on purpose */ }
}
}
}
@ -353,8 +369,8 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa
String password = null;
try {
password = node.get("password", null); //$NON-NLS-1$
}
catch (StorageException ex) { /* ignored on purpose */ }
} catch (StorageException ex) {
/* ignored on purpose */ }
return password;
}
@ -385,7 +401,7 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa
* @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#isValid()
*/
@Override
public boolean isValid(){
public boolean isValid() {
return isEncodingValid() && sshSettingsPage.validateSettings();
}
@ -393,10 +409,10 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa
* @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#getHostFromSettings()
*/
@Override
protected String getHostFromSettings() {
protected String getHostFromSettings() {
sshSettingsPage.saveSettings();
return sshSettings.getHost();
}
return sshSettings.getHost();
}
private void createSaveButtonsUI(final Composite parent, boolean separator) {
Assert.isNotNull(parent);

42
terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/launcher/SshLauncherDelegate.java
View file

@ -92,24 +92,26 @@ public class SshLauncherDelegate extends AbstractLauncherDelegate {
*
* @return The terminal title string or <code>null</code>.
*/
private String getTerminalTitle(Map<String, Object> properties) {
private String getTerminalTitle(Map<String, Object> properties) {
// Try to see if the user set a title explicitly via the properties map.
String title = getDefaultTerminalTitle(properties);
if (title != null) return title;
if (title != null)
return title;
//No title,try to calculate the title
String host = (String)properties.get(ITerminalsConnectorConstants.PROP_IP_HOST);
String user = (String)properties.get(ITerminalsConnectorConstants.PROP_SSH_USER);
String host = (String) properties.get(ITerminalsConnectorConstants.PROP_IP_HOST);
String user = (String) properties.get(ITerminalsConnectorConstants.PROP_SSH_USER);
Object value = properties.get(ITerminalsConnectorConstants.PROP_IP_PORT);
String port = value != null ? value.toString() : null;
if (host != null && user!= null) {
if (host != null && user != null) {
DateFormat format = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
String date = format.format(new Date(System.currentTimeMillis()));
if (port != null && Integer.valueOf(port).intValue() != ISshSettings.DEFAULT_SSH_PORT) {
return NLS.bind(Messages.SshLauncherDelegate_terminalTitle_port, new String[]{user, host, port, date});
return NLS.bind(Messages.SshLauncherDelegate_terminalTitle_port,
new String[] { user, host, port, date });
}
return NLS.bind(Messages.SshLauncherDelegate_terminalTitle, new String[]{user, host, date});
return NLS.bind(Messages.SshLauncherDelegate_terminalTitle, new String[] { user, host, date });
}
return Messages.SshLauncherDelegate_terminalTitle_default;
@ -118,40 +120,42 @@ public class SshLauncherDelegate extends AbstractLauncherDelegate {
/* (non-Javadoc)
* @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class)
*/
@Override
@Override
public Object getAdapter(Class adapter) {
if (IMementoHandler.class.equals(adapter)) {
return mementoHandler;
}
return super.getAdapter(adapter);
return super.getAdapter(adapter);
}
/* (non-Javadoc)
* @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#createTerminalConnector(java.util.Map)
*/
@Override
@Override
public ITerminalConnector createTerminalConnector(Map<String, Object> properties) {
Assert.isNotNull(properties);
Assert.isNotNull(properties);
// Check for the terminal connector id
String connectorId = (String)properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID);
if (connectorId == null) connectorId = "org.eclipse.tm.terminal.connector.ssh.SshConnector"; //$NON-NLS-1$
// Check for the terminal connector id
String connectorId = (String) properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID);
if (connectorId == null)
connectorId = "org.eclipse.tm.terminal.connector.ssh.SshConnector"; //$NON-NLS-1$
// Extract the ssh properties
String host = (String)properties.get(ITerminalsConnectorConstants.PROP_IP_HOST);
String host = (String) properties.get(ITerminalsConnectorConstants.PROP_IP_HOST);
Object value = properties.get(ITerminalsConnectorConstants.PROP_IP_PORT);
String port = value != null ? value.toString() : null;
value = properties.get(ITerminalsConnectorConstants.PROP_TIMEOUT);
String timeout = value != null ? value.toString() : null;
value = properties.get(ITerminalsConnectorConstants.PROP_SSH_KEEP_ALIVE);
String keepAlive = value != null ? value.toString() : null;
String password = (String)properties.get(ITerminalsConnectorConstants.PROP_SSH_PASSWORD);
String user = (String)properties.get(ITerminalsConnectorConstants.PROP_SSH_USER);
String password = (String) properties.get(ITerminalsConnectorConstants.PROP_SSH_PASSWORD);
String user = (String) properties.get(ITerminalsConnectorConstants.PROP_SSH_USER);
int portOffset = 0;
if (properties.get(ITerminalsConnectorConstants.PROP_IP_PORT_OFFSET) instanceof Integer) {
portOffset = ((Integer)properties.get(ITerminalsConnectorConstants.PROP_IP_PORT_OFFSET)).intValue();
if (portOffset < 0) portOffset = 0;
portOffset = ((Integer) properties.get(ITerminalsConnectorConstants.PROP_IP_PORT_OFFSET)).intValue();
if (portOffset < 0)
portOffset = 0;
}
// The real port to connect to is port + portOffset

100
terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/launcher/SshMementoHandler.java
View file

@ -26,7 +26,6 @@ import org.eclipse.ui.IMemento;
*/
public class SshMementoHandler implements IMementoHandler {
/* (non-Javadoc)
* @see org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler#saveState(org.eclipse.ui.IMemento, java.util.Map)
*/
@ -37,15 +36,21 @@ public class SshMementoHandler implements IMementoHandler {
// Do not write the terminal title to the memento -> needs to
// be recreated at the time of restoration.
memento.putString(ITerminalsConnectorConstants.PROP_IP_HOST, (String)properties.get(ITerminalsConnectorConstants.PROP_IP_HOST));
memento.putString(ITerminalsConnectorConstants.PROP_IP_HOST,
(String) properties.get(ITerminalsConnectorConstants.PROP_IP_HOST));
Object value = properties.get(ITerminalsConnectorConstants.PROP_IP_PORT);
memento.putInteger(ITerminalsConnectorConstants.PROP_IP_PORT, value instanceof Integer ? ((Integer)value).intValue() : -1);
memento.putInteger(ITerminalsConnectorConstants.PROP_IP_PORT,
value instanceof Integer ? ((Integer) value).intValue() : -1);
value = properties.get(ITerminalsConnectorConstants.PROP_TIMEOUT);
memento.putInteger(ITerminalsConnectorConstants.PROP_TIMEOUT, value instanceof Integer ? ((Integer)value).intValue() : -1);
memento.putInteger(ITerminalsConnectorConstants.PROP_TIMEOUT,
value instanceof Integer ? ((Integer) value).intValue() : -1);
value = properties.get(ITerminalsConnectorConstants.PROP_SSH_KEEP_ALIVE);
memento.putInteger(ITerminalsConnectorConstants.PROP_SSH_KEEP_ALIVE, value instanceof Integer ? ((Integer)value).intValue() : -1);
memento.putString(ITerminalsConnectorConstants.PROP_SSH_USER, (String)properties.get(ITerminalsConnectorConstants.PROP_SSH_USER));
memento.putString(ITerminalsConnectorConstants.PROP_ENCODING, (String)properties.get(ITerminalsConnectorConstants.PROP_ENCODING));
memento.putInteger(ITerminalsConnectorConstants.PROP_SSH_KEEP_ALIVE,
value instanceof Integer ? ((Integer) value).intValue() : -1);
memento.putString(ITerminalsConnectorConstants.PROP_SSH_USER,
(String) properties.get(ITerminalsConnectorConstants.PROP_SSH_USER));
memento.putString(ITerminalsConnectorConstants.PROP_ENCODING,
(String) properties.get(ITerminalsConnectorConstants.PROP_ENCODING));
// The password is stored within the Eclipse secure preferences -> no need to store it to the memento
//
@ -55,22 +60,22 @@ public class SshMementoHandler implements IMementoHandler {
String password = properties.getStringProperty(ITerminalsConnectorConstants.PROP_SSH_PASSWORD);
if (password != null) {
try {
// Generate a temporary key. In practice, you would save this key.
// See also Encrypting with DES Using a Pass Phrase.
// SecretKey key = KeyGenerator.getInstance("DESede").generateKey();
// Generate a temporary key. In practice, you would save this key.
// See also Encrypting with DES Using a Pass Phrase.
// SecretKey key = KeyGenerator.getInstance("DESede").generateKey();
SecretKeyFactory factory = SecretKeyFactory.getInstance("DESede"); //$NON-NLS-1$
SecretKey key = factory.generateSecret(new DESKeySpec((ITerminalsConnectorConstants.PROP_SSH_PASSWORD + ".SshMementoHandler").getBytes("UTF-8"))); //$NON-NLS-1$ //$NON-NLS-2$
Cipher cipher = Cipher.getInstance("DESede/CBC/PKCS5Padding"); //$NON-NLS-1$
cipher.init(Cipher.ENCRYPT_MODE, key);
Cipher cipher = Cipher.getInstance("DESede/CBC/PKCS5Padding"); //$NON-NLS-1$
cipher.init(Cipher.ENCRYPT_MODE, key);
String encrypedPwd = new String(Base64.encode(cipher.doFinal(password.getBytes("UTF-8")))); //$NON-NLS-1$
memento.putString(ITerminalsConnectorConstants.PROP_SSH_PASSWORD, encrypedPwd);
}
catch (Exception e) {
if (Platform.inDebugMode()) e.printStackTrace();
}
String encrypedPwd = new String(Base64.encode(cipher.doFinal(password.getBytes("UTF-8")))); //$NON-NLS-1$
memento.putString(ITerminalsConnectorConstants.PROP_SSH_PASSWORD, encrypedPwd);
}
catch (Exception e) {
if (Platform.inDebugMode()) e.printStackTrace();
}
}
*/
}
@ -84,50 +89,57 @@ public class SshMementoHandler implements IMementoHandler {
Assert.isNotNull(properties);
// Restore the terminal properties from the memento
properties.put(ITerminalsConnectorConstants.PROP_IP_HOST, memento.getString(ITerminalsConnectorConstants.PROP_IP_HOST));
properties.put(ITerminalsConnectorConstants.PROP_IP_PORT, memento.getInteger(ITerminalsConnectorConstants.PROP_IP_PORT));
properties.put(ITerminalsConnectorConstants.PROP_TIMEOUT, memento.getInteger(ITerminalsConnectorConstants.PROP_TIMEOUT));
properties.put(ITerminalsConnectorConstants.PROP_SSH_KEEP_ALIVE, memento.getInteger(ITerminalsConnectorConstants.PROP_SSH_KEEP_ALIVE));
properties.put(ITerminalsConnectorConstants.PROP_SSH_USER, memento.getString(ITerminalsConnectorConstants.PROP_SSH_USER));
properties.put(ITerminalsConnectorConstants.PROP_ENCODING, memento.getString(ITerminalsConnectorConstants.PROP_ENCODING));
properties.put(ITerminalsConnectorConstants.PROP_IP_HOST,
memento.getString(ITerminalsConnectorConstants.PROP_IP_HOST));
properties.put(ITerminalsConnectorConstants.PROP_IP_PORT,
memento.getInteger(ITerminalsConnectorConstants.PROP_IP_PORT));
properties.put(ITerminalsConnectorConstants.PROP_TIMEOUT,
memento.getInteger(ITerminalsConnectorConstants.PROP_TIMEOUT));
properties.put(ITerminalsConnectorConstants.PROP_SSH_KEEP_ALIVE,
memento.getInteger(ITerminalsConnectorConstants.PROP_SSH_KEEP_ALIVE));
properties.put(ITerminalsConnectorConstants.PROP_SSH_USER,
memento.getString(ITerminalsConnectorConstants.PROP_SSH_USER));
properties.put(ITerminalsConnectorConstants.PROP_ENCODING,
memento.getString(ITerminalsConnectorConstants.PROP_ENCODING));
// The password is stored within the Eclipse secure preferences -> restore it from there
// To access the secure storage, we need the preference instance
String password = null;
ISecurePreferences preferences = SecurePreferencesFactory.getDefault();
if (preferences != null && (String)properties.get(ITerminalsConnectorConstants.PROP_IP_HOST) != null) {
if (preferences != null && (String) properties.get(ITerminalsConnectorConstants.PROP_IP_HOST) != null) {
// Construct the secure preferences node key
String nodeKey = "/Target Explorer SSH Password/" + (String)properties.get(ITerminalsConnectorConstants.PROP_IP_HOST); //$NON-NLS-1$
String nodeKey = "/Target Explorer SSH Password/" //$NON-NLS-1$
+ (String) properties.get(ITerminalsConnectorConstants.PROP_IP_HOST);
ISecurePreferences node = preferences.node(nodeKey);
if (node != null) {
try {
password = node.get("password", null); //$NON-NLS-1$
}
catch (StorageException ex) { /* ignored on purpose */ }
} catch (StorageException ex) {
/* ignored on purpose */ }
}
}
// Example of restoring the password from an 3DES encrypted string. Do not remove!
/*
String encrypedPwd = memento.getString(ITerminalsConnectorConstants.PROP_SSH_PASSWORD);
if (encrypedPwd != null) {
try {
SecretKeyFactory factory = SecretKeyFactory.getInstance("DESede"); //$NON-NLS-1$
SecretKey key = factory.generateSecret(new DESKeySpec((ITerminalsConnectorConstants.PROP_SSH_PASSWORD + ".SshMementoHandler").getBytes("UTF-8"))); //$NON-NLS-1$ //$NON-NLS-2$
String encrypedPwd = memento.getString(ITerminalsConnectorConstants.PROP_SSH_PASSWORD);
if (encrypedPwd != null) {
try {
SecretKeyFactory factory = SecretKeyFactory.getInstance("DESede"); //$NON-NLS-1$
SecretKey key = factory.generateSecret(new DESKeySpec((ITerminalsConnectorConstants.PROP_SSH_PASSWORD + ".SshMementoHandler").getBytes("UTF-8"))); //$NON-NLS-1$ //$NON-NLS-2$
Cipher cipher = Cipher.getInstance("DESede/CBC/PKCS5Padding"); //$NON-NLS-1$
cipher.init(Cipher.DECRYPT_MODE, key);
Cipher cipher = Cipher.getInstance("DESede/CBC/PKCS5Padding"); //$NON-NLS-1$
cipher.init(Cipher.DECRYPT_MODE, key);
byte[] encBytes = Base64.decode(encrypedPwd.getBytes("UTF-8")); //$NON-NLS-1$
byte[] decBytes = cipher.doFinal(encBytes);
byte[] encBytes = Base64.decode(encrypedPwd.getBytes("UTF-8")); //$NON-NLS-1$
byte[] decBytes = cipher.doFinal(encBytes);
password = new String(decBytes);
}
catch (Exception e) {
if (Platform.inDebugMode()) e.printStackTrace();
}
}
*/
password = new String(decBytes);
}
catch (Exception e) {
if (Platform.inDebugMode()) e.printStackTrace();
}
}
*/
properties.put(ITerminalsConnectorConstants.PROP_SSH_PASSWORD, password);
}

4
terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/activator/UIPlugin.java
View file

@ -69,7 +69,7 @@ public class UIPlugin extends AbstractUIPlugin {
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
@Override
public void start(BundleContext context) throws Exception {
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
}
@ -78,7 +78,7 @@ public class UIPlugin extends AbstractUIPlugin {
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
@Override
public void stop(BundleContext context) throws Exception {
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
}

6
terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/ITelnetSettings.java
View file

@ -30,13 +30,19 @@ public interface ITelnetSettings {
static final String EOL_CRLF = "CR+LF"; //$NON-NLS-1$
String getHost();
int getNetworkPort();
int getTimeout();
/**
* @since 4.2
*/
String getEndOfLine();
String getSummary();
void load(ISettingsStore store);
void save(ISettingsStore store);
}

22
terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/NetworkPortMap.java
View file

@ -22,17 +22,15 @@ import java.util.ArrayList;
import java.util.List;
public class NetworkPortMap {
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_VALUETGTCONS = "1232"; //$NON-NLS-1$
public static final String PROP_VALUETELNET = "23"; //$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_VALUETGTCONS = "1232"; //$NON-NLS-1$
public static final String PROP_VALUETELNET = "23"; //$NON-NLS-1$
String[][] fPortMap=new String[][] {
String[][] fPortMap = new String[][] {
// portName, port
{PROP_NAMETGTCONS, PROP_VALUETGTCONS},
{PROP_NAMETELNET, PROP_VALUETELNET}
};
{ PROP_NAMETGTCONS, PROP_VALUETGTCONS }, { PROP_NAMETELNET, PROP_VALUETELNET } };
public String getDefaultNetworkPort() {
return PROP_VALUETELNET;
@ -40,7 +38,7 @@ public class NetworkPortMap {
public String findPortName(String strPort) {
for (int i = 0; i < fPortMap.length; i++) {
if(fPortMap[i][1].equals(strPort))
if (fPortMap[i][1].equals(strPort))
return fPortMap[i][0];
}
return null;
@ -48,14 +46,14 @@ public class NetworkPortMap {
public String findPort(String strPortName) {
for (int i = 0; i < fPortMap.length; i++) {
if(fPortMap[i][0].equals(strPortName))
if (fPortMap[i][0].equals(strPortName))
return fPortMap[i][1];
}
return null;
}
public List<String> getNameTable() {
List<String> names=new ArrayList<String>();
List<String> names = new ArrayList<String>();
for (int i = 0; i < fPortMap.length; i++) {
names.add(fPortMap[i][0]);
}

104
terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetCodes.java
View file

@ -8,10 +8,10 @@
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* 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
* 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.connector.telnet.connector;
@ -22,75 +22,73 @@ package org.eclipse.tm.terminal.connector.telnet.connector;
* interface. The meanings of these constants are defined in the various TELNET RFCs
* (RFC 854 to RFC 861, and others).
*/
interface TelnetCodes
{
/** Command code: Subnegotiation End. */
static final byte TELNET_SE = (byte)240;
interface TelnetCodes {
/** Command code: Subnegotiation End. */
static final byte TELNET_SE = (byte) 240;
/** Command code: No-op. */
static final byte TELNET_NOP = (byte)241;
/** Command code: No-op. */
static final byte TELNET_NOP = (byte) 241;
/** Command code: Data Mark. */
static final byte TELNET_DM = (byte)242;
/** Command code: Data Mark. */
static final byte TELNET_DM = (byte) 242;
/** Command code: Break. */
static final byte TELNET_BREAK = (byte)243;
/** Command code: Break. */
static final byte TELNET_BREAK = (byte) 243;
/** Command code: Interrupt Process. */
static final byte TELNET_IP = (byte)244;
/** Command code: Interrupt Process. */
static final byte TELNET_IP = (byte) 244;
/** Command code: Abort Output. */
static final byte TELNET_AO = (byte)245;
/** Command code: Abort Output. */
static final byte TELNET_AO = (byte) 245;
/** Command code: Are You There. */
static final byte TELNET_AYT = (byte)246;
/** Command code: Are You There. */
static final byte TELNET_AYT = (byte) 246;
/** Command code: Erase Character. */
static final byte TELNET_EC = (byte)247;
/** Command code: Erase Character. */
static final byte TELNET_EC = (byte) 247;
/** Command code: Erase Line. */
static final byte TELNET_EL = (byte)248;
/** Command code: Erase Line. */
static final byte TELNET_EL = (byte) 248;
/** Command code: Go Ahead. */
static final byte TELNET_GA = (byte)249;
/** Command code: Go Ahead. */
static final byte TELNET_GA = (byte) 249;
/** Command code: Subnegotiation Begin. */
static final byte TELNET_SB = (byte)250;
/** Command code: Subnegotiation Begin. */
static final byte TELNET_SB = (byte) 250;
/** Command code: Will. */
static final byte TELNET_WILL = (byte)251;
/** Command code: Will. */
static final byte TELNET_WILL = (byte) 251;
/** Command code: Won't. */
static final byte TELNET_WONT = (byte)252;
/** Command code: Won't. */
static final byte TELNET_WONT = (byte) 252;
/** Command code: Do. */
static final byte TELNET_DO = (byte)253;
/** Command code: Do. */
static final byte TELNET_DO = (byte) 253;
/** Command code: Don't. */
static final byte TELNET_DONT = (byte)254;
/** Command code: Don't. */
static final byte TELNET_DONT = (byte) 254;
/** Command code: Interpret As Command. */
static final byte TELNET_IAC = (byte)255;
/** Command code: Interpret As Command. */
static final byte TELNET_IAC = (byte) 255;
/** Command code: IS. */
static final byte TELNET_IS = 0;
/** Command code: IS. */
static final byte TELNET_IS = 0;
/** Command code: SEND. */
static final byte TELNET_SEND = 1;
/** Command code: SEND. */
static final byte TELNET_SEND = 1;
/** Option code: Transmit Binary option. */
static final byte TELNET_OPTION_TRANSMIT_BINARY = 0;
/** Option code: Transmit Binary option. */
static final byte TELNET_OPTION_TRANSMIT_BINARY = 0;
/** Option code: Echo option. */
static final byte TELNET_OPTION_ECHO = 1;
/** Option code: Echo option. */
static final byte TELNET_OPTION_ECHO = 1;
/** Option code: Suppress Go Ahead option. */
static final byte TELNET_OPTION_SUPPRESS_GA = 3;
/** Option code: Suppress Go Ahead option. */
static final byte TELNET_OPTION_SUPPRESS_GA = 3;
/** Option code: Terminal Type */
static final byte TELNET_OPTION_TERMINAL_TYPE = 24;
/** Option code: Terminal Type */
static final byte TELNET_OPTION_TERMINAL_TYPE = 24;
/** Option code: Negotitate About Window Size (NAWS) */
static final byte TELNET_OPTION_NAWS = 31;
/** Option code: Negotitate About Window Size (NAWS) */
static final byte TELNET_OPTION_NAWS = 31;
}

27
terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetConnectWorker.java
View file

@ -32,13 +32,15 @@ import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
class TelnetConnectWorker extends Thread {
private final ITerminalControl fControl;
private final TelnetConnector fConn;
protected TelnetConnectWorker(TelnetConnector conn,ITerminalControl control) {
protected TelnetConnectWorker(TelnetConnector conn, ITerminalControl control) {
fControl = control;
fConn = conn;
fControl.setState(TerminalState.CONNECTING);
}
@Override
public void run() {
public void run() {
// Retry the connect with after a little pause in case the
// remote telnet server isn't ready. ConnectExceptions might
// happen if the telnet server process did not initialized itself.
@ -48,14 +50,18 @@ class TelnetConnectWorker extends Thread {
while (remaining >= 0) {
// Pause before we re-try if the remaining tries are less than the initial value
if (remaining < 10) try { Thread.sleep(500); } catch (InterruptedException e) { /* ignored on purpose */ }
if (remaining < 10)
try {
Thread.sleep(500);
} catch (InterruptedException e) {
/* ignored on purpose */ }
try {
int nTimeout = fConn.getTelnetSettings().getTimeout() * 1000;
String strHost = fConn.getTelnetSettings().getHost();
int nPort = fConn.getTelnetSettings().getNetworkPort();
InetSocketAddress address = new InetSocketAddress(strHost, nPort);
Socket socket=new Socket();
Socket socket = new Socket();
socket.connect(address, nTimeout);
@ -74,7 +80,7 @@ class TelnetConnectWorker extends Thread {
fConn.setSocket(socket);
TelnetConnection connection=new TelnetConnection(fConn, socket);
TelnetConnection connection = new TelnetConnection(fConn, socket);
socket.setKeepAlive(true);
fConn.setTelnetConnection(connection);
connection.start();
@ -85,21 +91,22 @@ class TelnetConnectWorker extends Thread {
// the DNS will fix itself
remaining = 0;
//Construct error message and signal failed
String txt="Unknown host: " + ex.getMessage(); //$NON-NLS-1$
connectFailed(txt,"Unknown host: " + ex.getMessage() + "\n"); //$NON-NLS-1$ //$NON-NLS-2$
String txt = "Unknown host: " + ex.getMessage(); //$NON-NLS-1$
connectFailed(txt, "Unknown host: " + ex.getMessage() + "\n"); //$NON-NLS-1$ //$NON-NLS-2$
} catch (SocketTimeoutException socketTimeoutException) {
// Time out occurred. No re-try in this case either. Time out can
// be increased by the user. Multiplying the timeout with the remaining
// counter is not desired.
remaining = 0;
// Construct error message and signal failed
connectFailed(socketTimeoutException.getMessage(), "Connection Error!\n" + socketTimeoutException.getMessage()); //$NON-NLS-1$
connectFailed(socketTimeoutException.getMessage(),
"Connection Error!\n" + socketTimeoutException.getMessage()); //$NON-NLS-1$
} catch (ConnectException connectException) {
// In case of a ConnectException, do a re-try. The server could have been
// simply not ready yet and the worker would give up to early. If the terminal
// control is already closed (disconnected), don't print "Connection refused" errors
if (remaining == 0 && TerminalState.CLOSED != fControl.getState()) {
connectFailed(connectException.getMessage(),"Connection refused!"); //$NON-NLS-1$
connectFailed(connectException.getMessage(), "Connection refused!"); //$NON-NLS-1$
}
} catch (Exception exception) {
// Any other exception on connect. No re-try in this case either
@ -107,7 +114,7 @@ class TelnetConnectWorker extends Thread {
// Log the exception
Logger.logException(exception);
// And signal failed
connectFailed(exception.getMessage(),""); //$NON-NLS-1$
connectFailed(exception.getMessage(), ""); //$NON-NLS-1$
} finally {
remaining--;
}

15
terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetConnection.java
View file

@ -297,7 +297,7 @@ public class TelnetConnection extends Thread implements TelnetCodes {
* display.
*/
@Override
public void run() {
public void run() {
Logger.log("Entered"); //$NON-NLS-1$
try {
@ -335,7 +335,8 @@ public class TelnetConnection extends Thread implements TelnetCodes {
// A "socket closed" exception is normal here. It's caused by the
// user clicking the disconnect button on the Terminal view toolbar.
if (message != null && !message.equalsIgnoreCase("Socket closed") && !message.equalsIgnoreCase("Connection reset")) //$NON-NLS-1$ //$NON-NLS-2$
if (message != null && !message.equalsIgnoreCase("Socket closed") //$NON-NLS-1$
&& !message.equalsIgnoreCase("Connection reset")) //$NON-NLS-1$
{
Logger.logException(ex);
}
@ -345,8 +346,14 @@ public class TelnetConnection extends Thread implements TelnetCodes {
} finally {
// Tell the ITerminalControl object that the connection is closed.
terminalControl.setState(TerminalState.CLOSED);
try { inputStream.close(); } catch(IOException ioe) { /*ignore*/ }
try { outputStream.close(); } catch(IOException ioe) { /*ignore*/ }
try {
inputStream.close();
} catch (IOException ioe) {
/*ignore*/ }
try {
outputStream.close();
} catch (IOException ioe) {
/*ignore*/ }
}
}

61
terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetConnector.java
View file

@ -73,21 +73,24 @@ public class TelnetConnector extends TerminalConnectorImpl {
public TelnetConnector() {
this(new TelnetSettings());
}
public TelnetConnector(TelnetSettings settings) {
fSettings=settings;
fSettings = settings;
}
@Override
public void connect(ITerminalControl control) {
public void connect(ITerminalControl control) {
super.connect(control);
fWidth=-1;
fHeight=-1;
fWidth = -1;
fHeight = -1;
// TERM=xterm implies VT100 line wrapping mode
control.setVT100LineWrapping(true);
TelnetConnectWorker worker = new TelnetConnectWorker(this,control);
TelnetConnectWorker worker = new TelnetConnectWorker(this, control);
worker.start();
}
@Override
public void doDisconnect() {
public void doDisconnect() {
if (getSocket() != null) {
try {
getSocket().close();
@ -113,31 +116,37 @@ public class TelnetConnector extends TerminalConnectorImpl {
}
cleanSocket();
}
@Override
public boolean isLocalEcho() {
if(fTelnetConnection==null)
public boolean isLocalEcho() {
if (fTelnetConnection == null)
return false;
return fTelnetConnection.localEcho();
}
@Override
public void setTerminalSize(int newWidth, int newHeight) {
if(fTelnetConnection!=null && (newWidth!=fWidth || newHeight!=fHeight)) {
public void setTerminalSize(int newWidth, int newHeight) {
if (fTelnetConnection != null && (newWidth != fWidth || newHeight != fHeight)) {
//avoid excessive communications due to change size requests by caching previous size
fTelnetConnection.setTerminalSize(newWidth, newHeight);
fWidth=newWidth;
fHeight=newHeight;
fWidth = newWidth;
fHeight = newHeight;
}
}
public InputStream getInputStream() {
return fInputStream;
}
@Override
public OutputStream getTerminalToRemoteStream() {
public OutputStream getTerminalToRemoteStream() {
return fOutputStream;
}
private void setInputStream(InputStream inputStream) {
fInputStream = inputStream;
}
private void setOutputStream(OutputStream outputStream) {
if (outputStream == null) {
fOutputStream = null;
@ -146,6 +155,7 @@ public class TelnetConnector extends TerminalConnectorImpl {
// translate CR to telnet end-of-line sequence - RFC 854
fOutputStream = new TelnetOutputStream(outputStream, fSettings.getEndOfLine());
}
Socket getSocket() {
return fSocket;
}
@ -154,13 +164,13 @@ public class TelnetConnector extends TerminalConnectorImpl {
* sets the socket to null
*/
void cleanSocket() {
fSocket=null;
fSocket = null;
setInputStream(null);
setOutputStream(null);
}
void setSocket(Socket socket) throws IOException {
if(socket==null) {
if (socket == null) {
cleanSocket();
} else {
fSocket = socket;
@ -169,35 +179,44 @@ public class TelnetConnector extends TerminalConnectorImpl {
}
}
public void setTelnetConnection(TelnetConnection connection) {
fTelnetConnection=connection;
fTelnetConnection = connection;
}
public void displayTextInTerminal(String text) {
fControl.displayTextInTerminal(text);
}
public OutputStream getRemoteToTerminalOutputStream () {
public OutputStream getRemoteToTerminalOutputStream() {
return fControl.getRemoteToTerminalOutputStream();
}
public void setState(TerminalState state) {
fControl.setState(state);
}
public ITelnetSettings getTelnetSettings() {
return fSettings;
}
@Override
public void setDefaultSettings() {
fSettings.load(new NullSettingsStore());
fSettings.load(new NullSettingsStore());
}
@Override
public String getSettingsSummary() {
public String getSettingsSummary() {
return fSettings.getSummary();
}
@Override
public void load(ISettingsStore store) {
public void load(ISettingsStore store) {
fSettings.load(store);
}
@Override
public void save(ISettingsStore store) {
public void save(ISettingsStore store) {
fSettings.save(store);
}
}

2
terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetMessages.java
View file

@ -28,4 +28,4 @@ public class TelnetMessages extends NLS {
*/
public static String END_OF_LINE;
}
}

2
terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetMessages.properties
View file

@ -13,7 +13,7 @@
# Helmut Haigermoser and Ted Williams.
#
# Contributors:
# Michael Scharf (Wind River) - split into core, view and connector plugins
# Michael Scharf (Wind River) - split into core, view and connector plugins
# Martin Oberhuber (Wind River) - fixed copyright headers and beautified
###############################################################################
PORT = Port

417
terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetOption.java
View file

@ -43,207 +43,204 @@ import org.eclipse.tm.internal.terminal.provisional.api.Logger;
*
* @author Fran Litterio (francis.litterio@windriver.com)
*/
class TelnetOption implements TelnetCodes
{
/**
* This array of Strings maps an integer TELNET option code value to the symbolic
* name of the option. Array elements of the form "?" represent unassigned option
* values.
*/
protected static final String[] optionNames =
{
"BINARY", // 0 //$NON-NLS-1$
"ECHO", // 1 //$NON-NLS-1$
"RECONNECTION", // 2 //$NON-NLS-1$
"SUPPRESS GO AHEAD", // 3 //$NON-NLS-1$
"MSG SIZE NEGOTIATION", // 4 //$NON-NLS-1$
"STATUS", // 5 //$NON-NLS-1$
"TIMING MARK", // 6 //$NON-NLS-1$
"REMOTE CTRL TRANS+ECHO", // 7 //$NON-NLS-1$
"OUTPUT LINE WIDTH", // 8 //$NON-NLS-1$
"OUTPUT PAGE SIZE", // 9 //$NON-NLS-1$
"OUTPUT CR DISPOSITION", // 10 //$NON-NLS-1$
"OUTPUT HORIZ TABSTOPS", // 11 //$NON-NLS-1$
"OUTPUT HORIZ TAB DISPOSITION", // 12 //$NON-NLS-1$
"OUTPUT FORMFEED DISPOSITION", // 13 //$NON-NLS-1$
"OUTPUT VERTICAL TABSTOPS", // 14 //$NON-NLS-1$
"OUTPUT VT DISPOSITION", // 15 //$NON-NLS-1$
"OUTPUT LF DISPOSITION", // 16 //$NON-NLS-1$
"EXTENDED ASCII", // 17 //$NON-NLS-1$
"LOGOUT", // 18 //$NON-NLS-1$
"BYTE MACRO", // 19 //$NON-NLS-1$
"DATA ENTRY TERMINAL", // 20 //$NON-NLS-1$
"SUPDUP", // 21 //$NON-NLS-1$
"SUPDUP OUTPUT", // 22 //$NON-NLS-1$
"SEND LOCATION", // 23 //$NON-NLS-1$
"TERMINAL TYPE", // 24 //$NON-NLS-1$
"END OF RECORD", // 25 //$NON-NLS-1$
"TACACS USER IDENTIFICATION", // 26 //$NON-NLS-1$
"OUTPUT MARKING", // 27 //$NON-NLS-1$
"TERMINAL LOCATION NUMBER", // 28 //$NON-NLS-1$
"3270 REGIME", // 29 //$NON-NLS-1$
"X.3 PAD", // 30 //$NON-NLS-1$
"NEGOTIATE ABOUT WINDOW SIZE", // 31 //$NON-NLS-1$
"TERMINAL SPEED", // 32 //$NON-NLS-1$
"REMOTE FLOW CONTROL", // 33 //$NON-NLS-1$
"LINEMODE", // 34 //$NON-NLS-1$
"X DISPLAY LOCATION", // 35 //$NON-NLS-1$
"ENVIRONMENT OPTION", // 36 //$NON-NLS-1$
"AUTHENTICATION OPTION", // 37 //$NON-NLS-1$
"ENCRYPTION OPTION", // 38 //$NON-NLS-1$
"NEW ENVIRONMENT OPTION", // 39 //$NON-NLS-1$
"TN3270E", // 40 //$NON-NLS-1$
"XAUTH", // 41 //$NON-NLS-1$
"CHARSET", // 42 //$NON-NLS-1$
"REMOTE SERIAL PORT", // 43 //$NON-NLS-1$
"COM PORT CONTROL OPTION", // 44 //$NON-NLS-1$
"SUPPRESS LOCAL ECHO", // 45 //$NON-NLS-1$
"START TLS", // 46 //$NON-NLS-1$
"KERMIT", // 47 //$NON-NLS-1$
"SEND URL", // 48 //$NON-NLS-1$
"FORWARD X", // 49 //$NON-NLS-1$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", // 50 ... //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", // ... 137 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
"TELOPT PRAGMA LOGON", // 138 //$NON-NLS-1$
"TELOPT SSPI LOGON", // 139 //$NON-NLS-1$
"TELOPT PRAGMA HEARTBEAT", // 140 //$NON-NLS-1$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", // 141 ... //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", // ... 254 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
"EXTENDED OPTIONS LIST" // 255 //$NON-NLS-1$
};
class TelnetOption implements TelnetCodes {
/**
* This array of Strings maps an integer TELNET option code value to the symbolic
* name of the option. Array elements of the form "?" represent unassigned option
* values.
*/
protected static final String[] optionNames = { "BINARY", // 0 //$NON-NLS-1$
"ECHO", // 1 //$NON-NLS-1$
"RECONNECTION", // 2 //$NON-NLS-1$
"SUPPRESS GO AHEAD", // 3 //$NON-NLS-1$
"MSG SIZE NEGOTIATION", // 4 //$NON-NLS-1$
"STATUS", // 5 //$NON-NLS-1$
"TIMING MARK", // 6 //$NON-NLS-1$
"REMOTE CTRL TRANS+ECHO", // 7 //$NON-NLS-1$
"OUTPUT LINE WIDTH", // 8 //$NON-NLS-1$
"OUTPUT PAGE SIZE", // 9 //$NON-NLS-1$
"OUTPUT CR DISPOSITION", // 10 //$NON-NLS-1$
"OUTPUT HORIZ TABSTOPS", // 11 //$NON-NLS-1$
"OUTPUT HORIZ TAB DISPOSITION", // 12 //$NON-NLS-1$
"OUTPUT FORMFEED DISPOSITION", // 13 //$NON-NLS-1$
"OUTPUT VERTICAL TABSTOPS", // 14 //$NON-NLS-1$
"OUTPUT VT DISPOSITION", // 15 //$NON-NLS-1$
"OUTPUT LF DISPOSITION", // 16 //$NON-NLS-1$
"EXTENDED ASCII", // 17 //$NON-NLS-1$
"LOGOUT", // 18 //$NON-NLS-1$
"BYTE MACRO", // 19 //$NON-NLS-1$
"DATA ENTRY TERMINAL", // 20 //$NON-NLS-1$
"SUPDUP", // 21 //$NON-NLS-1$
"SUPDUP OUTPUT", // 22 //$NON-NLS-1$
"SEND LOCATION", // 23 //$NON-NLS-1$
"TERMINAL TYPE", // 24 //$NON-NLS-1$
"END OF RECORD", // 25 //$NON-NLS-1$
"TACACS USER IDENTIFICATION", // 26 //$NON-NLS-1$
"OUTPUT MARKING", // 27 //$NON-NLS-1$
"TERMINAL LOCATION NUMBER", // 28 //$NON-NLS-1$
"3270 REGIME", // 29 //$NON-NLS-1$
"X.3 PAD", // 30 //$NON-NLS-1$
"NEGOTIATE ABOUT WINDOW SIZE", // 31 //$NON-NLS-1$
"TERMINAL SPEED", // 32 //$NON-NLS-1$
"REMOTE FLOW CONTROL", // 33 //$NON-NLS-1$
"LINEMODE", // 34 //$NON-NLS-1$
"X DISPLAY LOCATION", // 35 //$NON-NLS-1$
"ENVIRONMENT OPTION", // 36 //$NON-NLS-1$
"AUTHENTICATION OPTION", // 37 //$NON-NLS-1$
"ENCRYPTION OPTION", // 38 //$NON-NLS-1$
"NEW ENVIRONMENT OPTION", // 39 //$NON-NLS-1$
"TN3270E", // 40 //$NON-NLS-1$
"XAUTH", // 41 //$NON-NLS-1$
"CHARSET", // 42 //$NON-NLS-1$
"REMOTE SERIAL PORT", // 43 //$NON-NLS-1$
"COM PORT CONTROL OPTION", // 44 //$NON-NLS-1$
"SUPPRESS LOCAL ECHO", // 45 //$NON-NLS-1$
"START TLS", // 46 //$NON-NLS-1$
"KERMIT", // 47 //$NON-NLS-1$
"SEND URL", // 48 //$NON-NLS-1$
"FORWARD X", // 49 //$NON-NLS-1$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", // 50 ... //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", // ... 137 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
"TELOPT PRAGMA LOGON", // 138 //$NON-NLS-1$
"TELOPT SSPI LOGON", // 139 //$NON-NLS-1$
"TELOPT PRAGMA HEARTBEAT", // 140 //$NON-NLS-1$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", // 141 ... //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
"?", "?", "?", "?", // ... 254 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
"EXTENDED OPTIONS LIST" // 255 //$NON-NLS-1$
};
/**
* Negotiation state: Negotiation not yet started for this option. <p>
*
* This constant and the others having similar names represent the states of a
* finite state automaton (FSA) that tracks the negotiation state of this option.
* The initial state is NEGOTIATION_NOT_STARTED. The state machine is as follows
* (with transitions labeled with letters in parentheses): <p>
*
* <pre>
* NEGOTIATION_NOT_STARTED -----> {@link #NEGOTIATION_IN_PROGRESS}
* | (A) | ^
* (C)| (B)| |(D)
* | V |
* +--------> {@link #NEGOTIATION_DONE}
* </pre> <p>
*
* Once the FSA leaves state NEGOTIATION_NOT_STARTED, it never returns to that
* state. Transition A happens when the local endpoint sends an option command
* before receiving a command for the same option from the remote endpoint. <p>
*
* Transition B happens when the local endpoint receives a reply to an option
* command sent earlier by the local endpoint. Receipt of that reply terminates
* the negotiation. <p>
*
* Transition D happens after negotiation is done and "something changes" (see the
* RFCs for the definition of "something changes"). Either endpoint can
* re-negotiate an option after a previous negotiation, but only if some external
* influence (such as the user or the OS) causes it to do so. Re-negotiation must
* start more than {@link #NEGOTIATION_IGNORE_DURATION} milliseconds after the FSA
* enters state NEGOTIATION_DONE or it will be ignored. This is how this client
* prevents negotiation loops. <p>
*
* Transition C happens when the local endpoint receives an option command from the
* remote endpoint before sending a command for the same option. In that case, the
* local endpoint replies immediately with an option command and the negotiation
* terminates. <p>
*
* Some TELNET servers (e.g., the Solaris server), after sending WILL and receiving
* DONT, will reply with a superfluous WONT. Any such superfluous option command
* received from the remote endpoint while the option's FSA is in state
* {@link #NEGOTIATION_DONE} will be ignored by the local endpoint.
*/
protected static final int NEGOTIATION_NOT_STARTED = 0;
/**
* Negotiation state: Negotiation not yet started for this option. <p>
*
* This constant and the others having similar names represent the states of a
* finite state automaton (FSA) that tracks the negotiation state of this option.
* The initial state is NEGOTIATION_NOT_STARTED. The state machine is as follows
* (with transitions labeled with letters in parentheses): <p>
*
* <pre>
* NEGOTIATION_NOT_STARTED -----> {@link #NEGOTIATION_IN_PROGRESS}
* | (A) | ^
* (C)| (B)| |(D)
* | V |
* +--------> {@link #NEGOTIATION_DONE}
* </pre> <p>
*
* Once the FSA leaves state NEGOTIATION_NOT_STARTED, it never returns to that
* state. Transition A happens when the local endpoint sends an option command
* before receiving a command for the same option from the remote endpoint. <p>
*
* Transition B happens when the local endpoint receives a reply to an option
* command sent earlier by the local endpoint. Receipt of that reply terminates
* the negotiation. <p>
*
* Transition D happens after negotiation is done and "something changes" (see the
* RFCs for the definition of "something changes"). Either endpoint can
* re-negotiate an option after a previous negotiation, but only if some external
* influence (such as the user or the OS) causes it to do so. Re-negotiation must
* start more than {@link #NEGOTIATION_IGNORE_DURATION} milliseconds after the FSA
* enters state NEGOTIATION_DONE or it will be ignored. This is how this client
* prevents negotiation loops. <p>
*
* Transition C happens when the local endpoint receives an option command from the
* remote endpoint before sending a command for the same option. In that case, the
* local endpoint replies immediately with an option command and the negotiation
* terminates. <p>
*
* Some TELNET servers (e.g., the Solaris server), after sending WILL and receiving
* DONT, will reply with a superfluous WONT. Any such superfluous option command
* received from the remote endpoint while the option's FSA is in state
* {@link #NEGOTIATION_DONE} will be ignored by the local endpoint.
*/
protected static final int NEGOTIATION_NOT_STARTED = 0;
/** Negotiation state: Negotiation is in progress for this option. */
protected static final int NEGOTIATION_IN_PROGRESS = 1;
/** Negotiation state: Negotiation is in progress for this option. */
protected static final int NEGOTIATION_IN_PROGRESS = 1;
/** Negotiation state: Negotiation has terminated for this option. */
protected static final int NEGOTIATION_DONE = 2;
/** Negotiation state: Negotiation has terminated for this option. */
protected static final int NEGOTIATION_DONE = 2;
/**
* The number of milliseconds following the end of negotiation of this option
* before which the remote endpoint can re-negotiate the option. Any option
* command received from the remote endpoint before this time passes is ignored.
* This is used to prevent option negotiation loops.
*
* @see #ignoreNegotiation()
* @see #negotiationCompletionTime
*/
protected static final int NEGOTIATION_IGNORE_DURATION = 30000;
/**
* The number of milliseconds following the end of negotiation of this option
* before which the remote endpoint can re-negotiate the option. Any option
* command received from the remote endpoint before this time passes is ignored.
* This is used to prevent option negotiation loops.
*
* @see #ignoreNegotiation()
* @see #negotiationCompletionTime
*/
protected static final int NEGOTIATION_IGNORE_DURATION = 30000;
/**
* This field holds the current negotiation state for this option.
*/
protected int negotiationState = NEGOTIATION_NOT_STARTED;
/**
* This field holds the current negotiation state for this option.
*/
protected int negotiationState = NEGOTIATION_NOT_STARTED;
/**
* This field holds the time when negotiation of this option most recently
* terminated (i.e., entered state {@link #NEGOTIATION_DONE}). This is used to
* determine whether an option command received from the remote endpoint after
* negotiation has terminated for this option is to be ignored or interpreted as
* the start of a new negotiation.
*
* @see #NEGOTIATION_IGNORE_DURATION
*/
protected Date negotiationCompletionTime = new Date(0);
/**
* This field holds the time when negotiation of this option most recently
* terminated (i.e., entered state {@link #NEGOTIATION_DONE}). This is used to
* determine whether an option command received from the remote endpoint after
* negotiation has terminated for this option is to be ignored or interpreted as
* the start of a new negotiation.
*
* @see #NEGOTIATION_IGNORE_DURATION
*/
protected Date negotiationCompletionTime = new Date(0);
/**
* Holds the total number of negotiations that have completed for this option.
*/
protected int negotiationCount = 0;
/**
* Holds the total number of negotiations that have completed for this option.
*/
protected int negotiationCount = 0;
/**
* Holds the integer code representing the option.
*/
protected byte option = 0;
/**
* Holds the integer code representing the option.
*/
protected byte option = 0;
/**
* Holds the OutputStream object that allows data to be sent to the remote endpoint
* of the TELNET connection.
*/
protected OutputStream outputStream;
/**
* Holds the OutputStream object that allows data to be sent to the remote endpoint
* of the TELNET connection.
*/
protected OutputStream outputStream;
/**
* True if this option is for the local endpoint, false for the remote endpoint.
*/
protected boolean local = true;
/**
* True if this option is for the local endpoint, false for the remote endpoint.
*/
protected boolean local = true;
/**
* This field is true if the option is enabled, false if it is disabled. All
* options are initially disabled until they are negotiated to be enabled. <p>
*/
protected boolean enabled = false;
/**
* This field is true if the option is enabled, false if it is disabled. All
* options are initially disabled until they are negotiated to be enabled. <p>
*/
protected boolean enabled = false;
/**
* This field is true if the client desires the option to be enabled, false if the
* client desires the option to be disabled. This field does not represent the
* remote's endpoints desire (as expressed via WILL and WONT commands) -- it
* represnet the local endpoint's desire. <p>
*
* @see #setDesired(boolean)
*/
protected boolean desired = false;
/**
* This field is true if the client desires the option to be enabled, false if the
* client desires the option to be disabled. This field does not represent the
* remote's endpoints desire (as expressed via WILL and WONT commands) -- it
* represnet the local endpoint's desire. <p>
*
* @see #setDesired(boolean)
*/
protected boolean desired = false;
/**
/**
* Constructor. <p>
*
* @param option The integer code of this option.
@ -251,8 +248,7 @@ class TelnetOption implements TelnetCodes
* @param local Whether this option is for the local or remote endpoint.
* @param outputStream A stream used to negotiate with the remote endpoint.
*/
TelnetOption(byte option, boolean desired, boolean local,
OutputStream outputStream) {
TelnetOption(byte option, boolean desired, boolean local, OutputStream outputStream) {
this.option = option;
this.desired = desired;
this.local = local;
@ -333,12 +329,10 @@ class TelnetOption implements TelnetCodes
public void negotiate() {
if (negotiationState == NEGOTIATION_NOT_STARTED && desired) {
if (local) {
Logger
.log("Starting negotiation for local option " + optionName()); //$NON-NLS-1$
Logger.log("Starting negotiation for local option " + optionName()); //$NON-NLS-1$
sendWill();
} else {
Logger
.log("Starting negotiation for remote option " + optionName()); //$NON-NLS-1$
Logger.log("Starting negotiation for remote option " + optionName()); //$NON-NLS-1$
sendDo();
}
@ -352,8 +346,7 @@ class TelnetOption implements TelnetCodes
*/
public void handleWill() {
if (negotiationState == NEGOTIATION_DONE && ignoreNegotiation()) {
Logger
.log("Ignoring superfluous WILL command from remote endpoint."); //$NON-NLS-1$
Logger.log("Ignoring superfluous WILL command from remote endpoint."); //$NON-NLS-1$
return;
}
@ -403,8 +396,7 @@ class TelnetOption implements TelnetCodes
*/
public void handleWont() {
if (negotiationState == NEGOTIATION_DONE && ignoreNegotiation()) {
Logger
.log("Ignoring superfluous WONT command from remote endpoint."); //$NON-NLS-1$
Logger.log("Ignoring superfluous WONT command from remote endpoint."); //$NON-NLS-1$
return;
}
@ -481,8 +473,7 @@ class TelnetOption implements TelnetCodes
*/
public void handleDont() {
if (negotiationState == NEGOTIATION_DONE && ignoreNegotiation()) {
Logger
.log("Ignoring superfluous DONT command from remote endpoint."); //$NON-NLS-1$
Logger.log("Ignoring superfluous DONT command from remote endpoint."); //$NON-NLS-1$
return;
}
@ -520,9 +511,8 @@ class TelnetOption implements TelnetCodes
case TELNET_OPTION_TERMINAL_TYPE:
if (subnegotiationData[1] != TELNET_SEND) {
// This should never happen!
Logger
.log("Invalid TERMINAL-TYPE subnegotiation command from remote endpoint: " + //$NON-NLS-1$
(subnegotiationData[1] & 0xff));
Logger.log("Invalid TERMINAL-TYPE subnegotiation command from remote endpoint: " + //$NON-NLS-1$
(subnegotiationData[1] & 0xff));
break;
}
@ -531,8 +521,7 @@ class TelnetOption implements TelnetCodes
//
// IAC SB TERMINAL-TYPE IS x t e r m IAC SE
byte[] terminalTypeData = { TELNET_IAC, TELNET_SB,
TELNET_OPTION_TERMINAL_TYPE, TELNET_IS, (byte) 'x',
byte[] terminalTypeData = { TELNET_IAC, TELNET_SB, TELNET_OPTION_TERMINAL_TYPE, TELNET_IS, (byte) 'x',
(byte) 't', (byte) 'e', (byte) 'r', (byte) 'm', TELNET_IAC, TELNET_SE };
try {
@ -545,8 +534,7 @@ class TelnetOption implements TelnetCodes
default:
// This should never happen!
Logger
.log("SHOULD NOT BE REACHED: Called for option " + optionName()); //$NON-NLS-1$
Logger.log("SHOULD NOT BE REACHED: Called for option " + optionName()); //$NON-NLS-1$
break;
}
}
@ -567,8 +555,7 @@ class TelnetOption implements TelnetCodes
// IAC SB NAWS <width-highbyte> <width-lowbyte> <height-highbyte>
// <height-lowbyte> IAC SE
final byte[] NAWSData = { TELNET_IAC, TELNET_SB, TELNET_OPTION_NAWS, 0,
0, 0, 0, TELNET_IAC, TELNET_SE };
final byte[] NAWSData = { TELNET_IAC, TELNET_SB, TELNET_OPTION_NAWS, 0, 0, 0, 0, TELNET_IAC, TELNET_SE };
int width = ((Integer) subnegotiationData[0]).intValue();
int height = ((Integer) subnegotiationData[1]).intValue();
@ -577,17 +564,16 @@ class TelnetOption implements TelnetCodes
NAWSData[5] = (byte) ((height >>> 8) & 0xff); // High order byte of height.
NAWSData[6] = (byte) (height & 0xff); // Low order byte of height.
Logger
.log("sending terminal size to remote endpoint: width = " + width + //$NON-NLS-1$
", height = " + height + "."); //$NON-NLS-1$ //$NON-NLS-2$
Logger.log("sending terminal size to remote endpoint: width = " + width + //$NON-NLS-1$
", height = " + height + "."); //$NON-NLS-1$ //$NON-NLS-2$
// Send the NAWS data in a new thread. The current thread is the display
// thread, and calls to write() can block, but blocking the display thread
// is _bad_ (it hangs the GUI).
Thread t=new Thread() {
Thread t = new Thread() {
@Override
public void run() {
public void run() {
try {
outputStream.write(NAWSData);
} catch (IOException ex) {
@ -602,8 +588,7 @@ class TelnetOption implements TelnetCodes
default:
// This should never happen!
Logger
.log("SHOULD NOT BE REACHED: Called for option " + optionName()); //$NON-NLS-1$
Logger.log("SHOULD NOT BE REACHED: Called for option " + optionName()); //$NON-NLS-1$
break;
}
}

2
terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetProperties.java
View file

@ -13,7 +13,7 @@
* Helmut Haigermoser and Ted Williams.
*
* Contributors:
* Michael Scharf (Wind River) - extracted from TerminalProperties
* Michael Scharf (Wind River) - extracted from TerminalProperties
* Martin Oberhuber (Wind River) - fixed copyright headers and beautified
*******************************************************************************/
package org.eclipse.tm.terminal.connector.telnet.connector;

27
terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetSettings.java
View file

@ -24,13 +24,14 @@ import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
* @noreference This class is not intended to be referenced by clients.
*/
public class TelnetSettings implements ITelnetSettings {
protected String fHost;
protected String fNetworkPort;
protected String fTimeout;
protected String fEndOfLine = EOL_CRNUL;
private final TelnetProperties fProperties=new TelnetProperties();
protected String fHost;
protected String fNetworkPort;
protected String fTimeout;
protected String fEndOfLine = EOL_CRNUL;
private final TelnetProperties fProperties = new TelnetProperties();
@Override
public String getHost() {
public String getHost() {
return fHost;
}
@ -43,7 +44,7 @@ public class TelnetSettings implements ITelnetSettings {
}
@Override
public int getNetworkPort() {
public int getNetworkPort() {
try {
return Integer.parseInt(fNetworkPort);
} catch (NumberFormatException numberFormatException) {
@ -56,20 +57,20 @@ public class TelnetSettings implements ITelnetSettings {
}
@Override
public String getSummary() {
public String getSummary() {
return getHost() + ":" + getNetworkPortString(); //$NON-NLS-1$
}
@Override
public void load(ISettingsStore store) {
public void load(ISettingsStore store) {
fHost = store.get("Host", fProperties.getDefaultHost());//$NON-NLS-1$
fNetworkPort = store.get("NetworkPort", fProperties.getDefaultNetworkPort());//$NON-NLS-1$
fTimeout = store.get("Timeout","10");//$NON-NLS-1$ //$NON-NLS-2$
fTimeout = store.get("Timeout", "10");//$NON-NLS-1$ //$NON-NLS-2$
fEndOfLine = store.get("EndOfLine", EOL_CRNUL);//$NON-NLS-1$
}
@Override
public void save(ISettingsStore store) {
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$
@ -79,14 +80,16 @@ public class TelnetSettings implements ITelnetSettings {
public TelnetProperties getProperties() {
return fProperties;
}
@Override
public int getTimeout() {
public int getTimeout() {
try {
return Integer.parseInt(fTimeout);
} catch (NumberFormatException numberFormatException) {
return 10;
}
}
public String getTimeoutString() {
return fTimeout;
}

63
terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetSettingsPage.java
View file

@ -48,10 +48,11 @@ public class TelnetSettingsPage extends AbstractSettingsPage {
private final TelnetSettings fTerminalSettings;
public TelnetSettingsPage(TelnetSettings settings) {
fTerminalSettings=settings;
fTerminalSettings = settings;
}
@Override
public void saveSettings() {
public void saveSettings() {
fTerminalSettings.setHost(fHostText.getText());
fTerminalSettings.setTimeout(fTimeout.getText());
fTerminalSettings.setNetworkPort(getNetworkPort());
@ -59,31 +60,34 @@ public class TelnetSettingsPage extends AbstractSettingsPage {
}
@Override
public void loadSettings() {
if(fTerminalSettings!=null) {
public void loadSettings() {
if (fTerminalSettings != null) {
setHost(fTerminalSettings.getHost());
setTimeout(fTerminalSettings.getTimeoutString());
setNetworkPort(fTerminalSettings.getNetworkPortString());
setEndOfLine(fTerminalSettings.getEndOfLine());
}
}
private void setHost(String strHost) {
if(strHost==null)
strHost=""; //$NON-NLS-1$
if (strHost == null)
strHost = ""; //$NON-NLS-1$
fHostText.setText(strHost);
}
private void setTimeout(String timeout) {
if(timeout==null || timeout.length()==0)
timeout="5"; //$NON-NLS-1$
if (timeout == null || timeout.length() == 0)
timeout = "5"; //$NON-NLS-1$
fTimeout.setText(timeout);
}
private void setNetworkPort(String strNetworkPort) {
if (strNetworkPort!=null) {
if (strNetworkPort != null) {
String strPortName = getNetworkPortMap().findPortName(strNetworkPort);
if(strPortName==null) {
strPortName=strNetworkPort; //fallback to verbatim port if not found
if (strPortName == null) {
strPortName = strNetworkPort; //fallback to verbatim port if not found
}
int nIndex = fNetworkPortCombo.indexOf(strPortName);
@ -94,23 +98,28 @@ public class TelnetSettingsPage extends AbstractSettingsPage {
}
}
}
private String getNetworkPort() {
String portText = fNetworkPortCombo.getText().trim();
String mappedPort = getNetworkPortMap().findPort(portText);
return mappedPort!=null ? mappedPort : portText;
return mappedPort != null ? mappedPort : portText;
}
private NetworkPortMap getNetworkPortMap() {
return fTerminalSettings.getProperties().getNetworkPortMap();
}
private void setEndOfLine(String eol) {
int idx = fEndOfLineCombo.indexOf(eol);
fEndOfLineCombo.select(idx >= 0 ? idx : 0);
}
private String getEndOfLine() {
return fEndOfLineCombo.getText();
}
@Override
public boolean validateSettings() {
public boolean validateSettings() {
String message = null;
int messageType = IMessageProvider.NONE;
boolean valid = true;
@ -119,7 +128,10 @@ public class TelnetSettingsPage extends AbstractSettingsPage {
String m = "Please enter a host IP or name."; //$NON-NLS-1$
int mt = IMessageProvider.INFORMATION;
updateControlDecoration(fHostText, m, mt);
if (mt > messageType) { message = m; messageType = mt; }
if (mt > messageType) {
message = m;
messageType = mt;
}
valid = false;
} else {
@ -132,7 +144,10 @@ public class TelnetSettingsPage extends AbstractSettingsPage {
String m = "Invalid network port. Must be between 0 and 65535."; //$NON-NLS-1$
int mt = IMessageProvider.ERROR;
updateControlDecoration(fNetworkPortCombo, m, mt);
if (mt > messageType) { message = m; messageType = mt; }
if (mt > messageType) {
message = m;
messageType = mt;
}
valid = false;
} else {
@ -144,7 +159,10 @@ public class TelnetSettingsPage extends AbstractSettingsPage {
String m = "Invalid timeout. Must be greater than 0."; //$NON-NLS-1$
int mt = IMessageProvider.ERROR;
updateControlDecoration(fTimeout, m, mt);
if (mt > messageType) { message = m; messageType = mt; }
if (mt > messageType) {
message = m;
messageType = mt;
}
valid = false;
} else {
@ -160,7 +178,7 @@ public class TelnetSettingsPage extends AbstractSettingsPage {
}
@Override
public void createControl(Composite parent) {
public void createControl(Composite parent) {
Composite composite = new Composite(parent, SWT.NONE);
GridLayout gridLayout = new GridLayout(2, false);
GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
@ -179,7 +197,7 @@ public class TelnetSettingsPage extends AbstractSettingsPage {
fHostText.setLayoutData(gridData);
fHostText.addModifyListener(new ModifyListener() {
@Override
public void modifyText(ModifyEvent e) {
public void modifyText(ModifyEvent e) {
fireListeners(fHostText);
}
});
@ -195,13 +213,13 @@ public class TelnetSettingsPage extends AbstractSettingsPage {
fNetworkPortCombo.setLayoutData(gridData);
fNetworkPortCombo.addModifyListener(new ModifyListener() {
@Override
public void modifyText(ModifyEvent e) {
public void modifyText(ModifyEvent e) {
fireListeners(fNetworkPortCombo);
}
});
fNetworkPortCombo.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
public void widgetSelected(SelectionEvent e) {
fireListeners(fNetworkPortCombo);
}
});
@ -216,7 +234,7 @@ public class TelnetSettingsPage extends AbstractSettingsPage {
fTimeout.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
fTimeout.addModifyListener(new ModifyListener() {
@Override
public void modifyText(ModifyEvent e) {
public void modifyText(ModifyEvent e) {
fireListeners(fTimeout);
}
});
@ -228,7 +246,7 @@ public class TelnetSettingsPage extends AbstractSettingsPage {
fEndOfLineCombo.setLayoutData(gridData);
fEndOfLineCombo.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
public void widgetSelected(SelectionEvent e) {
fireListeners(fEndOfLineCombo);
}
});
@ -236,6 +254,7 @@ public class TelnetSettingsPage extends AbstractSettingsPage {
loadSettings();
}
private void loadCombo(Combo ctlCombo, List<String> table) {
for (Iterator<String> iter = table.iterator(); iter.hasNext();) {
String label = iter.next();

86
terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/controls/TelnetWizardConfigurationPanel.java
View file

@ -36,7 +36,7 @@ import org.eclipse.tm.terminal.view.ui.panels.AbstractExtendedConfigurationPanel
*/
public class TelnetWizardConfigurationPanel extends AbstractExtendedConfigurationPanel {
public TelnetSettings telnetSettings;
public TelnetSettings telnetSettings;
private ISettingsPage telnetSettingsPage;
/**
@ -45,8 +45,8 @@ public class TelnetWizardConfigurationPanel extends AbstractExtendedConfiguratio
* @param container The configuration panel container or <code>null</code>.
*/
public TelnetWizardConfigurationPanel(IConfigurationPanelContainer container) {
super(container);
}
super(container);
}
/* (non-Javadoc)
* @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite)
@ -59,7 +59,8 @@ public class TelnetWizardConfigurationPanel extends AbstractExtendedConfiguratio
panel.setLayoutData(data);
// Create the host selection combo
if (isWithoutSelection()) createHostsUI(panel, true);
if (isWithoutSelection())
createHostsUI(panel, true);
TelnetConnector conn = new TelnetConnector();
telnetSettings = (TelnetSettings) conn.getTelnetSettings();
@ -69,7 +70,7 @@ public class TelnetWizardConfigurationPanel extends AbstractExtendedConfiguratio
telnetSettingsPage = new TelnetSettingsPage(telnetSettings);
if (telnetSettingsPage instanceof AbstractSettingsPage) {
((AbstractSettingsPage)telnetSettingsPage).setHasControlDecoration(true);
((AbstractSettingsPage) telnetSettingsPage).setHasControlDecoration(true);
}
telnetSettingsPage.createControl(panel);
@ -78,7 +79,8 @@ public class TelnetWizardConfigurationPanel extends AbstractExtendedConfiguratio
@Override
public void onSettingsPageChanged(Control control) {
if (getContainer() != null) getContainer().validate();
if (getContainer() != null)
getContainer().validate();
}
});
@ -93,54 +95,62 @@ public class TelnetWizardConfigurationPanel extends AbstractExtendedConfiguratio
*/
@Override
public void setupData(Map<String, Object> data) {
if (data == null || telnetSettings == null || telnetSettingsPage == null) return;
if (data == null || telnetSettings == null || telnetSettingsPage == null)
return;
String value = (String)data.get(ITerminalsConnectorConstants.PROP_IP_HOST);
if (value != null) telnetSettings.setHost(value);
String value = (String) data.get(ITerminalsConnectorConstants.PROP_IP_HOST);
if (value != null)
telnetSettings.setHost(value);
Object v = data.get(ITerminalsConnectorConstants.PROP_IP_PORT);
value = v != null ? v.toString() : null;
if (value != null) telnetSettings.setNetworkPort(value);
if (value != null)
telnetSettings.setNetworkPort(value);
v = data.get(ITerminalsConnectorConstants.PROP_TIMEOUT);
value = v != null ? v.toString() : null;
if (value != null) telnetSettings.setTimeout(value);
if (value != null)
telnetSettings.setTimeout(value);
v = data.get(ITerminalsConnectorConstants.PROP_TELNET_EOL);
value = v != null ? v.toString() : null;
if (value != null) telnetSettings.setEndOfLine(value);
if (value != null)
telnetSettings.setEndOfLine(value);
value = (String)data.get(ITerminalsConnectorConstants.PROP_ENCODING);
if (value != null) setEncoding(value);
value = (String) data.get(ITerminalsConnectorConstants.PROP_ENCODING);
if (value != null)
setEncoding(value);
telnetSettingsPage.loadSettings();
}
}
/* (non-Javadoc)
* @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#extractData(java.util.Map)
*/
@Override
public void extractData(Map<String, Object> data) {
if (data == null) return;
if (data == null)
return;
// set the terminal connector id for ssh
data.put(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID, "org.eclipse.tm.terminal.connector.telnet.TelnetConnector"); //$NON-NLS-1$
// set the terminal connector id for ssh
data.put(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID,
"org.eclipse.tm.terminal.connector.telnet.TelnetConnector"); //$NON-NLS-1$
telnetSettingsPage.saveSettings();
data.put(ITerminalsConnectorConstants.PROP_IP_HOST,telnetSettings.getHost());
telnetSettingsPage.saveSettings();
data.put(ITerminalsConnectorConstants.PROP_IP_HOST, telnetSettings.getHost());
data.put(ITerminalsConnectorConstants.PROP_IP_PORT, Integer.valueOf(telnetSettings.getNetworkPort()));
data.put(ITerminalsConnectorConstants.PROP_TIMEOUT, Integer.valueOf(telnetSettings.getTimeout()));
data.put(ITerminalsConnectorConstants.PROP_TELNET_EOL, telnetSettings.getEndOfLine());
data.put(ITerminalsConnectorConstants.PROP_ENCODING, getEncoding());
}
}
/* (non-Javadoc)
* @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#fillSettingsForHost(java.lang.String)
*/
@Override
protected void fillSettingsForHost(String host){
if (host != null && host.length() != 0){
if (hostSettingsMap.containsKey(host)){
protected void fillSettingsForHost(String host) {
if (host != null && host.length() != 0) {
if (hostSettingsMap.containsKey(host)) {
Map<String, String> hostSettings = hostSettingsMap.get(host);
if (hostSettings.get(ITerminalsConnectorConstants.PROP_IP_HOST) != null) {
telnetSettings.setHost(hostSettings.get(ITerminalsConnectorConstants.PROP_IP_HOST));
@ -171,18 +181,20 @@ public class TelnetWizardConfigurationPanel extends AbstractExtendedConfiguratio
* @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#saveSettingsForHost(boolean)
*/
@Override
protected void saveSettingsForHost(boolean add){
protected void saveSettingsForHost(boolean add) {
String host = getHostFromSettings();
if(host != null && host.length() != 0) {
if (host != null && host.length() != 0) {
Map<String, String> hostSettings = hostSettingsMap.get(host);
if (hostSettings == null && !add) {
hostSettings=new HashMap<String, String>();
hostSettings = new HashMap<String, String>();
hostSettingsMap.put(host, hostSettings);
}
if (hostSettings != null) {
hostSettings.put(ITerminalsConnectorConstants.PROP_IP_HOST, telnetSettings.getHost());
hostSettings.put(ITerminalsConnectorConstants.PROP_IP_PORT, Integer.toString(telnetSettings.getNetworkPort()));
hostSettings.put(ITerminalsConnectorConstants.PROP_TIMEOUT, Integer.toString(telnetSettings.getTimeout()));
hostSettings.put(ITerminalsConnectorConstants.PROP_IP_PORT,
Integer.toString(telnetSettings.getNetworkPort()));
hostSettings.put(ITerminalsConnectorConstants.PROP_TIMEOUT,
Integer.toString(telnetSettings.getTimeout()));
hostSettings.put(ITerminalsConnectorConstants.PROP_TELNET_EOL, telnetSettings.getEndOfLine());
if (getEncoding() != null) {
hostSettings.put(ITerminalsConnectorConstants.PROP_ENCODING, getEncoding());
@ -195,7 +207,7 @@ public class TelnetWizardConfigurationPanel extends AbstractExtendedConfiguratio
* @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#isValid()
*/
@Override
public boolean isValid(){
public boolean isValid() {
return isEncodingValid() && telnetSettingsPage.validateSettings();
}
@ -203,17 +215,17 @@ public class TelnetWizardConfigurationPanel extends AbstractExtendedConfiguratio
* @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#doSaveWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String)
*/
@Override
public void doSaveWidgetValues(IDialogSettings settings, String idPrefix) {
saveSettingsForHost(true);
super.doSaveWidgetValues(settings, idPrefix);
}
public void doSaveWidgetValues(IDialogSettings settings, String idPrefix) {
saveSettingsForHost(true);
super.doSaveWidgetValues(settings, idPrefix);
}
/* (non-Javadoc)
* @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#getHostFromSettings()
*/
@Override
protected String getHostFromSettings() {
protected String getHostFromSettings() {
telnetSettingsPage.saveSettings();
return telnetSettings.getHost();
}
return telnetSettings.getHost();
}
}

31
terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/launcher/TelnetLauncherDelegate.java
View file

@ -91,18 +91,19 @@ public class TelnetLauncherDelegate extends AbstractLauncherDelegate {
*
* @return The terminal title string or <code>null</code>.
*/
private String getTerminalTitle(Map<String, Object> properties) {
private String getTerminalTitle(Map<String, Object> properties) {
// Try to see if the user set a title explicitly via the properties map.
String title = getDefaultTerminalTitle(properties);
if (title != null) return title;
if (title != null)
return title;
//No title,try to calculate the title
String host = (String)properties.get(ITerminalsConnectorConstants.PROP_IP_HOST);
String host = (String) properties.get(ITerminalsConnectorConstants.PROP_IP_HOST);
if (host != null) {
DateFormat format = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
String date = format.format(new Date(System.currentTimeMillis()));
return NLS.bind(Messages.TelnetLauncherDelegate_terminalTitle, new String[]{host, date});
return NLS.bind(Messages.TelnetLauncherDelegate_terminalTitle, new String[] { host, date });
}
return Messages.TelnetLauncherDelegate_terminalTitle_default;
@ -116,32 +117,34 @@ public class TelnetLauncherDelegate extends AbstractLauncherDelegate {
if (IMementoHandler.class.equals(adapter)) {
return mementoHandler;
}
return super.getAdapter(adapter);
return super.getAdapter(adapter);
}
/* (non-Javadoc)
* @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#createTerminalConnector(java.util.Map)
*/
@Override
@Override
public ITerminalConnector createTerminalConnector(Map<String, Object> properties) {
Assert.isNotNull(properties);
Assert.isNotNull(properties);
// Check for the terminal connector id
String connectorId = (String)properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID);
if (connectorId == null) connectorId = "org.eclipse.tm.terminal.connector.telnet.TelnetConnector"; //$NON-NLS-1$
// Check for the terminal connector id
String connectorId = (String) properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID);
if (connectorId == null)
connectorId = "org.eclipse.tm.terminal.connector.telnet.TelnetConnector"; //$NON-NLS-1$
// Extract the telnet properties
String host = (String)properties.get(ITerminalsConnectorConstants.PROP_IP_HOST);
String host = (String) properties.get(ITerminalsConnectorConstants.PROP_IP_HOST);
Object value = properties.get(ITerminalsConnectorConstants.PROP_IP_PORT);
String port = value != null ? value.toString() : null;
value = properties.get(ITerminalsConnectorConstants.PROP_TIMEOUT);
String timeout = value != null ? value.toString() : null;
String endOfLine = (String)properties.get(ITerminalsConnectorConstants.PROP_TELNET_EOL);
String endOfLine = (String) properties.get(ITerminalsConnectorConstants.PROP_TELNET_EOL);
int portOffset = 0;
if (properties.get(ITerminalsConnectorConstants.PROP_IP_PORT_OFFSET) instanceof Integer) {
portOffset = ((Integer)properties.get(ITerminalsConnectorConstants.PROP_IP_PORT_OFFSET)).intValue();
if (portOffset < 0) portOffset = 0;
portOffset = ((Integer) properties.get(ITerminalsConnectorConstants.PROP_IP_PORT_OFFSET)).intValue();
if (portOffset < 0)
portOffset = 0;
}
// The real port to connect to is port + portOffset

24
terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/launcher/TelnetMementoHandler.java
View file

@ -33,12 +33,16 @@ public class TelnetMementoHandler implements IMementoHandler {
// Do not write the terminal title to the memento -> needs to
// be recreated at the time of restoration.
memento.putString(ITerminalsConnectorConstants.PROP_IP_HOST, (String)properties.get(ITerminalsConnectorConstants.PROP_IP_HOST));
memento.putString(ITerminalsConnectorConstants.PROP_IP_HOST,
(String) properties.get(ITerminalsConnectorConstants.PROP_IP_HOST));
Object value = properties.get(ITerminalsConnectorConstants.PROP_IP_PORT);
memento.putInteger(ITerminalsConnectorConstants.PROP_IP_PORT, value instanceof Integer ? ((Integer)value).intValue() : -1);
memento.putInteger(ITerminalsConnectorConstants.PROP_IP_PORT,
value instanceof Integer ? ((Integer) value).intValue() : -1);
value = properties.get(ITerminalsConnectorConstants.PROP_TIMEOUT);
memento.putInteger(ITerminalsConnectorConstants.PROP_TIMEOUT, value instanceof Integer ? ((Integer)value).intValue() : -1);
memento.putString(ITerminalsConnectorConstants.PROP_ENCODING, (String)properties.get(ITerminalsConnectorConstants.PROP_ENCODING));
memento.putInteger(ITerminalsConnectorConstants.PROP_TIMEOUT,
value instanceof Integer ? ((Integer) value).intValue() : -1);
memento.putString(ITerminalsConnectorConstants.PROP_ENCODING,
(String) properties.get(ITerminalsConnectorConstants.PROP_ENCODING));
}
/* (non-Javadoc)
@ -50,9 +54,13 @@ public class TelnetMementoHandler implements IMementoHandler {
Assert.isNotNull(properties);
// Restore the terminal properties from the memento
properties.put(ITerminalsConnectorConstants.PROP_IP_HOST, memento.getString(ITerminalsConnectorConstants.PROP_IP_HOST));
properties.put(ITerminalsConnectorConstants.PROP_IP_PORT, memento.getInteger(ITerminalsConnectorConstants.PROP_IP_PORT));
properties.put(ITerminalsConnectorConstants.PROP_TIMEOUT, memento.getInteger(ITerminalsConnectorConstants.PROP_TIMEOUT));
properties.put(ITerminalsConnectorConstants.PROP_ENCODING, memento.getString(ITerminalsConnectorConstants.PROP_ENCODING));
properties.put(ITerminalsConnectorConstants.PROP_IP_HOST,
memento.getString(ITerminalsConnectorConstants.PROP_IP_HOST));
properties.put(ITerminalsConnectorConstants.PROP_IP_PORT,
memento.getInteger(ITerminalsConnectorConstants.PROP_IP_PORT));
properties.put(ITerminalsConnectorConstants.PROP_TIMEOUT,
memento.getInteger(ITerminalsConnectorConstants.PROP_TIMEOUT));
properties.put(ITerminalsConnectorConstants.PROP_ENCODING,
memento.getString(ITerminalsConnectorConstants.PROP_ENCODING));
}
}

6
terminal/plugins/org.eclipse.tm.terminal.control/build.properties
View file

@ -13,7 +13,7 @@
# Helmut Haigermoser and Ted Williams.
#
# Contributors:
# Michael Scharf (Wind River) - split into core, view and connector plugins
# Michael Scharf (Wind River) - split into core, view and connector plugins
# Martin Oberhuber (Wind River) - fixed copyright headers and beautified
# Anna Dushistova (MontaVista) - added icons
###############################################################################
@ -31,9 +31,9 @@ bin.includes = .,\
css/,\
about.mappings,\
cdt_logo_icon32.png
source.. = src/
output.. = bin/
src.includes = schema/,\
about.html

2
terminal/plugins/org.eclipse.tm.terminal.control/plugin.properties
View file

@ -13,7 +13,7 @@
# Helmut Haigermoser and Ted Williams.
#
# Contributors:
# Michael Scharf (Wind River) - split into core, view and connector plugins
# Michael Scharf (Wind River) - split into core, view and connector plugins
# Martin Oberhuber (Wind River) - fixed copyright headers and beautified
# Martin Oberhuber (Wind River) - [378691][api] push Preferences into the Widget
###############################################################################

71
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/connector/TerminalConnector.java
View file

@ -10,7 +10,7 @@
* Contributors:
* Michael Scharf (Wind River) - initial API and implementation
* Michael Scharf (Wind River) - [200541] Extract from TerminalConnectorExtension.TerminalConnectorProxy
* Martin Oberhuber (Wind River) - [225853][api] Provide more default functionality in TerminalConnectorImpl
* Martin Oberhuber (Wind River) - [225853][api] Provide more default functionality in TerminalConnectorImpl
* Uwe Stieber (Wind River) - [282996] [terminal][api] Add "hidden" attribute to terminal connector extension point
*******************************************************************************/
package org.eclipse.tm.internal.terminal.connector;
@ -65,6 +65,7 @@ public class TerminalConnector implements ITerminalConnector {
*/
TerminalConnectorImpl makeConnector() throws Exception;
}
/**
* The factory for creating impl instances.
*/
@ -95,6 +96,7 @@ public class TerminalConnector implements ITerminalConnector {
* This keeps the value until the connector is created.
*/
private ISettingsStore fStore;
/**
* Constructor for the terminal connector.
*
@ -104,119 +106,138 @@ public class TerminalConnector implements ITerminalConnector {
* this ID.
* @param name translatable name to display the connector in the UI.
*/
public TerminalConnector(TerminalConnector.Factory terminalConnectorFactory, String id, String name, boolean hidden) {
public TerminalConnector(TerminalConnector.Factory terminalConnectorFactory, String id, String name,
boolean hidden) {
fTerminalConnectorFactory = terminalConnectorFactory;
fId = id;
fName = name;
fHidden = hidden;
}
public String getInitializationErrorMessage() {
getConnectorImpl();
if(fException!=null)
if (fException != null)
return fException.getLocalizedMessage();
return null;
}
public String getId() {
return fId;
}
public String getName() {
return fName;
}
public boolean isHidden() {
return fHidden;
}
private TerminalConnectorImpl getConnectorImpl() {
if(!isInitialized()) {
if (!isInitialized()) {
try {
fConnector=fTerminalConnectorFactory.makeConnector();
fConnector = fTerminalConnectorFactory.makeConnector();
fConnector.initialize();
} catch (Exception e) {
fException=e;
fConnector=new TerminalConnectorImpl(){
fException = e;
fConnector = new TerminalConnectorImpl() {
public void connect(ITerminalControl control) {
// super.connect(control);
control.setState(TerminalState.CLOSED);
control.setMsg(getInitializationErrorMessage());
}
public OutputStream getTerminalToRemoteStream() {
return null;
}
public String getSettingsSummary() {
return null;
}};
}
};
// that's the place where we log the exception
Logger.logException(e);
}
if(fConnector!=null && fStore!=null)
if (fConnector != null && fStore != null)
fConnector.load(fStore);
}
return fConnector;
}
public boolean isInitialized() {
return fConnector!=null || fException!=null;
return fConnector != null || fException != null;
}
public void connect(ITerminalControl control) {
getConnectorImpl().connect(control);
}
public void disconnect() {
getConnectorImpl().disconnect();
}
public OutputStream getTerminalToRemoteStream() {
return getConnectorImpl().getTerminalToRemoteStream();
}
public String getSettingsSummary() {
if(fConnector!=null)
if (fConnector != null)
return getConnectorImpl().getSettingsSummary();
else
return TerminalMessages.NotInitialized;
}
public boolean isLocalEcho() {
return getConnectorImpl().isLocalEcho();
}
public void load(ISettingsStore store) {
if(fConnector==null) {
fStore=store;
if (fConnector == null) {
fStore = store;
} else {
getConnectorImpl().load(store);
}
}
@Override
public void setDefaultSettings() {
getConnectorImpl().setDefaultSettings();
}
public void save(ISettingsStore store) {
// no need to save the settings: it cannot have changed
// because we are not initialized....
if(fConnector!=null)
if (fConnector != null)
getConnectorImpl().save(store);
}
public void setTerminalSize(int newWidth, int newHeight) {
// we assume that setTerminalSize is called also after
// the terminal has been initialized. Else we would have to cache
// the values....
if(fConnector!=null) {
if (fConnector != null) {
fConnector.setTerminalSize(newWidth, newHeight);
}
}
public Object getAdapter(Class adapter) {
TerminalConnectorImpl connector=null;
if(isInitialized())
connector=getConnectorImpl();
TerminalConnectorImpl connector = null;
if (isInitialized())
connector = getConnectorImpl();
// if we cannot create the connector then we cannot adapt...
if(connector!=null) {
if (connector != null) {
// maybe the connector is adaptable
if(connector instanceof IAdaptable) {
Object result =((IAdaptable)connector).getAdapter(adapter);
if (connector instanceof IAdaptable) {
Object result = ((IAdaptable) connector).getAdapter(adapter);
// Not sure if the next block is needed....
if(result==null)
if (result == null)
//defer to the platform
result= Platform.getAdapterManager().getAdapter(connector, adapter);
if(result!=null)
result = Platform.getAdapterManager().getAdapter(connector, adapter);
if (result != null)
return result;
}
// maybe the real adapter is what we need....
if(adapter.isInstance(connector))
if (adapter.isInstance(connector))
return connector;
}
// maybe we have to be adapted....

139
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/connector/TerminalToRemoteInjectionOutputStream.java
View file

@ -29,19 +29,22 @@ public class TerminalToRemoteInjectionOutputStream extends FilterOutputStream {
*/
static abstract public class Interceptor {
protected OutputStream fOriginal;
/**
* @param original the injection into the original stream begins
* @throws IOException
*/
public void begin(OutputStream original) throws IOException {
fOriginal=original;
fOriginal = original;
}
/**
* @param b a byte was written to the {@link TerminalToRemoteInjectionOutputStream}.
* @throws IOException
*/
public void write(int b) throws IOException {
}
/**
* @param b bytes written to the {@link TerminalToRemoteInjectionOutputStream}.
* @param off the start offset in the data.
@ -50,122 +53,144 @@ public class TerminalToRemoteInjectionOutputStream extends FilterOutputStream {
*/
public void write(byte[] b, int off, int len) throws IOException {
}
/**
* The injection into the normal stream ends.
* @throws IOException
*/
public void close() throws IOException {
}
public void flush() {
}
}
static public class BufferInterceptor extends Interceptor {
private final ByteArrayOutputStream fBuffer=new ByteArrayOutputStream();
public void close() throws IOException {
fOriginal.write(fBuffer.toByteArray());
private final ByteArrayOutputStream fBuffer = new ByteArrayOutputStream();
public void close() throws IOException {
fOriginal.write(fBuffer.toByteArray());
}
public void write(byte[] b, int off, int len) throws IOException {
fBuffer.write(b, off, len);
}
public void write(int b) throws IOException {
fBuffer.write(b);
}
}
private class TerminalFilterOutputStream extends OutputStream {
final private Object fLock=TerminalToRemoteInjectionOutputStream.this;
final private Object fLock = TerminalToRemoteInjectionOutputStream.this;
public void close() throws IOException {
synchronized(fLock) {
if(fInjection==this) {
synchronized (fLock) {
if (fInjection == this) {
flush();
ungrabOutput();
}
}
}
public void write(byte[] b, int off, int len) throws IOException {
synchronized(fLock) {
synchronized (fLock) {
checkStream();
out.write(b, off, len);
}
}
public void write(byte[] b) throws IOException {
synchronized(fLock) {
synchronized (fLock) {
checkStream();
out.write(b);
}
}
public void flush() throws IOException {
synchronized(fLock) {
synchronized (fLock) {
checkStream();
out.flush();
}
}
public void write(int b) throws IOException {
synchronized(fLock) {
synchronized (fLock) {
checkStream();
out.write(b);
}
}
private void checkStream() throws IOException {
if(fInjection!=this)
if (fInjection != this)
throw new IOException("Stream is closed"); //$NON-NLS-1$
}
}
private Interceptor fInterceptor;
private TerminalFilterOutputStream fInjection;
private Interceptor fInterceptor;
private TerminalFilterOutputStream fInjection;
public TerminalToRemoteInjectionOutputStream(OutputStream out) {
super(out);
}
synchronized protected void ungrabOutput() throws IOException {
if(fInterceptor!=null) {
if (fInterceptor != null) {
fInterceptor.close();
fInterceptor=null;
fInjection=null;
fInterceptor = null;
fInjection = null;
}
}
/**
* There can only be one injection stream active at a time. You must call close on the
* returned output stream to end the injection.
* @param interceptor This is used handle bytes sent while the injection stream is active.
* @return a output stream that can be used to write to the decorated stream.
* @throws IOException
*/
public synchronized OutputStream grabOutput(Interceptor interceptor) throws IOException {
if(fInjection!=null) {
throw new IOException("Buffer in use"); //$NON-NLS-1$
}
fInterceptor=interceptor;
fInterceptor.begin(out);
fInjection=new TerminalFilterOutputStream();
return fInjection;
}
/** See {@link #grabOutput(TerminalToRemoteInjectionOutputStream.Interceptor)}.
* @return injection output stream
* @throws IOException
*/
public synchronized OutputStream grabOutput() throws IOException {
return grabOutput(new BufferInterceptor());
}
synchronized public void close() throws IOException {
if(fInjection!=null) {
fInjection.close();
}
super.close();
/**
* There can only be one injection stream active at a time. You must call close on the
* returned output stream to end the injection.
* @param interceptor This is used handle bytes sent while the injection stream is active.
* @return a output stream that can be used to write to the decorated stream.
* @throws IOException
*/
public synchronized OutputStream grabOutput(Interceptor interceptor) throws IOException {
if (fInjection != null) {
throw new IOException("Buffer in use"); //$NON-NLS-1$
}
fInterceptor = interceptor;
fInterceptor.begin(out);
fInjection = new TerminalFilterOutputStream();
return fInjection;
}
/** See {@link #grabOutput(TerminalToRemoteInjectionOutputStream.Interceptor)}.
* @return injection output stream
* @throws IOException
*/
public synchronized OutputStream grabOutput() throws IOException {
return grabOutput(new BufferInterceptor());
}
synchronized public void close() throws IOException {
if (fInjection != null) {
fInjection.close();
}
super.close();
}
synchronized public void flush() throws IOException {
if(fInterceptor!=null)
fInterceptor.flush();
if (fInterceptor != null)
fInterceptor.flush();
out.flush();
}
synchronized public void write(byte[] b, int off, int len) throws IOException {
if(fInterceptor!=null)
fInterceptor.write(b, off, len);
else
out.write(b, off, len);
synchronized public void write(byte[] b, int off, int len) throws IOException {
if (fInterceptor != null)
fInterceptor.write(b, off, len);
else
out.write(b, off, len);
}
synchronized public void write(int b) throws IOException {
if(fInterceptor!=null)
fInterceptor.write(b);
else
out.write(b);
}
if (fInterceptor != null)
fInterceptor.write(b);
else
out.write(b);
}
}

171
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/CommandInputFieldWithHistory.java
View file

@ -41,8 +41,6 @@ import org.eclipse.swt.widgets.Sash;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.fieldassist.ContentAssistCommandAdapter;
/**
* Manages the Command History for the command line input
* of the terminal control.
@ -60,16 +58,16 @@ public class CommandInputFieldWithHistory implements ICommandInputField {
private class FieldAssist implements IContentProposalProvider {
public IContentProposal[] getProposals(String contents, int position) {
String prefix=contents.substring(0, position);
List<Proposal> result=new ArrayList<Proposal>();
String prefix = contents.substring(0, position);
List<Proposal> result = new ArrayList<Proposal>();
// show an entry only once
Set<String> seen=new HashSet<String>();
Set<String> seen = new HashSet<String>();
for (Iterator<String> iterator = fHistory.iterator(); iterator.hasNext();) {
String history = iterator.next();
if(history.startsWith(prefix) && !seen.contains(history)) {
if (history.startsWith(prefix) && !seen.contains(history)) {
// the content is the rest of the history item
String content=history.substring(prefix.length());
result.add(new Proposal(content,history));
String content = history.substring(prefix.length());
result.add(new Proposal(content, history));
// don't add this proposal again
seen.add(history);
}
@ -78,14 +76,17 @@ public class CommandInputFieldWithHistory implements ICommandInputField {
}
}
private static class Proposal implements IContentProposal {
private final String fContent;
private final String fLabel;
Proposal(String content, String label) {
fContent= content;
fLabel= label;
fContent = content;
fLabel = label;
}
public String getContent() {
return fContent;
}
@ -103,7 +104,7 @@ public class CommandInputFieldWithHistory implements ICommandInputField {
}
}
final List<String> fHistory=new ArrayList<String>();
final List<String> fHistory = new ArrayList<String>();
/**
* Keeps a modifiable history while in history editing mode
*/
@ -111,7 +112,7 @@ public class CommandInputFieldWithHistory implements ICommandInputField {
/**
* The current position in the edit history
*/
private int fEditHistoryPos=0;
private int fEditHistoryPos = 0;
/**
* The limit of the history.
*/
@ -122,9 +123,11 @@ public class CommandInputFieldWithHistory implements ICommandInputField {
private Text fInputField;
private Sash fSash;
private Composite fPanel;
public CommandInputFieldWithHistory(int maxHistorySize) {
fMaxSize=maxHistorySize;
fMaxSize = maxHistorySize;
}
/**
* Add a line to the history.
* @param line The line to be added to the history.
@ -132,16 +135,17 @@ public class CommandInputFieldWithHistory implements ICommandInputField {
protected void pushLine(String line) {
endHistoryMode();
// anything to remember?
if(line==null || line.trim().length()==0)
if (line == null || line.trim().length() == 0)
return;
fHistory.add(0,line);
fHistory.add(0, line);
// ignore if the same as last
if(fHistory.size()>1 && line.equals(fHistory.get(1)))
if (fHistory.size() > 1 && line.equals(fHistory.get(1)))
fHistory.remove(0);
// limit the history size.
if(fHistory.size()>=fMaxSize)
fHistory.remove(fHistory.size()-1);
if (fHistory.size() >= fMaxSize)
fHistory.remove(fHistory.size() - 1);
}
/**
* Sets the history
* @param history or null
@ -149,34 +153,36 @@ public class CommandInputFieldWithHistory implements ICommandInputField {
public void setHistory(String history) {
endHistoryMode();
fHistory.clear();
if(history==null)
if (history == null)
return;
// add history entries separated by '\n'
// fHistory.addAll(Arrays.asList(history.split("\n"))); //$NON-NLS-1$
//<J2ME CDC-1.1 Foundation-1.1 variant>
StringTokenizer tok=new StringTokenizer(history,"\n"); //$NON-NLS-1$
while(tok.hasMoreElements())
StringTokenizer tok = new StringTokenizer(history, "\n"); //$NON-NLS-1$
while (tok.hasMoreElements())
fHistory.add((String) tok.nextElement());
//</J2ME CDC-1.1 Foundation-1.1 variant>
}
/**
* @return the current content of the history buffer and new line separated list
*/
public String getHistory() {
StringBuffer buff=new StringBuffer();
boolean sep=false;
StringBuffer buff = new StringBuffer();
boolean sep = false;
for (Iterator<String> iterator = fHistory.iterator(); iterator.hasNext();) {
String line=iterator.next();
if(line.length()>0) {
if(sep)
String line = iterator.next();
if (line.length() > 0) {
if (sep)
buff.append("\n"); //$NON-NLS-1$
else
sep=true;
sep = true;
buff.append(line);
}
}
return buff.toString();
}
/**
* @param currLine Line of text to be moved in history
* @param count (+1 or -1) for forward and backward movement. -1 goes back
@ -184,22 +190,23 @@ public class CommandInputFieldWithHistory implements ICommandInputField {
* if the limit is reached.
*/
public String move(String currLine, int count) {
if(!inHistoryMode()) {
fEditedHistory=new ArrayList<Object>(fHistory.size()+1);
if (!inHistoryMode()) {
fEditedHistory = new ArrayList<Object>(fHistory.size() + 1);
fEditedHistory.add(currLine);
fEditedHistory.addAll(fHistory);
fEditHistoryPos=0;
fEditHistoryPos = 0;
}
fEditedHistory.set(fEditHistoryPos,currLine);
if(fEditHistoryPos+count>=fEditedHistory.size())
fEditedHistory.set(fEditHistoryPos, currLine);
if (fEditHistoryPos + count >= fEditedHistory.size())
return null;
if(fEditHistoryPos+count<0)
if (fEditHistoryPos + count < 0)
return null;
fEditHistoryPos+=count;
fEditHistoryPos += count;
return (String) fEditedHistory.get(fEditHistoryPos);
}
private boolean inHistoryMode() {
return fEditedHistory!=null;
return fEditedHistory != null;
}
/**
@ -207,41 +214,43 @@ public class CommandInputFieldWithHistory implements ICommandInputField {
* @return the string to be shown in the command line
*/
protected String escape() {
if(!inHistoryMode())
if (!inHistoryMode())
return null;
String line= (String) fEditedHistory.get(0);
String line = (String) fEditedHistory.get(0);
endHistoryMode();
return line;
}
/**
* End history editing
*/
private void endHistoryMode() {
fEditedHistory=null;
fEditHistoryPos=0;
fEditedHistory = null;
fEditHistoryPos = 0;
}
public void createControl(final Composite parent,final ITerminalViewControl terminal) {
// fSash = new Sash(parent,SWT.HORIZONTAL|SWT.SMOOTH);
fSash = new Sash(parent,SWT.HORIZONTAL);
public void createControl(final Composite parent, final ITerminalViewControl terminal) {
// fSash = new Sash(parent,SWT.HORIZONTAL|SWT.SMOOTH);
fSash = new Sash(parent, SWT.HORIZONTAL);
final GridData gd_sash = new GridData(SWT.FILL, SWT.CENTER, true, false);
gd_sash.heightHint=5;
gd_sash.heightHint = 5;
fSash.setLayoutData(gd_sash);
fSash.addListener (SWT.Selection, new Listener () {
public void handleEvent (Event e) {
fSash.addListener(SWT.Selection, new Listener() {
public void handleEvent(Event e) {
if (e.detail == SWT.DRAG) {
// don't redraw during drag, it causes paint errors - bug 220971
return;
}
// no idea why this is needed
GridData gdata = (GridData) fInputField.getLayoutData();
Rectangle sashRect = fSash.getBounds ();
Rectangle containerRect = parent.getClientArea ();
Rectangle sashRect = fSash.getBounds();
Rectangle containerRect = parent.getClientArea();
int h=fInputField.getLineHeight();
int h = fInputField.getLineHeight();
// make sure the input filed height is a multiple of the line height
gdata.heightHint = Math.max(((containerRect.height-e.y-sashRect.height)/h)*h,h);
gdata.heightHint = Math.max(((containerRect.height - e.y - sashRect.height) / h) * h, h);
// do not show less then one line
e.y=Math.min(e.y,containerRect.height-h);
e.y = Math.min(e.y, containerRect.height - h);
fInputField.setLayoutData(gdata);
parent.layout();
// else the content assist icon will be replicated
@ -250,17 +259,20 @@ public class CommandInputFieldWithHistory implements ICommandInputField {
});
fPanel = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout();
layout.marginWidth = 0; layout.marginHeight = 0; layout.marginTop = 0; layout.marginBottom = 2;
layout.marginWidth = 0;
layout.marginHeight = 0;
layout.marginTop = 0;
layout.marginBottom = 2;
fPanel.setLayout(layout);
fPanel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
fInputField=new Text(fPanel, SWT.MULTI|SWT.BORDER|SWT.WRAP|SWT.V_SCROLL);
GridData data=new GridData(SWT.FILL, SWT.FILL, true, false);
boolean installDecoration=true;
if(installDecoration) {
fInputField = new Text(fPanel, SWT.MULTI | SWT.BORDER | SWT.WRAP | SWT.V_SCROLL);
GridData data = new GridData(SWT.FILL, SWT.FILL, true, false);
boolean installDecoration = true;
if (installDecoration) {
// The ContentAssistCommandAdapter says: "The client is responsible for
// ensuring that adequate space is reserved for the decoration."
// TODO: what is the "adequate space"???
data.horizontalIndent=6;
data.horizontalIndent = 6;
}
fInputField.setLayoutData(data);
fInputField.setFont(terminal.getFont());
@ -268,57 +280,56 @@ public class CommandInputFieldWithHistory implements ICommandInputField {
// Else the ENTER key is sent *first* to the input field
// and then to the field assist popup.
// (https://bugs.eclipse.org/bugs/show_bug.cgi?id=211659)
new ContentAssistCommandAdapter(
fInputField,
new TextContentAdapter(),
new FieldAssist(),
null,
null,
new ContentAssistCommandAdapter(fInputField, new TextContentAdapter(), new FieldAssist(), null, null,
installDecoration);
fInputField.addKeyListener(new KeyListener(){
fInputField.addKeyListener(new KeyListener() {
public void keyPressed(KeyEvent e) {
// if the field assist has handled the key already then
// ignore it (https://bugs.eclipse.org/bugs/show_bug.cgi?id=211659)
if(!e.doit)
if (!e.doit)
return;
if(e.character==SWT.CR || e.character==SWT.LF) {
e.doit=false;
String line=fInputField.getText();
if(!terminal.pasteString(line+'\r'))
if (e.character == SWT.CR || e.character == SWT.LF) {
e.doit = false;
String line = fInputField.getText();
if (!terminal.pasteString(line + '\r'))
return;
pushLine(line);
setCommand("");//$NON-NLS-1$
} else if(e.keyCode==SWT.ARROW_UP || e.keyCode==SWT.PAGE_UP) {
e.doit=false;
setCommand(move(fInputField.getText(),1));
} else if(e.keyCode==SWT.ARROW_DOWN || e.keyCode==SWT.PAGE_DOWN) {
e.doit=false;
setCommand(move(fInputField.getText(),-1));
} else if(e.keyCode==SWT.ESC) {
e.doit=false;
} else if (e.keyCode == SWT.ARROW_UP || e.keyCode == SWT.PAGE_UP) {
e.doit = false;
setCommand(move(fInputField.getText(), 1));
} else if (e.keyCode == SWT.ARROW_DOWN || e.keyCode == SWT.PAGE_DOWN) {
e.doit = false;
setCommand(move(fInputField.getText(), -1));
} else if (e.keyCode == SWT.ESC) {
e.doit = false;
setCommand(escape());
}
}
private void setCommand(String line) {
if(line==null)
if (line == null)
return;
fInputField.setText(line);
fInputField.setSelection(fInputField.getCharCount());
}
public void keyReleased(KeyEvent e) {
}
});
}
public void setFont(Font font) {
fInputField.setFont(font);
fInputField.getParent().layout(true);
}
public void dispose() {
fSash.dispose();
fSash=null;
fSash = null;
fPanel.dispose();
fPanel=null;
fPanel = null;
fInputField.dispose();
fInputField=null;
fInputField = null;
}
}

15
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ICommandInputField.java
View file

@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2018 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 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* Contributors:
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* Contributors:
* Michael Scharf (Wind River) - initial implementation
*******************************************************************************/
package org.eclipse.tm.internal.terminal.control;
@ -23,8 +23,9 @@ public interface ICommandInputField {
* @param terminal
*/
void createControl(Composite parent, ITerminalViewControl terminal);
void dispose();
/**
* Sets the font of a control created with {@link #createControl(Composite, ITerminalViewControl)}
* @param control

2
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalListener2.java
View file

@ -13,7 +13,7 @@ package org.eclipse.tm.internal.terminal.control;
/**
* Terminal listener allowing to listen to terminal selection changes.
*
*
* @since 4.1
*/
public interface ITerminalListener2 extends ITerminalListener {

4
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalMouseListener.java
View file

@ -17,7 +17,7 @@ import org.eclipse.tm.terminal.model.ITerminalTextDataReadOnly;
* Terminal specific version of {@link org.eclipse.swt.events.MouseListener}
* @since 4.1
*/
public interface ITerminalMouseListener {
public interface ITerminalMouseListener {
/**
* Invoked when a double-click has happend inside the terminal control.<br>
* <br>
@ -26,6 +26,7 @@ public interface ITerminalMouseListener {
* @param button see {@link org.eclipse.swt.events.MouseEvent#button} for the meaning of the button values
*/
void mouseDoubleClick(ITerminalTextDataReadOnly terminalText, int line, int column, int button);
/**
* Invoked when a mouse button is pushed down inside the terminal control.<br>
* <br>
@ -34,6 +35,7 @@ public interface ITerminalMouseListener {
* @param button see {@link org.eclipse.swt.events.MouseEvent#button} for the meaning of the button values
*/
void mouseDown(ITerminalTextDataReadOnly terminalText, int line, int column, int button);
/**
* Invoked when a mouse button is released inside the terminal control.<br>
* <br>

100
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalViewControl.java
View file

@ -50,13 +50,15 @@ public interface ITerminalViewControl {
*/
String getEncoding();
boolean isEmpty();
/**
* Sets the Terminal font
* @deprecated use {@link #setFont(String)} in order to support bold and italic variants of the given font
* @param font
*/
boolean isEmpty();
/**
* Sets the Terminal font
* @deprecated use {@link #setFont(String)} in order to support bold and italic variants of the given font
* @param font
*/
void setFont(Font font);
/**
* Sets the font for the Terminal, using a JFace symbolic font name, such
* that bold and italic variants can be leveraged.
@ -64,51 +66,74 @@ public interface ITerminalViewControl {
* @param fontName
*/
void setFont(String fontName);
void setInvertedColors(boolean invert);
Font getFont();
/**
* @return the text control
*/
Control getControl();
/**
* @return the root of all controls
*/
Control getRootControl();
boolean isDisposed();
void selectAll();
void clearTerminal();
void copy();
void paste();
String getSelection();
TerminalState getState();
Clipboard getClipboard();
void disconnectTerminal();
void disposeTerminal();
String getSettingsSummary();
ITerminalConnector[] getConnectors();
void setFocus();
ITerminalConnector getTerminalConnector();
void setConnector(ITerminalConnector connector);
void connectTerminal();
/**
* @param write a single character to terminal
*/
void sendKey(char arg0);
boolean isDisposed();
void selectAll();
void clearTerminal();
void copy();
void paste();
String getSelection();
TerminalState getState();
Clipboard getClipboard();
void disconnectTerminal();
void disposeTerminal();
String getSettingsSummary();
ITerminalConnector[] getConnectors();
void setFocus();
ITerminalConnector getTerminalConnector();
void setConnector(ITerminalConnector connector);
void connectTerminal();
/**
* @param write a single character to terminal
*/
void sendKey(char arg0);
/**
* @param string write string to terminal
*/
public boolean pasteString(String string);
boolean isConnected();
boolean isConnected();
/**
* @param inputField null means no input field is shown
*/
void setCommandInputField(ICommandInputField inputField);
/**
* @return null or the current input field
*/
ICommandInputField getCommandInputField();
/**
* @param inputField null means no input field is shown
*/
void setCommandInputField(ICommandInputField inputField);
/**
* @return null or the current input field
*/
ICommandInputField getCommandInputField();
/**
* @return the maximum number of lines to display
@ -121,13 +146,16 @@ public interface ITerminalViewControl {
* in the terminal view. -1 means unlimited.
*/
public void setBufferLineLimit(int bufferLineLimit);
boolean isScrollLock();
void setScrollLock(boolean on);
/**
* @since 4.1
*/
void addMouseListener(ITerminalMouseListener listener);
/**
* @since 4.1
*/

20
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/TerminalViewControlFactory.java
View file

@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2006, 2018 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 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* Contributors:
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* Contributors:
* Michael Scharf (Wind River) - initial API and implementation
* Martin Oberhuber (Wind River) - fixed copyright headers and beautified
* Martin Oberhuber (Wind River) - [378691][api] push Preferences into the Widget
@ -23,7 +23,8 @@ public class TerminalViewControlFactory {
* @param wndParent The Window parent to embed the Terminal in.
* @param connectors Provided connectors.
*/
public static ITerminalViewControl makeControl(ITerminalListener target, Composite wndParent, ITerminalConnector[] connectors) {
public static ITerminalViewControl makeControl(ITerminalListener target, Composite wndParent,
ITerminalConnector[] connectors) {
return makeControl(target, wndParent, connectors, false);
}
@ -32,12 +33,13 @@ public class TerminalViewControlFactory {
* @param target Callback for notifying the owner of Terminal state changes.
* @param wndParent The Window parent to embed the Terminal in.
* @param connectors Provided connectors.
* @param useCommonPrefs If <code>true</code>, the Terminal widget will pick up settings
* @param useCommonPrefs If <code>true</code>, the Terminal widget will pick up settings
* from the <code>org.eclipse.tm.terminal.TerminalPreferencePage</code> Preference page.
* Otherwise, clients need to maintain settings themselves.
* @since 3.2
*/
public static ITerminalViewControl makeControl(ITerminalListener target, Composite wndParent, ITerminalConnector[] connectors, boolean useCommonPrefs) {
public static ITerminalViewControl makeControl(ITerminalListener target, Composite wndParent,
ITerminalConnector[] connectors, boolean useCommonPrefs) {
return new VT100TerminalControl(target, wndParent, connectors, useCommonPrefs);
}

35
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/AbstractTerminalAction.java
View file

@ -32,13 +32,11 @@ public abstract class AbstractTerminalAction extends Action {
this(null, strId, 0);
}
public AbstractTerminalAction(ITerminalViewControl target,
String strId) {
public AbstractTerminalAction(ITerminalViewControl target, String strId) {
this(target, strId, 0);
}
public AbstractTerminalAction(ITerminalViewControl target,
String strId, int style) {
public AbstractTerminalAction(ITerminalViewControl target, String strId, int style) {
super("", style); //$NON-NLS-1$
fTarget = target;
@ -48,27 +46,20 @@ public abstract class AbstractTerminalAction extends Action {
abstract public void run();
protected void setupAction(String strText, String strToolTip,
String strImage, String strEnabledImage, String strDisabledImage,
boolean bEnabled) {
setupAction(strText, strToolTip, strImage, strEnabledImage,
strDisabledImage, bEnabled, TerminalPlugin.getDefault()
.getImageRegistry());
protected void setupAction(String strText, String strToolTip, String strImage, String strEnabledImage,
String strDisabledImage, boolean bEnabled) {
setupAction(strText, strToolTip, strImage, strEnabledImage, strDisabledImage, bEnabled,
TerminalPlugin.getDefault().getImageRegistry());
}
protected void setupAction(String strText, String strToolTip,
String strHoverImage, String strEnabledImage,
String strDisabledImage, boolean bEnabled,
ImageRegistry imageRegistry) {
setupAction(strText, strToolTip, imageRegistry
.getDescriptor(strHoverImage), imageRegistry
.getDescriptor(strEnabledImage), imageRegistry
.getDescriptor(strDisabledImage), bEnabled);
protected void setupAction(String strText, String strToolTip, String strHoverImage, String strEnabledImage,
String strDisabledImage, boolean bEnabled, ImageRegistry imageRegistry) {
setupAction(strText, strToolTip, imageRegistry.getDescriptor(strHoverImage),
imageRegistry.getDescriptor(strEnabledImage), imageRegistry.getDescriptor(strDisabledImage), bEnabled);
}
protected void setupAction(String strText, String strToolTip,
ImageDescriptor hoverImage, ImageDescriptor enabledImage,
ImageDescriptor disabledImage, boolean bEnabled) {
protected void setupAction(String strText, String strToolTip, ImageDescriptor hoverImage,
ImageDescriptor enabledImage, ImageDescriptor disabledImage, boolean bEnabled) {
setText(strText);
setToolTipText(strToolTip);
setEnabled(bEnabled);
@ -85,7 +76,7 @@ public abstract class AbstractTerminalAction extends Action {
/**
* Return the terminal instance on which the action should operate.
*
*
* @return the terminal instance on which the action should operate.
*/
protected ITerminalViewControl getTarget() {

3
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/ActionMessages.java
View file

@ -23,8 +23,7 @@ import org.eclipse.osgi.util.NLS;
public class ActionMessages extends NLS {
static {
NLS.initializeMessages(ActionMessages.class.getName(),
ActionMessages.class);
NLS.initializeMessages(ActionMessages.class.getName(), ActionMessages.class);
}
public static String COPY;

2
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/ActionMessages.properties
View file

@ -13,7 +13,7 @@
# Helmut Haigermoser and Ted Williams.
#
# Contributors:
# Michael Scharf (Wind River) - split into core, view and connector plugins
# Michael Scharf (Wind River) - split into core, view and connector plugins
# Martin Oberhuber (Wind River) - fixed copyright headers and beautified
# Anna Dushistova (MontaVista) - [227537] moved actions from terminal.view to terminal plugin
###############################################################################

2
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/ImageConsts.java
View file

@ -23,7 +23,7 @@ public interface ImageConsts {
public final static String IMAGE_DIR_ROOT = "icons/"; //$NON-NLS-1$
public final static String IMAGE_DIR_LOCALTOOL = IMAGE_DIR_ROOT + "clcl16/"; // basic colors - size 16x16 //$NON-NLS-1$
public final static String IMAGE_DIR_DLCL = IMAGE_DIR_ROOT + "dlcl16/"; // disabled - size 16x16 //$NON-NLS-1$
public final static String IMAGE_DIR_ELCL = IMAGE_DIR_ROOT+ "elcl16/"; // enabled - size 16x16 //$NON-NLS-1$
public final static String IMAGE_DIR_ELCL = IMAGE_DIR_ROOT + "elcl16/"; // enabled - size 16x16 //$NON-NLS-1$
public static final String IMAGE_CLCL_CLEAR_ALL = "ImageClclClearAll"; //$NON-NLS-1$

12
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionClearAll.java
View file

@ -26,19 +26,15 @@ public class TerminalActionClearAll extends AbstractTerminalAction {
public TerminalActionClearAll() {
super(TerminalActionClearAll.class.getName());
setupAction(ActionMessages.CLEARALL, ActionMessages.CLEARALL,
ImageConsts.IMAGE_CLCL_CLEAR_ALL,
ImageConsts.IMAGE_ELCL_CLEAR_ALL,
ImageConsts.IMAGE_DLCL_CLEAR_ALL, false);
setupAction(ActionMessages.CLEARALL, ActionMessages.CLEARALL, ImageConsts.IMAGE_CLCL_CLEAR_ALL,
ImageConsts.IMAGE_ELCL_CLEAR_ALL, ImageConsts.IMAGE_DLCL_CLEAR_ALL, false);
}
public TerminalActionClearAll(ITerminalViewControl target) {
super(target, TerminalActionClearAll.class.getName());
setupAction(ActionMessages.CLEARALL, ActionMessages.CLEARALL,
ImageConsts.IMAGE_CLCL_CLEAR_ALL,
ImageConsts.IMAGE_ELCL_CLEAR_ALL,
ImageConsts.IMAGE_DLCL_CLEAR_ALL, false);
setupAction(ActionMessages.CLEARALL, ActionMessages.CLEARALL, ImageConsts.IMAGE_CLCL_CLEAR_ALL,
ImageConsts.IMAGE_ELCL_CLEAR_ALL, ImageConsts.IMAGE_DLCL_CLEAR_ALL, false);
}
public void run() {

14
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCopy.java
View file

@ -29,20 +29,18 @@ public class TerminalActionCopy extends AbstractTerminalAction {
super(TerminalActionCopy.class.getName());
setActionDefinitionId("org.eclipse.tm.terminal.copy"); //$NON-NLS-1$
ISharedImages si = PlatformUI.getWorkbench().getSharedImages();
setupAction(ActionMessages.COPY, ActionMessages.COPY, si
.getImageDescriptor(ISharedImages.IMG_TOOL_COPY), si
.getImageDescriptor(ISharedImages.IMG_TOOL_COPY), si
.getImageDescriptor(ISharedImages.IMG_TOOL_COPY_DISABLED), true);
setupAction(ActionMessages.COPY, ActionMessages.COPY, si.getImageDescriptor(ISharedImages.IMG_TOOL_COPY),
si.getImageDescriptor(ISharedImages.IMG_TOOL_COPY),
si.getImageDescriptor(ISharedImages.IMG_TOOL_COPY_DISABLED), true);
}
public TerminalActionCopy(ITerminalViewControl target) {
super(target, TerminalActionCopy.class.getName());
setActionDefinitionId("org.eclipse.tm.terminal.copy"); //$NON-NLS-1$
ISharedImages si = PlatformUI.getWorkbench().getSharedImages();
setupAction(ActionMessages.COPY, ActionMessages.COPY, si
.getImageDescriptor(ISharedImages.IMG_TOOL_COPY), si
.getImageDescriptor(ISharedImages.IMG_TOOL_COPY), si
.getImageDescriptor(ISharedImages.IMG_TOOL_COPY_DISABLED), true);
setupAction(ActionMessages.COPY, ActionMessages.COPY, si.getImageDescriptor(ISharedImages.IMG_TOOL_COPY),
si.getImageDescriptor(ISharedImages.IMG_TOOL_COPY),
si.getImageDescriptor(ISharedImages.IMG_TOOL_COPY_DISABLED), true);
}
public void run() {

14
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCut.java
View file

@ -27,19 +27,17 @@ public class TerminalActionCut extends AbstractTerminalAction {
public TerminalActionCut() {
super(TerminalActionCut.class.getName());
ISharedImages si = PlatformUI.getWorkbench().getSharedImages();
setupAction(ActionMessages.CUT, ActionMessages.CUT, si
.getImageDescriptor(ISharedImages.IMG_TOOL_CUT), si
.getImageDescriptor(ISharedImages.IMG_TOOL_CUT), si
.getImageDescriptor(ISharedImages.IMG_TOOL_CUT_DISABLED), true);
setupAction(ActionMessages.CUT, ActionMessages.CUT, si.getImageDescriptor(ISharedImages.IMG_TOOL_CUT),
si.getImageDescriptor(ISharedImages.IMG_TOOL_CUT),
si.getImageDescriptor(ISharedImages.IMG_TOOL_CUT_DISABLED), true);
}
public TerminalActionCut(ITerminalViewControl target) {
super(target, TerminalActionCut.class.getName());
ISharedImages si = PlatformUI.getWorkbench().getSharedImages();
setupAction(ActionMessages.CUT, ActionMessages.CUT, si
.getImageDescriptor(ISharedImages.IMG_TOOL_CUT), si
.getImageDescriptor(ISharedImages.IMG_TOOL_CUT), si
.getImageDescriptor(ISharedImages.IMG_TOOL_CUT_DISABLED), true);
setupAction(ActionMessages.CUT, ActionMessages.CUT, si.getImageDescriptor(ISharedImages.IMG_TOOL_CUT),
si.getImageDescriptor(ISharedImages.IMG_TOOL_CUT),
si.getImageDescriptor(ISharedImages.IMG_TOOL_CUT_DISABLED), true);
}
public void run() {

19
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionPaste.java
View file

@ -33,22 +33,18 @@ public class TerminalActionPaste extends AbstractTerminalAction {
super(TerminalActionPaste.class.getName());
setActionDefinitionId("org.eclipse.tm.terminal.paste"); //$NON-NLS-1$
ISharedImages si = PlatformUI.getWorkbench().getSharedImages();
setupAction(ActionMessages.PASTE, ActionMessages.PASTE,
si.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE),
si.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE),
si.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE_DISABLED),
false);
setupAction(ActionMessages.PASTE, ActionMessages.PASTE, si.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE),
si.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE),
si.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE_DISABLED), false);
}
public TerminalActionPaste(ITerminalViewControl target) {
super(target, TerminalActionPaste.class.getName());
setActionDefinitionId("org.eclipse.tm.terminal.paste"); //$NON-NLS-1$
ISharedImages si = PlatformUI.getWorkbench().getSharedImages();
setupAction(ActionMessages.PASTE, ActionMessages.PASTE,
si.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE),
si.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE),
si.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE_DISABLED),
false);
setupAction(ActionMessages.PASTE, ActionMessages.PASTE, si.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE),
si.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE),
si.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE_DISABLED), false);
}
public void run() {
@ -62,8 +58,7 @@ public class TerminalActionPaste extends AbstractTerminalAction {
ITerminalViewControl target = getTarget();
boolean bEnabled = target != null && target.getClipboard() != null && !target.getClipboard().isDisposed();
if (bEnabled) {
String strText = (String) target.getClipboard().getContents(
TextTransfer.getInstance());
String strText = (String) target.getClipboard().getContents(TextTransfer.getInstance());
bEnabled = ((strText != null) && (!strText.equals("")) && (target.getState() == TerminalState.CONNECTED));//$NON-NLS-1$
}
setEnabled(bEnabled);

6
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionSelectAll.java
View file

@ -27,15 +27,13 @@ public class TerminalActionSelectAll extends AbstractTerminalAction {
public TerminalActionSelectAll() {
super(TerminalActionSelectAll.class.getName());
setupAction(ActionMessages.SELECTALL, ActionMessages.SELECTALL,
(ImageDescriptor) null, null, null, false);
setupAction(ActionMessages.SELECTALL, ActionMessages.SELECTALL, (ImageDescriptor) null, null, null, false);
}
public TerminalActionSelectAll(ITerminalViewControl target) {
super(target, TerminalActionSelectAll.class.getName());
setupAction(ActionMessages.SELECTALL, ActionMessages.SELECTALL,
(ImageDescriptor) null, null, null, false);
setupAction(ActionMessages.SELECTALL, ActionMessages.SELECTALL, (ImageDescriptor) null, null, null, false);
}
public void run() {

22
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/ITerminalControlForText.java
View file

@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2006, 2018 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 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* Contributors:
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* Contributors:
* Michael Scharf (Wind River) - initial API and implementation
* Martin Oberhuber (Wind River) - fixed copyright headers and beautified
* Anton Leherbauer (Wind River) - [458398] Add support for normal/application cursor keys mode
@ -23,19 +23,21 @@ import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
*
*/
public interface ITerminalControlForText {
TerminalState getState();
void setState(TerminalState state);
void setTerminalTitle(String title);
ITerminalConnector getTerminalConnector();
OutputStream getOutputStream();
/**
* Enable/disable Application Cursor Keys mode (DECCKM)
* @param enable
*/
void enableApplicationCursorKeys(boolean enable);
}

28
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.java
View file

@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2006, 2018 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 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* Contributors:
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* Contributors:
* Michael Scharf (Wind River) - initial API and implementation
* Martin Oberhuber (Wind River) - fixed copyright headers and beautified
* Martin Oberhuber (Wind River) - [378691][api] push Preferences into the Widget
@ -19,14 +19,14 @@ public class TerminalMessages extends NLS {
NLS.initializeMessages(TerminalMessages.class.getName(), TerminalMessages.class);
}
public static String TerminalError;
public static String SocketError;
public static String IOError;
public static String CannotConnectTo;
public static String NotInitialized;
public static String TerminalError;
public static String SocketError;
public static String IOError;
public static String CannotConnectTo;
public static String NotInitialized;
//Preference Page
public static String INVERT_COLORS;
public static String BUFFERLINES;
//Preference Page
public static String INVERT_COLORS;
public static String BUFFERLINES;
}

2
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.properties
View file

@ -13,7 +13,7 @@
# Helmut Haigermoser and Ted Williams.
#
# Contributors:
# Michael Scharf (Wind River) - split into core, view and connector plugins
# Michael Scharf (Wind River) - split into core, view and connector plugins
# Martin Oberhuber (Wind River) - fixed copyright headers and beautified
# Martin Oberhuber (Wind River) - [378691][api] push Preferences into the Widget
###############################################################################

23
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/TerminalPlugin.java
View file

@ -31,14 +31,15 @@ import org.osgi.framework.BundleContext;
public class TerminalPlugin extends AbstractUIPlugin {
private static TerminalPlugin plugin;
public static final String PLUGIN_ID = "org.eclipse.tm.terminal.control"; //$NON-NLS-1$
public static final String HELP_VIEW = PLUGIN_ID + ".terminal_view"; //$NON-NLS-1$
public static final String PLUGIN_ID = "org.eclipse.tm.terminal.control"; //$NON-NLS-1$
public static final String HELP_VIEW = PLUGIN_ID + ".terminal_view"; //$NON-NLS-1$
/**
* The constructor.
*/
public TerminalPlugin() {
}
/**
* Returns the shared instance.
*/
@ -50,7 +51,7 @@ public class TerminalPlugin extends AbstractUIPlugin {
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
@Override
public void start(BundleContext context) throws Exception {
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
}
@ -59,7 +60,7 @@ public class TerminalPlugin extends AbstractUIPlugin {
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
@Override
public void stop(BundleContext context) throws Exception {
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
}
@ -73,20 +74,24 @@ public class TerminalPlugin extends AbstractUIPlugin {
}
@Override
protected void initializeImageRegistry(ImageRegistry imageRegistry) {
protected void initializeImageRegistry(ImageRegistry imageRegistry) {
try {
// Local toolbars
putImageInRegistry(imageRegistry, ImageConsts.IMAGE_CLCL_CLEAR_ALL, ImageConsts.IMAGE_DIR_LOCALTOOL + "clear_co.gif"); //$NON-NLS-1$
putImageInRegistry(imageRegistry, ImageConsts.IMAGE_CLCL_CLEAR_ALL,
ImageConsts.IMAGE_DIR_LOCALTOOL + "clear_co.gif"); //$NON-NLS-1$
// Enabled local toolbars
putImageInRegistry(imageRegistry, ImageConsts.IMAGE_ELCL_CLEAR_ALL, ImageConsts.IMAGE_DIR_ELCL + "clear_co.gif"); //$NON-NLS-1$
putImageInRegistry(imageRegistry, ImageConsts.IMAGE_ELCL_CLEAR_ALL,
ImageConsts.IMAGE_DIR_ELCL + "clear_co.gif"); //$NON-NLS-1$
// Disabled local toolbars
putImageInRegistry(imageRegistry, ImageConsts.IMAGE_DLCL_CLEAR_ALL, ImageConsts.IMAGE_DIR_DLCL + "clear_co.gif"); //$NON-NLS-1$
putImageInRegistry(imageRegistry, ImageConsts.IMAGE_DLCL_CLEAR_ALL,
ImageConsts.IMAGE_DIR_DLCL + "clear_co.gif"); //$NON-NLS-1$
} catch (MalformedURLException malformedURLException) {
malformedURLException.printStackTrace();
}
}
protected void putImageInRegistry(ImageRegistry imageRegistry, String strKey, String relativePath) throws MalformedURLException {
protected void putImageInRegistry(ImageRegistry imageRegistry, String strKey, String relativePath)
throws MalformedURLException {
URL url = TerminalPlugin.getDefault().getBundle().getEntry(relativePath);
ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(url);
imageRegistry.put(strKey, imageDescriptor);

2
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/EditActionAccelerators.java
View file

@ -33,7 +33,7 @@ class EditActionAccelerators {
private void addAccelerator(String commandId) {
TriggerSequence[] bindings = bindingsFor(commandId);
for (int i=0; i<bindings.length; ++i) {
for (int i = 0; i < bindings.length; ++i) {
if (bindings[i] instanceof KeySequence) {
KeyStroke[] keyStrokes = ((KeySequence) bindings[i]).getKeyStrokes();
if (keyStrokes.length != 0) {

44
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/IVT100EmulatorBackend.java
View file

@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2018 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 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* Contributors:
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* Contributors:
* Michael Scharf (Wind River) - initial API and implementation
* Anton Leherbauer (Wind River) - [433751] Add option to enable VT100 line wrapping mode
* Anton Leherbauer (Wind River) - [458218] Add support for ANSI insert mode
@ -73,17 +73,17 @@ public interface IVT100EmulatorBackend {
void eraseLineToCursor();
/**
* Inserts n lines at line with cursor. Lines displayed below cursor move down.
* Lines moved past the bottom margin are lost. This sequence is ignored when
* Inserts n lines at line with cursor. Lines displayed below cursor move down.
* Lines moved past the bottom margin are lost. This sequence is ignored when
* cursor is outside scrolling region.
* @param n the number of lines to insert
*/
void insertLines(int n);
/**
* Deletes n characters, starting with the character at cursor position.
* When a character is deleted, all characters to the right of cursor move
* left. This creates a space character at right margin. This character
* Deletes n characters, starting with the character at cursor position.
* When a character is deleted, all characters to the right of cursor move
* left. This creates a space character at right margin. This character
* has same character attribute as the last character moved left.
* @param n
* 012345
@ -92,9 +92,9 @@ public interface IVT100EmulatorBackend {
void deleteCharacters(int n);
/**
* Deletes n lines, starting at line with cursor. As lines are deleted,
* lines displayed below cursor move up. Lines added to bottom of screen
* have spaces with same character attributes as last line moved up. This
* Deletes n lines, starting at line with cursor. As lines are deleted,
* lines displayed below cursor move up. Lines added to bottom of screen
* have spaces with same character attributes as last line moved up. This
* sequence is ignored when cursor is outside scrolling region.
* @param n the number of lines to delete
*/
@ -117,7 +117,7 @@ public interface IVT100EmulatorBackend {
* view, wrapping text at the right edge of the screen and overwriting text
* when the cursor is not at the very end of the screen's text.
* <p>
*
*
* There are never any ANSI control characters or escape sequences in the
* text being displayed by this method (this includes newlines, carriage
* returns, and tabs).
@ -134,7 +134,7 @@ public interface IVT100EmulatorBackend {
* first column of the next line, as if a carriage return (CR) and a NL were
* written.
* <p>
*
*
* UNIX terminals typically display a NL character as a CR followed by a NL
* because the terminal device typically has the ONLCR attribute bit set
* (see the termios(4) man page for details), which causes the terminal
@ -151,7 +151,7 @@ public interface IVT100EmulatorBackend {
* This method returns the relative line number of the line containing the
* cursor. The returned line number is relative to the topmost visible line,
* which has relative line number 0.
*
*
* @return The relative line number of the line containing the cursor.
*/
int getCursorLine();
@ -181,7 +181,7 @@ public interface IVT100EmulatorBackend {
* If enabled, writing to the rightmost column does not cause
* an immediate wrap to the next line. Instead the line wrap occurs on the
* next output character.
*
*
* @param enable whether to enable or disable VT100 line wrapping mode
*/
void setVT100LineWrapping(boolean enable);
@ -193,14 +193,14 @@ public interface IVT100EmulatorBackend {
/**
* Enables/disables insert mode (IRM).
*
*
* @param enable whether to enable insert mode
*/
void setInsertMode(boolean enable);
/**
* Set scrolling region. Negative values reset the scroll region.
*
*
* @param top top line of scroll region
* @param bottom bottom line of scroll region
*/
@ -208,14 +208,14 @@ public interface IVT100EmulatorBackend {
/**
* Scroll text upwards.
*
*
* @param lines number of lines to scroll
*/
void scrollUp(int lines);
/**
* Scroll text downwards.
*
*
* @param lines number of lines to scroll
*/
void scrollDown(int lines);

26
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/LoggingOutputStream.java
View file

@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2018 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 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* Contributors:
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* Contributors:
* Michael Scharf (Wind River) - initial API and implementation
*******************************************************************************/
package org.eclipse.tm.internal.terminal.emulator;
@ -23,25 +23,25 @@ public class LoggingOutputStream extends FilterOutputStream {
}
public void write(byte[] b, int off, int len) throws IOException {
if(Logger.isLogEnabled())
if (Logger.isLogEnabled())
Logger.log("Received " + len + " bytes: '" + //$NON-NLS-1$ //$NON-NLS-2$
Logger.encode(new String(b, 0, len)) + "'"); //$NON-NLS-1$
// we cannot call super.write, because this would call our write
// which logs character by character.....
//super.write(b, off, len);
if ((off | len | (b.length - (len + off)) | (off + len)) < 0)
throw new IndexOutOfBoundsException();
throw new IndexOutOfBoundsException();
for (int i = 0 ; i < len ; i++) {
super.write(b[off + i]);
for (int i = 0; i < len; i++) {
super.write(b[off + i]);
}
}
public void write(int b) throws IOException {
if(Logger.isLogEnabled())
if (Logger.isLogEnabled())
Logger.log("Received " + 1 + " bytes: '" + //$NON-NLS-1$ //$NON-NLS-2$
Logger.encode(new String(new byte[]{(byte)b}, 0, 1)) + "'"); //$NON-NLS-1$
Logger.encode(new String(new byte[] { (byte) b }, 0, 1)) + "'"); //$NON-NLS-1$
super.write(b);
}

47
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100BackendTraceDecorator.java
View file

@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2007, 2018 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 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* Contributors:
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* Contributors:
* Michael Scharf (Wind River) - initial API and implementation
* Anton Leherbauer (Wind River) - [433751] Add option to enable VT100 line wrapping mode
* Anton Leherbauer (Wind River) - [458218] Add support for ANSI insert mode
@ -20,13 +20,14 @@ import org.eclipse.tm.terminal.model.Style;
public class VT100BackendTraceDecorator implements IVT100EmulatorBackend {
final IVT100EmulatorBackend fBackend;
final PrintStream fWriter;
public VT100BackendTraceDecorator(IVT100EmulatorBackend backend, PrintStream out) {
fBackend = backend;
fWriter=out;
fWriter = out;
}
public void appendString(String buffer) {
fWriter.println("appendString(\""+buffer+"\")"); //$NON-NLS-1$ //$NON-NLS-2$
fWriter.println("appendString(\"" + buffer + "\")"); //$NON-NLS-1$ //$NON-NLS-2$
fBackend.appendString(buffer);
}
@ -36,12 +37,12 @@ public class VT100BackendTraceDecorator implements IVT100EmulatorBackend {
}
public void deleteCharacters(int n) {
fWriter.println("deleteCharacters("+n+")"); //$NON-NLS-1$ //$NON-NLS-2$
fWriter.println("deleteCharacters(" + n + ")"); //$NON-NLS-1$ //$NON-NLS-2$
fBackend.deleteCharacters(n);
}
public void deleteLines(int n) {
fWriter.println("deleteLines("+n+")"); //$NON-NLS-1$ //$NON-NLS-2$
fWriter.println("deleteLines(" + n + ")"); //$NON-NLS-1$ //$NON-NLS-2$
fBackend.deleteLines(n);
}
@ -100,12 +101,12 @@ public class VT100BackendTraceDecorator implements IVT100EmulatorBackend {
}
public void insertCharacters(int charactersToInsert) {
fWriter.println("insertCharacters("+charactersToInsert+")"); //$NON-NLS-1$ //$NON-NLS-2$
fWriter.println("insertCharacters(" + charactersToInsert + ")"); //$NON-NLS-1$ //$NON-NLS-2$
fBackend.insertCharacters(charactersToInsert);
}
public void insertLines(int n) {
fWriter.println("insertLines("+n+")"); //$NON-NLS-1$ //$NON-NLS-2$
fWriter.println("insertLines(" + n + ")"); //$NON-NLS-1$ //$NON-NLS-2$
fBackend.insertLines(n);
}
@ -115,37 +116,37 @@ public class VT100BackendTraceDecorator implements IVT100EmulatorBackend {
}
public void setCursor(int targetLine, int targetColumn) {
fWriter.println("setCursor("+targetLine+", "+targetColumn+")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
fWriter.println("setCursor(" + targetLine + ", " + targetColumn + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
fBackend.setCursor(targetLine, targetColumn);
}
public void setCursorColumn(int targetColumn) {
fWriter.println("setCursorColumn("+targetColumn+")"); //$NON-NLS-1$ //$NON-NLS-2$
fWriter.println("setCursorColumn(" + targetColumn + ")"); //$NON-NLS-1$ //$NON-NLS-2$
fBackend.setCursorColumn(targetColumn);
}
public void setCursorLine(int targetLine) {
fWriter.println("setCursorLine("+targetLine+")"); //$NON-NLS-1$ //$NON-NLS-2$
fWriter.println("setCursorLine(" + targetLine + ")"); //$NON-NLS-1$ //$NON-NLS-2$
fBackend.setCursorLine(targetLine);
}
public void setDefaultStyle(Style defaultStyle) {
fWriter.println("setDefaultStyle("+defaultStyle+")"); //$NON-NLS-1$ //$NON-NLS-2$
fWriter.println("setDefaultStyle(" + defaultStyle + ")"); //$NON-NLS-1$ //$NON-NLS-2$
fBackend.setDefaultStyle(defaultStyle);
}
public void setDimensions(int lines, int cols) {
fWriter.println("setDimensions("+lines+","+cols+")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
fWriter.println("setDimensions(" + lines + "," + cols + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
fBackend.setDimensions(lines, cols);
}
public void setStyle(Style style) {
fWriter.println("setStyle("+style+")"); //$NON-NLS-1$ //$NON-NLS-2$
fWriter.println("setStyle(" + style + ")"); //$NON-NLS-1$ //$NON-NLS-2$
fBackend.setStyle(style);
}
public void setVT100LineWrapping(boolean enable) {
fWriter.println("setVT100LineWrapping("+enable+")"); //$NON-NLS-1$ //$NON-NLS-2$
fWriter.println("setVT100LineWrapping(" + enable + ")"); //$NON-NLS-1$ //$NON-NLS-2$
fBackend.setVT100LineWrapping(enable);
}
@ -154,22 +155,22 @@ public class VT100BackendTraceDecorator implements IVT100EmulatorBackend {
}
public void setInsertMode(boolean enable) {
fWriter.println("setInsertMode("+enable+")"); //$NON-NLS-1$ //$NON-NLS-2$
fWriter.println("setInsertMode(" + enable + ")"); //$NON-NLS-1$ //$NON-NLS-2$
fBackend.setInsertMode(enable);
}
public void setScrollRegion(int top, int bottom) {
fWriter.println("setScrollRegion("+top+','+bottom+")"); //$NON-NLS-1$ //$NON-NLS-2$
fWriter.println("setScrollRegion(" + top + ',' + bottom + ")"); //$NON-NLS-1$ //$NON-NLS-2$
fBackend.setScrollRegion(top, bottom);
}
public void scrollUp(int lines) {
fWriter.println("scrollUp("+lines+")"); //$NON-NLS-1$ //$NON-NLS-2$
fWriter.println("scrollUp(" + lines + ")"); //$NON-NLS-1$ //$NON-NLS-2$
fBackend.scrollUp(lines);
}
public void scrollDown(int lines) {
fWriter.println("scrollDown("+lines+")"); //$NON-NLS-1$ //$NON-NLS-2$
fWriter.println("scrollDown(" + lines + ")"); //$NON-NLS-1$ //$NON-NLS-2$
fBackend.scrollDown(lines);
}

Some files were not shown because too many files have changed in this diff Show more