Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreutarass2008-06-05 22:41:36 +0000
committereutarass2008-06-05 22:41:36 +0000
commit81d6d2bfffbc7b2ab33cf9d6dc3938dfdd99f597 (patch)
treec0cad43ffba1462902dfdd18a0f8352229e52e65 /plugins/org.eclipse.tm.tcf.dsf
parent72cddcac552c4ae7d945157e34bd5d737d6e801d (diff)
downloadorg.eclipse.tcf-81d6d2bfffbc7b2ab33cf9d6dc3938dfdd99f597.tar.gz
org.eclipse.tcf-81d6d2bfffbc7b2ab33cf9d6dc3938dfdd99f597.tar.xz
org.eclipse.tcf-81d6d2bfffbc7b2ab33cf9d6dc3938dfdd99f597.zip
1. Java and agent code updated to match latest Breakpoints service specifications.
2. Breakpoint status is implemented
Diffstat (limited to 'plugins/org.eclipse.tm.tcf.dsf')
-rw-r--r--plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFBreakpoints.java20
1 files changed, 13 insertions, 7 deletions
diff --git a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFBreakpoints.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFBreakpoints.java
index 0d3c7cd00..f310d160b 100644
--- a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFBreakpoints.java
+++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFBreakpoints.java
@@ -177,14 +177,17 @@ public class TCFDSFBreakpoints extends AbstractDsfService implements org.eclipse
@SuppressWarnings("unchecked")
public IAddress[] getAddresses() {
if (status == null) return null;
- Map<String,Collection<Number>> arr = (Map<String,Collection<Number>>)status.get(IBreakpoints.STATUS_PLANTED);
+ Collection<Map<String,Object>> arr = (Collection<Map<String,Object>>)status.get(IBreakpoints.STATUS_INSTANCES);
if (arr == null) return null;
int cnt = 0;
- for (Collection<Number> c : arr.values()) cnt += c.size();
+ for (Map<String,Object> m : arr) {
+ if (m.get(IBreakpoints.INSTANCE_ADDRESS) != null) cnt++;
+ }
IAddress[] res = new IAddress[cnt];
int pos = 0;
- for (Collection<Number> c : arr.values()) {
- for (Number addr : c) res[pos++] = new TCFAddress(addr);
+ for (Map<String,Object> m : arr) {
+ Number n = (Number)m.get(IBreakpoints.INSTANCE_ADDRESS);
+ if (n != null) res[pos++] = new TCFAddress(n);
}
return res;
}
@@ -213,7 +216,7 @@ public class TCFDSFBreakpoints extends AbstractDsfService implements org.eclipse
}
public int getIgnoreCount() {
- Integer count = (Integer)attrs.get(ITCFConstants.ID_TCF_DEBUG_MODEL + '.' + IBreakpoints.PROP_SKIP_COUNT);
+ Integer count = (Integer)attrs.get(ITCFConstants.ID_TCF_DEBUG_MODEL + '.' + IBreakpoints.PROP_IGNORECOUNT);
if (count != null) return count.intValue();
return 0;
}
@@ -242,9 +245,12 @@ public class TCFDSFBreakpoints extends AbstractDsfService implements org.eclipse
Set<IBreakpointsTargetDMContext> add_targets = new HashSet<IBreakpointsTargetDMContext>();
Set<IBreakpointsTargetDMContext> rem_targets = new HashSet<IBreakpointsTargetDMContext>();
if (map != null) {
- Map<String,Collection<Number>> arr = (Map<String,Collection<Number>>)map.get(IBreakpoints.STATUS_PLANTED);
+ Collection<Map<String,Object>> arr = (Collection<Map<String,Object>>)map.get(IBreakpoints.STATUS_INSTANCES);
if (arr != null) {
- for (String ctx_id : arr.keySet()) add_targets.add(rc.getContext(ctx_id));
+ for (Map<String,Object> m : arr) {
+ String ctx_id = (String)m.get(IBreakpoints.INSTANCE_CONTEXT);
+ if (ctx_id != null) add_targets.add(rc.getContext(ctx_id));
+ }
}
}
for (IBreakpointsTargetDMContext t : dmc.targets) {

Back to the top