diff options
| author | Michael Rennie | 2010-02-26 16:10:35 +0000 |
|---|---|---|
| committer | Michael Rennie | 2010-02-26 16:10:35 +0000 |
| commit | 8b7ac054e66d25cb31fcebf25b91b309e8948813 (patch) | |
| tree | 1c03e8d143ffb6006223b1ecb2f378f790cd5570 /org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions | |
| parent | ff2c1abf11772674439799ca3478dedada4eb5f4 (diff) | |
| download | eclipse.platform.debug-8b7ac054e66d25cb31fcebf25b91b309e8948813.tar.gz eclipse.platform.debug-8b7ac054e66d25cb31fcebf25b91b309e8948813.tar.xz eclipse.platform.debug-8b7ac054e66d25cb31fcebf25b91b309e8948813.zip | |
Bug 300393 - LaunchingResourceManager.isContextLaunchingEnabled should consider the external tools launch group
Diffstat (limited to 'org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions')
| -rw-r--r-- | org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java | 3 | ||||
| -rw-r--r-- | org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchToolbarAction.java | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java index 716440f53..7575041b5 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java @@ -387,8 +387,7 @@ public abstract class AbstractLaunchHistoryAction implements IActionDelegate2, I public void runWithEvent(IAction action, Event event) { if((event.stateMask & SWT.MOD1) > 0) { ILaunchConfiguration configuration = null; - if(LaunchingResourceManager.isContextLaunchEnabled() && - !getLaunchGroupIdentifier().equals("org.eclipse.ui.externaltools.launchGroup")) { //$NON-NLS-1$ + if(LaunchingResourceManager.isContextLaunchEnabled(getLaunchGroupIdentifier())) { configuration = resolveContextConfiguration(); } else { configuration = getLaunchConfigurationManager().getFilteredLastLaunch(getLaunchGroupIdentifier()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchToolbarAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchToolbarAction.java index d7f41bbdf..574c6644a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchToolbarAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchToolbarAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2010 IBM Corporation 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 @@ -75,8 +75,7 @@ public class AbstractLaunchToolbarAction extends AbstractLaunchHistoryAction { */ public void run(IAction action) { //always ignore external tools during context launching - if(LaunchingResourceManager.isContextLaunchEnabled() && - !getLaunchGroupIdentifier().equals("org.eclipse.ui.externaltools.launchGroup")) { //$NON-NLS-1$ + if(LaunchingResourceManager.isContextLaunchEnabled(getLaunchGroupIdentifier())) { ContextRunner.getDefault().launch(DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchGroup(getLaunchGroupIdentifier())); } else { |