Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Schwarz2014-09-16 03:41:46 -0400
committerTobias Schwarz2014-09-16 03:41:46 -0400
commit3a04598e24c7dee6274afec7d74ec73a8e0594db (patch)
tree4ce9a64ae1cd1dd437744ec95d2c3f3e82ce815b
parent11c2ed8bf5dd1b0e0895701cc35e6aba7fc5e27b (diff)
downloadorg.eclipse.tcf-3a04598e24c7dee6274afec7d74ec73a8e0594db.tar.gz
org.eclipse.tcf-3a04598e24c7dee6274afec7d74ec73a8e0594db.tar.xz
org.eclipse.tcf-3a04598e24c7dee6274afec7d74ec73a8e0594db.zip
Target Explorer: fix encoding persistence
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/controls/TelnetWizardConfigurationPanel.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/controls/TelnetWizardConfigurationPanel.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/controls/TelnetWizardConfigurationPanel.java
index 7d0252504..d65ad73f1 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/controls/TelnetWizardConfigurationPanel.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.telnet/src/org/eclipse/tcf/te/ui/terminals/telnet/controls/TelnetWizardConfigurationPanel.java
@@ -183,13 +183,17 @@ public class TelnetWizardConfigurationPanel extends AbstractConfigurationPanel i
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_ENCODING, getEncoding());
+ if (getEncoding() != null) {
+ hostSettings.put(ITerminalsConnectorConstants.PROP_ENCODING, getEncoding());
+ }
} else if (add) {
Map<String, String> hostSettings=new HashMap<String, String>();
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_ENCODING, getEncoding());
+ if (getEncoding() != null) {
+ hostSettings.put(ITerminalsConnectorConstants.PROP_ENCODING, getEncoding());
+ }
hostSettingsMap.put(host, hostSettings);
}
}

Back to the top