();
ContactsManager contacts = CollaborationConnection.getConnection()
.getContactsManager();
- for (RosterEntry node : groupNode.getEntries()) {
+ for (RosterEntry node : entries) {
UserId user = IDConverter.convertFrom(node);
Presence presence = contacts.getPresence(user);
if (presence.getType() == Type.available) {
@@ -902,22 +899,22 @@ public class CollaborationGroupView extends CaveFloatingView implements
}
@Override
- public void groupCreated(LocalGroup group) {
+ public void groupCreated(RosterGroup group) {
refreshUsersTreeViewerAsync(usersTreeViewer.getInput());
}
@Override
- public void groupDeleted(LocalGroup group) {
+ public void groupDeleted(RosterGroup group) {
refreshUsersTreeViewerAsync(usersTreeViewer.getInput());
}
@Override
- public void userAdded(LocalGroup group, UserId user) {
+ public void userAdded(RosterGroup group, UserId user) {
refreshUsersTreeViewerAsync(group);
}
@Override
- public void userDeleted(LocalGroup group, UserId user) {
+ public void userDeleted(RosterGroup group, UserId user) {
refreshUsersTreeViewerAsync(group);
}
diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/CreateGroupDialog.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/CreateGroupDialog.java
index 96ae44ba3d..9798c0c3bc 100644
--- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/CreateGroupDialog.java
+++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/CreateGroupDialog.java
@@ -37,7 +37,8 @@ import com.raytheon.uf.viz.collaboration.comm.provider.session.CollaborationConn
import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
/**
- * TODO Add Description
+ * Dialog allowing user to create a new group in the roster. At least one user
+ * must be added to the group afterwards for it to be persisted on the server.
*
*
*
@@ -46,13 +47,13 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jun 27, 2012 bsteffen Initial creation
+ * Jan 24, 2014 2701 bclement removed local groups
*
*
*
* @author bsteffen
* @version 1.0
*/
-
public class CreateGroupDialog extends CaveSWTDialog {
private Text nameText;
@@ -115,7 +116,7 @@ public class CreateGroupDialog extends CaveSWTDialog {
private void finish() {
newGroup = nameText.getText();
CollaborationConnection.getConnection().getContactsManager()
- .createLocalGroup(newGroup);
+ .createGroup(newGroup);
close();
}
diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/UsersTreeContentProvider.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/UsersTreeContentProvider.java
index f332528f0a..7ad8dae547 100644
--- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/UsersTreeContentProvider.java
+++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/UsersTreeContentProvider.java
@@ -33,13 +33,13 @@ import org.jivesoftware.smack.RosterGroup;
import com.raytheon.uf.viz.collaboration.comm.provider.session.CollaborationConnection;
import com.raytheon.uf.viz.collaboration.comm.provider.user.IDConverter;
-import com.raytheon.uf.viz.collaboration.comm.provider.user.LocalGroups.LocalGroup;
+import com.raytheon.uf.viz.collaboration.comm.provider.user.SharedGroup;
import com.raytheon.uf.viz.collaboration.comm.provider.user.UserId;
import com.raytheon.uf.viz.collaboration.ui.data.CollaborationGroupContainer;
import com.raytheon.uf.viz.collaboration.ui.data.SessionGroupContainer;
/**
- * TODO Add Description
+ * Provides access to contacts list tree
*
*
*
@@ -49,6 +49,7 @@ import com.raytheon.uf.viz.collaboration.ui.data.SessionGroupContainer;
* ------------ ---------- ----------- --------------------------
* Mar 1, 2012 rferrel Initial creation
* Dec 6, 2013 2561 bclement removed ECF
+ * Jan 24, 2014 2701 bclement removed local groups, added shared groups
*
*
*
@@ -118,35 +119,33 @@ public class UsersTreeContentProvider implements ITreeContentProvider {
return cont.getObjects().toArray();
} else if (parentElement instanceof RosterGroup) {
RosterGroup group = (RosterGroup) parentElement;
- List result = new ArrayList();
- UserId localUser = CollaborationConnection.getConnection()
- .getUser();
- Collection entries = group.getEntries();
- synchronized (entries) {
- entries = new ArrayList(entries);
- }
- for (RosterEntry entry : entries) {
- String user = entry.getUser();
- if (!localUser.isSameUser(user)) {
- result.add(IDConverter.convertFrom(entry));
- }
- }
- return result.toArray();
- } else if (parentElement instanceof LocalGroup) {
- List result = new ArrayList();
- LocalGroup group = (LocalGroup) parentElement;
- UserId localUser = CollaborationConnection.getConnection()
- .getUser();
- for (UserId user : group.getUsers()) {
- if (!localUser.isSameUser(user.getNormalizedId())) {
- result.add(user);
- }
- }
- return result.toArray();
+ return getRosterChildren(group.getEntries());
+ } else if (parentElement instanceof SharedGroup) {
+ SharedGroup group = (SharedGroup) parentElement;
+ return getRosterChildren(group.getEntries());
}
return null;
}
+ /**
+ * Get child objects of roster groups
+ *
+ * @param entries
+ * entries in group
+ * @return
+ */
+ private Object[] getRosterChildren(Collection entries) {
+ List result = new ArrayList();
+ UserId localUser = CollaborationConnection.getConnection().getUser();
+ for (RosterEntry entry : entries) {
+ String user = entry.getUser();
+ if (!localUser.isSameUser(user)) {
+ result.add(IDConverter.convertFrom(entry));
+ }
+ }
+ return result.toArray();
+ }
+
/*
* (non-Javadoc)
*
@@ -172,19 +171,10 @@ public class UsersTreeContentProvider implements ITreeContentProvider {
boolean hasChildren = false;
if (element instanceof RosterGroup) {
RosterGroup group = (RosterGroup) element;
- UserId localUser = CollaborationConnection.getConnection()
- .getUser();
- Collection entries = group.getEntries();
- synchronized (entries) {
- entries = new ArrayList(entries);
- }
- for (RosterEntry entry : entries) {
- String user = entry.getUser();
- if (!localUser.isSameUser(user)) {
- hasChildren = true;
- break;
- }
- }
+ hasChildren = rosterHasChildren(group.getEntries());
+ } else if (element instanceof SharedGroup) {
+ SharedGroup group = (SharedGroup) element;
+ hasChildren = rosterHasChildren(group.getEntries());
} else if (element instanceof SessionGroupContainer) {
SessionGroupContainer cont = (SessionGroupContainer) element;
if (cont.getObjects() != null && cont.getObjects().size() > 0) {
@@ -192,16 +182,6 @@ public class UsersTreeContentProvider implements ITreeContentProvider {
} else {
hasChildren = false;
}
- } else if (element instanceof LocalGroup) {
- UserId localUser = CollaborationConnection.getConnection()
- .getUser();
- List userNames = ((LocalGroup) element).getUserNames();
- for (String userName : userNames) {
- if (!localUser.isSameUser(userName)) {
- hasChildren = true;
- break;
- }
- }
}
// need to check whether items are filtered out so we don't get
@@ -219,4 +199,22 @@ public class UsersTreeContentProvider implements ITreeContentProvider {
}
return hasChildren;
}
+
+ /**
+ * @param entries
+ * @return true if entries has at least one entry that isn't the users
+ * account
+ */
+ private boolean rosterHasChildren(Collection entries) {
+ UserId localUser = CollaborationConnection.getConnection().getUser();
+ boolean hasChildren = false;
+ for (RosterEntry entry : entries) {
+ String user = entry.getUser();
+ if (!localUser.isSameUser(user)) {
+ hasChildren = true;
+ break;
+ }
+ }
+ return hasChildren;
+ }
}
diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/UsersTreeLabelProvider.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/UsersTreeLabelProvider.java
index 3397c1c87c..a7e9c0df3c 100644
--- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/UsersTreeLabelProvider.java
+++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/UsersTreeLabelProvider.java
@@ -43,7 +43,7 @@ import com.raytheon.uf.viz.collaboration.comm.identity.IVenueSession;
import com.raytheon.uf.viz.collaboration.comm.identity.info.IVenueInfo;
import com.raytheon.uf.viz.collaboration.comm.provider.session.CollaborationConnection;
import com.raytheon.uf.viz.collaboration.comm.provider.user.IDConverter;
-import com.raytheon.uf.viz.collaboration.comm.provider.user.LocalGroups.LocalGroup;
+import com.raytheon.uf.viz.collaboration.comm.provider.user.SharedGroup;
import com.raytheon.uf.viz.collaboration.comm.provider.user.UserId;
import com.raytheon.uf.viz.collaboration.ui.data.SessionGroupContainer;
@@ -59,6 +59,7 @@ import com.raytheon.uf.viz.collaboration.ui.data.SessionGroupContainer;
* Mar 1, 2012 rferrel Initial creation
* Dec 6, 2013 2561 bclement removed ECF
* Dec 20, 2013 2563 bclement fixed support for ungrouped roster items
+ * Jan 24, 2014 2701 bclement removed local groups, added shared groups
*
*
*
@@ -105,13 +106,13 @@ public class UsersTreeLabelProvider extends ColumnLabelProvider {
return userLabelProvider.getImage(IDConverter
.convertFrom((RosterEntry) element));
} else if (element instanceof RosterGroup) {
- key = "group";
+ key = "roster_group";
+ } else if (element instanceof SharedGroup) {
+ key = "shared_group";
} else if (element instanceof IVenueSession) {
// key = "session_group";
} else if (element instanceof SessionGroupContainer) {
key = "session_group";
- } else if (element instanceof LocalGroup) {
- key = "local_group";
}
if (imageMap.get(key) == null && !key.equals("")) {
@@ -124,6 +125,8 @@ public class UsersTreeLabelProvider extends ColumnLabelProvider {
public String getText(Object element) {
if (element instanceof RosterGroup) {
return ((RosterGroup) element).getName();
+ } else if (element instanceof SharedGroup) {
+ return ((SharedGroup) element).getName();
} else if (element instanceof RosterEntry) {
return userLabelProvider.getText(IDConverter
.convertFrom((RosterEntry) element));
@@ -153,17 +156,14 @@ public class UsersTreeLabelProvider extends ColumnLabelProvider {
return null;
}
return info.getVenueDescription();
- } else if (element instanceof LocalGroup) {
- return ((LocalGroup) element).getName();
}
return null;
}
@Override
public Font getFont(Object element) {
- if (element instanceof RosterGroup
- || element instanceof SessionGroupContainer
- || element instanceof LocalGroup) {
+ if (element instanceof RosterGroup || element instanceof SharedGroup
+ || element instanceof SessionGroupContainer) {
// for this case do nothing, as it is not the top level of
// session groups
if (boldFont == null) {
diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/UsersTreeViewerSorter.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/UsersTreeViewerSorter.java
index dde5f3cde6..57330d5a25 100644
--- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/UsersTreeViewerSorter.java
+++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/UsersTreeViewerSorter.java
@@ -26,12 +26,12 @@ import org.jivesoftware.smack.RosterEntry;
import org.jivesoftware.smack.RosterGroup;
import com.raytheon.uf.viz.collaboration.comm.identity.IVenueSession;
-import com.raytheon.uf.viz.collaboration.comm.provider.user.LocalGroups.LocalGroup;
+import com.raytheon.uf.viz.collaboration.comm.provider.user.SharedGroup;
import com.raytheon.uf.viz.collaboration.comm.provider.user.UserId;
import com.raytheon.uf.viz.collaboration.ui.data.SessionGroupContainer;
/**
- * TODO Add Description
+ * Sorts the contacts list
*
*
*
@@ -41,6 +41,7 @@ import com.raytheon.uf.viz.collaboration.ui.data.SessionGroupContainer;
* ------------ ---------- ----------- --------------------------
* Mar 1, 2012 rferrel Initial creation
* Dec 6, 2013 2561 bclement removed ECF
+ * Jan 24, 2014 2701 bclement removed local groups, added shared groups
*
*
*
@@ -74,9 +75,12 @@ public class UsersTreeViewerSorter extends ViewerSorter {
}
// Groups before users.
- if (e1 instanceof RosterGroup) {
- if (!(e2 instanceof RosterGroup)) {
+ if (e1 instanceof SharedGroup) {
+ if (!(e2 instanceof SharedGroup)) {
return -1;
+ } else {
+ return ((SharedGroup) e1).getName().compareTo(
+ ((SharedGroup) e2).getName());
}
} else if (e1 instanceof RosterGroup) {
return 1;
@@ -113,17 +117,18 @@ public class UsersTreeViewerSorter extends ViewerSorter {
return ((IVenueSession) e1).getVenue().toString()
.compareTo(((IVenueSession) e2).getVenue().toString());
}
- if (e1 instanceof LocalGroup) {
- if (!(e2 instanceof LocalGroup)) {
+ if (e1 instanceof RosterGroup) {
+ if (!(e2 instanceof RosterGroup)) {
return -1;
}
- } else if (e1 instanceof LocalGroup) {
+ } else if (e1 instanceof RosterGroup) {
return 1;
}
- if (e1 instanceof LocalGroup && e2 instanceof LocalGroup) {
- return ((LocalGroup) e1).getName().compareTo(
- ((LocalGroup) e2).getName());
+ if (e1 instanceof RosterGroup && e2 instanceof RosterGroup) {
+ return ((RosterGroup) e1).getName().compareTo(
+ ((RosterGroup) e2).getName());
}
+
return 0;
}
}
diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/actions/AddToGroupAction.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/actions/AddToGroupAction.java
index b2ce023668..5f67258136 100644
--- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/actions/AddToGroupAction.java
+++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/actions/AddToGroupAction.java
@@ -19,9 +19,6 @@
**/
package com.raytheon.uf.viz.collaboration.ui.actions;
-import java.util.ArrayList;
-import java.util.List;
-
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.action.IContributionItem;
@@ -30,13 +27,13 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Menu;
import org.jivesoftware.smack.RosterEntry;
+import org.jivesoftware.smack.RosterGroup;
import com.raytheon.uf.viz.collaboration.comm.identity.event.RosterChangeType;
import com.raytheon.uf.viz.collaboration.comm.provider.event.RosterChangeEvent;
import com.raytheon.uf.viz.collaboration.comm.provider.session.CollaborationConnection;
import com.raytheon.uf.viz.collaboration.comm.provider.user.ContactsManager;
import com.raytheon.uf.viz.collaboration.comm.provider.user.IDConverter;
-import com.raytheon.uf.viz.collaboration.comm.provider.user.LocalGroups.LocalGroup;
import com.raytheon.uf.viz.collaboration.comm.provider.user.UserId;
import com.raytheon.uf.viz.collaboration.ui.Activator;
import com.raytheon.uf.viz.collaboration.ui.CreateGroupDialog;
@@ -53,13 +50,13 @@ import com.raytheon.uf.viz.core.icon.IconUtil;
* ------------ ---------- ----------- --------------------------
* Jul 3, 2012 bsteffen Initial creation
* Dec 20, 2013 2563 bclement added support for ungrouped roster entries
+ * Jan 24, 2014 2701 bclement removed local groups
*
*
*
* @author bsteffen
* @version 1.0
*/
-
public class AddToGroupAction extends Action {
private final String group;
@@ -83,7 +80,7 @@ public class AddToGroupAction extends Action {
public AddToGroupAction(String group, UserId... users) {
super(group, IconUtil.getImageDescriptor(Activator.getDefault()
- .getBundle(), "local_group.gif"));
+ .getBundle(), "roster_group.gif"));
this.group = group;
this.users = users;
}
@@ -112,8 +109,7 @@ public class AddToGroupAction extends Action {
}
CollaborationConnection connection = CollaborationConnection.getConnection();
for (UserId user : users) {
- connection.getContactsManager()
- .addToLocalGroup(group, user);
+ connection.getContactsManager().addToGroup(group, user);
}
if (entry != null) {
// the entry wasn't in a group, so the entire tree needs to be
@@ -149,13 +145,7 @@ public class AddToGroupAction extends Action {
private void fill() {
ContactsManager contactsMgr = CollaborationConnection
.getConnection().getContactsManager();
- List groups = contactsMgr.getLocalGroups();
- List usedGroups = new ArrayList(groups);
- for (UserId user : users) {
- usedGroups.retainAll(contactsMgr.getLocalGroups(user));
- }
- groups.removeAll(usedGroups);
- for (LocalGroup group : groups) {
+ for (RosterGroup group : contactsMgr.getGroups()) {
AddToGroupAction action = new AddToGroupAction(group.getName(),
users);
action.setEntry(entry);
diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/actions/CreateGroupAction.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/actions/CreateGroupAction.java
index 8b1a893578..97954ec2ed 100644
--- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/actions/CreateGroupAction.java
+++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/actions/CreateGroupAction.java
@@ -39,6 +39,7 @@ import com.raytheon.uf.viz.core.icon.IconUtil;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jul 3, 2012 bsteffen Initial creation
+ * Jan 24, 2014 2701 bclement removed local groups
*
*
*
@@ -74,7 +75,7 @@ public class CreateGroupAction extends Action {
}
for (UserId user : users) {
CollaborationConnection.getConnection().getContactsManager()
- .addToLocalGroup(group, user);
+ .addToGroup(group, user);
}
}
}
diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/actions/DeleteGroupAction.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/actions/DeleteGroupAction.java
index a93c2129ca..85d3fb19d5 100644
--- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/actions/DeleteGroupAction.java
+++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/actions/DeleteGroupAction.java
@@ -35,6 +35,7 @@ import com.raytheon.uf.viz.core.icon.IconUtil;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jul 3, 2012 bsteffen Initial creation
+ * Jan 24, 2014 2701 bclement removed local groups
*
*
*
@@ -55,6 +56,6 @@ public class DeleteGroupAction extends Action {
@Override
public void run() {
CollaborationConnection.getConnection().getContactsManager()
- .deleteLocalGroup(group);
+ .deleteGroup(group);
}
}
diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/actions/RemoveFromGroupAction.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/actions/RemoveFromGroupAction.java
index 6cf777c344..b131b1a4e5 100644
--- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/actions/RemoveFromGroupAction.java
+++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/actions/RemoveFromGroupAction.java
@@ -37,6 +37,7 @@ import com.raytheon.uf.viz.core.icon.IconUtil;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jul 3, 2012 bsteffen Initial creation
+ * Jan 24, 2014 2701 bclement removed local groups
*
*
*
@@ -62,7 +63,7 @@ public class RemoveFromGroupAction extends Action {
ContactsManager manager = CollaborationConnection.getConnection()
.getContactsManager();
for (UserId user : users) {
- manager.deleteFromLocalGroup(group, user);
+ manager.deleteFromGroup(group, user);
}
}
}
diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/data/CollaborationGroupContainer.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/data/CollaborationGroupContainer.java
index 8f53f96300..a04300722e 100644
--- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/data/CollaborationGroupContainer.java
+++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/data/CollaborationGroupContainer.java
@@ -21,17 +21,10 @@ package com.raytheon.uf.viz.collaboration.ui.data;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
-
-import org.jivesoftware.smack.Roster;
-import org.jivesoftware.smack.RosterEntry;
-import org.jivesoftware.smack.RosterGroup;
import com.raytheon.uf.viz.collaboration.comm.provider.session.CollaborationConnection;
-import com.raytheon.uf.viz.collaboration.comm.provider.session.RosterManager;
-import com.raytheon.uf.viz.collaboration.comm.provider.user.LocalGroups.LocalGroup;
+import com.raytheon.uf.viz.collaboration.comm.provider.user.ContactsManager;
/**
* Container for collaboration information window. Includes current user,
@@ -45,6 +38,7 @@ import com.raytheon.uf.viz.collaboration.comm.provider.user.LocalGroups.LocalGro
* ------------ ---------- ----------- --------------------------
* Apr 23, 2012 mnash Initial creation
* Dec 20, 2013 2563 bclement added items from server roster not in groups
+ * Jan 24, 2014 2701 bclement removed local groups, added shared groups
*
*
*
@@ -73,24 +67,10 @@ public class CollaborationGroupContainer {
List