Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Tarassov2012-02-28 13:43:48 -0500
committerEugene Tarassov2012-02-28 13:43:48 -0500
commit18f4efcd52c7944f1244e935437aebd3a25393bd (patch)
tree010b7e78e156ba9e9d37479bcac27311f98c9fda
parent61179a16cca9a1f01abbb13a77cb81d738d72de3 (diff)
downloadorg.eclipse.tcf-18f4efcd52c7944f1244e935437aebd3a25393bd.tar.gz
org.eclipse.tcf-18f4efcd52c7944f1244e935437aebd3a25393bd.tar.xz
org.eclipse.tcf-18f4efcd52c7944f1244e935437aebd3a25393bd.zip
TCF Core: added new breakpoint properties: "EventType" and "EventArgs".
-rw-r--r--plugins/org.eclipse.tcf.core/src/org/eclipse/tcf/services/IBreakpoints.java2
-rw-r--r--plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFModelPresentation.java2
-rw-r--r--plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/model/TCFBreakpointsModel.java14
3 files changed, 17 insertions, 1 deletions
diff --git a/plugins/org.eclipse.tcf.core/src/org/eclipse/tcf/services/IBreakpoints.java b/plugins/org.eclipse.tcf.core/src/org/eclipse/tcf/services/IBreakpoints.java
index e5585406e..9a3aff380 100644
--- a/plugins/org.eclipse.tcf.core/src/org/eclipse/tcf/services/IBreakpoints.java
+++ b/plugins/org.eclipse.tcf.core/src/org/eclipse/tcf/services/IBreakpoints.java
@@ -62,6 +62,8 @@ public interface IBreakpoints extends IService {
PROP_UNITS = "TimeUnits", // String
PROP_CONDITION = "Condition", // String
PROP_TEMPORARY = "Temporary", // Boolean
+ PROP_EVENT_TYPE = "EventType", // String
+ PROP_EVENT_ARGS = "EventArgs", // String or Object
PROP_CLIENT_DATA = "ClientData"; // Object
/**
diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFModelPresentation.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFModelPresentation.java
index 2e644e46a..357c58854 100644
--- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFModelPresentation.java
+++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFModelPresentation.java
@@ -61,6 +61,8 @@ public class TCFModelPresentation implements IDebugModelPresentation {
TCFBreakpointsModel.ATTR_FUNCTION, "location",
TCFBreakpointsModel.ATTR_EXPRESSION, "expression",
TCFBreakpointsModel.ATTR_CONDITION, "condition",
+ TCFBreakpointsModel.ATTR_EVENT_TYPE, "event type",
+ TCFBreakpointsModel.ATTR_EVENT_ARGS, "event args",
TCFBreakpointsModel.ATTR_CONTEXTNAMES, "scope (names)",
TCFBreakpointsModel.ATTR_CONTEXTIDS, "scope (IDs)",
TCFBreakpointsModel.ATTR_EXE_PATHS, "scope (modules)",
diff --git a/plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/model/TCFBreakpointsModel.java b/plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/model/TCFBreakpointsModel.java
index af0b00bde..dc6c87628 100644
--- a/plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/model/TCFBreakpointsModel.java
+++ b/plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/model/TCFBreakpointsModel.java
@@ -76,7 +76,9 @@ public class TCFBreakpointsModel {
ATTR_CONTEXTIDS = ITCFConstants.ID_TCF_DEBUG_MODEL + '.' + IBreakpoints.PROP_CONTEXTIDS,
ATTR_EXE_PATHS = ITCFConstants.ID_TCF_DEBUG_MODEL + '.' + IBreakpoints.PROP_EXECUTABLEPATHS,
ATTR_STOP_GROUP = ITCFConstants.ID_TCF_DEBUG_MODEL + '.' + IBreakpoints.PROP_STOP_GROUP,
- ATTR_CONTEXT_QUERY = ITCFConstants.ID_TCF_DEBUG_MODEL + '.' + IBreakpoints.PROP_CONTEXT_QUERY;
+ ATTR_CONTEXT_QUERY = ITCFConstants.ID_TCF_DEBUG_MODEL + '.' + IBreakpoints.PROP_CONTEXT_QUERY,
+ ATTR_EVENT_TYPE = "org.eclipse.cdt.debug.core.eventbreakpoint_event_id",
+ ATTR_EVENT_ARGS = "org.eclipse.cdt.debug.core.eventbreakpoint_event_arg";
private final IBreakpointManager bp_manager = DebugPlugin.getDefault().getBreakpointManager();
private final HashMap<IChannel,Map<String,Object>> channels = new HashMap<IChannel,Map<String,Object>>();
@@ -480,6 +482,8 @@ public class TCFBreakpointsModel {
if (key.equals(IBreakpoints.PROP_ACCESSMODE)) continue;
if (key.equals(IBreakpoints.PROP_SIZE)) continue;
if (key.equals(IBreakpoints.PROP_CONDITION)) continue;
+ if (key.equals(IBreakpoints.PROP_EVENT_TYPE)) continue;
+ if (key.equals(IBreakpoints.PROP_EVENT_ARGS)) continue;
if (val instanceof String[]) {
StringBuffer bf = new StringBuffer();
for (String s : (String[])val) {
@@ -544,6 +548,10 @@ public class TCFBreakpointsModel {
}
String condition = (String)p.get(IBreakpoints.PROP_CONDITION);
if (condition != null && condition.length() > 0) m.put(ATTR_CONDITION, condition);
+ String event_type = (String)p.get(IBreakpoints.PROP_EVENT_TYPE);
+ if (event_type != null && event_type.length() > 0) m.put(ATTR_EVENT_TYPE, event_type);
+ String event_args = (String)p.get(IBreakpoints.PROP_EVENT_ARGS);
+ if (event_args != null && event_args.length() > 0) m.put(ATTR_EVENT_ARGS, event_args);
Number ignore_count = (Number)p.get(IBreakpoints.PROP_IGNORECOUNT);
if (ignore_count != null) m.put(ATTR_IGNORE_COUNT, ignore_count);
return m;
@@ -651,6 +659,10 @@ public class TCFBreakpointsModel {
}
String condition = (String)p.get(ATTR_CONDITION);
if (condition != null && condition.length() > 0) m.put(IBreakpoints.PROP_CONDITION, condition);
+ String event_type = (String)p.get(ATTR_EVENT_TYPE);
+ if (event_type != null && event_type.length() > 0) m.put(IBreakpoints.PROP_EVENT_TYPE, event_type);
+ String event_args = (String)p.get(ATTR_EVENT_ARGS);
+ if (event_args != null && event_args.length() > 0) m.put(IBreakpoints.PROP_EVENT_ARGS, event_args);
Number ignore_count = (Number)p.get(ATTR_IGNORE_COUNT);
if (ignore_count != null && ignore_count.intValue() > 0) m.put(IBreakpoints.PROP_IGNORECOUNT, ignore_count);
return m;

Back to the top