Use Boolean over Bit

Broadened the generics so let's also broaden the wording

Author: gselzer

src/main/java/net/imglib2/imagej/RAIToImagePlus.java

@@ -417,9 +417,9 @@ public static < T > ImagePlus wrapUnsignedShort(
      * @param title the name assigned to the resulting {@link ImagePlus}
      * @param service the {@link ExecutorService} used for processing.
      * @return an {@link ImagePlus} wrapping {@code img}
-     * @see #wrapAndScaleBit(RandomAccessibleInterval, String, ExecutorService) for wrapping with scaling.
+     * @see #wrapAndScaleBoolean(RandomAccessibleInterval, String, ExecutorService) for wrapping with scaling.
      */
-    public static < B extends BooleanType< B >> ImagePlus wrapBit(
+    public static < B extends BooleanType< B >> ImagePlus wrapBoolean(
             final RandomAccessibleInterval< B > img,
             final String title,
             final ExecutorService service )
@@ -441,13 +441,13 @@ public static < B extends BooleanType< B >> ImagePlus wrapBit(
      * @param img the {@link RandomAccessibleInterval} to wrap
      * @param title the name assigned to the resulting {@link ImagePlus}
      * @return an {@link ImagePlus} wrapping {@code img}
-     * @see #wrapAndScaleBit(RandomAccessibleInterval, String) for wrapping with scaling.
+     * @see #wrapAndScaleBoolean(RandomAccessibleInterval, String) for wrapping with scaling.
      */
-    public static < B extends BooleanType< B >> ImagePlus wrapBit(
+    public static < B extends BooleanType< B >> ImagePlus wrapBoolean(
             final RandomAccessibleInterval< B > img,
             final String title )
     {
-        return wrapBit( img, title, null );
+        return wrapBoolean( img, title, null );
     }
 
     /**
@@ -463,16 +463,16 @@ public static < B extends BooleanType< B >> ImagePlus wrapBit(
      * @param title the name assigned to the resulting {@link ImagePlus}
      * @param service the {@link ExecutorService} used for processing.
      * @return an {@link ImagePlus} wrapping {@code img}
-     * @see #wrapBit(RandomAccessibleInterval, String, ExecutorService) for wrapping without scaling.
+     * @see #wrapBoolean(RandomAccessibleInterval, String, ExecutorService) for wrapping without scaling.
      */
-    public static < B extends BooleanType<B> > ImagePlus wrapAndScaleBit(
+    public static < B extends BooleanType<B> > ImagePlus wrapAndScaleBoolean(
             final RandomAccessibleInterval<B> img,
             final String title,
             final ExecutorService service )
     {
         return internalWrap( //
             img, //
-            ImageJVirtualStackUnsignedByte::wrapAndScaleBitType, //
+            ImageJVirtualStackUnsignedByte::wrapAndScaleBoolean, //
             title, //
             service //
         );
@@ -490,13 +490,13 @@ public static < B extends BooleanType<B> > ImagePlus wrapAndScaleBit(
      * @param img the {@link RandomAccessibleInterval} to wrap
      * @param title the name assigned to the resulting {@link ImagePlus}
      * @return an {@link ImagePlus} wrapping {@code img}
-     * @see #wrapBit(RandomAccessibleInterval, String) for wrapping without scaling.
+     * @see #wrapBoolean(RandomAccessibleInterval, String) for wrapping without scaling.
      */
-    public static < B extends BooleanType<B> > ImagePlus wrapAndScaleBit(
+    public static < B extends BooleanType<B> > ImagePlus wrapAndScaleBoolean(
             final RandomAccessibleInterval<B> img,
             final String title )
     {
-        return wrapAndScaleBit( img, title, null );
+        return wrapAndScaleBoolean( img, title, null );
     }
 
     private static <T, U extends NativeType<U>> ImagePlus internalWrap(
@@ -568,9 +568,9 @@ public static ImagePlus wrapVirtualStack(final RandomAccessibleInterval< ? > rai
      * @return an {@link ImagePlus} wrapping {@code rai}
      * @see ArrayImgToImagePlus
      */
-    public static ImagePlus wrapVirtualStackAndScaleBitType(final RandomAccessibleInterval< BitType > rai , final String title )
+    public static <B extends BooleanType<B>> ImagePlus wrapVirtualStackAndScaleBooleanType(final RandomAccessibleInterval< B > rai , final String title )
     {
-        return wrapVirtualStack( rai, title, RAIToImagePlus::createVirtualStackBits );
+        return wrapVirtualStack( rai, title, RAIToImagePlus::createVirtualStackBools);
     }
 
     private static < T > ImagePlus wrapVirtualStack(RandomAccessibleInterval< T > rai, final String title, final Function< RandomAccessibleInterval< T >, ImageJVirtualStack<?>> imageStackWrapper )
@@ -582,9 +582,9 @@ private static < T > ImagePlus wrapVirtualStack(RandomAccessibleInterval< T > ra
         return result;
     }
 
-    private static ImageJVirtualStack<?> createVirtualStackBits(final RandomAccessibleInterval< BitType > sorted )
+    private static <B extends BooleanType<B>> ImageJVirtualStack<?> createVirtualStackBools(final RandomAccessibleInterval< B > sorted )
     {
-        return ImageJVirtualStackUnsignedByte.wrapAndScaleBitType( sorted );
+        return ImageJVirtualStackUnsignedByte.wrapAndScaleBoolean( sorted );
     }
 
     private static ImageJVirtualStack<?> createVirtualStack(final RandomAccessibleInterval< ? > rai )

src/main/java/net/imglib2/imagej/img/ImageJVirtualStackUnsignedByte.java

@@ -41,10 +41,8 @@
 import net.imglib2.converter.readwrite.SamplerConverter;
 import net.imglib2.img.basictypeaccess.ByteAccess;
 import net.imglib2.type.BooleanType;
-import net.imglib2.type.logic.BitType;
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.integer.UnsignedByteType;
-import net.imglib2.util.Util;
 
 import java.util.concurrent.ExecutorService;
 
@@ -66,7 +64,7 @@ public class ImageJVirtualStackUnsignedByte extends ImageJVirtualStack< Unsigned
 		return Converters.convert(source, new ToUnsignedByteSamplerConverter( source.getType() ) );
 	}
 
-	public static <B extends BooleanType<B>> ImageJVirtualStackUnsignedByte wrapAndScaleBitType( final RandomAccessibleInterval< B > source )
+	public static <B extends BooleanType<B>> ImageJVirtualStackUnsignedByte wrapAndScaleBoolean(final RandomAccessibleInterval< B > source )
 	{
 		return new ImageJVirtualStackUnsignedByte( Converters.convert(source, new ToBitByteSamplerConverter()) );
 	}

src/test/java/net/imglib2/imagej/RAIToImagePlusTest.java

@@ -233,7 +233,7 @@ public void testPersistenceBits()
 	{
 		// setup
 		final Img< BitType > img = ArrayImgs.bits( 1, 1 );
-		final ImagePlus imagePlus = RAIToImagePlus.wrapAndScaleBit( img, "test" );
+		final ImagePlus imagePlus = RAIToImagePlus.wrapAndScaleBoolean( img, "test" );
 		// process
 		final ImageProcessor processor = imagePlus.getStack().getProcessor( 1 );
 		processor.setf( 0, 0, 255 );