Attachment 133018 Details for Bug 270469 – Updated patch.

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Updated patch.

20090423_270469.patch (text/plain), 5.42 KB, created by Pawel Piech

on 2009-04-23 16:25:41 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Pawel Piech

Created: 2009-04-23 16:25:41 EDT

Size: 5.42 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.launch
>Index: src/org/eclipse/cdt/launch/ui/CMainTab.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java,v
>retrieving revision 1.69
>diff -u -r1.69 CMainTab.java
>--- src/org/eclipse/cdt/launch/ui/CMainTab.java	23 Apr 2009 17:34:02 -0000	1.69
>+++ src/org/eclipse/cdt/launch/ui/CMainTab.java	23 Apr 2009 20:21:04 -0000
>@@ -13,6 +13,7 @@
> package org.eclipse.cdt.launch.ui;
> 
> import java.util.ArrayList;
>+import java.util.HashSet;
> import java.util.List;
> 
> import org.eclipse.cdt.core.CCorePlugin;
>@@ -42,6 +43,7 @@
> import org.eclipse.core.runtime.Path;
> import org.eclipse.debug.core.ILaunchConfiguration;
> import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
>+import org.eclipse.debug.core.ILaunchDelegate;
> import org.eclipse.debug.ui.DebugUITools;
> import org.eclipse.debug.ui.IDebugUIConstants;
> import org.eclipse.jface.dialogs.MessageDialog;
>@@ -86,7 +88,7 @@
>      *   
>      * @since 6.0
>      */
>-    public static final String TAB_ID = "org.eclipse.cdt.cdi.launch.mainTab";
>+    public static final String TAB_ID = "org.eclipse.cdt.cdi.launch.mainTab"; //$NON-NLS-1$
> 
> 	// Project UI widgets
> 	protected Label fProjLabel;
>@@ -690,6 +692,23 @@
> 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
> 	 */
> 	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
>+	    
>+	    // Workaround for bug 262840: select the standard CDT launcher by default.
>+	    HashSet<String> set = new HashSet<String>();
>+	    set.add(getLaunchConfigurationDialog().getMode());
>+	    try {
>+    	    ILaunchDelegate preferredDelegate = config.getPreferredDelegate(set);
>+    	    if (preferredDelegate == null) {
>+    	        if (config.getType().getIdentifier().equals(ICDTLaunchConfigurationConstants.ID_LAUNCH_C_APP)) {
>+    	            config.setPreferredLaunchDelegate(set, "org.eclipse.cdt.cdi.launch.localCLaunch");
>+    	        } else if (config.getType().getIdentifier().equals(ICDTLaunchConfigurationConstants.ID_LAUNCH_C_ATTACH)) {
>+                    config.setPreferredLaunchDelegate(set, "org.eclipse.cdt.cdi.launch.localCAttachLaunch");
>+    	        } else if (config.getType().getIdentifier().equals(ICDTLaunchConfigurationConstants.ID_LAUNCH_C_POST_MORTEM)) {
>+                    config.setPreferredLaunchDelegate(set, "org.eclipse.cdt.cdi.launch.coreFileCLaunch");
>+                } 
>+    	    }
>+	    } catch (CoreException e) {}
>+	        
> 		// We set empty attributes for project & program so that when one config
> 		// is
> 		// compared to another, the existence of empty attributes doesn't cause
>#P org.eclipse.cdt.debug.ui
>Index: src/org/eclipse/cdt/debug/internal/ui/launch/CApplicationLaunchShortcut.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/CApplicationLaunchShortcut.java,v
>retrieving revision 1.2
>diff -u -r1.2 CApplicationLaunchShortcut.java
>--- src/org/eclipse/cdt/debug/internal/ui/launch/CApplicationLaunchShortcut.java	8 Apr 2009 21:30:45 -0000	1.2
>+++ src/org/eclipse/cdt/debug/internal/ui/launch/CApplicationLaunchShortcut.java	23 Apr 2009 20:21:05 -0000
>@@ -15,6 +15,7 @@
> import java.lang.reflect.InvocationTargetException;
> import java.util.ArrayList;
> import java.util.Collections;
>+import java.util.HashSet;
> import java.util.Iterator;
> import java.util.List;
> 
>@@ -47,6 +48,7 @@
> import org.eclipse.debug.core.ILaunchConfiguration;
> import org.eclipse.debug.core.ILaunchConfigurationType;
> import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
>+import org.eclipse.debug.core.ILaunchDelegate;
> import org.eclipse.debug.core.ILaunchManager;
> import org.eclipse.debug.ui.DebugUITools;
> import org.eclipse.debug.ui.IDebugModelPresentation;
>@@ -166,7 +168,7 @@
> 			}
> 			
> 			if (debugConfig != null) {
>-				configuration = createConfiguration(bin, debugConfig);
>+				configuration = createConfiguration(bin, debugConfig, mode);
> 			}
> 		} else if (candidateCount == 1) {
> 			configuration = (ILaunchConfiguration) candidateConfigs.get(0);
>@@ -184,7 +186,7 @@
> 	 * @param bin
> 	 * @return ILaunchConfiguration
> 	 */
>-	private ILaunchConfiguration createConfiguration(IBinary bin, ICDebugConfiguration debugConfig) {
>+	private ILaunchConfiguration createConfiguration(IBinary bin, ICDebugConfiguration debugConfig, String mode) {
> 		ILaunchConfiguration config = null;
> 		try {
> 			String projectName = bin.getResource().getProjectRelativePath().toString();
>@@ -201,6 +203,17 @@
> 				ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN);
> 			wc.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ID, debugConfig.getID());
> 
>+	        // Workaround for bug 262840: select the standard CDT launcher by default.
>+	        HashSet<String> set = new HashSet<String>();
>+	        set.add(mode);
>+	        try {
>+	            ILaunchDelegate preferredDelegate = wc.getPreferredDelegate(set);
>+	            if (preferredDelegate == null) {
>+                    wc.setPreferredLaunchDelegate(set, "org.eclipse.cdt.cdi.launch.localCLaunch");
>+	            }
>+	        } catch (CoreException e) {}
>+			// End workaround for bug 262840
>+	        
> 			ICProjectDescription projDes = CCorePlugin.getDefault().getProjectDescription(bin.getCProject().getProject());
> 			if (projDes != null)
> 			{

Actions: View | Diff

Attachments on bug 270469: 130508 | 133018