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

Issue #440 fixes in group view

Browse source 
Former-commit-id: ad3f6cd8ad [formerly c4123b42e9078f2c5975da38d2aa6737348afa8a]
Former-commit-id: 7065ea8107
This commit is contained in:
Matt Nash 2012-05-22 11:12:28 -05:00
parent d4ba003ce0
commit 2f7a2747aa
1 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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.AlertWordWrapper;
import com.raytheon.uf.viz.collaboration.data.CollaborationDataManager; import com.raytheon.uf.viz.collaboration.data.CollaborationDataManager;
import com.raytheon.uf.viz.collaboration.data.CollaborationGroupContainer; 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.SessionContainer;
import com.raytheon.uf.viz.collaboration.data.SessionGroupContainer; import com.raytheon.uf.viz.collaboration.data.SessionGroupContainer;
import com.raytheon.uf.viz.collaboration.data.SharedDisplaySessionMgr; import com.raytheon.uf.viz.collaboration.data.SharedDisplaySessionMgr;
@ -145,6 +146,8 @@ public class CollaborationGroupView extends ViewPart implements IPartListener {
private SessionGroupContainer activeSessionGroup; private SessionGroupContainer activeSessionGroup;
private InvitationGroupContainer activeInvitationGroup;
private TreeViewer usersTreeViewer; private TreeViewer usersTreeViewer;
private CollaborationGroupContainer topLevel; private CollaborationGroupContainer topLevel;
@ -298,6 +301,7 @@ public class CollaborationGroupView extends ViewPart implements IPartListener {
.getInfo().getVenueSubject(), ""); .getInfo().getVenueSubject(), "");
} }
session.sendInvitation(ids, invite); session.sendInvitation(ids, invite);
activeInvitationGroup.addObject(invite);
} catch (CollaborationException e) { } catch (CollaborationException e) {
statusHandler.handle(Priority.PROBLEM, statusHandler.handle(Priority.PROBLEM,
"Error sending invitiation", e); "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 // populates the sessions that the user currently is involved with
populateActiveSessions(); 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 // populates the groups that the user is a part of
populateGroups(); 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. * 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) { if (e.keyCode == SWT.CR || e.keyCode == SWT.KEYPAD_CR) {
UserId id = IDConverter.convertFrom(entry.getUser()); UserId id = IDConverter.convertFrom(entry.getUser());
id.setAlias(treeEditor.getItem().getText()); id.setAlias(treeEditor.getItem().getText());
((User) entry.getUser()).setNickname(treeEditor.getItem() if (entry.getUser() instanceof User) {
.getText()); ((User) entry.getUser()).setNickname(treeEditor
.getItem().getText());
}
CollaborationUtils.addAlias(); CollaborationUtils.addAlias();
CollaborationDataManager.getInstance() CollaborationDataManager.getInstance()
.getCollaborationConnection(true) .getCollaborationConnection(true)
@ -824,8 +840,13 @@ public class CollaborationGroupView extends ViewPart implements IPartListener {
case SWT.FocusOut: case SWT.FocusOut:
item.setText(modText.getText()); item.setText(modText.getText());
composite.dispose(); composite.dispose();
((User) entry.getUser()).setNickname(treeEditor.getItem() if (entry.getUser() instanceof User) {
.getText()); ((User) entry.getUser()).setNickname(treeEditor
.getItem().getText());
} else if (entry.getUser() instanceof UserId) {
IDConverter.convertFrom(entry.getUser()).setAlias(
treeEditor.getItem().getText());
}
CollaborationUtils.addAlias(); CollaborationUtils.addAlias();
CollaborationDataManager.getInstance() CollaborationDataManager.getInstance()
.getCollaborationConnection(true) .getCollaborationConnection(true)
@ -950,6 +971,7 @@ public class CollaborationGroupView extends ViewPart implements IPartListener {
result.getSubject(), b); result.getSubject(), b);
} }
session.sendInvitation(usersList, invite); session.sendInvitation(usersList, invite);
activeInvitationGroup.addObject(invite);
} }
} catch (Exception e) { } catch (Exception e) {
statusHandler.handle(Priority.ERROR, statusHandler.handle(Priority.ERROR,