mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 06:32:10 +02:00
Code Issues Wiki Activity

Bug 433308 - Always show the Common page initially for new breakpoints

Browse source
This commit is contained in:
Anton Leherbauer 2014-04-24 14:17:48 +02:00
parent 79e8512ebf
commit 0152c28c22
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/AbstractToggleBreakpointAdapter.java
View file

@ -834,7 +834,12 @@ abstract public class AbstractToggleBreakpointAdapter
.getContextService(part.getSite().getWorkbenchWindow()).getActiveContext(part.getSite().getId()); .getContextService(part.getSite().getWorkbenchWindow()).getActiveContext(part.getSite().getId());
CBreakpointContext bpContext = new CBreakpointContext(bp, debugContext, resource, attributes); CBreakpointContext bpContext = new CBreakpointContext(bp, debugContext, resource, attributes);
PreferenceDialog dialog = PreferencesUtil.createPropertyDialogOn(part.getSite().getShell(), bpContext, null, String initialPageId = null;
if (bp.getMarker() == null) {
// Bug 433308 - Always show Common page initially for new breakpoints
initialPageId = CBreakpointPropertyDialogAction.PAGE_ID_COMMON;
}
PreferenceDialog dialog = PreferencesUtil.createPropertyDialogOn(part.getSite().getShell(), bpContext, initialPageId ,
null, null); null, null);
if (dialog != null) { if (dialog != null) {
dialog.open(); dialog.open();

11
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CBreakpointPropertyDialogAction.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2012 Wind River Systems and others. * Copyright (c) 2012, 2014 Wind River Systems and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -59,7 +59,7 @@ public class CBreakpointPropertyDialogAction extends SelectionProviderAction {
private IDebugContextProvider fDebugContextProvider; private IDebugContextProvider fDebugContextProvider;
private static final String PAGE_ID_COMMON = "org.eclipse.cdt.debug.ui.propertypages.breakpoint.common"; //$NON-NLS-1$ static final String PAGE_ID_COMMON = "org.eclipse.cdt.debug.ui.propertypages.breakpoint.common"; //$NON-NLS-1$
public CBreakpointPropertyDialogAction(IShellProvider shell, ISelectionProvider selectionProvider, IDebugContextProvider debugContextProvider) { public CBreakpointPropertyDialogAction(IShellProvider shell, ISelectionProvider selectionProvider, IDebugContextProvider debugContextProvider) {
super(selectionProvider, WorkbenchMessages.PropertyDialog_text); super(selectionProvider, WorkbenchMessages.PropertyDialog_text);
@ -190,7 +190,12 @@ public class CBreakpointPropertyDialogAction extends SelectionProviderAction {
if (ss.isEmpty()) if (ss.isEmpty())
return null; return null;
return PreferencesUtil.createPropertyDialogOn(fShellProvider.getShell(), bpContext, null, null, null); String initialPageId = null;
if (bpContext.getBreakpoint().getMarker() == null) {
// Bug 433308 - Always show Common page initially for new breakpoints
initialPageId = PAGE_ID_COMMON;
}
return PreferencesUtil.createPropertyDialogOn(fShellProvider.getShell(), bpContext, initialPageId, null, null);
} }