Attachment 168498 Details for Bug 284573 – Fix

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

[patch] Fix

zpatch.txt (text/plain), 2.06 KB, created by Marc Khouzam

on 2010-05-13 22:45:35 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Khouzam

Created: 2010-05-13 22:45:35 EDT

Size: 2.06 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#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.5
>diff -u -r1.5 CApplicationLaunchShortcut.java
>--- src/org/eclipse/cdt/debug/internal/ui/launch/CApplicationLaunchShortcut.java	14 May 2010 01:50:34 -0000	1.5
>+++ src/org/eclipse/cdt/debug/internal/ui/launch/CApplicationLaunchShortcut.java	14 May 2010 02:43:14 -0000
>@@ -48,7 +48,6 @@
> 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;
>@@ -207,8 +206,7 @@
> 			try {
> 				HashSet<String> set = new HashSet<String>();
> 				set.add(ILaunchManager.RUN_MODE);
>-				ILaunchDelegate preferredDelegate = wc.getPreferredDelegate(set);
>-				if (preferredDelegate == null) {
>+	            if (wc.getPreferredDelegate(set) == null && wc.getType().getPreferredDelegate(set) == null) {
> 					wc.setPreferredLaunchDelegate(set, ICDTLaunchConfigurationConstants.PREFERRED_RUN_LAUNCH_DELEGATE);
> 				}
> 			} catch (CoreException e) {}
>@@ -218,8 +216,7 @@
> 	        try {
> 	        	HashSet<String> set = new HashSet<String>();
> 	        	set.add(ILaunchManager.DEBUG_MODE);
>-	            ILaunchDelegate preferredDelegate = wc.getPreferredDelegate(set);
>-	            if (preferredDelegate == null) {
>+	            if (wc.getPreferredDelegate(set) == null && wc.getType().getPreferredDelegate(set) == null) {
>                     wc.setPreferredLaunchDelegate(set, ICDTLaunchConfigurationConstants.PREFERRED_DEBUG_LOCAL_LAUNCH_DELEGATE);
> 	            }
> 	        } catch (CoreException e) {}

Flags:

marc.khouzam: iplog-

Actions: View | Diff

Attachments on bug 284573: 168498