Bug 501245 - Trigger points -- API deficiencies
Change-Id: I14cb54483ba06e86d86b97a986c7996da5a0a7dd
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java
index c1d21b7..bb02b14 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java
@@ -1048,7 +1048,7 @@
}
if (breakpoint.isTriggerPoint()) {
flags |= JDIImageDescriptor.TRIGGER_POINT;
- } else if (!DebugPlugin.getDefault().getBreakpointManager().canSupendOnBreakpoint()) {
+ } else if (DebugPlugin.getDefault().getBreakpointManager().hasActiveTriggerPoints()) {
flags |= JDIImageDescriptor.TRIGGER_SUPPRESSED;
}
if (breakpoint instanceof IJavaLineBreakpoint) {
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaBreakpoint.java
index 1fec036..4988e17 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaBreakpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaBreakpoint.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 IBM Corporation 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
@@ -12,6 +12,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.model.IBreakpoint;
+import org.eclipse.debug.core.model.ITriggerPoint;
/**
* A breakpoint specific to the Java debug model. A Java breakpoint supports:
@@ -29,7 +30,7 @@
* @noimplement This interface is not intended to be implemented by clients.
* @noextend This interface is not intended to be extended by clients.
*/
-public interface IJavaBreakpoint extends IBreakpoint {
+public interface IJavaBreakpoint extends IBreakpoint, ITriggerPoint {
/**
* Suspend policy constant indicating a breakpoint will suspend the target
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaBreakpoint.java
index 585417e..c8cff8f 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaBreakpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaBreakpoint.java
@@ -480,7 +480,7 @@
protected void disableTriggerPoint(Event event) {
try{
if (isTriggerPoint() && isEnabled()) {
- DebugPlugin.getDefault().getBreakpointManager().enableTriggerpoints(null, false);
+ DebugPlugin.getDefault().getBreakpointManager().enableTriggerPoints(null, false);
// make a note that we auto-disabled the trigger point for this breakpoint.
// we re enable it at cleanup of JDITarget
}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugTarget.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugTarget.java
index 9d930d4..24288c8 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugTarget.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugTarget.java
@@ -1863,7 +1863,7 @@
plugin.getBreakpointManager().removeBreakpointManagerListener(this);
plugin.removeDebugEventListener(this);
removeAllBreakpoints();
- DebugPlugin.getDefault().getBreakpointManager().enableTriggerpoints(null, true);
+ DebugPlugin.getDefault().getBreakpointManager().enableTriggerPoints(null, true);
fOutOfSynchTypes.clear();
if (fEngines != null) {
Iterator<IAstEvaluationEngine> engines = fEngines.values().iterator();
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThread.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThread.java
index fc9ad74..a9231e9 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThread.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThread.java
@@ -1430,7 +1430,7 @@
try {
if (!(breakpoint.isTriggerPoint())) {
- if (!DebugPlugin.getDefault().getBreakpointManager().canSupendOnBreakpoint()){
+ if (DebugPlugin.getDefault().getBreakpointManager().hasActiveTriggerPoints()){
fSuspendVoteInProgress = false;
return false;
}
