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

Merge "Issue #2799 fixed double click chat not working for roster entries" into development

Browse source 
Former-commit-id: 1841c4f7bf [formerly ed87998c31] [formerly 6093312861] [formerly 1841c4f7bf [formerly ed87998c31] [formerly 6093312861] [formerly 94b8b7eb04 [formerly 6093312861 [formerly 381c3f6c6585f414c27b771168746f6dd838df0c]]]]
Former-commit-id: 94b8b7eb04
Former-commit-id: 906e7f679a [formerly f53e9523f3] [formerly 5a33efafe8dc13c6044be153e57d9a79150c60c2 [formerly b9e027059f]]
Former-commit-id: f1c22bbd6a9a841cc0f1e2161f7c123c3ecff932 [formerly 78f8a9fbe3]
Former-commit-id: 5771b557ef
This commit is contained in:
Nate Jensen 2014-02-12 17:34:27 -06:00 • committed by Gerrit Code Review
commit 6b059bb502
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -141,6 +141,7 @@ import com.raytheon.viz.ui.views.CaveFloatingView;
* Jan 27, 2014 2700 bclement fixed context menu for roster entries
* Jan 30, 2014 2698 bclement fixed alias not working for roster entries
* removed unneeded subscription for nickname changed events
* Feb 12, 2014 2799 bclement fixed double click chat not working for roster entries
*
* </pre>
*
@ -483,8 +484,9 @@ public class CollaborationGroupView extends CaveFloatingView implements
TreeSelection selection = (TreeSelection) usersTreeViewer
.getSelection();
Object o = selection.getFirstElement();
if (o instanceof UserId) {
new PeerToPeerChatAction((UserId) o).run();
if (o instanceof RosterEntry) {
UserId user = IDConverter.convertFrom((RosterEntry) o);
new PeerToPeerChatAction(user).run();
} else if (o instanceof IVenueSession) {
new ShowVenueAction((IVenueSession) o).run();
}