Issue #427 small improvements

Change-Id: I9a28888dceb268ab62f60bc9686b0130da01ca0e

Former-commit-id: 89d7f5ec7e [formerly 89d7f5ec7e [formerly 3a268a54417ee7ed6fcef6549b9c47b86fadfc82]]
Former-commit-id: 80500eec9c
Former-commit-id: 9602216cda

cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/data/CollaborationDataManager.java

@@ -41,6 +41,8 @@ import com.raytheon.uf.viz.collaboration.ui.editor.CollaborationEditor;
 import com.raytheon.uf.viz.collaboration.ui.login.LoginData;
 import com.raytheon.uf.viz.collaboration.ui.login.LoginDialog;
 import com.raytheon.uf.viz.collaboration.ui.role.AbstractRoleEventController;
+import com.raytheon.uf.viz.collaboration.ui.role.DataProviderEventController;
+import com.raytheon.uf.viz.collaboration.ui.role.ParticipantEventController;
 import com.raytheon.uf.viz.core.VizApp;
 
 /**
@@ -88,9 +90,9 @@ public class CollaborationDataManager {
      */
     Map<String, IVenueSession> sessionsMap;
 
-    Map<String, AbstractRoleEventController> displaySessionsMap;
+    Map<String, AbstractRoleEventController> displaySessionsMap = new HashMap<String, AbstractRoleEventController>();
 
-    Map<String, CollaborationEditor> editorsMap;
+    Map<String, CollaborationEditor> editorsMap = new HashMap<String, CollaborationEditor>();
 
     public static CollaborationDataManager getInstance() {
         if (instance == null) {
@@ -303,6 +305,10 @@ public class CollaborationDataManager {
                 ISharedDisplaySession displaySession = session
                         .spawnSharedDisplaySession();
                 sessionsMap.put(sessionId, session);
+                DataProviderEventController dpec = new DataProviderEventController(
+                        displaySession);
+                dpec.startup();
+                displaySessionsMap.put(sessionId, dpec);
                 // TODO set displaySession's data provider and session leader.
             }
         } catch (CollaborationException e) {
@@ -328,6 +334,10 @@ public class CollaborationDataManager {
                 ISharedDisplaySession displaySession = session
                         .spawnSharedDisplaySession();
                 sessionsMap.put(sessionId, session);
+                ParticipantEventController pec = new ParticipantEventController(
+                        displaySession);
+                pec.startup();
+                displaySessionsMap.put(sessionId, pec);
                 // displaySessionsMap.put(sessionId, displaySession);
             } catch (CollaborationException e) {
                 // TODO Auto-generated catch block. Please revise as

cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/role/DataProviderEventController.java

@@ -24,9 +24,9 @@ import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.viz.collaboration.comm.identity.CollaborationException;
+import com.raytheon.uf.viz.collaboration.comm.identity.ISharedDisplaySession;
 import com.raytheon.uf.viz.collaboration.comm.identity.event.ParticipantEventType;
 import com.raytheon.uf.viz.collaboration.comm.provider.event.VenueParticipantEvent;
-import com.raytheon.uf.viz.collaboration.comm.provider.session.VenueSession;
 import com.raytheon.uf.viz.collaboration.ui.editor.EditorSetup;
 import com.raytheon.uf.viz.collaboration.ui.editor.SharedEditor;
 import com.raytheon.viz.ui.VizWorkbenchManager;
@@ -55,9 +55,7 @@ public class DataProviderEventController extends AbstractRoleEventController {
     private static final transient IUFStatusHandler statusHandler = UFStatus
             .getHandler(DataProviderEventController.class);
 
-    private VenueSession session;
+    public DataProviderEventController(ISharedDisplaySession session) {
-
-    public DataProviderEventController(VenueSession session) {
         super(session);
     }
 

cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/role/ParticipantEventController.java

@@ -22,8 +22,9 @@ package com.raytheon.uf.viz.collaboration.ui.role;
 import com.google.common.eventbus.Subscribe;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
+import com.raytheon.uf.viz.collaboration.comm.identity.ISharedDisplaySession;
 import com.raytheon.uf.viz.collaboration.comm.identity.event.IInitData;
-import com.raytheon.uf.viz.collaboration.comm.provider.session.VenueSession;
+import com.raytheon.uf.viz.collaboration.data.CollaborationDataManager;
 import com.raytheon.uf.viz.collaboration.ui.editor.CollaborationEditor;
 import com.raytheon.uf.viz.collaboration.ui.editor.EditorSetup;
 import com.raytheon.uf.viz.collaboration.ui.editor.SharedEditor;
@@ -50,7 +51,7 @@ public class ParticipantEventController extends AbstractRoleEventController {
     private static final transient IUFStatusHandler statusHandler = UFStatus
             .getHandler(ParticipantEventController.class);
 
-    public ParticipantEventController(VenueSession session) {
+    public ParticipantEventController(ISharedDisplaySession session) {
         super(session);
     }
 
@@ -59,8 +60,8 @@ public class ParticipantEventController extends AbstractRoleEventController {
         if (initData instanceof SharedEditor) {
             SharedEditor se = (SharedEditor) initData;
             CollaborationEditor editor = EditorSetup.createEditor(se);
-            // TODO need to send the editor somewhere so it can be tied to the
+            CollaborationDataManager.getInstance().editorCreated(
-            // session for the link to editor capability
+                    session.getSessionId(), editor);
         }
     }