Bug 108636: mi level selection option should be moved to the gdb page.

1 files changed, 0 insertions, 49 deletions

diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java
index feb7a3b9156..ea7ad0a4517 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java
@@ -18,7 +18,6 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.IBinaryParser;
 import org.eclipse.cdt.core.ICExtensionReference;
@@ -45,7 +44,6 @@ import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Group;
@@ -59,9 +57,6 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
 
 		private Button fRegBookKeeping;
 
-		final String[] protocolItems = new String[] { "mi", "mi1", "mi2", "mi3" };   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$
-		private Combo fPCombo;
-
 		/**
 		 * Constructor for AdvancedDebuggerOptionsDialog.
 		 */
@@ -85,25 +80,10 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
 			fVarBookKeeping.setText(LaunchMessages.getString("CDebuggerTab.Variables")); //$NON-NLS-1$
 			fRegBookKeeping = new Button(group, SWT.CHECK);
 			fRegBookKeeping.setText(LaunchMessages.getString("CDebuggerTab.Registers")); //$NON-NLS-1$
-			createProtocolCombo(composite, 2);
 			initialize();
 			return composite;
 		}
 
-		protected void createProtocolCombo(Composite parent, int colspan) {
-			Group comboComp = new Group(parent, SWT.NONE);
-			comboComp.setText("Protocol");
-			GridLayout layout = new GridLayout(2, false);
-			comboComp.setLayout(layout);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = colspan;
-			comboComp.setLayoutData(gd);
-			fPCombo = new Combo(comboComp, SWT.READ_ONLY | SWT.DROP_DOWN);
-			fPCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			fPCombo.setItems(protocolItems);
-		}
-
-
 		protected void okPressed() {
 			saveValues();
 			super.okPressed();
@@ -115,19 +95,6 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
 			fVarBookKeeping.setSelection( (varBookkeeping instanceof Boolean) ? ! ((Boolean)varBookkeeping).booleanValue() : true);
 			Object regBookkeeping = attr.get(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_REGISTER_BOOKKEEPING);
 			fRegBookKeeping.setSelection( (regBookkeeping instanceof Boolean) ? ! ((Boolean)regBookkeeping).booleanValue() : true);
-			Object protocol = attr.get(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_PROTOCOL);
-			int index = 0;
-			if (protocol instanceof String) {
-				String p = (String)protocol;
-				if (p != null && p.length() > 0) {
-					for (int i = 0; i < protocolItems.length; ++i) {
-						if (protocolItems[i].equals(p)) {
-							index = i;
-						}
-					}
-				}
-			}
-			fPCombo.select(index);
 		}
 
 		private void saveValues() {
@@ -136,10 +103,6 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
 			attr.put(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_VARIABLE_BOOKKEEPING, varBookkeeping);
 			Boolean regBookkeeping = (fRegBookKeeping.getSelection()) ? Boolean.FALSE : Boolean.TRUE;
 			attr.put(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_REGISTER_BOOKKEEPING, regBookkeeping);
-			String protocol = fPCombo.getText();
-			if (protocol != null && protocol.length() > 0) {
-				attr.put(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_PROTOCOL, protocol);
-			}
 			updateLaunchConfigurationDialog();
 		}
 
@@ -422,11 +385,6 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
 			attr.put(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_REGISTER_BOOKKEEPING, regBookkeeping);
 		} catch (CoreException e) {
 		}
-		try {
-			String protocol = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_PROTOCOL, "mi"); //$NON-NLS-1$
-			attr.put(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_PROTOCOL, protocol);
-		} catch (CoreException e) {
-		}
 	}
 
 	private void applyAdvancedAttributes(ILaunchConfigurationWorkingCopy config) {
@@ -439,13 +397,6 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
 		if (regBookkeeping instanceof Boolean)
 			config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_REGISTER_BOOKKEEPING,
 					((Boolean)regBookkeeping).booleanValue());
-		Object protocol = attr.get(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_PROTOCOL);
-		if (protocol instanceof String) {
-			String p = (String)protocol;
-			if (p != null && p.length() > 0) {
-				config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_PROTOCOL, p);
-			}
-		}
 	}
 
 	protected Shell getShell() {