From 89994e4eb20c82a8a35960db83c6bb18d4082490 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Thu, 7 Dec 2006 14:16:24 +0000
Subject: [PATCH] [167071] use telnet ports that cannot be mapped verbatim

---
 .../internal/telnet/TelnetSettingsPage.java   | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetSettingsPage.java b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetSettingsPage.java
index 925f881a380..87c71aed8af 100644
--- a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetSettingsPage.java
+++ b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetSettingsPage.java
@@ -64,19 +64,23 @@ public class TelnetSettingsPage implements ISettingsPage {
 		
 	}
 	private void setNetworkPort(String strNetworkPort) {
-		String strPortName = getNetworkPortMap().findPortName(strNetworkPort);
-		if(strPortName==null)
-			strPortName=""; //$NON-NLS-1$
-		int nIndex = fNetworkPortCombo.indexOf(strPortName);
+		if (strNetworkPort!=null) {
+			String strPortName = getNetworkPortMap().findPortName(strNetworkPort);
+			if(strPortName==null)
+				strPortName=""; //$NON-NLS-1$
+			int nIndex = fNetworkPortCombo.indexOf(strPortName);
 
-		if (nIndex == -1) {
-			fNetworkPortCombo.setText(strNetworkPort);
-		} else {
-			fNetworkPortCombo.select(nIndex);
+			if (nIndex == -1) {
+				fNetworkPortCombo.setText(strNetworkPort);
+			} else {
+				fNetworkPortCombo.select(nIndex);
+			}
 		}
 	}
 	private String getNetworkPort() {
-		return getNetworkPortMap().findPort(fNetworkPortCombo.getText());
+		String portText = fNetworkPortCombo.getText();
+		String mappedPort = getNetworkPortMap().findPort(portText);
+		return mappedPort!=null ? mappedPort : portText;
 	}
 	private NetworkPortMap getNetworkPortMap() {
 		return fTerminalSettings.getProperties().getNetworkPortMap();