Bug 560252 - "Remove all triggers" enabled even if you remove allY20210101-1200Y20201229-1200Y20201229-0040Y20201225-1200Y20201222-1200I20210102-0600I20210101-1800I20210101-0720I20201231-1800I20201230-2150I20201230-1800I20201229-1800I20201228-1800I20201227-1800I20201226-1800I20201226-0940I20201225-1800I20201225-0450I20201225-0130I20201224-1800I20201223-1800I20201222-1800

breakpoints

Change-Id: Id43bf1d7a276d755598b341b2d877bfdfcb81137
Signed-off-by: Vikas Chandra <Vikas.Chandra@in.ibm.com>

1 files changed, 7 insertions, 1 deletions

diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java
index 6d8539d66..ae1f02c32 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2000, 2018 IBM Corporation and others.
+ *  Copyright (c) 2000, 2020 IBM Corporation and others.
  *
  *  This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License 2.0
@@ -503,6 +503,8 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis
 			for (IBreakpoint breakpoint : remove) {
 				bps.remove(breakpoint);
 				fMarkersToBreakpoints.remove(breakpoint.getMarker());
+				// If the breakpoint is a trigger point, remove else do nothing.
+				removeTriggerPoint(breakpoint);
 			}
 			fireUpdate(remove, null, REMOVED);
 			refreshTriggerpointDisplay();
@@ -602,6 +604,10 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis
 					added.add(breakpoint);
 					getBreakpoints0().add(breakpoint);
 					fMarkersToBreakpoints.put(breakpoint.getMarker(), breakpoint);
+					if (breakpoint instanceof ITriggerPoint && ((ITriggerPoint) breakpoint).isTriggerPoint()) {
+						addTriggerPoint(breakpoint);
+					}
+
 				} else {
 					// need to update the 'registered' and/or 'group' attributes
 					update.add(breakpoint);