Bug 284963: Add a third parameter to the streams service “created” event

2 files changed, 7 insertions, 6 deletions

diff --git a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFLaunch.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFLaunch.java
index cbc9141fe..8e4d2eb29 100644
--- a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFLaunch.java
+++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFLaunch.java
@@ -85,16 +85,17 @@ public class TCFLaunch extends Launch {
     private final HashMap<String,LinkedList<Runnable>> context_action_queue =
         new HashMap<String,LinkedList<Runnable>>();
     
-    private HashSet<String> stream_ids = new HashSet<String>();
+    private HashMap<String,String> stream_ids = new HashMap<String,String>();
     
     private final IStreams.StreamsListener streams_listener = new IStreams.StreamsListener() {
 
-        public void created(String stream_type, String stream_id) {
+        public void created(String stream_type, String stream_id, String context_id) {
+            assert IProcesses.NAME.equals(stream_type);
             if (process_start_command == null) {
                 disconnectStream(stream_id);
             }
             else {
-                stream_ids.add(stream_id);
+                stream_ids.put(stream_id, context_id);
             }
         }
 
@@ -400,7 +401,7 @@ public class TCFLaunch extends Launch {
         final String inp_id = (String)process.getProperties().get(IProcesses.PROP_STDIN_ID);
         final String out_id = (String)process.getProperties().get(IProcesses.PROP_STDOUT_ID);
         final String err_id = (String)process.getProperties().get(IProcesses.PROP_STDERR_ID);
-        for (final String id : stream_ids.toArray(new String[stream_ids.size()])) {
+        for (final String id : stream_ids.keySet().toArray(new String[stream_ids.size()])) {
             if (id.equals(inp_id)) {
                 process_input_stream_id = id;
             }
@@ -528,7 +529,7 @@ public class TCFLaunch extends Launch {
         if (channel.getState() == IChannel.STATE_CLOSED) return;
         IStreams streams = getService(IStreams.class);
         final Set<IToken> cmds = new HashSet<IToken>();
-        for (String id : stream_ids) {
+        for (String id : stream_ids.keySet()) {
             cmds.add(streams.disconnect(id, new IStreams.DoneDisconnect() {
                 public void doneDisconnect(IToken token, Exception error) {
                     cmds.remove(token);
diff --git a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TestStreams.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TestStreams.java
index 7cddd7073..19dc9a0cf 100644
--- a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TestStreams.java
+++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TestStreams.java
@@ -217,7 +217,7 @@ class TestStreams implements ITCFTest, IStreams.StreamsListener {
     
     /************************** StreamsListener **************************/
 
-    public void created(String stream_type, String stream_id) {
+    public void created(String stream_type, String stream_id, String context_id) {
         if (!IDiagnostics.NAME.equals(stream_type)) exit(new Exception("Invalid stream type in Streams.created event"));
         if (stream_ids.contains(stream_id)) exit(new Exception("Invalid stream ID in Streams.created event"));
         stream_ids.add(stream_id);