From 0a3e10466376d1d37093f221c007dfb2d4fd4867 Mon Sep 17 00:00:00 2001 From: Pablo Torregrosa Paez Date: Tue, 18 Aug 2015 14:45:52 +0200 Subject: [PATCH] SSH Terminal: Default user stored if "Save user" is checked. Change-Id: I530fe20e288dea3798960b9c9fa3a3ea8f90455b Signed-off-by: Pablo Torregrosa Paez --- .../connector/ssh/controls/SshWizardConfigurationPanel.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/controls/SshWizardConfigurationPanel.java b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/controls/SshWizardConfigurationPanel.java index ee31c27b4f8..16cae8cc515 100644 --- a/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/controls/SshWizardConfigurationPanel.java +++ b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/controls/SshWizardConfigurationPanel.java @@ -257,8 +257,7 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa hostSettings.put(ITerminalsConnectorConstants.PROP_TIMEOUT, Integer.toString(sshSettings.getTimeout())); hostSettings.put(ITerminalsConnectorConstants.PROP_SSH_KEEP_ALIVE, Integer.toString(sshSettings.getKeepalive())); if (saveUser) { - String defaultUser = getDefaultUser(); - if (defaultUser == null || !defaultUser.equals(sshSettings.getUser())) { + if (sshSettings.getUser() != null) { hostSettings.put(ITerminalsConnectorConstants.PROP_SSH_USER, sshSettings.getUser()); } else { 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_SSH_KEEP_ALIVE, Integer.toString(sshSettings.getKeepalive())); if (saveUser) { - String defaultUser = getDefaultUser(); - if (defaultUser == null || !defaultUser.equals(sshSettings.getUser())) { + if (sshSettings.getUser() != null) { hostSettings.put(ITerminalsConnectorConstants.PROP_SSH_USER, sshSettings.getUser()); } }