Changeset 1649 for branches/3.0-Beta2

Timestamp:

06/18/07 22:37:09 (15 months ago)

Author:

jmoore

Message:

#737 Handling timestamps as immutable

Location:

branches/3.0-Beta2/components

Files:

• blitz/test/ome/icy/model/utests/AdapterTest.java (modified) (3 diffs)
• common/src/ome/util/ModelMapper.java (modified) (1 diff)

branches/3.0-Beta2/components/blitz/test/ome/icy/model/utests/AdapterTest.java

@@ -26 +26 @@
 import ome.model.display.PlaneSlicingContext;
 import ome.model.display.RenderingDef;
+import ome.model.meta.Event;
 import ome.util.builders.PojoOptions;
 import omero.JArray;
@@ -55 +56 @@
 import omero.constants.POJOLEAVES;
 import omero.model.DatasetI;
+import omero.model.EventI;
 import omero.model.IObject;
 import omero.model.ImageI;
@@ -337 +339 @@
     }
 
+    @Test(groups = "ticket:737")
+    public void testEventsAndTimes() throws Exception {
+        Event e = new Event();
+        Timestamp t = new Timestamp(System.currentTimeMillis());
+        e.setTime(t);
+        IceMapper mapper = new IceMapper();
+        EventI ei = (EventI) mapper.map(e);
+        assertNotNull(ei.getTime());
+    }
 }

branches/3.0-Beta2/components/common/src/ome/util/ModelMapper.java

@@ -102 +102 @@
         // IMMUTABLES
         if (null == current || current instanceof Number
-                || current instanceof String || current instanceof Boolean) {
+                || current instanceof String || current instanceof Boolean
+                || current instanceof Timestamp) {
             return current;
         }