Bug 501245 - Trigger points -- API deficienciesY20161103-1000I20161108-1015I20161108-0800

Change-Id: Ic30d5b6894408d5371b2095ef1b6cb109fbe318f

3 files changed, 9 insertions, 9 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.java
index 1855c13f6..8032a01d5 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.java
@@ -106,8 +106,8 @@ public class ActionMessages extends NLS {
 	public static String RemoveBreakpointAction_Exceptions_occurred_attempting_to_remove_a_breakpoint__5;
 	public static String RemoveBreakpointAction_Removing_a_breakpoint_4;
 
-	public static String RemoveAllTriggerpointsAction_0;
-	public static String RemoveAllTriggerpointsAction_1;
+	public static String RemoveAllTriggerPointsAction_0;
+	public static String RemoveAllTriggerPointsAction_1;
 	
 	public static String DeleteBreakpointOperationName;
 	public static String DeleteBreakpointsOperationName;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties
index 97c8c0e1e..7dbb8cbfc 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties
@@ -60,8 +60,8 @@ RemoveBreakpointAction_6=Cancel
 RemoveBreakpointAction_Exceptions_occurred_attempting_to_remove_a_breakpoint__5=An exception occurred attempting to remove breakpoint(s).
 RemoveBreakpointAction_Removing_a_breakpoint_4=Removing a breakpoint
 
-RemoveAllTriggerpointsAction_0=Remove All Triggerpoints
-RemoveAllTriggerpointsAction_1=Are you sure you want to remove all triggerpoints?
+RemoveAllTriggerPointsAction_0=Remove All Triggerpoints
+RemoveAllTriggerPointsAction_1=Are you sure you want to remove all triggerpoints?
 
 DeleteBreakpointOperationName=Delete Breakpoint
 DeleteBreakpointsOperationName=Delete Breakpoints
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RemoveAllTriggerpointsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RemoveAllTriggerPointsAction.java
index 1be6d04c8..5b6ec2e67 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RemoveAllTriggerpointsAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RemoveAllTriggerPointsAction.java
@@ -33,7 +33,7 @@ import org.eclipse.ui.IWorkbenchWindow;
 /**
  * Removes all triggerpoints from the source (markers)
  */
-public class RemoveAllTriggerpointsAction extends AbstractRemoveAllActionDelegate implements IBreakpointsListener {
+public class RemoveAllTriggerPointsAction extends AbstractRemoveAllActionDelegate implements IBreakpointsListener {
 
 
 	/* (non-Javadoc)
@@ -41,7 +41,7 @@ public class RemoveAllTriggerpointsAction extends AbstractRemoveAllActionDelegat
 	 */
 	@Override
 	protected boolean isEnabled() {
-		return DebugPlugin.getDefault().getBreakpointManager().getTriggerBreakpoints().length > 0;
+		return DebugPlugin.getDefault().getBreakpointManager().getTriggerPoints().length > 0;
 	}	
 	
 	/* (non-Javadoc)
@@ -100,7 +100,7 @@ public class RemoveAllTriggerpointsAction extends AbstractRemoveAllActionDelegat
 		boolean prompt = store.getBoolean(IDebugPreferenceConstants.PREF_PROMPT_REMOVE_ALL_TRIGGER_BREAKPOINTS);
 		boolean proceed = true;
 		if (prompt) {
-			MessageDialogWithToggle mdwt = MessageDialogWithToggle.openYesNoQuestion(window.getShell(), ActionMessages.RemoveAllTriggerpointsAction_0, ActionMessages.RemoveAllTriggerpointsAction_1, ActionMessages.RemoveAllBreakpointsAction_3, !prompt, null, null);
+			MessageDialogWithToggle mdwt = MessageDialogWithToggle.openYesNoQuestion(window.getShell(), ActionMessages.RemoveAllTriggerPointsAction_0, ActionMessages.RemoveAllTriggerPointsAction_1, ActionMessages.RemoveAllBreakpointsAction_3, !prompt, null, null);
 			if (mdwt.getReturnCode() != IDialogConstants.YES_ID) {
 				proceed = false;
 			} else {
@@ -108,11 +108,11 @@ public class RemoveAllTriggerpointsAction extends AbstractRemoveAllActionDelegat
 			}
 		}
 		if (proceed) {
-			new Job(ActionMessages.RemoveAllTriggerpointsAction_1) {
+			new Job(ActionMessages.RemoveAllTriggerPointsAction_1) {
 				@Override
 				protected IStatus run(IProgressMonitor monitor) {
 					try {
-						DebugPlugin.getDefault().getBreakpointManager().removeAllTriggerpoints();
+						DebugPlugin.getDefault().getBreakpointManager().removeAllTriggerPoints();
 					} catch (CoreException e) {
 						DebugUIPlugin.log(e);
 						return Status.CANCEL_STATUS;