Changeset 5525

Timestamp:

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

Author:

jburel

Message:

Cleaning code and modified group selection

Location:

trunk/SRC/org/openmicroscopy/shoola

Files:

• agents/imviewer/view/ImViewerComponent.java (modified) (1 diff)
• agents/treeviewer/view/TreeViewer.java (modified) (1 diff)
• env/data/DataServicesFactory.java (modified) (1 diff)
• env/data/OMEROGateway.java (modified) (5 diffs)
• env/data/OmeroDataService.java (modified) (2 diffs)
• env/data/OmeroDataServiceImpl.java (modified) (3 diffs)
• env/data/views/DataHandlerView.java (modified) (2 diffs)
• env/data/views/DataHandlerViewImpl.java (modified) (1 diff)
• env/data/views/calls/AdminLoader.java (modified) (4 diffs)

trunk/SRC/org/openmicroscopy/shoola/agents/imviewer/view/ImViewerComponent.java

@@ -180 +180 @@
                                                         ((HistoryItem) i.next()).setHighlight(null);
                                                 }
+                                                item.setHighlight(Color.BLUE);
+                                                view.setCursor(Cursor.getPredefinedCursor(
+                                                                Cursor.WAIT_CURSOR));
                                                 model.resetMappingSettings(item.getRndSettings(), true);
-                                                item.setHighlight(Color.BLUE);
+                                                view.setCursor(Cursor.getPredefinedCursor(
+                                                                Cursor.DEFAULT_CURSOR));
                                                 renderXYPlane();
                                         } catch (Exception e) {

trunk/SRC/org/openmicroscopy/shoola/agents/treeviewer/view/TreeViewer.java

@@ -747 +747 @@
 
         /**
-         * 
-         * @param node
-         * @param set
+         * Browses the images acquired during the passed time interval.
+         * 
+         * @param node The node holding the time information.
+         * @param set Tne 
          */
         public void browseTimeInterval(TreeImageTimeSet node, Set set);

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

@@ -253 +253 @@
         List<ExperimenterData> exps = new ArrayList<ExperimenterData>();
         try {
-                 groups = omeroGateway.getAvailableGroups();
+                 groups = omeroGateway.getAvailableGroups(exp);
                  registry.bind(LookupNames.USER_GROUP_DETAILS, groups);
                  

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());

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

@@ -41 +41 @@
 import pojos.DataObject;
 import pojos.ExperimenterData;
-import pojos.GroupData;
 import pojos.ImageData;
 
@@ -480 +479 @@
 
         /**
-         * Returns a map whose keys are the <code>GroupData</code> objetcs
-         * and the values are the <code>ExperimenterData</code>s contained
-         * in the group.
-         * 
-         * @return See above.
-         * @throws DSOutOfServiceException If the connection is broken, or logged in
-         * @throws DSAccessException If an error occured while trying to 
-         * retrieve data from OMERO service. 
-         */
-        public Map<GroupData, Set> getAvailableGroups()
-                throws DSOutOfServiceException, DSAccessException;
-
-        /**
          * Retrieves and saves the archived files.
          * Returns a map whose keys are the number of archived files retrieves

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

@@ -63 +63 @@
 import pojos.DatasetData;
 import pojos.ExperimenterData;
-import pojos.GroupData;
 import pojos.ImageData;
 import pojos.ProjectData;
@@ -171 +170 @@
                 if (withLeaves) po.leaves();
                 else po.noLeaves();
-                //po.countsFor(new Long(userID));
-                //If rootNodeIDs, returns the orphaned containers:
                 Set parents = gateway.loadContainerHierarchy(rootNodeType, rootNodeIDs,
                                 po.map()); 
@@ -762 +759 @@
                 }
                 return results;
-        }
-
-        /**
-         * Implemented as specified by {@link OmeroDataService}.
-         * @see OmeroDataService#getAvailableGroups()
-         */
-        public Map<GroupData, Set> getAvailableGroups() 
-                throws DSOutOfServiceException, DSAccessException
-        {
-                return gateway.getAvailableGroups();
         }
 

trunk/SRC/org/openmicroscopy/shoola/env/data/views/DataHandlerView.java

@@ -39 +39 @@
 import org.openmicroscopy.shoola.env.event.AgentEventListener;
 import pojos.AnnotationData;
-import pojos.CategoryData;
 import pojos.DataObject;
 import pojos.ExperimenterData;
@@ -447 +446 @@
                                                                                 AgentEventListener observer);
         
-        /**
-         * Loads the experimenter groups.
-         * 
-         * @param observer Callback handler.
-         * @return A handle that can be used to cancel the call.
-         */
-        public CallHandle loadAvailableGroups(AgentEventListener observer);
-        
 }

trunk/SRC/org/openmicroscopy/shoola/env/data/views/DataHandlerViewImpl.java

@@ -385 +385 @@
                 return cmd.exec(observer);
         }
-        
-        /**
-         * Implemented as specified by the view interface.
-         * @see DataHandlerView#loadAvailableGroups(AgentEventListener)
-         */
-        public CallHandle loadAvailableGroups(AgentEventListener observer)
-        {
-                BatchCallTree cmd = new AdminLoader(-1, AdminLoader.GROUP);
-                return cmd.exec(observer);
-        }
 
         /**

trunk/SRC/org/openmicroscopy/shoola/env/data/views/calls/AdminLoader.java

@@ -55 +55 @@
 {
 
-        /** Identifies to load the available groups. */
-        public static final int GROUP = 0;
-        
         /** Identifies to load the available and used space. */
         public static final int SPACE = 1;
@@ -68 +65 @@
     
     /**
-     * Creates a {@link BatchCall} to retrieve the experimenter groups.
-     * 
-     * @param userID    The id of the user or <code>-1</code>.
-     * @return The {@link BatchCall}.
-     */
-    private BatchCall availableGroupsCall(final long userID)
-    {
-        return new BatchCall("Loading experimenter groups") {
-            public void doCall() throws Exception
-            {
-                OmeroDataService os = context.getDataService();
-                result = os.getAvailableGroups();
-            }
-        };
-    }
-    
-    /**
      * Creates a {@link BatchCall} to retrieve the available and used
      * disk space.
@@ -93 +73 @@
     private BatchCall availableSpaceCall(final long userID)
     {
-        return new BatchCall("Loading available and used disk space") {
+        return new BatchCall("Loading disk space information") {
             public void doCall() throws Exception
             {
@@ -163 +143 @@
     {
         switch (index) {
-                        case GROUP:
-                                loadCall = availableGroupsCall(userID);
-                                break;
                         case SPACE:
                                 loadCall = availableSpaceCall(userID);