From 89d7f5ec7e343d67d8668fba10ace2b77e428bd0 Mon Sep 17 00:00:00 2001 From: Nate Jensen Date: Tue, 27 Mar 2012 09:42:39 -0500 Subject: [PATCH] Issue #427 small improvements Change-Id: I9a28888dceb268ab62f60bc9686b0130da01ca0e Former-commit-id: 3a268a54417ee7ed6fcef6549b9c47b86fadfc82 --- .../data/CollaborationDataManager.java | 14 ++++++++++++-- .../ui/role/DataProviderEventController.java | 6 ++---- .../ui/role/ParticipantEventController.java | 9 +++++---- 3 files changed, 19 insertions(+), 10 deletions(-) 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 1e8318513e..d855ab8eb4 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 @@ -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 sessionsMap; - Map displaySessionsMap; + Map displaySessionsMap = new HashMap(); - Map editorsMap; + Map editorsMap = new HashMap(); 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 diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/role/DataProviderEventController.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/role/DataProviderEventController.java index e8665ce36b..eca6ac29e9 100644 --- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/role/DataProviderEventController.java +++ b/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(VenueSession session) { + public DataProviderEventController(ISharedDisplaySession session) { super(session); } diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/role/ParticipantEventController.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/role/ParticipantEventController.java index 3b25dc1373..dd4214369c 100644 --- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/role/ParticipantEventController.java +++ b/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 - // session for the link to editor capability + CollaborationDataManager.getInstance().editorCreated( + session.getSessionId(), editor); } }