mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-10 12:03:16 +02:00
Code Issues Wiki Activity

SSH Terminal: Default user stored if "Save user" is checked.

Browse source 
Change-Id: I530fe20e288dea3798960b9c9fa3a3ea8f90455b
Signed-off-by: Pablo Torregrosa Paez <pablo.torregrosa@windriver.com>
This commit is contained in:
Pablo Torregrosa Paez 2015-08-18 14:45:52 +02:00 • committed by Uwe Stieber
parent 311b9e027c
commit 0a3e104663
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -257,8 +257,7 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa
hostSettings.put(ITerminalsConnectorConstants.PROP_TIMEOUT, Integer.toString(sshSettings.getTimeout())); 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 (saveUser) {
String defaultUser = getDefaultUser(); if (sshSettings.getUser() != null) {
if (defaultUser == null || !defaultUser.equals(sshSettings.getUser())) {
hostSettings.put(ITerminalsConnectorConstants.PROP_SSH_USER, sshSettings.getUser()); hostSettings.put(ITerminalsConnectorConstants.PROP_SSH_USER, sshSettings.getUser());
} else { } else {
hostSettings.remove(ITerminalsConnectorConstants.PROP_SSH_USER); hostSettings.remove(ITerminalsConnectorConstants.PROP_SSH_USER);
@ -292,8 +291,7 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa
hostSettings.put(ITerminalsConnectorConstants.PROP_TIMEOUT, Integer.toString(sshSettings.getTimeout())); 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 (saveUser) {
String defaultUser = getDefaultUser(); if (sshSettings.getUser() != null) {
if (defaultUser == null || !defaultUser.equals(sshSettings.getUser())) {
hostSettings.put(ITerminalsConnectorConstants.PROP_SSH_USER, sshSettings.getUser()); hostSettings.put(ITerminalsConnectorConstants.PROP_SSH_USER, sshSettings.getUser());
} }
} }