Changeset 1599 for branches/3.0-Beta2

Timestamp:

06/06/07 02:15:58 (17 months ago)

Author:

david

Message:

DeltaVision? test successful

Location:

branches/3.0-Beta2/components/romio

Files:

• build.xml (modified) (1 diff)
• src/ome/io/nio/DeltaVision.java (modified) (5 diffs)
• src/ome/io/nio/DeltaVisionHeader.java (modified) (2 diffs)
• test/ome/io/nio/utests/DeltaVisionTest.java (added)
• test/ome/io/nio/utests/tinyTest.d3d.dv (deleted)
• test/tinyTest.d3d.dv (added)

branches/3.0-Beta2/components/romio/build.xml

@@ -4 +4 @@
         <property name="classpath.file" value="classpath.xml"/>
         <import file="${classpath.file}"/>
+
+        <copy todir="${testclasses.dir}">
+        <fileset dir="${test.dir}">
+                <include name="tinyTest.d3d.dv"/>
+         </fileset>
+        </copy>
         
 </project>

branches/3.0-Beta2/components/romio/src/ome/io/nio/DeltaVision.java

@@ -66 +66 @@
                         -128, 127, -128, 127 };
 
+        
         /**
          * Constructor requires OriginalFile object
@@ -96 +97 @@
          */
         public byte[] calculateMessageDigest() throws IOException {
-                // TODO - test
+
                 MessageDigest md;
 
@@ -138 +139 @@
         public MappedByteBuffer getPlane(Integer z, Integer c, Integer t)
                         throws IOException, DimensionsOutOfBoundsException {
-                // TODO - test
+
                 Long offset = getPlaneOffset(z, c, t);
                 Integer size = getPlaneSize();
@@ -212 +213 @@
          */
         public Integer getPlaneSize() {
+
                 if (planeSize == null) {
                         planeSize = getSizeX() * getSizeY() * getByteWidth();
                 }
                 return planeSize;
+                
         }
 
@@ -240 +243 @@
         public MappedByteBuffer getRow(Integer y, Integer z, Integer c, Integer t)
                         throws IOException, DimensionsOutOfBoundsException {
-                // TODO - affected by stack and timepoint
+
                 Long offset = getRowOffset(y, z, c, t);
                 Integer size = getRowSize();

branches/3.0-Beta2/components/romio/src/ome/io/nio/DeltaVisionHeader.java

@@ -3 +3 @@
 import java.nio.ByteOrder;
 import java.nio.MappedByteBuffer;
-
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
@@ -57 +53 @@
         private String imageType;
 
-        private transient static Log log = LogFactory.getLog(DeltaVisionHeader.class);
-
         /**
          * Constructor