xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #427 clean up telestrator rsc on session exit

Browse source 
Change-Id: I14b5603f480e15537aa42eb2d8e5eebad87d09de

Former-commit-id: 9908d7d3de10ac919c550995ce0ba766f67096ee
This commit is contained in:
Nate Jensen 2012-05-11 16:09:29 -05:00
parent e68e75d735
commit 46e165ef69
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cave/com.raytheon.uf.viz.collaboration.comm/src/com/raytheon/uf/viz/collaboration/comm/provider/session/CollaborationConnection.java
View file

@ -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(

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

@ -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<ResourcePair> rscToRemoveList = new ArrayList<ResourcePair>();
for (ResourcePair rp : list) {
unwrapResourcePair(rp);
if (rp.getResource() instanceof DataProviderRsc) {
if (rp.getResource() instanceof DataProviderRsc
|| rp.getResource() instanceof CollaborationDrawingLayer) {
rscToRemoveList.add(rp);
}
}