mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-23 16:23:52 +02:00
Bug 468399 - mode selector filled with tostrings
Change-Id: I109b728b2b7e1356c026c11b3b3663089940c5fe Signed-off-by: Rob Stryker <rob.stryker@jboss.com>
This commit is contained in:
parent
93a926385f
commit
652500b200
1 changed files with 22 additions and 1 deletions
|
@ -16,8 +16,10 @@ import java.util.Map;
|
||||||
|
|
||||||
import org.eclipse.core.runtime.CoreException;
|
import org.eclipse.core.runtime.CoreException;
|
||||||
import org.eclipse.debug.core.ILaunchConfigurationType;
|
import org.eclipse.debug.core.ILaunchConfigurationType;
|
||||||
|
import org.eclipse.debug.core.ILaunchManager;
|
||||||
import org.eclipse.debug.core.ILaunchMode;
|
import org.eclipse.debug.core.ILaunchMode;
|
||||||
import org.eclipse.debug.internal.ui.DebugUIPlugin;
|
import org.eclipse.debug.internal.ui.DebugUIPlugin;
|
||||||
|
import org.eclipse.debug.ui.IDebugUIConstants;
|
||||||
import org.eclipse.debug.ui.ILaunchGroup;
|
import org.eclipse.debug.ui.ILaunchGroup;
|
||||||
import org.eclipse.jface.resource.ImageDescriptor;
|
import org.eclipse.jface.resource.ImageDescriptor;
|
||||||
import org.eclipse.jface.viewers.IStructuredContentProvider;
|
import org.eclipse.jface.viewers.IStructuredContentProvider;
|
||||||
|
@ -77,6 +79,9 @@ public class ModeSelector extends CSelector {
|
||||||
ILaunchMode mode = (ILaunchMode) element;
|
ILaunchMode mode = (ILaunchMode) element;
|
||||||
try {
|
try {
|
||||||
ILaunchGroup group = getLaunchGroup(mode.getIdentifier());
|
ILaunchGroup group = getLaunchGroup(mode.getIdentifier());
|
||||||
|
if( group == null ) {
|
||||||
|
group = getDefaultLaunchGroup(mode.getIdentifier());
|
||||||
|
}
|
||||||
if (group != null) {
|
if (group != null) {
|
||||||
ImageDescriptor imageDesc = group.getImageDescriptor();
|
ImageDescriptor imageDesc = group.getImageDescriptor();
|
||||||
Image image = images.get(imageDesc);
|
Image image = images.get(imageDesc);
|
||||||
|
@ -98,6 +103,9 @@ public class ModeSelector extends CSelector {
|
||||||
ILaunchMode mode = (ILaunchMode) element;
|
ILaunchMode mode = (ILaunchMode) element;
|
||||||
try {
|
try {
|
||||||
ILaunchGroup group = getLaunchGroup(mode.getIdentifier());
|
ILaunchGroup group = getLaunchGroup(mode.getIdentifier());
|
||||||
|
if( group == null ) {
|
||||||
|
group = getDefaultLaunchGroup(mode.getIdentifier());
|
||||||
|
}
|
||||||
if (group != null) {
|
if (group != null) {
|
||||||
return group.getLabel().replace("&", ""); //$NON-NLS-1$ //$NON-NLS-2$
|
return group.getLabel().replace("&", ""); //$NON-NLS-1$ //$NON-NLS-2$
|
||||||
}
|
}
|
||||||
|
@ -138,6 +146,19 @@ public class ModeSelector extends CSelector {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected ILaunchGroup getDefaultLaunchGroup(String mode) throws CoreException {
|
||||||
|
String groupId = null;
|
||||||
|
if (mode.equals(ILaunchManager.DEBUG_MODE)) {
|
||||||
|
groupId = IDebugUIConstants.ID_DEBUG_LAUNCH_GROUP;
|
||||||
|
} else if( mode.equals(ILaunchManager.PROFILE_MODE)) {
|
||||||
|
groupId = IDebugUIConstants.ID_PROFILE_LAUNCH_GROUP;
|
||||||
|
} else {
|
||||||
|
groupId = IDebugUIConstants.ID_RUN_LAUNCH_GROUP;
|
||||||
|
}
|
||||||
|
if( groupId != null )
|
||||||
|
return DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchGroup(groupId);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
protected ILaunchGroup getLaunchGroup(String mode) throws CoreException {
|
protected ILaunchGroup getLaunchGroup(String mode) throws CoreException {
|
||||||
ILaunchConfigurationType type = manager.getLaunchConfigurationType(manager.getActiveLaunchDescriptor(), manager.getActiveLaunchTarget());
|
ILaunchConfigurationType type = manager.getLaunchConfigurationType(manager.getActiveLaunchDescriptor(), manager.getActiveLaunchTarget());
|
||||||
|
|
Loading…
Add table
Reference in a new issue