diff options
| author | Norbert Plött | 2006-09-01 14:32:46 +0000 |
|---|---|---|
| committer | Norbert Plött | 2006-09-01 14:32:46 +0000 |
| commit | 3ddf1a258f5ac8bb727a483f6e46734537472016 (patch) | |
| tree | 4d42cbdd86d176597fb32b949b26b4d05dbcf175 /debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse | |
| parent | 4924166f873915db8958f53ddcc6d6331ca71edf (diff) | |
| download | org.eclipse.cdt-3ddf1a258f5ac8bb727a483f6e46734537472016.tar.gz org.eclipse.cdt-3ddf1a258f5ac8bb727a483f6e46734537472016.tar.xz org.eclipse.cdt-3ddf1a258f5ac8bb727a483f6e46734537472016.zip | |
bug #154854 - Guard against NPE when cancelling save dialog. Regrouping icons.
Diffstat (limited to 'debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse')
2 files changed, 7 insertions, 4 deletions
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/MiConsolePageParticipant.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/MiConsolePageParticipant.java index a18d989b2da..94564d86888 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/MiConsolePageParticipant.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/MiConsolePageParticipant.java @@ -64,12 +64,12 @@ public class MiConsolePageParticipant implements IConsolePageParticipant, IDebug // add two new actions: save console content and verbose console mode switcher IActionBars bars = page.getSite().getActionBars(); - bars.getToolBarManager().appendToGroup(IConsoleConstants.LAUNCH_GROUP, new Separator()); + bars.getToolBarManager().appendToGroup(IConsoleConstants.OUTPUT_GROUP, new Separator()); fSaveConsole = new MiConsoleSaveAction(fConsole); - bars.getToolBarManager().appendToGroup(IConsoleConstants.LAUNCH_GROUP, fSaveConsole); + bars.getToolBarManager().appendToGroup(IConsoleConstants.OUTPUT_GROUP, fSaveConsole); fVerboseMode = new MiConsoleVerboseModeAction(fConsole); - bars.getToolBarManager().appendToGroup(IConsoleConstants.LAUNCH_GROUP, fVerboseMode); - bars.getToolBarManager().appendToGroup(IConsoleConstants.LAUNCH_GROUP, new Separator()); + bars.getToolBarManager().appendToGroup(IConsoleConstants.OUTPUT_GROUP, fVerboseMode); + bars.getToolBarManager().appendToGroup(IConsoleConstants.OUTPUT_GROUP, new Separator()); // add a debug event listener DebugPlugin.getDefault().addDebugEventListener(this); diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/actions/MiConsoleSaveAction.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/actions/MiConsoleSaveAction.java index 5f7d5e1ec47..38111c7e051 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/actions/MiConsoleSaveAction.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/actions/MiConsoleSaveAction.java @@ -45,6 +45,9 @@ public class MiConsoleSaveAction extends Action{ FileDialog fileDialog = new FileDialog(Display.getCurrent().getActiveShell(), SWT.SAVE); fileName = fileDialog.open(); + if(fileName==null) { + return; + } Runnable saveJob = new Runnable() { public void run() { |