From a3113066c8cdb0baf915451b219d1cfb9785ff76 Mon Sep 17 00:00:00 2001
From: Roger Ferrel <Roger.L.Ferrel@raytheon.com>
Date: Tue, 3 Apr 2012 17:28:09 -0500
Subject: [PATCH] Issue #244 Fix bug in handleInvitationEvent

Change-Id: Ic47628203707a8238b1d3c0982d177641bba53a9

Former-commit-id: c2b5a62e3885fcad06879b3c60b41516203f9190 [formerly 7aa926028e2401f18385caf0d52ae9a08e13ac4f] [formerly a39475e04d9435e7efb738476feba0e17dff127d] [formerly c2b5a62e3885fcad06879b3c60b41516203f9190 [formerly 7aa926028e2401f18385caf0d52ae9a08e13ac4f] [formerly a39475e04d9435e7efb738476feba0e17dff127d] [formerly 46ddf008b82000dab1f4cbd5c155fb3a05cd4cd1 [formerly a39475e04d9435e7efb738476feba0e17dff127d [formerly 12e29dfb9e3a77e44b7b946f138c84e082e0990a]]]]
Former-commit-id: 46ddf008b82000dab1f4cbd5c155fb3a05cd4cd1
Former-commit-id: c3b0f8dc27625d6091980c83d773fbbdbe5e0002 [formerly d1ce0844e3f090a694ba0b5cb346afcd9c54c8df] [formerly 17eff5c7bcf326f80da2ab7de13763602e79ffb9 [formerly 5145bb9e7ea095972d1ab2912bb5c78a713c4efc]]
Former-commit-id: 6bd56e8fcad54690a5ba52cabdd9e8c39e21329c [formerly 3afe426ae1e5152378149bd408c70cdd05950764]
Former-commit-id: d5bf79f20d5ae8af4dcef37779f79f87834ed894
---
 .../viz/collaboration/data/CollaborationDataManager.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/data/CollaborationDataManager.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/data/CollaborationDataManager.java
index 8f5bfbc48d..22f69075b4 100644
--- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/data/CollaborationDataManager.java
+++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/data/CollaborationDataManager.java
@@ -464,13 +464,18 @@ public class CollaborationDataManager {
                             .joinCollaborationVenue(invitation);
                     String sessionId = session.getSessionId();
                     sessionsMap.put(sessionId, session);
+                    ISharedDisplaySession displaySession = session
+                            .spawnSharedDisplaySession();
+                    ParticipantEventController pec = new ParticipantEventController(
+                            displaySession);
+                    pec.startup();
+                    roleEventControllersMap.put(sessionId, pec);
                     PlatformUI
                             .getWorkbench()
                             .getActiveWorkbenchWindow()
                             .getActivePage()
                             .showView(CollaborationSessionView.ID, sessionId,
                                     IWorkbenchPage.VIEW_ACTIVATE);
-
                 } catch (CollaborationException e) {
                     // TODO Auto-generated catch block. Please revise as
                     // appropriate.
@@ -529,6 +534,7 @@ public class CollaborationDataManager {
         });
     }
 
+    @Deprecated
     public String joinCollaborationSession(String venueName, String sessionId) {
         String result = sessionId;
         if (sessionsMap.get(sessionId) == null) {