Target Explorer: Cleanup duplicate implementations in TcpTransportPanel vs NetworkCablePanel

1 files changed, 13 insertions, 2 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/wire/network/NetworkCablePanel.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/wire/network/NetworkCablePanel.java
index 69aff54bc..7250bbf1d 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/wire/network/NetworkCablePanel.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/wire/network/NetworkCablePanel.java
@@ -96,6 +96,7 @@ public class NetworkCablePanel extends AbstractWizardConfigurationPanel implemen
 		portControl = doCreatePortControl(this);

 		portControl.setParentControlIsInnerPanel(true);

 		portControl.setupPanel(addressControl.getInnerPanelComposite());

+		portControl.setEditFieldControlText(getDefaultPort());

 	}

 

 	/**

@@ -120,6 +121,15 @@ public class NetworkCablePanel extends AbstractWizardConfigurationPanel implemen
 		return new NetworkPortControl(parentPanel);

 	}

 

+	/**

+	 * Returns the default port to set to the port control.

+	 *

+	 * @return The default port to set or <code>null</code>.

+	 */

+	protected String getDefaultPort() {

+		return null;

+	}

+

 	/* (non-Javadoc)

 	 * @see org.eclipse.tcf.te.ui.controls.panels.AbstractWizardConfigurationPanel#setEnabled(boolean)

 	 */

@@ -192,7 +202,7 @@ public class NetworkCablePanel extends AbstractWizardConfigurationPanel implemen
 

 		if (portControl != null) {

 			String port = portControl.getEditFieldControlText();

-			if (port != null) isDirty |= !port.equals(container.get(IWireTypeNetwork.PROPERTY_NETWORK_PORT) != null ? container.get(IWireTypeNetwork.PROPERTY_NETWORK_PORT) : ""); //$NON-NLS-1$

+			if (port != null) isDirty |= !port.equals(container.get(IWireTypeNetwork.PROPERTY_NETWORK_PORT) != null ? container.get(IWireTypeNetwork.PROPERTY_NETWORK_PORT) : getDefaultPort() != null ? getDefaultPort() : ""); //$NON-NLS-1$

 		}

 

 		return isDirty;

@@ -213,7 +223,8 @@ public class NetworkCablePanel extends AbstractWizardConfigurationPanel implemen
 		}

 

 		if (portControl != null) {

-			portControl.setEditFieldControlText((String)container.get(IWireTypeNetwork.PROPERTY_NETWORK_PORT));

+			String port = (String)container.get(IWireTypeNetwork.PROPERTY_NETWORK_PORT);

+			portControl.setEditFieldControlText(port != null && !"".equals(port) ? port : getDefaultPort()); //$NON-NLS-1$

 		}

 	}