Target Explorer: Fix regression in LaunchTerminalSettingsDialog - Terminal type setting pages not created except for the first shown terminal type

3 files changed, 13 insertions, 24 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/controls/TransportSectionTypePanelControl.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/controls/TransportSectionTypePanelControl.java
index c23ecc82f..6f911b916 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/controls/TransportSectionTypePanelControl.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/controls/TransportSectionTypePanelControl.java
@@ -51,11 +51,10 @@ public class TransportSectionTypePanelControl extends TransportTypePanelControl
 			if (transportType != null) {
 				// get the panel for the transport simulator and validate the panel
 				IWizardConfigurationPanel panel = getConfigurationPanel(transportType);
-
-				if (panel != null) {
-					valid = panel.isValid();
-					setMessage(panel.getMessage(), panel.getMessageType());
-				}
+				// getConfigurationPanel(...) always return a non-null value
+				Assert.isNotNull(panel);
+				valid = panel.isValid();
+				setMessage(panel.getMessage(), panel.getMessageType());
 			}
 		}
 
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/sections/TransportSection.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/sections/TransportSection.java
index cc44714ee..ccc241e8f 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/sections/TransportSection.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/sections/TransportSection.java
@@ -335,8 +335,7 @@ public class TransportSection extends AbstractSection implements IDataExchangeNo
 					}
 
 					for (String id : transportTypePanelControl.getConfigurationPanelIds()) {
-						IWizardConfigurationPanel panel = transportTypePanelControl
-						                .getConfigurationPanel(id);
+						IWizardConfigurationPanel panel = transportTypePanelControl.getConfigurationPanel(id);
 						if (panel instanceof IDataExchangeNode3) {
 							((IDataExchangeNode3) panel).copyData(src, odc);
 						}
@@ -391,8 +390,7 @@ public class TransportSection extends AbstractSection implements IDataExchangeNo
 		}
 
 		if (transportTypeControl != null) {
-			data.setProperty(IPeer.ATTR_TRANSPORT_NAME, transportTypeControl
-			                .getSelectedTransportType());
+			data.setProperty(IPeer.ATTR_TRANSPORT_NAME, transportTypeControl.getSelectedTransportType());
 		}
     }
 
@@ -551,10 +549,7 @@ public class TransportSection extends AbstractSection implements IDataExchangeNo
 			}
 
 			if (transportTypePanelControl != null) {
-				IWizardConfigurationPanel panel = transportTypePanelControl.getConfigurationPanel(transportType);
-				if (panel != null) {
-					isDirty |= panel.dataChanged(odc, e);
-				}
+				isDirty |= transportTypePanelControl.getConfigurationPanel(transportType).dataChanged(odc, e);
 			}
 		}
 
@@ -591,8 +586,7 @@ public class TransportSection extends AbstractSection implements IDataExchangeNo
 		}
 
 		if (transportTypeControl != null) {
-			attributes.setProperty(IPeer.ATTR_TRANSPORT_NAME, transportTypeControl
-			                .getSelectedTransportType());
+			attributes.setProperty(IPeer.ATTR_TRANSPORT_NAME, transportTypeControl.getSelectedTransportType());
 		}
 	}
 
@@ -608,10 +602,7 @@ public class TransportSection extends AbstractSection implements IDataExchangeNo
 			boolean enabled = !isReadOnly() && (!(input instanceof IPeerNode) || ((IPeerNode)input).getConnectState() == IConnectable.STATE_DISCONNECTED);
 			SWTControlUtil.setEnabled(transportTypeControl.getEditFieldControl(), enabled && SWTControlUtil.getItemCount(transportTypeControl.getEditFieldControl()) > 1);
 			if (transportTypePanelControl != null) {
-				IWizardConfigurationPanel panel = transportTypePanelControl.getConfigurationPanel(transportTypeControl.getSelectedTransportType());
-				if (panel != null) {
-					panel.setEnabled(enabled);
-				}
+				transportTypePanelControl.getConfigurationPanel(transportTypeControl.getSelectedTransportType()).setEnabled(enabled);
 			}
 		}
 	}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/wizards/pages/NewTargetWizardPage.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/wizards/pages/NewTargetWizardPage.java
index 7d861e01f..d89872013 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/wizards/pages/NewTargetWizardPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/wizards/pages/NewTargetWizardPage.java
@@ -149,11 +149,10 @@ public class NewTargetWizardPage extends AbstractValidatingWizardPage implements
 				if (transportType != null) {
 					// get the panel for the transport type and validate the panel
 					IWizardConfigurationPanel panel = getConfigurationPanel(transportType);
-
-					if (panel != null) {
-						valid = panel.isValid();
-						setMessage(panel.getMessage(), panel.getMessageType());
-					}
+					// getConfigurationPanel(...) always return a non-null value
+					Assert.isNotNull(panel);
+					valid = panel.isValid();
+					setMessage(panel.getMessage(), panel.getMessageType());
 				}
 			}