Bug 281970: No longer show the Debugger, Refresh and Source tabs for a Run Configuration. Also, make sure a Run configuration can be used for Debug and vice versa.

1 files changed, 40 insertions, 1 deletions

diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/LocalApplicationCDebuggerTab.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/LocalApplicationCDebuggerTab.java
index 9e779f3747a..77d993dec4a 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/LocalApplicationCDebuggerTab.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/LocalApplicationCDebuggerTab.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 Wind River Systems and others.
+ * Copyright (c) 2008, 2010 Wind River Systems and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,6 +11,9 @@
 package org.eclipse.cdt.dsf.gdb.internal.ui.launching;
 
 import org.eclipse.cdt.dsf.gdb.service.SessionType;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 
 /**
  * Debugger tab to use for a local application launch configuration.
@@ -19,7 +22,43 @@ import org.eclipse.cdt.dsf.gdb.service.SessionType;
  */
 public class LocalApplicationCDebuggerTab extends CDebuggerTab {
 
+	/*
+	 * When the launch configuration is created for Run mode,
+	 * this Debugger tab is not created because it is not used
+	 * for Run mode but only for Debug mode.
+	 * When we then open the same configuration in Debug mode, the launch
+	 * configuration already exists and initializeFrom() is called
+	 * instead of setDefaults().
+	 * We therefore call setDefaults() ourselves and update the configuration.
+	 * If we don't then the user will be required to press Apply to get the
+	 * default settings saved.
+	 * Bug 281970
+	 */
+	private boolean fSetDefaultCalled;
+
     public LocalApplicationCDebuggerTab() {
         super(SessionType.LOCAL, false);
     }
+    
+    @Override
+    public void setDefaults(ILaunchConfigurationWorkingCopy config) {
+    	fSetDefaultCalled = true;
+    	
+    	super.setDefaults(config);
+    }
+    
+    @Override
+    public void initializeFrom(ILaunchConfiguration config) {
+		if (fSetDefaultCalled == false) {
+			try {
+				ILaunchConfigurationWorkingCopy wc;
+				wc = config.getWorkingCopy();
+				setDefaults(wc);
+				wc.doSave();
+			} catch (CoreException e) {
+			}
+		}
+
+		super.initializeFrom(config);
+    }
 }