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

2 files changed, 14 insertions, 4 deletions

diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/AbstractToggleBreakpointAdapter.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/AbstractToggleBreakpointAdapter.java
index 2cf55254f6d..24353369a6e 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/AbstractToggleBreakpointAdapter.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/AbstractToggleBreakpointAdapter.java
@@ -823,7 +823,12 @@ abstract public class AbstractToggleBreakpointAdapter
             .getContextService(part.getSite().getWorkbenchWindow()).getActiveContext(part.getSite().getId());
         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);
         if (dialog != null) {
             dialog.open();
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CBreakpointPropertyDialogAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CBreakpointPropertyDialogAction.java
index 461c050d625..5d3d85c722f 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CBreakpointPropertyDialogAction.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CBreakpointPropertyDialogAction.java
@@ -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
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -59,7 +59,7 @@ public class CBreakpointPropertyDialogAction extends SelectionProviderAction {
     
     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) {
         super(selectionProvider, WorkbenchMessages.PropertyDialog_text); 
@@ -190,7 +190,12 @@ public class CBreakpointPropertyDialogAction extends SelectionProviderAction {
         if (ss.isEmpty())
             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);
     }