Changeset 1041

Timestamp:

10/16/06 12:20:13 (2 years ago)

Author:

callan

Message:

Fixes for changes put in place by on #427 by r1038. For the moment I'm setting the relevant methods to read/write. I'm also adding proper exception handling here so we can actually find out what the hell is going on when there is an exception thrown in the calling code.

Files:

• trunk/components/server/src/ome/services/RawPixelsBean.java (modified) (21 diffs)

trunk/components/server/src/ome/services/RawPixelsBean.java

@@ -36 +36 @@
 import java.io.Serializable;
 import java.nio.BufferOverflowException;
+import java.nio.ByteBuffer;
 import java.nio.MappedByteBuffer;
 
@@ -60 +61 @@
 import ome.api.ServiceInterface;
 import ome.conditions.ApiUsageException;
+import ome.conditions.ResourceError;
 import ome.io.nio.DimensionsOutOfBoundsException;
 import ome.io.nio.PixelBuffer;
@@ -81 +83 @@
  */
 @TransactionManagement(TransactionManagementType.BEAN)
-@Transactional
+@Transactional(readOnly=false)
 @Stateful
 @Remote(RawPixelsStore.class)
@@ -149 +151 @@
     
     @RolesAllowed("user")
-    @Transactional( readOnly = true )
     public void setPixelsId( long pixelsId )
     {
@@ -187 +188 @@
         {
             return buffer.calculateMessageDigest();
-        } catch (IOException e)
-        {
-            e.printStackTrace();
-            throw new RuntimeException("Unimplemented exception.");
-        }
+        }
+        catch (Exception e)
+        {
+                handleException(e);
+        }
+                return null;
     }
 
@@ -199 +201 @@
         errorIfNotLoaded();
         
-        MappedByteBuffer plane;
+        MappedByteBuffer plane = null;
                 try
                 {
@@ -206 +208 @@
                 catch (Exception e)
                 {
-                        throw new RuntimeException(e);
+                        handleException(e);
                 }
 
-        return bufferAsByteArrayWithExceptionIfNull( plane );
+                return bufferAsByteArrayWithExceptionIfNull(plane);
     }
 
@@ -220 +222 @@
         {
             return buffer.getPlaneOffset(arg0, arg1, arg2);
-        } catch (DimensionsOutOfBoundsException e)
-        {
-            e.printStackTrace();
-            throw new RuntimeException("Unimplemented exception.");
-        }
+        }
+        catch (Exception e)
+        {
+                        handleException(e);
+        }
+        return null;
     }
 
@@ -240 +243 @@
         errorIfNotLoaded();
         
-        MappedByteBuffer region;
+        MappedByteBuffer region = null;
         try
         {
             region = buffer.getRegion(arg0, arg1);
-        } catch (IOException e)
-        {
-            e.printStackTrace();
-            throw new RuntimeException("Unimplemented exception.");
-        }
-        return bufferAsByteArrayWithExceptionIfNull( region ); 
+        } catch (Exception e)
+        {
+                        handleException(e);
+        }
+        return bufferAsByteArrayWithExceptionIfNull(region); 
     }
 
@@ -257 +259 @@
         errorIfNotLoaded();
         
-        MappedByteBuffer row;
+        MappedByteBuffer row = null;
         try
         {
             row = buffer.getRow(arg0, arg1, arg2, arg3);
-        } catch (IOException e)
-        {
-            e.printStackTrace();
-            throw new RuntimeException("Unimplemented exception.");
-        } catch (DimensionsOutOfBoundsException e)
-        {
-            e.printStackTrace();
-            throw new RuntimeException("Unimplemented exception.");
+        }
+        catch (Exception e)
+        {
+                        handleException(e);
         }
         return bufferAsByteArrayWithExceptionIfNull( row ); 
@@ -282 +280 @@
         {
             return buffer.getRowOffset(arg0, arg1, arg2, arg3);
-        } catch (DimensionsOutOfBoundsException e)
-        {
-            e.printStackTrace();
-            throw new RuntimeException("Unimplemented exception.");
-        }
+        }
+        catch (Exception e)
+        {
+                        handleException(e);
+        }
+        return null;
     }
 
@@ -302 +301 @@
         errorIfNotLoaded();
         
-        MappedByteBuffer stack;
+        MappedByteBuffer stack = null;
         try
         {
             stack = buffer.getStack(arg0, arg1);
-        } catch (IOException e)
-        {
-            e.printStackTrace();
-            throw new RuntimeException("Unimplemented exception.");
-        } catch (DimensionsOutOfBoundsException e)
-        {
-            e.printStackTrace();
-            throw new RuntimeException("Unimplemented exception.");
+        }
+        catch (Exception e)
+        {
+                        handleException(e);
         }
         return bufferAsByteArrayWithExceptionIfNull( stack );
@@ -326 +321 @@
         {
             return buffer.getStackOffset(arg0, arg1);
-        } catch (DimensionsOutOfBoundsException e)
-        {
-            e.printStackTrace();
-            throw new RuntimeException("Unimplemented exception.");
-        }
+        }
+        catch (Exception e)
+        {
+                        handleException(e);
+        }
+        return null;
     }
 
@@ -346 +342 @@
         errorIfNotLoaded();
         
-        MappedByteBuffer timepoint;
+        MappedByteBuffer timepoint = null;
         try
         {
             timepoint = buffer.getTimepoint(arg0);
-        } catch (IOException e)
-        {
-            e.printStackTrace();
-            throw new RuntimeException("Unimplemented exception.");
-        } catch (DimensionsOutOfBoundsException e)
-        {
-            e.printStackTrace();
-            throw new RuntimeException("Unimplemented exception.");
-        }
-        return bufferAsByteArrayWithExceptionIfNull( timepoint );
+        }
+        catch (Exception e)
+        {
+                        handleException(e);
+        }
+        return bufferAsByteArrayWithExceptionIfNull(timepoint);
     }
 
@@ -370 +362 @@
         {
             return buffer.getTimepointOffset(arg0);
-        } catch (DimensionsOutOfBoundsException e)
-        {
-            e.printStackTrace();
-            throw new RuntimeException("Unimplemented exception.");
-        }
+        }
+        catch (Exception e)
+        {
+                        handleException(e);
+        }
+        return null;
     }
 
@@ -401 +394 @@
         {
             buffer.setPlane(arg0, arg1, arg2, arg3);
-        } catch (BufferOverflowException e)
-        {
-            e.printStackTrace();
-            throw new RuntimeException("Unimplemented exception.");
-        } catch (IOException e)
-        {
-            e.printStackTrace();
-            throw new RuntimeException("Unimplemented exception.");
-        } catch (DimensionsOutOfBoundsException e)
-        {
-            e.printStackTrace();
-            throw new RuntimeException("Unimplemented exception.");
+        }
+        catch (Exception e)
+        {
+                        handleException(e);
         }
     }
@@ -424 +409 @@
         {
             buffer.setRegion(arg0, arg1, arg2);
-        } catch (BufferOverflowException e)
-        {
-            e.printStackTrace();
-            throw new RuntimeException("Unimplemented exception.");
-        } catch (IOException e)
-        {
-            e.printStackTrace();
-            throw new RuntimeException("Unimplemented exception.");
+        }
+        catch (Exception e)
+        {
+                        handleException(e);
         }
     }
@@ -440 +421 @@
         errorIfNotLoaded();
         
-        // FIXME buffer.setRow(arg0, arg1, arg2, arg3, arg4);
-        throw new RuntimeException("Not implemented yet.");
+        try
+        {
+                ByteBuffer buf = ByteBuffer.wrap(arg0);
+                buffer.setRow(buf, arg1, arg2, arg3, arg4);
+        }
+        catch (Exception e)
+        {
+                handleException(e);
+        }
     }
 
@@ -452 +440 @@
         {
             buffer.setStack(arg0, arg1, arg2, arg3);
-        } catch (BufferOverflowException e)
-        {
-            e.printStackTrace();
-            throw new RuntimeException("Unimplemented exception.");
-        } catch (IOException e)
-        {
-            e.printStackTrace();
-            throw new RuntimeException("Unimplemented exception.");
-        } catch (DimensionsOutOfBoundsException e)
-        {
-            e.printStackTrace();
-            throw new RuntimeException("Unimplemented exception.");
+        }
+        catch (Exception e)
+        {
+                handleException(e);
         }
     }
@@ -475 +455 @@
         {
             buffer.setTimepoint(arg0, arg1);
-        } catch (BufferOverflowException e)
-        {
-            e.printStackTrace();
-            throw new RuntimeException("Unimplemented exception.");
-        } catch (IOException e)
-        {
-            e.printStackTrace();
-            throw new RuntimeException("Unimplemented exception.");
-        } catch (DimensionsOutOfBoundsException e)
-        {
-            e.printStackTrace();
-            throw new RuntimeException("Unimplemented exception.");
+        }
+        catch (Exception e)
+        {
+                handleException(e);
         }
     }
@@ -499 +471 @@
                 return b;
     }
+    
+    private void handleException(Exception e)
+    {
+                e.printStackTrace();
+                
+        if (e instanceof IOException)
+                {
+                        throw new ResourceError(e.getMessage());
+                }
+        if (e instanceof DimensionsOutOfBoundsException)
+                {
+                        throw new ApiUsageException(e.getMessage());
+                }
+        if (e instanceof BufferOverflowException)
+        {
+                throw new ResourceError(e.getMessage());
+        }
+
+        // Fallthrough
+        throw new RuntimeException(e);
+    }
 }