Changeset 2302

Timestamp:

03/21/08 09:07:52 (9 months ago)

Author:

callan

Message:

Resolves (I hope) #894 and ensures that more nullable RTypes are allowed in Blitz Slice definitions.

Location:

trunk/components/blitz

Files:

• resources/omero/API.ice (modified) (1 diff)
• src/ome/services/blitz/util/ApiConsistencyCheck.java (modified) (2 diffs)
• src/omero/util/IceMapper.java (modified) (2 diffs)

trunk/components/blitz/resources/omero/API.ice

@@ -195 +195 @@
                                          omero::RInt sizeZ,
                                          omero::RInt sizeT,
-                                         string methodology);
+                                         string methodology) throws ServerError;
       };
 

trunk/components/blitz/src/ome/services/blitz/util/ApiConsistencyCheck.java

@@ -18 +18 @@
 import omeis.providers.re.codomain.CodomainMapContext;
 import omeis.providers.re.data.PlaneDef;
+import omero.RInt;
 import omero.RString;
 import omero.RType;
@@ -166 +167 @@
         if (Integer.class.isAssignableFrom(apiType)
                 && int.class.isAssignableFrom(opsType)) {
+            return true;
+        }
+
+        if (Integer.class.isAssignableFrom(apiType)
+                && RInt.class.isAssignableFrom(opsType)) {
             return true;
         }

trunk/components/blitz/src/omero/util/IceMapper.java

@@ -695 +695 @@
                 || p.equals(float.class) || p.equals(float[].class)
                 || p.equals(boolean.class) || p.equals(boolean[].class)
-                || p.equals(Integer.class) || p.equals(Long.class)
-                || p.equals(Double.class) || p.equals(Float.class)
                 || p.equals(String.class)) {
             return true;
@@ -763 +761 @@
         } else if (isPrimitive(type)) {
             return o;
+        } else if (Boolean.class.isAssignableFrom(type)
+                   || Integer.class.isAssignableFrom(type)
+                   || Long.class.isAssignableFrom(type)
+                   || Double.class.isAssignableFrom(type)
+                   || Float.class.isAssignableFrom(type)
+                   || String.class.isAssignableFrom(type)) {
+            return toRType(o);
         } else if (RGBBuffer.class.isAssignableFrom(type)) {
             return convert((RGBBuffer) o);