From 5cc7230b61671817bd63d0d8de67bfac6d7f4995 Mon Sep 17 00:00:00 2001 From: Nate Jensen Date: Fri, 11 May 2012 16:09:29 -0500 Subject: [PATCH] Issue #427 clean up telestrator rsc on session exit Change-Id: I14b5603f480e15537aa42eb2d8e5eebad87d09de Former-commit-id: 46e165ef697e25a05ac384ab198ca022585bd6e4 [formerly 46e165ef697e25a05ac384ab198ca022585bd6e4 [formerly 9908d7d3de10ac919c550995ce0ba766f67096ee]] Former-commit-id: 56a8c1f937cbcded51b4f808d95b54231379e475 Former-commit-id: a72d2b528f0a7dab4f0cd9cc392f3dbd124d90fa --- .../comm/provider/session/CollaborationConnection.java | 5 ----- .../collaboration/ui/role/DataProviderEventController.java | 4 +++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/cave/com.raytheon.uf.viz.collaboration.comm/src/com/raytheon/uf/viz/collaboration/comm/provider/session/CollaborationConnection.java b/cave/com.raytheon.uf.viz.collaboration.comm/src/com/raytheon/uf/viz/collaboration/comm/provider/session/CollaborationConnection.java index 34968420ab..65dedcf058 100644 --- a/cave/com.raytheon.uf.viz.collaboration.comm/src/com/raytheon/uf/viz/collaboration/comm/provider/session/CollaborationConnection.java +++ b/cave/com.raytheon.uf.viz.collaboration.comm/src/com/raytheon/uf/viz/collaboration/comm/provider/session/CollaborationConnection.java @@ -511,11 +511,6 @@ public class CollaborationConnection implements IEventPublisher { public void handlePresence(ID fromId, org.eclipse.ecf.presence.IPresence presence) { - String name = Tools.parseName(fromId.getName()); - String host = Tools.parseHost(fromId.getName()); - String resource = Tools.parseResource(fromId.getName()); - - // UserId id = new UserId(name, host, resource); UserId id = IDConverter.convertFrom(fromId); if (rosterManager != null) { IRosterEntry entry = contactsMgr.getUsersMap().get( 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 b560d96612..f5d9c0df7b 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 @@ -50,6 +50,7 @@ import com.raytheon.uf.viz.collaboration.ui.role.dataprovider.CollaborationDispa import com.raytheon.uf.viz.collaboration.ui.rsc.CollaborationWrapperResource; import com.raytheon.uf.viz.collaboration.ui.rsc.CollaborationWrapperResourceData; import com.raytheon.uf.viz.collaboration.ui.rsc.DataProviderRsc; +import com.raytheon.uf.viz.collaboration.ui.telestrator.CollaborationDrawingLayer; import com.raytheon.uf.viz.core.IDisplayPane; import com.raytheon.uf.viz.core.IDisplayPaneContainer; import com.raytheon.uf.viz.core.VizApp; @@ -367,7 +368,8 @@ public class DataProviderEventController extends AbstractRoleEventController { List rscToRemoveList = new ArrayList(); for (ResourcePair rp : list) { unwrapResourcePair(rp); - if (rp.getResource() instanceof DataProviderRsc) { + if (rp.getResource() instanceof DataProviderRsc + || rp.getResource() instanceof CollaborationDrawingLayer) { rscToRemoveList.add(rp); } }