For consistency, move AbstractVolatileNative[Numeric|Real]Type to package net.imglib2.type.numeric

src/main/java/net/imglib2/type/volatiles/AbstractVolatileNativeNumericType.java → src/main/java/net/imglib2/type/numeric/AbstractVolatileNativeNumericType.java

@@ -7,13 +7,13 @@
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -28,10 +28,11 @@
  * #L%
  */
 
-package net.imglib2.type.volatiles;
+package net.imglib2.type.numeric;
 
 import net.imglib2.type.NativeType;
-import net.imglib2.type.numeric.NumericType;
+import net.imglib2.type.volatiles.AbstractVolatileNumericType;
+import net.imglib2.type.volatiles.VolatileNumericType;
 import net.imglib2.util.Fraction;
 
 /**

src/main/java/net/imglib2/type/volatiles/AbstractVolatileNativeRealType.java → src/main/java/net/imglib2/type/numeric/AbstractVolatileNativeRealType.java

@@ -7,13 +7,13 @@
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -28,10 +28,11 @@
  * #L%
  */
 
-package net.imglib2.type.volatiles;
+package net.imglib2.type.numeric;
 
 import net.imglib2.type.NativeType;
-import net.imglib2.type.numeric.RealType;
+import net.imglib2.type.volatiles.AbstractVolatileRealType;
+import net.imglib2.type.volatiles.VolatileRealType;
 import net.imglib2.util.Fraction;
 
 /**

src/main/java/net/imglib2/type/numeric/VolatileARGBType.java

@@ -31,13 +31,11 @@ package net.imglib2.type.numeric;
 
 import net.imglib2.Volatile;
 import net.imglib2.img.NativeImg;
-import net.imglib2.img.basictypeaccess.IntAccess;
 import net.imglib2.img.basictypeaccess.volatiles.VolatileIntAccess;
 import net.imglib2.img.basictypeaccess.volatiles.VolatileShortAccess;
 import net.imglib2.img.basictypeaccess.volatiles.array.VolatileIntArray;
 import net.imglib2.type.PrimitiveTypeInfo;
 import net.imglib2.type.numeric.integer.UnsignedShortType;
-import net.imglib2.type.volatiles.AbstractVolatileNativeNumericType;
 
 /**
  * A {@link Volatile} variant of {@link UnsignedShortType}. It uses an

src/main/java/net/imglib2/type/numeric/integer/VolatileByteType.java

@@ -31,11 +31,10 @@ package net.imglib2.type.numeric.integer;
 
 import net.imglib2.Volatile;
 import net.imglib2.img.NativeImg;
-import net.imglib2.img.basictypeaccess.ByteAccess;
 import net.imglib2.img.basictypeaccess.volatiles.VolatileByteAccess;
 import net.imglib2.img.basictypeaccess.volatiles.array.VolatileByteArray;
 import net.imglib2.type.PrimitiveTypeInfo;
-import net.imglib2.type.volatiles.AbstractVolatileNativeRealType;
+import net.imglib2.type.numeric.AbstractVolatileNativeRealType;
 
 /**
  * A {@link Volatile} variant of {@link ByteType}. It uses an

src/main/java/net/imglib2/type/numeric/integer/VolatileIntType.java

@@ -31,11 +31,10 @@ package net.imglib2.type.numeric.integer;
 
 import net.imglib2.Volatile;
 import net.imglib2.img.NativeImg;
-import net.imglib2.img.basictypeaccess.IntAccess;
 import net.imglib2.img.basictypeaccess.volatiles.VolatileIntAccess;
 import net.imglib2.img.basictypeaccess.volatiles.array.VolatileIntArray;
 import net.imglib2.type.PrimitiveTypeInfo;
-import net.imglib2.type.volatiles.AbstractVolatileNativeRealType;
+import net.imglib2.type.numeric.AbstractVolatileNativeRealType;
 
 /**
  * A {@link Volatile} variant of {@link IntType}. It uses an

src/main/java/net/imglib2/type/numeric/integer/VolatileLongType.java

@@ -31,11 +31,10 @@ package net.imglib2.type.numeric.integer;
 
 import net.imglib2.Volatile;
 import net.imglib2.img.NativeImg;
-import net.imglib2.img.basictypeaccess.LongAccess;
 import net.imglib2.img.basictypeaccess.volatiles.VolatileLongAccess;
 import net.imglib2.img.basictypeaccess.volatiles.array.VolatileLongArray;
 import net.imglib2.type.PrimitiveTypeInfo;
-import net.imglib2.type.volatiles.AbstractVolatileNativeRealType;
+import net.imglib2.type.numeric.AbstractVolatileNativeRealType;
 
 /**
  * A {@link Volatile} variant of {@link LongType}. It uses an

src/main/java/net/imglib2/type/numeric/integer/VolatileShortType.java

@@ -31,11 +31,10 @@ package net.imglib2.type.numeric.integer;
 
 import net.imglib2.Volatile;
 import net.imglib2.img.NativeImg;
-import net.imglib2.img.basictypeaccess.ShortAccess;
 import net.imglib2.img.basictypeaccess.volatiles.VolatileShortAccess;
 import net.imglib2.img.basictypeaccess.volatiles.array.VolatileShortArray;
 import net.imglib2.type.PrimitiveTypeInfo;
-import net.imglib2.type.volatiles.AbstractVolatileNativeRealType;
+import net.imglib2.type.numeric.AbstractVolatileNativeRealType;
 
 /**
  * A {@link Volatile} variant of {@link ShortType}. It uses an

src/main/java/net/imglib2/type/numeric/integer/VolatileUnsignedByteType.java

@@ -31,11 +31,10 @@ package net.imglib2.type.numeric.integer;
 
 import net.imglib2.Volatile;
 import net.imglib2.img.NativeImg;
-import net.imglib2.img.basictypeaccess.ByteAccess;
 import net.imglib2.img.basictypeaccess.volatiles.VolatileByteAccess;
 import net.imglib2.img.basictypeaccess.volatiles.array.VolatileByteArray;
 import net.imglib2.type.PrimitiveTypeInfo;
-import net.imglib2.type.volatiles.AbstractVolatileNativeRealType;
+import net.imglib2.type.numeric.AbstractVolatileNativeRealType;
 
 /**
  * A {@link Volatile} variant of {@link UnsignedByteType}. It uses an

src/main/java/net/imglib2/type/numeric/integer/VolatileUnsignedIntType.java

@@ -31,11 +31,10 @@ package net.imglib2.type.numeric.integer;
 
 import net.imglib2.Volatile;
 import net.imglib2.img.NativeImg;
-import net.imglib2.img.basictypeaccess.IntAccess;
 import net.imglib2.img.basictypeaccess.volatiles.VolatileIntAccess;
 import net.imglib2.img.basictypeaccess.volatiles.array.VolatileIntArray;
 import net.imglib2.type.PrimitiveTypeInfo;
-import net.imglib2.type.volatiles.AbstractVolatileNativeRealType;
+import net.imglib2.type.numeric.AbstractVolatileNativeRealType;
 
 /**
  * A {@link Volatile} variant of {@link UnsignedIntType}. It uses an underlying

src/main/java/net/imglib2/type/numeric/integer/VolatileUnsignedLongType.java

@@ -31,11 +31,10 @@ package net.imglib2.type.numeric.integer;
 
 import net.imglib2.Volatile;
 import net.imglib2.img.NativeImg;
-import net.imglib2.img.basictypeaccess.LongAccess;
 import net.imglib2.img.basictypeaccess.volatiles.VolatileLongAccess;
 import net.imglib2.img.basictypeaccess.volatiles.array.VolatileLongArray;
 import net.imglib2.type.PrimitiveTypeInfo;
-import net.imglib2.type.volatiles.AbstractVolatileNativeRealType;
+import net.imglib2.type.numeric.AbstractVolatileNativeRealType;
 
 /**
  * A {@link Volatile} variant of {@link UnsignedLongType}. It uses an underlying

src/main/java/net/imglib2/type/numeric/integer/VolatileUnsignedShortType.java

@@ -31,11 +31,10 @@ package net.imglib2.type.numeric.integer;
 
 import net.imglib2.Volatile;
 import net.imglib2.img.NativeImg;
-import net.imglib2.img.basictypeaccess.ShortAccess;
 import net.imglib2.img.basictypeaccess.volatiles.VolatileShortAccess;
 import net.imglib2.img.basictypeaccess.volatiles.array.VolatileShortArray;
 import net.imglib2.type.PrimitiveTypeInfo;
-import net.imglib2.type.volatiles.AbstractVolatileNativeRealType;
+import net.imglib2.type.numeric.AbstractVolatileNativeRealType;
 
 /**
  * A {@link Volatile} variant of {@link UnsignedShortType}. It uses an

src/main/java/net/imglib2/type/numeric/real/VolatileDoubleType.java

@@ -31,11 +31,10 @@ package net.imglib2.type.numeric.real;
 
 import net.imglib2.Volatile;
 import net.imglib2.img.NativeImg;
-import net.imglib2.img.basictypeaccess.DoubleAccess;
 import net.imglib2.img.basictypeaccess.volatiles.VolatileDoubleAccess;
 import net.imglib2.img.basictypeaccess.volatiles.array.VolatileDoubleArray;
 import net.imglib2.type.PrimitiveTypeInfo;
-import net.imglib2.type.volatiles.AbstractVolatileNativeRealType;
+import net.imglib2.type.numeric.AbstractVolatileNativeRealType;
 
 /**
  * A {@link Volatile} variant of {@link DoubleType}. It uses an

src/main/java/net/imglib2/type/numeric/real/VolatileFloatType.java

@@ -31,11 +31,10 @@ package net.imglib2.type.numeric.real;
 
 import net.imglib2.Volatile;
 import net.imglib2.img.NativeImg;
-import net.imglib2.img.basictypeaccess.FloatAccess;
 import net.imglib2.img.basictypeaccess.volatiles.VolatileFloatAccess;
 import net.imglib2.img.basictypeaccess.volatiles.array.VolatileFloatArray;
 import net.imglib2.type.PrimitiveTypeInfo;
-import net.imglib2.type.volatiles.AbstractVolatileNativeRealType;
+import net.imglib2.type.numeric.AbstractVolatileNativeRealType;
 
 /**
  * A {@link Volatile} variant of {@link FloatType}. It uses an