From e1e8d6c091f465f3e42ba1a324359b203a7a9828 Mon Sep 17 00:00:00 2001 From: Nate Jensen Date: Mon, 26 Mar 2012 16:37:44 -0500 Subject: [PATCH] Issue #427 event controllers use ISharedDisplaySession Change-Id: Ia0e41dcb7f0b49956a4a3c88a037894b972435c9 Former-commit-id: 1af05f177cde0d93f466ae8af5522261e61894e2 [formerly ef03821455cffa230d85efbe55a46beaddaba740] [formerly f6226a89d9db6a5fd47c8d76333ded792fa3eab6] [formerly 1af05f177cde0d93f466ae8af5522261e61894e2 [formerly ef03821455cffa230d85efbe55a46beaddaba740] [formerly f6226a89d9db6a5fd47c8d76333ded792fa3eab6] [formerly cbf105015f8d9305985caf55cf7e1b0cf40b051f [formerly f6226a89d9db6a5fd47c8d76333ded792fa3eab6 [formerly bf6cf477825be1d19081965ca9e958ebf423c0af]]]] Former-commit-id: cbf105015f8d9305985caf55cf7e1b0cf40b051f Former-commit-id: e93c5213279c415760bce5bb6af0e87f2ac53f7d [formerly ff5fec3f09da621db0f75a0799b0f130dede0a67] [formerly 5385afe9ce1d1a6ded716c4d96c0ce04ff2b6cf7 [formerly e28fc62a56534e19b5bfcdf99d3d4649559b55f9]] Former-commit-id: f2ba609b9ffdb06232123d1fdbdafaa1a5e08879 [formerly b6be43d0e5a69e9e6fffb0fbf990872b7083e03d] Former-commit-id: e9f2d75d955c6e2f4c04253b5dd329fbf4a59170 --- .../uf/viz/collaboration/ui/editor/CollaborationEditor.java | 2 +- .../collaboration/ui/role/AbstractRoleEventController.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/editor/CollaborationEditor.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/editor/CollaborationEditor.java index 1458f3d3c6..e55afaf09e 100644 --- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/editor/CollaborationEditor.java +++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/editor/CollaborationEditor.java @@ -43,7 +43,7 @@ import com.raytheon.viz.ui.panes.PaneManager; public class CollaborationEditor extends AbstractEditor { - public static final String EDITOR_ID = "com.raytheon.uf.viz.collaboration.display.editor.CollaborationEditor"; + public static final String EDITOR_ID = "com.raytheon.uf.viz.collaboration.ui.editor.CollaborationEditor"; @Override protected PaneManager getNewPaneManager() { diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/role/AbstractRoleEventController.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/role/AbstractRoleEventController.java index 095991d6d3..ee862b5edd 100644 --- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/role/AbstractRoleEventController.java +++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/role/AbstractRoleEventController.java @@ -19,7 +19,7 @@ **/ package com.raytheon.uf.viz.collaboration.ui.role; -import com.raytheon.uf.viz.collaboration.comm.provider.session.VenueSession; +import com.raytheon.uf.viz.collaboration.comm.identity.ISharedDisplaySession; /** * TODO Add Description @@ -41,9 +41,9 @@ import com.raytheon.uf.viz.collaboration.comm.provider.session.VenueSession; public abstract class AbstractRoleEventController implements IRoleEventController { - protected VenueSession session; + protected ISharedDisplaySession session; - protected AbstractRoleEventController(VenueSession session) { + protected AbstractRoleEventController(ISharedDisplaySession session) { this.session = session; }