Merge pull request #12 from qupath/volatile-accesses

Make DataAccess implement VolatileAccess

Author: Rylern

src/main/java/qupath/ext/imglib2/bufferedimageaccesses/ArgbBufferedImageAccess.java

@@ -1,6 +1,7 @@
 package qupath.ext.imglib2.bufferedimageaccesses;
 
 import net.imglib2.img.basictypeaccess.IntAccess;
+import net.imglib2.img.basictypeaccess.volatiles.VolatileAccess;
 import qupath.ext.imglib2.SizableDataAccess;
 
 import java.awt.image.BufferedImage;
@@ -13,8 +14,10 @@
  * <p>
  * This {@link IntAccess} is immutable; any attempt to changes its values will result in a
  * {@link UnsupportedOperationException}.
+ * <p>
+ * This data access is marked as volatile but always contain valid data.
  */
-public class ArgbBufferedImageAccess implements IntAccess, SizableDataAccess {
+public class ArgbBufferedImageAccess implements IntAccess, SizableDataAccess, VolatileAccess {
 
     private final BufferedImage image;
     private final DataBuffer dataBuffer;
@@ -63,4 +66,9 @@ public void setValue(int index, int value) {
     public int getSizeBytes() {
         return size;
     }
+
+    @Override
+    public boolean isValid() {
+        return true;
+    }
 }

src/main/java/qupath/ext/imglib2/bufferedimageaccesses/ByteRasterAccess.java

@@ -1,6 +1,7 @@
 package qupath.ext.imglib2.bufferedimageaccesses;
 
 import net.imglib2.img.basictypeaccess.ByteAccess;
+import net.imglib2.img.basictypeaccess.volatiles.VolatileAccess;
 import qupath.ext.imglib2.SizableDataAccess;
 
 import java.awt.image.DataBuffer;
@@ -12,8 +13,10 @@
  * <p>
  * This {@link ByteAccess} is immutable; any attempt to changes its values will result in a
  * {@link UnsupportedOperationException}.
+ * <p>
+ * This data access is marked as volatile but always contain valid data.
  */
-public class ByteRasterAccess implements ByteAccess, SizableDataAccess {
+public class ByteRasterAccess implements ByteAccess, SizableDataAccess, VolatileAccess {
 
     private final Raster raster;
     private final DataBuffer dataBuffer;
@@ -62,4 +65,9 @@ public void setValue(int index, byte value) {
     public int getSizeBytes() {
         return size;
     }
+
+    @Override
+    public boolean isValid() {
+        return true;
+    }
 }

src/main/java/qupath/ext/imglib2/bufferedimageaccesses/DoubleRasterAccess.java

@@ -1,6 +1,7 @@
 package qupath.ext.imglib2.bufferedimageaccesses;
 
 import net.imglib2.img.basictypeaccess.DoubleAccess;
+import net.imglib2.img.basictypeaccess.volatiles.VolatileAccess;
 import qupath.ext.imglib2.SizableDataAccess;
 
 import java.awt.image.DataBuffer;
@@ -12,8 +13,10 @@
  * <p>
  * This {@link DoubleAccess} is immutable; any attempt to changes its values will result in a
  * {@link UnsupportedOperationException}.
+ * <p>
+ * This data access is marked as volatile but always contain valid data.
  */
-public class DoubleRasterAccess implements DoubleAccess, SizableDataAccess {
+public class DoubleRasterAccess implements DoubleAccess, SizableDataAccess, VolatileAccess {
 
     private final Raster raster;
     private final DataBuffer dataBuffer;
@@ -62,4 +65,9 @@ public void setValue(int index, double value) {
     public int getSizeBytes() {
         return size;
     }
+
+    @Override
+    public boolean isValid() {
+        return true;
+    }
 }

src/main/java/qupath/ext/imglib2/bufferedimageaccesses/FloatRasterAccess.java

@@ -1,6 +1,7 @@
 package qupath.ext.imglib2.bufferedimageaccesses;
 
 import net.imglib2.img.basictypeaccess.FloatAccess;
+import net.imglib2.img.basictypeaccess.volatiles.VolatileAccess;
 import qupath.ext.imglib2.SizableDataAccess;
 
 import java.awt.image.DataBuffer;
@@ -12,8 +13,10 @@
  * <p>
  * This {@link FloatAccess} is immutable; any attempt to changes its values will result in a
  * {@link UnsupportedOperationException}.
+ * <p>
+ * This data access is marked as volatile but always contain valid data.
  */
-public class FloatRasterAccess implements FloatAccess, SizableDataAccess {
+public class FloatRasterAccess implements FloatAccess, SizableDataAccess, VolatileAccess {
 
     private final Raster raster;
     private final DataBuffer dataBuffer;
@@ -62,4 +65,9 @@ public void setValue(int index, float value) {
     public int getSizeBytes() {
         return size;
     }
+
+    @Override
+    public boolean isValid() {
+        return true;
+    }
 }

src/main/java/qupath/ext/imglib2/bufferedimageaccesses/IntRasterAccess.java

@@ -1,6 +1,7 @@
 package qupath.ext.imglib2.bufferedimageaccesses;
 
 import net.imglib2.img.basictypeaccess.IntAccess;
+import net.imglib2.img.basictypeaccess.volatiles.VolatileAccess;
 import qupath.ext.imglib2.SizableDataAccess;
 
 import java.awt.image.DataBuffer;
@@ -12,8 +13,10 @@
  * <p>
  * This {@link IntAccess} is immutable; any attempt to changes its values will result in a
  * {@link UnsupportedOperationException}.
+ * <p>
+ * This data access is marked as volatile but always contain valid data.
  */
-public class IntRasterAccess implements IntAccess, SizableDataAccess {
+public class IntRasterAccess implements IntAccess, SizableDataAccess, VolatileAccess {
 
     private final Raster raster;
     private final DataBuffer dataBuffer;
@@ -62,4 +65,9 @@ public void setValue(int index, int value) {
     public int getSizeBytes() {
         return size;
     }
+
+    @Override
+    public boolean isValid() {
+        return true;
+    }
 }

src/main/java/qupath/ext/imglib2/bufferedimageaccesses/ShortRasterAccess.java

@@ -1,6 +1,7 @@
 package qupath.ext.imglib2.bufferedimageaccesses;
 
 import net.imglib2.img.basictypeaccess.ShortAccess;
+import net.imglib2.img.basictypeaccess.volatiles.VolatileAccess;
 import qupath.ext.imglib2.SizableDataAccess;
 
 import java.awt.image.DataBuffer;
@@ -13,8 +14,10 @@
  * <p>
  * This {@link ShortAccess} is immutable; any attempt to changes its values will result in a
  * {@link UnsupportedOperationException}.
+ * <p>
+ * This data access is marked as volatile but always contain valid data.
  */
-public class ShortRasterAccess implements ShortAccess, SizableDataAccess {
+public class ShortRasterAccess implements ShortAccess, SizableDataAccess, VolatileAccess {
 
     private final Raster raster;
     private final DataBuffer dataBuffer;
@@ -63,4 +66,9 @@ public void setValue(int index, short value) {
     public int getSizeBytes() {
         return size;
     }
+
+    @Override
+    public boolean isValid() {
+        return true;
+    }
 }