From 3936530e86e3661a904b5b55fd6b1a60913d650d Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Mon, 14 Jul 2014 12:27:24 -0400 Subject: [PATCH] Show the proper ILaunchGroup in the LaunchBar Mode Selector. --- .../ui/internal/controls/ModeSelector.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/launch/org.eclipse.cdt.launchbar.ui/src/org/eclipse/cdt/launchbar/ui/internal/controls/ModeSelector.java b/launch/org.eclipse.cdt.launchbar.ui/src/org/eclipse/cdt/launchbar/ui/internal/controls/ModeSelector.java index ef6c9a54567..c064433c4da 100644 --- a/launch/org.eclipse.cdt.launchbar.ui/src/org/eclipse/cdt/launchbar/ui/internal/controls/ModeSelector.java +++ b/launch/org.eclipse.cdt.launchbar.ui/src/org/eclipse/cdt/launchbar/ui/internal/controls/ModeSelector.java @@ -17,6 +17,7 @@ import java.util.Map; import org.eclipse.cdt.launchbar.core.ILaunchBarManager; import org.eclipse.cdt.launchbar.ui.internal.Activator; import org.eclipse.core.runtime.CoreException; +import org.eclipse.debug.core.ILaunchConfigurationType; import org.eclipse.debug.core.ILaunchMode; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.ui.ILaunchGroup; @@ -128,13 +129,11 @@ public class ModeSelector extends CSelector { protected ILaunchGroup getLaunchGroup(String mode) { - ILaunchGroup[] groups = DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchGroups(); - ILaunchGroup extension = null; - for (int i = 0; i < groups.length; i++) { - extension = groups[i]; - if (extension.getMode().equals(mode)) { - return extension; - } + try { + ILaunchConfigurationType type = getManager().getLaunchConfigurationType(getManager().getActiveLaunchDescriptor(), getManager().getActiveLaunchTarget()); + return DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchGroup(type, mode); + } catch (CoreException e) { + Activator.log(e.getStatus()); } return null; }