From 02ab07f89a01bbb9b5d4d5027c39a680d79cf376 Mon Sep 17 00:00:00 2001
From: Matt Nash <Matt_Nash@raytheon.com>
Date: Tue, 22 May 2012 11:12:28 -0500
Subject: [PATCH] Issue #440 fixes in group view

Former-commit-id: 414c5524623b99584009b4c1b5480a318ccb85f1 [formerly ad3f6cd8ad4fb5e6ae7173f0dbceda52001efea4] [formerly 414c5524623b99584009b4c1b5480a318ccb85f1 [formerly ad3f6cd8ad4fb5e6ae7173f0dbceda52001efea4] [formerly 7065ea8107d51f8eb2e72e8cd154693531045391 [formerly c4123b42e9078f2c5975da38d2aa6737348afa8a]]]
Former-commit-id: 7065ea8107d51f8eb2e72e8cd154693531045391
Former-commit-id: dbcb9b7b8731d7fb9b8b208307fcbf3fcb01376d [formerly 2f7a2747aa55e1c5234b9539bafb9349a9567d0c]
Former-commit-id: 77b210c155edcd7d76b922bf243e061e16b4dc35
---
 .../ui/CollaborationGroupView.java            | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 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 7bc59c6c1c..ce54b15df6 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
@@ -106,6 +106,7 @@ import com.raytheon.uf.viz.collaboration.comm.provider.user.UserId;
 import com.raytheon.uf.viz.collaboration.data.AlertWordWrapper;
 import com.raytheon.uf.viz.collaboration.data.CollaborationDataManager;
 import com.raytheon.uf.viz.collaboration.data.CollaborationGroupContainer;
+import com.raytheon.uf.viz.collaboration.data.InvitationGroupContainer;
 import com.raytheon.uf.viz.collaboration.data.SessionContainer;
 import com.raytheon.uf.viz.collaboration.data.SessionGroupContainer;
 import com.raytheon.uf.viz.collaboration.data.SharedDisplaySessionMgr;
@@ -145,6 +146,8 @@ public class CollaborationGroupView extends ViewPart implements IPartListener {
 
     private SessionGroupContainer activeSessionGroup;
 
+    private InvitationGroupContainer activeInvitationGroup;
+
     private TreeViewer usersTreeViewer;
 
     private CollaborationGroupContainer topLevel;
@@ -298,6 +301,7 @@ public class CollaborationGroupView extends ViewPart implements IPartListener {
                                 .getInfo().getVenueSubject(), "");
                     }
                     session.sendInvitation(ids, invite);
+                    activeInvitationGroup.addObject(invite);
                 } catch (CollaborationException e) {
                     statusHandler.handle(Priority.PROBLEM,
                             "Error sending invitiation", e);
@@ -604,6 +608,12 @@ public class CollaborationGroupView extends ViewPart implements IPartListener {
         // populates the sessions that the user currently is involved with
         populateActiveSessions();
 
+        activeInvitationGroup = new InvitationGroupContainer();
+        topLevel.addObject(activeInvitationGroup);
+        // populates the active invitations in case a user leaves and wants to
+        // rejoin
+        populateActiveInvitations();
+
         // populates the groups that the user is a part of
         populateGroups();
 
@@ -637,6 +647,10 @@ public class CollaborationGroupView extends ViewPart implements IPartListener {
         }
     }
 
+    private void populateActiveInvitations() {
+        activeInvitationGroup.clear();
+    }
+
     /**
      * Clear and populate the groups from the roster manager entries.
      */
@@ -781,8 +795,10 @@ public class CollaborationGroupView extends ViewPart implements IPartListener {
                 if (e.keyCode == SWT.CR || e.keyCode == SWT.KEYPAD_CR) {
                     UserId id = IDConverter.convertFrom(entry.getUser());
                     id.setAlias(treeEditor.getItem().getText());
-                    ((User) entry.getUser()).setNickname(treeEditor.getItem()
-                            .getText());
+                    if (entry.getUser() instanceof User) {
+                        ((User) entry.getUser()).setNickname(treeEditor
+                                .getItem().getText());
+                    }
                     CollaborationUtils.addAlias();
                     CollaborationDataManager.getInstance()
                             .getCollaborationConnection(true)
@@ -824,8 +840,13 @@ public class CollaborationGroupView extends ViewPart implements IPartListener {
                 case SWT.FocusOut:
                     item.setText(modText.getText());
                     composite.dispose();
-                    ((User) entry.getUser()).setNickname(treeEditor.getItem()
-                            .getText());
+                    if (entry.getUser() instanceof User) {
+                        ((User) entry.getUser()).setNickname(treeEditor
+                                .getItem().getText());
+                    } else if (entry.getUser() instanceof UserId) {
+                        IDConverter.convertFrom(entry.getUser()).setAlias(
+                                treeEditor.getItem().getText());
+                    }
                     CollaborationUtils.addAlias();
                     CollaborationDataManager.getInstance()
                             .getCollaborationConnection(true)
@@ -950,6 +971,7 @@ public class CollaborationGroupView extends ViewPart implements IPartListener {
                                 result.getSubject(), b);
                     }
                     session.sendInvitation(usersList, invite);
+                    activeInvitationGroup.addObject(invite);
                 }
             } catch (Exception e) {
                 statusHandler.handle(Priority.ERROR,