Changeset 5525 for trunk/SRC/org/openmicroscopy/shoola/env/data/OMEROGateway.java

Timestamp:

06/30/08 10:15:48 (5 months ago)

Author:

jburel

Message:

Cleaning code and modified group selection

Files:

• trunk/SRC/org/openmicroscopy/shoola/env/data/OMEROGateway.java (modified) (5 diffs)

trunk/SRC/org/openmicroscopy/shoola/env/data/OMEROGateway.java

@@ -557 +557 @@
         {
                 String n = group.getName();
-                return ("system".equals(n) || "user".equals(n) || "default".equals(n));
+                return ("system".equals(n) || "user".equals(n) || "default".equals(n) ||
+                                "guest".equals(n));
         }
 
@@ -1869 +1870 @@
         
         /**
-         * Retrieves the available experimenter groups.
-         * 
+         * Retrieves the groups visible by the current experimenter.
+         * 
+         * @param loggedInUser The user currently logged in.
          * @return See above.
          * @throws DSOutOfServiceException If the connection is broken, or logged in
@@ -1876 +1878 @@
          * retrieve data from OMERO service. 
          */
-        Map<GroupData, Set> getAvailableGroups()
+        Map<GroupData, Set> getAvailableGroups(ExperimenterData loggedInUser)
                 throws DSOutOfServiceException, DSAccessException
         {
@@ -1882 +1884 @@
                 try {
                         IAdmin service = getAdminService();
+                        //Need method server side.
                         List<ExperimenterGroup> groups = service.lookupGroups();
                         Iterator i = groups.iterator();
@@ -1889 +1892 @@
                         Map<GroupData, Set> pojos = new HashMap<GroupData, Set>();
                         DataObject pojoGroup;
+                        //
+                        List<GroupData> l = loggedInUser.getGroups();
+                        Iterator<GroupData> k = l.iterator();
+                        List<Long> groupIds = new ArrayList<Long>();
+                        while (k.hasNext()) {
+                                groupIds.add(k.next().getId());
+                        }
+                        
                         while (i.hasNext()) {
                                 group = (ExperimenterGroup) i.next();
-                                if (!isSystemGroup(group)) {
+                                if (!isSystemGroup(group) && groupIds.contains(group.getId())) {
                                         pojoGroup = PojoMapper.asDataObject(group);
                                         experimenters = containedExperimenters(group.getId());