mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

fixed 'revert' behavior in debugger tab

Browse source
This commit is contained in:
David Inglis 2003-01-16 20:25:07 +00:00
parent 3fcb7bd031
commit b3e245d849
3 changed files with 39 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
launch/org.eclipse.cdt.launch/ChangeLog
View file

@ -1,3 +1,7 @@
2003-01-16 David Inglis
* src/.../launch/ui/CDebuggerTab.java
made 'revert' work properly within the debugger tab.
2003-01-16 David Inglis 2003-01-16 David Inglis
* src/.../launch/AbstractCLaunchDelegate.java * src/.../launch/AbstractCLaunchDelegate.java
add check for program existance on disk before launch add check for program existance on disk before launch

54
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java
View file

@ -64,8 +64,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
public void widgetSelected(SelectionEvent e) { public void widgetSelected(SelectionEvent e) {
if (fRunButton.getSelection() == true) { if (fRunButton.getSelection() == true) {
fStopInMain.setEnabled(true); fStopInMain.setEnabled(true);
} } else {
else {
fStopInMain.setEnabled(false); fStopInMain.setEnabled(false);
} }
updateLaunchConfigurationDialog(); updateLaunchConfigurationDialog();
@ -80,6 +79,11 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
fStopInMain = new Button(comp, SWT.CHECK); fStopInMain = new Button(comp, SWT.CHECK);
fStopInMain.setText("Stop at main() on startup"); fStopInMain.setText("Stop at main() on startup");
fStopInMain.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
updateLaunchConfigurationDialog();
}
});
gd = new GridData(); gd = new GridData();
gd.horizontalSpan = 2; gd.horizontalSpan = 2;
fStopInMain.setLayoutData(gd); fStopInMain.setLayoutData(gd);
@ -105,8 +109,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
try { try {
IBinary bin = (IBinary) ce; IBinary bin = (IBinary) ce;
programCPU = bin.getCPU(); programCPU = bin.getCPU();
} } catch (Exception e) {
catch (Exception e) {
} }
fDCombo.removeAll(); fDCombo.removeAll();
debugConfigs = CDebugCorePlugin.getDefault().getDebugConfigurations(); debugConfigs = CDebugCorePlugin.getDefault().getDebugConfigurations();
@ -117,14 +120,14 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
|| debugConfigs[i].supportsMode(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH)) { || debugConfigs[i].supportsMode(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH)) {
String debuggerPlatform = debugConfigs[i].getPlatform(); String debuggerPlatform = debugConfigs[i].getPlatform();
boolean isNative = configPlatform.equals(BootLoader.getOS()); boolean isNative = configPlatform.equals(BootLoader.getOS());
if (debuggerPlatform.equalsIgnoreCase(configPlatform) || if (debuggerPlatform.equalsIgnoreCase(configPlatform)
(isNative && debuggerPlatform.equalsIgnoreCase("native"))) { || (isNative && debuggerPlatform.equalsIgnoreCase("native"))) {
if (debugConfigs[i].supportsCPU(programCPU)) { if (debugConfigs[i].supportsCPU(programCPU)) {
fDCombo.add(debugConfigs[i].getName()); fDCombo.add(debugConfigs[i].getName());
fDCombo.setData(Integer.toString(x), debugConfigs[i]); fDCombo.setData(Integer.toString(x), debugConfigs[i]);
// select first exact matching debugger for platform or requested selection // select first exact matching debugger for platform or requested selection
if ((selndx == -1 && debuggerPlatform.equalsIgnoreCase(configPlatform)) || if ((selndx == -1 && debuggerPlatform.equalsIgnoreCase(configPlatform))
selection.equals(debugConfigs[i].getID())) { || selection.equals(debugConfigs[i].getID())) {
selndx = x; selndx = x;
} }
x++; x++;
@ -134,7 +137,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
} }
// if no selection meaning nothing in config the force initdefault on tab // if no selection meaning nothing in config the force initdefault on tab
setInitializeDefault(selection.equals("") ? true : false); setInitializeDefault(selection.equals("") ? true : false);
fDCombo.select(selndx == -1 ? 0 : selndx); fDCombo.select(selndx == -1 ? 0 : selndx);
//The behaviour is undefined for if the callbacks should be triggered for this, //The behaviour is undefined for if the callbacks should be triggered for this,
//so to avoid unnecessary confusion, we force an update. //so to avoid unnecessary confusion, we force an update.
@ -157,18 +160,15 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN); ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN);
if (mode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN) && fRunButton.isEnabled()) { if (mode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN) && fRunButton.isEnabled()) {
fRunButton.setSelection(true); fRunButton.setSelection(true);
} } else if (mode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH) && fAttachButton.isEnabled()) {
else if (mode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH) && fAttachButton.isEnabled()) {
fAttachButton.setSelection(true); fAttachButton.setSelection(true);
} }
if (fRunButton.getSelection() == true) { if (fRunButton.getSelection() == true) {
fStopInMain.setEnabled(true); fStopInMain.setEnabled(true);
} } else {
else {
fStopInMain.setEnabled(false); fStopInMain.setEnabled(false);
} }
} } catch (CoreException ex) {
catch (CoreException ex) {
} }
} }
updateLaunchConfigurationDialog(); updateLaunchConfigurationDialog();
@ -186,12 +186,24 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
super.initializeFrom(config); super.initializeFrom(config);
try { try {
String id = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ID, ""); String id = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ID, "");
loadDebuggerComboBox(config, id); if (getDebugConfig() == null || !getDebugConfig().getID().equals(id)) {
loadDebuggerComboBox(config, id);
}
String mode =
config.getAttribute(
ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE,
ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN);
if (mode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN)) {
fRunButton.setSelection(true);
fAttachButton.setSelection(false);
} else if (mode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH)) {
fAttachButton.setSelection(true);
fRunButton.setSelection(false);
}
if (config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, DEFAULT_STOP_AT_MAIN) == true) { if (config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, DEFAULT_STOP_AT_MAIN) == true) {
fStopInMain.setSelection(true); fStopInMain.setSelection(true);
} }
} } catch (CoreException e) {
catch (CoreException e) {
return; return;
} }
} }
@ -204,8 +216,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
config.setAttribute( config.setAttribute(
ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE,
ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH); ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH);
} } else {
else {
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, fStopInMain.getSelection()); config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, fStopInMain.getSelection());
config.setAttribute( config.setAttribute(
ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE,
@ -238,8 +249,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
try { try {
IBinary bin = (IBinary) ce; IBinary bin = (IBinary) ce;
projectCPU = bin.getCPU(); projectCPU = bin.getCPU();
} } catch (Exception e) {
catch (Exception e) {
} }
} }
ICDebugConfiguration debugConfig = getDebugConfig(); ICDebugConfiguration debugConfig = getDebugConfig();

4
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CorefileDebuggerTab.java
View file

@ -114,7 +114,9 @@ public class CorefileDebuggerTab extends AbstractCDebuggerTab {
super.initializeFrom(config); super.initializeFrom(config);
try { try {
String id = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ID, ""); String id = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ID, "");
loadDebuggerComboBox(config, id); if (getDebugConfig() == null || !getDebugConfig().getID().equals(id)) {
loadDebuggerComboBox(config, id);
}
} }
catch (CoreException e) { catch (CoreException e) {
return; return;