From 6ad86fa192a9bdb51abbfa529a95de04b396e464 Mon Sep 17 00:00:00 2001
From: Marc Khouzam <marc.khouzam@ericsson.com>
Date: Fri, 7 May 2010 18:02:49 +0000
Subject: [PATCH] Bug 281970: Cleanup based on John's review

---
 .../internal/ui/launching/CDebuggerTab.java   | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/CDebuggerTab.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/CDebuggerTab.java
index 60040b113e7..0f22a3bef1e 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/CDebuggerTab.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/CDebuggerTab.java
@@ -13,9 +13,7 @@
  *******************************************************************************/
 package org.eclipse.cdt.dsf.gdb.internal.ui.launching;
 
-import java.util.LinkedHashSet;
 import java.util.Map;
-import java.util.Set;
 
 import org.eclipse.cdt.debug.core.CDebugCorePlugin;
 import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
@@ -145,16 +143,13 @@ public class CDebuggerTab extends CLaunchConfigurationTab {
 
 	protected void initDebuggerTypes(String selection) {
 		if (fAttachMode) {
-			// Use a LinkedHashSet to keep ordering
-			Set<String> set = new LinkedHashSet<String>();
-			set.add(LOCAL_DEBUGGER_ID);
-			set.add(REMOTE_DEBUGGER_ID);
+			setInitializeDefault(selection.equals("") ? true : false); //$NON-NLS-1$
+
 			if (selection.equals("")) { //$NON-NLS-1$
 				selection = LOCAL_DEBUGGER_ID;
 			}
 
-			setInitializeDefault(selection.equals("") ? true : false); //$NON-NLS-1$
-			loadDebuggerCombo(set.toArray(new String[set.size()]), selection);
+			loadDebuggerCombo(new String[] { LOCAL_DEBUGGER_ID, REMOTE_DEBUGGER_ID }, selection);
 		} else {
 			if (fRemoteMode) {
 				setDebuggerId(REMOTE_DEBUGGER_ID);
@@ -385,8 +380,9 @@ public class CDebuggerTab extends CLaunchConfigurationTab {
 	}
 	
 	protected void loadDynamicDebugArea() {
+		Composite dynamicTabHolder = getDynamicTabHolder();
 		// Dispose of any current child widgets in the tab holder area
-		Control[] children = getDynamicTabHolder().getChildren();
+		Control[] children = dynamicTabHolder.getChildren();
 		for (int i = 0; i < children.length; i++) {
 			children[i].dispose();
 		}
@@ -403,18 +399,21 @@ public class CDebuggerTab extends CLaunchConfigurationTab {
 				}
 			} else if (debuggerId.equals(REMOTE_DEBUGGER_ID)) {
 				setDynamicTab(new GdbServerDebuggerPage());
+			} else {
+				assert false : "Unknown debugger id"; //$NON-NLS-1$
 			}
 		}
 		setDebuggerId(debuggerId);
 
-		if (getDynamicTab() == null) {
+		ICDebuggerPage debuggerPage = getDynamicTab();
+		if (debuggerPage == null) {
 			return;
 		}
 		// Ask the dynamic UI to create its Control
-		getDynamicTab().setLaunchConfigurationDialog(getLaunchConfigurationDialog());
-		getDynamicTab().createControl(getDynamicTabHolder());
-		getDynamicTab().getControl().setVisible(true);
-		getDynamicTabHolder().layout(true);
+		debuggerPage.setLaunchConfigurationDialog(getLaunchConfigurationDialog());
+		debuggerPage.createControl(dynamicTabHolder);
+		debuggerPage.getControl().setVisible(true);
+		dynamicTabHolder.layout(true);
 		contentsChanged();
 	}
 	
@@ -594,10 +593,10 @@ public class CDebuggerTab extends CLaunchConfigurationTab {
 		tabHolderLayout.marginHeight = 0;
 		tabHolderLayout.marginWidth = 0;
 		tabHolderLayout.numColumns = 1;
-		getDynamicTabHolder().setLayout(tabHolderLayout);
+		debuggerGroup.setLayout(tabHolderLayout);
 		GridData gd = new GridData(GridData.FILL_BOTH);
 		gd.horizontalSpan = colspan;
-		getDynamicTabHolder().setLayoutData(gd);
+		debuggerGroup.setLayoutData(gd);
 	}
 
 	protected void updateComboFromSelection() {