mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Generics.

Browse source
This commit is contained in:
Sergey Prigogin 2011-05-26 18:50:26 +00:00
parent 9a1ff716f7
commit e14cadc60a
1 changed files with 22 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/CApplicationLaunchShortcut.java
View file

@ -96,10 +96,10 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut2 {
protected ILaunchConfiguration findLaunchConfiguration(IBinary bin, String mode) { protected ILaunchConfiguration findLaunchConfiguration(IBinary bin, String mode) {
ILaunchConfiguration configuration = null; ILaunchConfiguration configuration = null;
ILaunchConfigurationType configType = getCLaunchConfigType(); ILaunchConfigurationType configType = getCLaunchConfigType();
List candidateConfigs = Collections.EMPTY_LIST; List<ILaunchConfiguration> candidateConfigs = Collections.emptyList();
try { try {
ILaunchConfiguration[] configs = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations(configType); ILaunchConfiguration[] configs = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations(configType);
candidateConfigs = new ArrayList(configs.length); candidateConfigs = new ArrayList<ILaunchConfiguration>(configs.length);
for (int i = 0; i < configs.length; i++) { for (int i = 0; i < configs.length; i++) {
ILaunchConfiguration config = configs[i]; ILaunchConfiguration config = configs[i];
IPath programPath = CDebugUtils.getProgramPath(config); IPath programPath = CDebugUtils.getProgramPath(config);
@ -147,7 +147,7 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut2 {
String programCPU = bin.getCPU(); String programCPU = bin.getCPU();
String os = Platform.getOS(); String os = Platform.getOS();
debugConfigs = CDebugCorePlugin.getDefault().getActiveDebugConfigurations(); debugConfigs = CDebugCorePlugin.getDefault().getActiveDebugConfigurations();
List debugList = new ArrayList(debugConfigs.length); List<ICDebugConfiguration> debugList = new ArrayList<ICDebugConfiguration>(debugConfigs.length);
for (int i = 0; i < debugConfigs.length; i++) { for (int i = 0; i < debugConfigs.length; i++) {
String platform = debugConfigs[i].getPlatform(); String platform = debugConfigs[i].getPlatform();
if (debugConfigs[i].supportsMode(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN)) { if (debugConfigs[i].supportsMode(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN)) {
@ -157,7 +157,7 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut2 {
} }
} }
} }
debugConfigs = (ICDebugConfiguration[]) debugList.toArray(new ICDebugConfiguration[0]); debugConfigs = debugList.toArray(new ICDebugConfiguration[0]);
if (debugConfigs.length == 1) { if (debugConfigs.length == 1) {
debugConfig = debugConfigs[0]; debugConfig = debugConfigs[0];
} else if (debugConfigs.length > 1) { } else if (debugConfigs.length > 1) {
@ -169,11 +169,11 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut2 {
configuration = createConfiguration(bin, debugConfig, mode); configuration = createConfiguration(bin, debugConfig, mode);
} }
} else if (candidateCount == 1) { } else if (candidateCount == 1) {
configuration = (ILaunchConfiguration) candidateConfigs.get(0); configuration = candidateConfigs.get(0);
} else { } else {
// Prompt the user to choose a config. A null result means the user // Prompt the user to choose a config. A null result means the user
// cancelled the dialog, in which case this method returns null, // cancelled the dialog, in which case this method returns null,
// since cancelling the dialog should also cancel launching anything. // since canceling the dialog should also cancel launching anything.
configuration = chooseConfiguration(candidateConfigs, mode); configuration = chooseConfiguration(candidateConfigs, mode);
} }
return configuration; return configuration;
@ -196,8 +196,7 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut2 {
wc.setMappedResources(new IResource[] {bin.getResource().getProject()}); wc.setMappedResources(new IResource[] {bin.getResource().getProject()});
wc.setAttribute(ICDTLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, (String) null); wc.setAttribute(ICDTLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, (String) null);
wc.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, true); wc.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, true);
wc.setAttribute( wc.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE,
ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE,
ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN); ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN);
wc.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ID, debugConfig.getID()); wc.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ID, debugConfig.getID());
@ -235,7 +234,7 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut2 {
* Convenience method to get the window that owns this action's Shell. * Convenience method to get the window that owns this action's Shell.
*/ */
protected Shell getShell() { protected Shell getShell() {
IWorkbenchWindow w = CDebugUIPlugin.getDefault().getActiveWorkbenchWindow(); IWorkbenchWindow w = CDebugUIPlugin.getActiveWorkbenchWindow();
if (w != null) { if (w != null) {
return w.getShell(); return w.getShell();
} }
@ -290,13 +289,12 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut2 {
return LaunchMessages.getString("CApplicationLaunchShortcut.Invalid_launch_mode_1"); //$NON-NLS-1$ return LaunchMessages.getString("CApplicationLaunchShortcut.Invalid_launch_mode_1"); //$NON-NLS-1$
} }
/** /**
* Show a selection dialog that allows the user to choose one of the specified * Show a selection dialog that allows the user to choose one of the specified
* launch configurations. Return the chosen config, or <code>null</code> if the * launch configurations. Return the chosen config, or <code>null</code> if the
* user cancelled the dialog. * user cancelled the dialog.
*/ */
protected ILaunchConfiguration chooseConfiguration(List configList, String mode) { protected ILaunchConfiguration chooseConfiguration(List<ILaunchConfiguration> configList, String mode) {
IDebugModelPresentation labelProvider = DebugUITools.newDebugModelPresentation(); IDebugModelPresentation labelProvider = DebugUITools.newDebugModelPresentation();
ElementListSelectionDialog dialog = new ElementListSelectionDialog(getShell(), labelProvider); ElementListSelectionDialog dialog = new ElementListSelectionDialog(getShell(), labelProvider);
dialog.setElements(configList.toArray()); dialog.setElements(configList.toArray());
@ -311,11 +309,11 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut2 {
return null; return null;
} }
protected String getLaunchSelectionDialogTitleString(List configList, String mode) { protected String getLaunchSelectionDialogTitleString(List<ILaunchConfiguration> configList, String mode) {
return LaunchMessages.getString("CApplicationLaunchShortcut.LaunchConfigSelection"); //$NON-NLS-1$ return LaunchMessages.getString("CApplicationLaunchShortcut.LaunchConfigSelection"); //$NON-NLS-1$
} }
protected String getLaunchSelectionDialogMessageString(List binList, String mode) { protected String getLaunchSelectionDialogMessageString(List<ILaunchConfiguration> binList, String mode) {
if (mode.equals(ILaunchManager.DEBUG_MODE)) { if (mode.equals(ILaunchManager.DEBUG_MODE)) {
return LaunchMessages.getString("CApplicationLaunchShortcut.ChooseLaunchConfigToDebug"); //$NON-NLS-1$ return LaunchMessages.getString("CApplicationLaunchShortcut.ChooseLaunchConfigToDebug"); //$NON-NLS-1$
} else if (mode.equals(ILaunchManager.RUN_MODE)) { } else if (mode.equals(ILaunchManager.RUN_MODE)) {
@ -329,7 +327,7 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut2 {
* *
* @return the selected binary or <code>null</code> if none. * @return the selected binary or <code>null</code> if none.
*/ */
protected IBinary chooseBinary(List binList, String mode) { protected IBinary chooseBinary(List<IBinary> binList, String mode) {
ILabelProvider programLabelProvider = new CElementLabelProvider() { ILabelProvider programLabelProvider = new CElementLabelProvider() {
public String getText(Object element) { public String getText(Object element) {
if (element instanceof IBinary) { if (element instanceof IBinary) {
@ -370,11 +368,11 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut2 {
return null; return null;
} }
protected String getBinarySelectionDialogTitleString(List binList, String mode) { protected String getBinarySelectionDialogTitleString(List<IBinary> binList, String mode) {
return LaunchMessages.getString("CApplicationLaunchShortcut.CLocalApplication"); //$NON-NLS-1$ return LaunchMessages.getString("CApplicationLaunchShortcut.CLocalApplication"); //$NON-NLS-1$
} }
protected String getBinarySelectionDialogMessageString(List binList, String mode) { protected String getBinarySelectionDialogMessageString(List<IBinary> binList, String mode) {
if (mode.equals(ILaunchManager.DEBUG_MODE)) { if (mode.equals(ILaunchManager.DEBUG_MODE)) {
return LaunchMessages.getString("CApplicationLaunchShortcut.ChooseLocalAppToDebug"); //$NON-NLS-1$ return LaunchMessages.getString("CApplicationLaunchShortcut.ChooseLocalAppToDebug"); //$NON-NLS-1$
} else if (mode.equals(ILaunchManager.RUN_MODE)) { } else if (mode.equals(ILaunchManager.RUN_MODE)) {
@ -394,7 +392,7 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut2 {
if (elements.length == 1 && elements[0] instanceof IBinary) { if (elements.length == 1 && elements[0] instanceof IBinary) {
bin = (IBinary)elements[0]; bin = (IBinary)elements[0];
} else { } else {
final List results = new ArrayList(); final List<IBinary> results = new ArrayList<IBinary>();
ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell()); ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell());
IRunnableWithProgress runnable = new IRunnableWithProgress() { IRunnableWithProgress runnable = new IRunnableWithProgress() {
public void run(IProgressMonitor pm) throws InterruptedException { public void run(IProgressMonitor pm) throws InterruptedException {
@ -445,7 +443,7 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut2 {
} else if (count > 1) { } else if (count > 1) {
bin = chooseBinary(results, mode); bin = chooseBinary(results, mode);
} else { } else {
bin = (IBinary)results.get(0); bin = results.get(0);
} }
} }
if (bin != null) { if (bin != null) {
@ -473,19 +471,15 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut2 {
// be used for the launch. // be used for the launch.
if (selection instanceof IStructuredSelection) { if (selection instanceof IStructuredSelection) {
Object firstElement = ((IStructuredSelection) selection).getFirstElement(); Object firstElement = ((IStructuredSelection) selection).getFirstElement();
if (firstElement != null) if (firstElement != null) {
{ if (firstElement instanceof IFile) {
if (firstElement instanceof IFile)
{
IFile file = (IFile) firstElement; IFile file = (IFile) firstElement;
return file.getProject(); return file.getProject();
} }
if (firstElement instanceof Executable) if (firstElement instanceof Executable) {
{
return ((Executable)firstElement).getProject(); return ((Executable)firstElement).getProject();
} }
if (firstElement instanceof IBinary) if (firstElement instanceof IBinary) {
{
return ((IBinary)firstElement).getResource().getProject(); return ((IBinary)firstElement).getResource().getProject();
} }
} }
@ -528,7 +522,6 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut2 {
for (Iterator<?> iter = structuredSelection.iterator(); iter.hasNext();) { for (Iterator<?> iter = structuredSelection.iterator(); iter.hasNext();) {
Object element = iter.next(); Object element = iter.next();
if (element != null) { if (element != null) {
if (element instanceof ICProject) { if (element instanceof ICProject) {
projects.add(((ICProject)element).getProject()); projects.add(((ICProject)element).getProject());
} else if (element instanceof IResource) { } else if (element instanceof IResource) {
@ -572,5 +565,4 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut2 {
} }
return null; return null;
} }
} }