From 739a4ac2dbcffdf069eb4f9c6c11e24ab1cefc8c Mon Sep 17 00:00:00 2001
From: Matt Nash <Matt_Nash@raytheon.com>
Date: Mon, 4 Mar 2013 09:41:11 -0600
Subject: [PATCH] Issue #1476 make fix for collaboration for issues with
 closing of views when detached

Change-Id: Id35df245089ae352b5023ad2d31d1519379f8293

Former-commit-id: 311ac710cad84a23b1d7eb9af3b19a15cc072692 [formerly fdc6db0a500f2fd194a95487c53a8bd48eb9475d] [formerly 1d25736871a8918912478f5e402c504677c9cc2e [formerly 42a3798a2fcee3c383814b92c9010f77eb7b242a]]
Former-commit-id: 1d25736871a8918912478f5e402c504677c9cc2e
Former-commit-id: 274becd212469ac091b7d21f71bee930c3312e75
---
 .../uf/viz/collaboration/ui/CollaborationGroupView.java     | 4 +++-
 .../uf/viz/collaboration/ui/session/SessionView.java        | 6 +-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/CollaborationGroupView.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/CollaborationGroupView.java
index 2d1e573ac1..d6692704e7 100644
--- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/CollaborationGroupView.java
+++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/CollaborationGroupView.java
@@ -761,7 +761,9 @@ public class CollaborationGroupView extends CaveFloatingView implements
         VizApp.runAsync(new Runnable() {
             @Override
             public void run() {
-                usersTreeViewer.refresh(element);
+                if (usersTreeViewer.getControl().isDisposed() == false) {
+                    usersTreeViewer.refresh(element);
+                }
             }
         });
     }
diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/session/SessionView.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/session/SessionView.java
index ccebb4c687..15e61562f9 100644
--- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/session/SessionView.java
+++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/session/SessionView.java
@@ -62,7 +62,6 @@ import org.eclipse.swt.widgets.Menu;
 import org.eclipse.ui.IViewSite;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
 
 import com.google.common.eventbus.Subscribe;
 import com.raytheon.uf.common.status.IUFStatusHandler;
@@ -213,10 +212,7 @@ public class SessionView extends AbstractSessionView implements IPrintableView {
         });
         Menu menu = menuManager.createContextMenu(usersTable.getControl());
         usersTable.getControl().setMenu(menu);
-        PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
-                .getActivePart().getSite()
-                .registerContextMenu(menuManager, usersTable);
-        usersTable.getTable().setMenu(menu);
+        getSite().registerContextMenu(menuManager, usersTable);
     }
 
     protected void fillContextMenu(IMenuManager manager) {