From 6e8a57dcc3ed225f2821f29b32af75f5d48f2e26 Mon Sep 17 00:00:00 2001 From: Uwe Stieber Date: Sat, 23 May 2015 09:30:38 +0200 Subject: [PATCH] Bug 350176 - Incorrect SSH Settings Summary string. The 'port' value is modified, not appended. --- .../tm/terminal/connector/ssh/connector/SshConnection.java | 7 ------- .../tm/terminal/connector/ssh/connector/SshSettings.java | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshConnection.java b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshConnection.java index 0f7ee7b1c5a..7117b567087 100644 --- a/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshConnection.java +++ b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshConnection.java @@ -107,13 +107,6 @@ public class SshConnection extends Thread { String password = fConn.getSshSettings().getPassword(); port = fConn.getSshSettings().getPort(); - ////Giving a connectionId could be the index into a local - ////Store where passwords are stored - //String connectionId = host; - //if (port!=ISshSettings.DEFAULT_SSH_PORT) { - // connectionId += ':' + port; - //} - //UserInfo ui=new MyUserInfo(connectionId, user, password); UserInfo ui=new MyUserInfo(null, user, password); Session session = createSession(user, password, host, port, diff --git a/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshSettings.java b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshSettings.java index bd2bd7d5de6..f570bb62941 100644 --- a/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshSettings.java +++ b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshSettings.java @@ -36,7 +36,7 @@ public class SshSettings implements ISshSettings { public String getSummary() { String settings = getUser()+'@'+getHost(); if(getPort()!=ISshSettings.DEFAULT_SSH_PORT) { - settings += ':' + getPort(); + settings += ":" + getPort(); //$NON-NLS-1$ } return settings; }