Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2012-10-26 08:11:25 -0400
committerUwe Stieber2012-10-26 08:11:25 -0400
commit03b53d06408f140ca7471663d3f9e15cd5899f44 (patch)
tree74b8d758fcaa20b8e195f753a5e1e6396cf7c887 /target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh
parentaa9368d12021023f2e00c2fc94f9e761cd6e6f09 (diff)
downloadorg.eclipse.tcf-03b53d06408f140ca7471663d3f9e15cd5899f44.tar.gz
org.eclipse.tcf-03b53d06408f140ca7471663d3f9e15cd5899f44.tar.xz
org.eclipse.tcf-03b53d06408f140ca7471663d3f9e15cd5899f44.zip
Target Explorer: Fix Bug 392244 - [TERMINALS] contents of the "encoding" control is not restored when switching to a saved host config
Diffstat (limited to 'target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh')
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/controls/SshWizardConfigurationPanel.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/controls/SshWizardConfigurationPanel.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/controls/SshWizardConfigurationPanel.java
index 0ceef4086..55703444f 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/controls/SshWizardConfigurationPanel.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/src/org/eclipse/tcf/te/ui/terminals/ssh/controls/SshWizardConfigurationPanel.java
@@ -149,9 +149,10 @@ public class SshWizardConfigurationPanel extends AbstractConfigurationPanel impl
if (password != null) {
sshSettings.setPassword(password);
}
- if (hostSettings.get(ITerminalsConnectorConstants.PROP_ENCODING) != null) {
- setEncoding(hostSettings.get(ITerminalsConnectorConstants.PROP_ENCODING));
- }
+
+ String encoding = hostSettings.get(ITerminalsConnectorConstants.PROP_ENCODING);
+ if (encoding == null || "null".equals(encoding)) encoding = "ISO-8859-1"; //$NON-NLS-1$ //$NON-NLS-2$
+ setEncoding(encoding);
} else {
sshSettings.setHost(getSelectionHost());
sshSettings.setUser(getDefaultUser());

Back to the top