Changeset 5643

Timestamp:

10/03/08 15:02:50 (7 weeks ago)

Author:

jburel

Message:

Used PojoOptions?

Location:

trunk

Files:

• .classpath (modified) (1 diff)
• LIB/OmeroJava-Beta4.jar (added)
• SRC/org/openmicroscopy/shoola/env/data/OMEROGateway.java (modified) (8 diffs)
• SRC/org/openmicroscopy/shoola/env/data/OmeroDataServiceImpl.java (modified) (21 diffs)
• SRC/org/openmicroscopy/shoola/env/ui/UserNotifierImpl.java (modified) (1 diff)
• config/about.xml (modified) (1 diff)
• config/container.xml (modified) (1 diff)

trunk/.classpath

@@ -23 +23 @@
         <classpathentry kind="lib" path="LIB/jakarta-oro-2.0.8.jar"/>
         <classpathentry kind="lib" path="LIB/ice-3.3.0.jar"/>
-        <classpathentry kind="lib" path="LIB/OmeroJava-3.0-Beta3.jar"/>
+        <classpathentry kind="lib" path="LIB/OmeroJava-Beta4.jar"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

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

@@ -52 +52 @@
 import org.openmicroscopy.shoola.env.data.util.SearchDataContext;
 import org.openmicroscopy.shoola.env.rnd.RenderingServiceException;
-
 import ome.system.UpgradeCheck;
 import omero.InternalException;
@@ -75 +74 @@
 import omero.api.RawPixelsStorePrx;
 import omero.api.RenderingEnginePrx;
-import omero.api.Search;
 import omero.api.SearchPrx;
 import omero.api.ServiceFactoryPrx;
 import omero.api.ThumbnailStorePrx;
-import omero.constants.CLASSIFICATIONME;
-import omero.constants.CLASSIFICATIONNME;
-import omero.constants.DECLASSIFICATION;
 import omero.constants.projection.ProjectionType;
 import omero.model.Annotation;
@@ -111 +106 @@
 import omero.sys.EventContext;
 import omero.sys.Parameters;
-import omero.util.ParametersI;
-import omero.util.PojoOptionsI;
+import omero.sys.ParametersI;
+import omero.sys.PojoOptions;
 import pojos.ArchivedAnnotationData;
 import pojos.DataObject;
@@ -241 +236 @@
                 Throwable cause = t.getCause();
                 if (cause instanceof ServerError) {
+                        
+                        
                         String s = "Cannot access data for security reasons \n"; 
                         throw new DSAccessException(s+message, t);
                 } else
-                        throw new DSOutOfServiceException(message, t);
+                        
+;
         }
         
@@ -736 +734 @@
         
         /**
-         * Reconnects to server. This method should be invoked when the password
-         * is reset.
-         * 
-         * @param userName      The name of the user who modifies his/her password.
-         * @param password      The new password.
-         */
-        private void resetFactory(String userName, String password)
-        {
-                //First close the previous session
-                /*
-                logout();
-                login = new Login(userName, password);
-                entry = new ServiceFactory(server, new Login(userName, password));
-                thumbRetrieval = 0;
-                */
-        }
-        
-        /**
          * Formats the terms to search for.
          * 
@@ -2015 +1995 @@
                         IPojosPrx service = getPojosService();
                         Map m = service.findAnnotations(Pixels.class.getName(), ids, null, 
-                                                                        (new PojoOptionsI().map()));
+                                                                        (new PojoOptions().map()));
                         Collection c = (Collection) m.get(pixelsID);
                         if (c == null || c.size() == 0) return false;
@@ -2275 +2255 @@
          * Modifies the password of the currently logged in user.
          * 
-         * @param userName      The name of the user whose password has not be changed.
          * @param password      The new password.
          * @throws DSOutOfServiceException If the connection is broken, or logged in
@@ -2281 +2260 @@
          * retrieve data from OMERO service. 
          */
-        void changePassword(String userName, String password)
-                throws DSOutOfServiceException, DSAccessException
-        {
-                isSessionAlive();
-                
+        void changePassword(String password)
+                throws DSOutOfServiceException, DSAccessException
+        {
+                isSessionAlive();
                 try {
                         getAdminService().changePassword(new RString(password));
-                        resetFactory(userName, password);
                 } catch (Throwable t) {
                         handleException(t, "Cannot modify password. ");

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

@@ -39 +39 @@
 
 //Application-internal dependencies
+import omero.RLong;
+import omero.RTime;
 import omero.model.Channel;
 import omero.model.Dataset;
@@ -49 +51 @@
 import omero.model.Screen;
 import omero.model.ScreenPlateLink;
-import omero.util.PojoOptionsI;
+import omero.sys.PojoOptions;
 import org.openmicroscopy.shoola.env.LookupNames;
 import org.openmicroscopy.shoola.env.config.AgentInfo;
@@ -91 +93 @@
 
         /**
-         * Helper method to return the user's details.
-         * 
-         * @return See above.
-         */
-        private ExperimenterData getUserDetails()
-        {
-                return (ExperimenterData) context.lookup(
-                                LookupNames.CURRENT_USER_DETAILS);
-        }
-
-        /**
          * Unlinks the collection of children from the specified parent.
          * 
@@ -152 +143 @@
                         return loadScreenPlates(rootNodeType, rootNodeIDs, userID);
                 }
-                PojoOptionsI po = new PojoOptionsI();
-                //if (rootNodeIDs == null) po.exp(new RLong(userID));
-                //if (withLeaves) po.leaves();
-                //else po.noLeaves();
+                PojoOptions po = new PojoOptions();
+                if (rootNodeIDs == null) po.exp(new RLong(userID));
+                if (withLeaves) po.leaves();
+                else po.noLeaves();
                 Set parents = gateway.loadContainerHierarchy(rootNodeType, rootNodeIDs,
                                 po.map()); 
@@ -164 +155 @@
 
                         if (klass != null) {
-                                po = new PojoOptionsI(); 
-                                //po.exp(new Long(userID));
-                                //options.allCounts();
-                                //po.noLeaves();
+                                po = new PojoOptions(); 
+                                po.exp(new RLong(userID));
+                                po.noLeaves();
                                 //Set r = gateway.loadContainerHierarchy(klass, null, po.map());
                                 Set r = gateway.fetchContainers(klass, userID);
@@ -207 +197 @@
                 throws DSOutOfServiceException, DSAccessException 
         {
-                PojoOptionsI po = new PojoOptionsI();
-                //po.exp(new Long(userID));
+                PojoOptions po = new PojoOptions();
+                po.exp(new RLong(userID));
                 //po.noLeaves();
                 return gateway.loadContainerHierarchy(rootNodeType, null, po.map());                         
@@ -222 +212 @@
         {
                 try {
-                        PojoOptionsI po = new PojoOptionsI();
-                        //po.leaves();
-                        //po.exp(new Long(userID));
-                        //po.countsFor(new Long(userID));
+                        PojoOptions po = new PojoOptions();
+                        po.leaves();
+                        po.exp(new RLong(userID));
                         return gateway.findContainerHierarchy(rootNodeType, leavesIDs,
                                         po.map());
@@ -245 +234 @@
                 //if (forUser) po.exp(new Long(getUserDetails().getId()));
                 return gateway.findAnnotations(nodeType, nodeIDs, annotatorIDs, 
-                                new PojoOptionsI().map());
+                                new PojoOptions().map());
         }
         
@@ -255 +244 @@
                 throws DSOutOfServiceException, DSAccessException
         {
-                PojoOptionsI po = new PojoOptionsI();
-                //po.leaves();
-                //PojoOptions po = new PojoOptions();
-                //if (rootNodeIDs == null) po.exp(new Long(userID));
-                //if (withLeaves) po.leaves();
-                //else 
-                
-                //po.countsFor(new Long(userID));
-                
-                return gateway.getContainerImages(nodeType, nodeIDs, po.map());
+                return gateway.getContainerImages(nodeType, nodeIDs, 
+                                new PojoOptions().map());
         }
 
@@ -274 +255 @@
                 throws DSOutOfServiceException, DSAccessException
         {
-                PojoOptionsI po = new PojoOptionsI();
-                //po.exp(new Long(userID));
+                PojoOptions po = new PojoOptions();
+                po.exp(new RLong(userID));
                 return gateway.getUserImages(po.map());
         }
@@ -292 +273 @@
                         return gateway.getImagesTaggedCount(rootNodeIDs);
                 return gateway.getCollectionCount(rootNodeType, property, rootNodeIDs, 
-                                new PojoOptionsI().map());
+                                new PojoOptions().map());
         }
 
@@ -312 +293 @@
                 IObject object = gateway.createObject(
                                 ModelMapper.createAnnotationAndLink(ho, data), 
-                                (new PojoOptionsI()).map());
+                                (new PojoOptions()).map());
                 return PojoMapper.asDataObject(ModelMapper.getAnnotatedObject(object));
         }
@@ -332 +313 @@
                 if (obj == null) 
                         throw new NullPointerException("Cannot convert object.");
-                Map options = (new PojoOptionsI()).map();
+                Map options = (new PojoOptions()).map();
 
                 IObject created = gateway.createObject(obj, options);
@@ -399 +380 @@
                 ModelMapper.unloadCollections(ho);
                 IObject updated = gateway.updateObject(ho,
-                                (new PojoOptionsI()).map());
+                                (new PojoOptions()).map());
                 return PojoMapper.asDataObject(updated);
         }
@@ -488 +469 @@
                 }
                 if (objects.size() != 0) {
-                        gateway.createObjects(objects, (new PojoOptionsI()).map());
+                        gateway.createObjects(objects, (new PojoOptions()).map());
                 } 
         }
@@ -564 +545 @@
                                 
                                 objects[index] = gateway.createObject(toCreate[index], 
-                                                (new PojoOptionsI()).map());
+                                                (new PojoOptions()).map());
                                 index++;
                         }
@@ -588 +569 @@
                         throw new IllegalArgumentException("No DataObject to annotate."); 
 
-                Map options = (new PojoOptionsI()).map();
+                Map options = (new PojoOptions()).map();
                 Iterator i = nodes.keySet().iterator();
                 DataObject annotatedObject;
@@ -638 +619 @@
                 DataObject image;
                 List<DataObject> results = new ArrayList<DataObject>();
-                PojoOptionsI po = new PojoOptionsI();
-                //po.allExps();
+                PojoOptions po = new PojoOptions();
+                po.allExps();
                 Map map = po.map();
                 while (i.hasNext()) {
@@ -675 +656 @@
                 if (!uc.getPassword().equals(oldPassword)) return Boolean.FALSE;
 
-                gateway.changePassword(uc.getUserName(), newPassword);
+                gateway.changePassword(newPassword);
                 uc.resetPassword(newPassword);
                 return Boolean.TRUE;
@@ -760 +741 @@
                         throw new NullPointerException("Time not specified.");
                 
-                PojoOptionsI po = new PojoOptionsI();
-                /*
+                PojoOptions po = new PojoOptions();
                 po.leaves();
-                po.exp(new Long(userID));
-                po.startTime(startTime);
-                po.endTime(endTime);
-                */
+                po.exp(new RLong(userID));
+                po.startTime(new RTime(startTime.getTime()));
+                po.endTime(new RTime(endTime.getTime()));
                 return gateway.getImages(po.map());
         }
@@ -838 +817 @@
                 Map<Integer, Object> results = new HashMap<Integer, Object>();
                 Set<DataObject> nodes;
-                Map pojoMap = new PojoOptionsI().map();
+                Map pojoMap = new PojoOptions().map();
                 Object v;
                 

trunk/SRC/org/openmicroscopy/shoola/env/ui/UserNotifierImpl.java

@@ -37 +37 @@
 import omero.model.FileAnnotation;
 import omero.model.OriginalFile;
-
 import org.openmicroscopy.shoola.env.Container;
-import org.openmicroscopy.shoola.env.LookupNames;
 import org.openmicroscopy.shoola.util.ui.MessengerDialog;
 import org.openmicroscopy.shoola.util.ui.NotificationDialog;
 import org.openmicroscopy.shoola.util.ui.UIUtilities;
-
 import pojos.FileAnnotationData;
 

trunk/config/about.xml

@@ -6 +6 @@
 </p>
 <p>
-Version: Beta3.1<br></br>
+Version: Beta4<br></br>
 Build: 05-09-2008<br></br>
 </p>

trunk/config/container.xml

@@ -266 +266 @@
    * etc.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-    <entry name="Version">Beta3.1rc3</entry>
+    <entry name="Version">Beta4</entry>
     <entry name="SoftwareName">OMERO.insight</entry>
     <entry name="AboutFile">about.xml</entry>