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

Issue #1476 make fix for collaboration for issues with closing of views when detached

Browse source 
Change-Id: Id35df245089ae352b5023ad2d31d1519379f8293

Former-commit-id: 311ac710ca [formerly fdc6db0a50] [formerly 1d25736871 [formerly 42a3798a2fcee3c383814b92c9010f77eb7b242a]]
Former-commit-id: 1d25736871
Former-commit-id: 274becd212
This commit is contained in:
Matt Nash 2013-03-04 09:41:11 -06:00
parent e00d5344b1
commit 739a4ac2db
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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);
}
}
});
}

6
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/session/SessionView.java
View file

@ -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) {