Bug 212145 [launching] Selection cannot be launched and there are no recent launches

1 files changed, 8 insertions, 12 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/ContextRunner.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/ContextRunner.java
index a0d4bcf2c..b40f8eda1 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/ContextRunner.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/ContextRunner.java
@@ -77,14 +77,8 @@ public final class ContextRunner {
 	 */
 	public void launch(ILaunchGroup group) {
 		IStructuredSelection selection = SelectedResourceManager.getDefault().getCurrentSelection();
-		String mode = group.getMode();
-		List shortcuts = fLRM.getShortcutsForSelection(selection, mode);
 		IResource resource = SelectedResourceManager.getDefault().getSelectedResource();
-		if(resource == null) {
-			resource = fLRM.getLaunchableResource(shortcuts, selection);
-		}
-		shortcuts = fLRM.pruneShortcuts(shortcuts, resource, mode);
-		selectAndLaunch(resource, group, shortcuts, selection);
+		selectAndLaunch(resource, group, selection);
 	}
 	
 	
@@ -113,10 +107,15 @@ public final class ContextRunner {
 	 * @param resource
 	 * @param group
 	 */
-	protected void selectAndLaunch(IResource resource, ILaunchGroup group, List shortcuts, IStructuredSelection selection) {
+	protected void selectAndLaunch(IResource resource, ILaunchGroup group, IStructuredSelection selection) {
 		if(group != null) {			
 			LaunchConfigurationManager lcm = DebugUIPlugin.getDefault().getLaunchConfigurationManager();
 			String mode = group.getMode();
+			List shortcuts = fLRM.getShortcutsForSelection(selection, mode);
+			if(resource == null) {
+				resource = fLRM.getLaunchableResource(shortcuts, selection);
+			}
+			shortcuts = fLRM.pruneShortcuts(shortcuts, resource, mode);
 		//see if the context is a shared configuration
 			ILaunchConfiguration config = lcm.isSharedConfig(resource);
 			if(config != null) {
@@ -158,10 +157,7 @@ public final class ContextRunner {
 						if(resource != null) {
 							IProject project = resource.getProject();
 							if(project != null && !project.equals(resource)) {
-								IStructuredSelection projectSelection = new StructuredSelection(project);
-								List projectShortcuts = fLRM.getShortcutsForSelection(projectSelection, mode);
-								projectShortcuts = fLRM.pruneShortcuts(projectShortcuts, project, mode);
-								selectAndLaunch(project, group, projectShortcuts, projectSelection);
+								selectAndLaunch(project, group, new StructuredSelection(project));
 							}
 							else {
 								String msg = ContextMessages.ContextRunner_7;