Bug 120509: CDebuggerTab invokes wong initialization code (in addition to right code).

3 files changed, 13 insertions, 8 deletions

diff --git a/launch/org.eclipse.cdt.launch/ChangeLog b/launch/org.eclipse.cdt.launch/ChangeLog
index 0ff7ca94b4f..38e1f300502 100644
--- a/launch/org.eclipse.cdt.launch/ChangeLog
+++ b/launch/org.eclipse.cdt.launch/ChangeLog
@@ -1,4 +1,9 @@
 2006-01-06 Mikhail Khodjaiants
+	Bug 120509: CDebuggerTab invokes wong initialization code (in addition to right code).
+	* CDebuggerTab.java
+	* CoreFileDebuggerTab.java
+
+2006-01-06 Mikhail Khodjaiants
 	Cleanup.
 	* CArgumentsTab.java
 	* CMainTab.java
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 51163409043..6647c802c74 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
@@ -101,7 +101,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
 			attr.put(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_VARIABLE_BOOKKEEPING, varBookkeeping);
 			Boolean regBookkeeping = Boolean.valueOf( fRegBookKeeping.getSelection() );
 			attr.put(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_REGISTER_BOOKKEEPING, regBookkeeping);
-			updateLaunchConfigurationDialog();
+			update();
 		}
 
 		/*
@@ -321,8 +321,10 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
 	/**
 	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#updateLaunchConfigurationDialog()
 	 */
-	protected void updateLaunchConfigurationDialog() {
-		super.updateLaunchConfigurationDialog();
+	protected void update() {
+		if (!isInitializing()) {
+			super.updateLaunchConfigurationDialog();
+		}
 	}
 
 	protected void createOptionsComposite(Composite parent) {
@@ -336,9 +338,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
 			fStopInMain.addSelectionListener(new SelectionAdapter() {
 
 				public void widgetSelected(SelectionEvent e) {
-					if (!isInitializing()) {
-						updateLaunchConfigurationDialog();
-					}
+					update();
 				}
 			});
 		}
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CoreFileDebuggerTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CoreFileDebuggerTab.java
index d8722c7665d..5688485d59a 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CoreFileDebuggerTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CoreFileDebuggerTab.java
@@ -79,7 +79,7 @@ public class CoreFileDebuggerTab extends AbstractCDebuggerTab {
 
 	public void initializeFrom(ILaunchConfiguration config) {
 		setInitializing(true);
-		super.initializeFrom(config);
+		setLaunchConfiguration(config);
 		try {
 			String id = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ID, ""); //$NON-NLS-1$
 			loadDebuggerComboBox(config, id);
@@ -138,7 +138,7 @@ public class CoreFileDebuggerTab extends AbstractCDebuggerTab {
 					// select first exact matching debugger for platform or
 					// requested selection
 					String debuggerPlatform = debugConfigs[i].getPlatform();
-					if (defaultSelection == null && debuggerPlatform.equalsIgnoreCase(projectPlatform)) { //$NON-NLS-1$
+					if (defaultSelection == null && debuggerPlatform.equalsIgnoreCase(projectPlatform)) {
 						defaultSelection = debugConfigs[i].getID();
 					}
 				}