Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreutarass2008-05-30 00:12:40 +0000
committereutarass2008-05-30 00:12:40 +0000
commitc8ed77ecfd7c897791825f30846b5f5c09d534af (patch)
treed9074880bea215956c9781d7be03de1564cb584f /plugins/org.eclipse.tm.tcf.debug.ui
parent59e3f1e10ebe09a211b438c1a5974af39d9f05f2 (diff)
downloadorg.eclipse.tcf-c8ed77ecfd7c897791825f30846b5f5c09d534af.tar.gz
org.eclipse.tcf-c8ed77ecfd7c897791825f30846b5f5c09d534af.tar.xz
org.eclipse.tcf-c8ed77ecfd7c897791825f30846b5f5c09d534af.zip
Fixed few minor bugs that were found during extensive testing of VxWorks version of TCF agent.
Diffstat (limited to 'plugins/org.eclipse.tm.tcf.debug.ui')
-rw-r--r--plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFSelfTest.java14
-rw-r--r--plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFChildrenExecContext.java12
2 files changed, 0 insertions, 26 deletions
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFSelfTest.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFSelfTest.java
index 79efc47e1..2da503318 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFSelfTest.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFSelfTest.java
@@ -362,13 +362,6 @@ class TCFSelfTest {
assert context != null;
IRunControl.RunControlContext ctx = map.get(context);
if (ctx == null) exit(new Error("Invalid 'contextSuspended' event for " + context));
- if (process_ids.contains(context) || process_ids.contains(ctx.getParentID())) {
- ctx.resume(IRunControl.RM_RESUME, 1, new IRunControl.DoneCommand() {
- public void doneCommand(IToken token, Exception error) {
- if (error != null) exit(error);
- }
- });
- }
}
}
@@ -405,13 +398,6 @@ class TCFSelfTest {
assert context != null;
IRunControl.RunControlContext ctx = map.get(context);
if (ctx == null) exit(new Error("Invalid 'contextSuspended' event for " + context));
- if (process_ids.contains(context) || process_ids.contains(ctx.getParentID())) {
- ctx.resume(IRunControl.RM_RESUME, 1, new IRunControl.DoneCommand() {
- public void doneCommand(IToken token, Exception error) {
- if (error != null) exit(error);
- }
- });
- }
}
}
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFChildrenExecContext.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFChildrenExecContext.java
index 2a1b609d9..e48da9201 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFChildrenExecContext.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFChildrenExecContext.java
@@ -11,7 +11,6 @@
package org.eclipse.tm.internal.tcf.debug.ui.model;
import java.util.HashMap;
-import java.util.LinkedHashMap;
import java.util.Map;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
@@ -26,20 +25,12 @@ import org.eclipse.tm.tcf.util.TCFDataCache;
* that are children of a given parent context. The job is slightly complicated by necessity
* to merge results from two independent services.
*/
-@SuppressWarnings("serial")
public class TCFChildrenExecContext extends TCFChildren {
private final TCFNode node;
private final TCFChildren mem_children;
private final TCFChildren run_children;
- // Track disposed IDs to detect violations of the communication protocol
- private LinkedHashMap<String,String> disposed_ids = new LinkedHashMap<String,String>() {
- protected boolean removeEldestEntry(Map.Entry<String,String> eldest) {
- return size() > 128;
- }
- };
-
TCFChildrenExecContext(final TCFNode node) {
super(node.model.getLaunch().getChannel());
this.node = node;
@@ -58,7 +49,6 @@ public class TCFChildrenExecContext extends TCFChildren {
if (command == token && error == null) {
data = new HashMap<String,TCFNode>();
for (String id : contexts) {
- assert disposed_ids.get(id) == null;
TCFNode n = node.model.getNode(id);
if (n == null) n = new TCFNodeExecContext(node, id);
data.put(id, n);
@@ -85,7 +75,6 @@ public class TCFChildrenExecContext extends TCFChildren {
if (command == token && error == null) {
data = new HashMap<String,TCFNode>();
for (String id : contexts) {
- assert disposed_ids.get(id) == null;
TCFNode n = node.model.getNode(id);
if (n == null) n = new TCFNodeExecContext(node, id);
data.put(id, n);
@@ -111,7 +100,6 @@ public class TCFChildrenExecContext extends TCFChildren {
super.dispose(id);
mem_children.dispose(id);
run_children.dispose(id);
- disposed_ids.put(id, id);
}
@Override

Back to the top