From 959296fdd1827680bb212b5be2be31dde05c16ae Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Fri, 18 Dec 2009 15:59:54 +0000 Subject: [PATCH] [293634] Fix to make line breakpoints the default choice again. --- .../ui/actions/ToggleBreakpointAdapter.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleBreakpointAdapter.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleBreakpointAdapter.java index b8f2fbf7aaa..2f889f5d3b7 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleBreakpointAdapter.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleBreakpointAdapter.java @@ -544,21 +544,25 @@ public class ToggleBreakpointAdapter implements IToggleBreakpointsTargetExtensio * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTargetExtension#canToggleBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) */ public boolean canToggleBreakpoints(IWorkbenchPart part, ISelection selection) { - return canToggleLineBreakpoints(part, selection); + return canToggleLineBreakpoints(part, selection) || + canToggleWatchpoints(part, selection) || + canToggleMethodBreakpoints(part, selection); } /* * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTargetExtension#toggleBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) */ public void toggleBreakpoints(IWorkbenchPart part, ISelection selection) throws CoreException { - ICElement element = getCElementFromSelection(part, selection); - if (element instanceof IFunction || element instanceof IMethod) { - toggleMethodBreakpoints0((IDeclaration)element); - } else if (element instanceof IVariable) { - toggleVariableWatchpoint(part, (IVariable) element); - } else { - toggleLineBreakpoints(part, selection); - } + if (canToggleLineBreakpoints(part, selection)) { + toggleLineBreakpoints(part, selection); + } else { + ICElement element = getCElementFromSelection(part, selection); + if (element instanceof IFunction || element instanceof IMethod) { + toggleMethodBreakpoints0((IDeclaration)element); + } else if (element instanceof IVariable) { + toggleVariableWatchpoint(part, (IVariable) element); + } + } } }