From c23bfcd3603cbb67e4840d629423c6042b714790 Mon Sep 17 00:00:00 2001
From: Tobias Pietzsch <tobias.pietzsch@gmail.com>
Date: Mon, 15 Jan 2018 14:56:22 +0100
Subject: [PATCH] For consistency, move
AbstractVolatileNative[Numeric|Real]Type to package net.imglib2.type.numeric
---
.../AbstractVolatileNativeNumericType.java | 9 +++++----
.../AbstractVolatileNativeRealType.java | 9 +++++----
.../java/net/imglib2/type/numeric/VolatileARGBType.java | 2 --
.../imglib2/type/numeric/integer/VolatileByteType.java | 3 +--
.../imglib2/type/numeric/integer/VolatileIntType.java | 3 +--
.../imglib2/type/numeric/integer/VolatileLongType.java | 3 +--
.../imglib2/type/numeric/integer/VolatileShortType.java | 3 +--
.../type/numeric/integer/VolatileUnsignedByteType.java | 3 +--
.../type/numeric/integer/VolatileUnsignedIntType.java | 3 +--
.../type/numeric/integer/VolatileUnsignedLongType.java | 3 +--
.../type/numeric/integer/VolatileUnsignedShortType.java | 3 +--
.../imglib2/type/numeric/real/VolatileDoubleType.java | 3 +--
.../net/imglib2/type/numeric/real/VolatileFloatType.java | 3 +--
13 files changed, 20 insertions(+), 30 deletions(-)
rename src/main/java/net/imglib2/type/{volatiles => numeric}/AbstractVolatileNativeNumericType.java (94%)
rename src/main/java/net/imglib2/type/{volatiles => numeric}/AbstractVolatileNativeRealType.java (94%)
diff --git a/src/main/java/net/imglib2/type/volatiles/AbstractVolatileNativeNumericType.java b/src/main/java/net/imglib2/type/numeric/AbstractVolatileNativeNumericType.java
similarity index 94%
rename from src/main/java/net/imglib2/type/volatiles/AbstractVolatileNativeNumericType.java
rename to src/main/java/net/imglib2/type/numeric/AbstractVolatileNativeNumericType.java
index 0e24e9eb..cf41741c 100644
--- a/src/main/java/net/imglib2/type/volatiles/AbstractVolatileNativeNumericType.java
+++ b/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;
/**
diff --git a/src/main/java/net/imglib2/type/volatiles/AbstractVolatileNativeRealType.java b/src/main/java/net/imglib2/type/numeric/AbstractVolatileNativeRealType.java
similarity index 94%
rename from src/main/java/net/imglib2/type/volatiles/AbstractVolatileNativeRealType.java
rename to src/main/java/net/imglib2/type/numeric/AbstractVolatileNativeRealType.java
index d743d635..29f31b88 100644
--- a/src/main/java/net/imglib2/type/volatiles/AbstractVolatileNativeRealType.java
+++ b/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;
/**
diff --git a/src/main/java/net/imglib2/type/numeric/VolatileARGBType.java b/src/main/java/net/imglib2/type/numeric/VolatileARGBType.java
index 079a5e19..0486d5c3 100644
--- a/src/main/java/net/imglib2/type/numeric/VolatileARGBType.java
+++ b/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
diff --git a/src/main/java/net/imglib2/type/numeric/integer/VolatileByteType.java b/src/main/java/net/imglib2/type/numeric/integer/VolatileByteType.java
index 4cb78cdc..6c7889d1 100644
--- a/src/main/java/net/imglib2/type/numeric/integer/VolatileByteType.java
+++ b/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
diff --git a/src/main/java/net/imglib2/type/numeric/integer/VolatileIntType.java b/src/main/java/net/imglib2/type/numeric/integer/VolatileIntType.java
index 380d9029..841ed1df 100644
--- a/src/main/java/net/imglib2/type/numeric/integer/VolatileIntType.java
+++ b/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
diff --git a/src/main/java/net/imglib2/type/numeric/integer/VolatileLongType.java b/src/main/java/net/imglib2/type/numeric/integer/VolatileLongType.java
index b2945a79..55d123d9 100644
--- a/src/main/java/net/imglib2/type/numeric/integer/VolatileLongType.java
+++ b/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
diff --git a/src/main/java/net/imglib2/type/numeric/integer/VolatileShortType.java b/src/main/java/net/imglib2/type/numeric/integer/VolatileShortType.java
index 92198aca..35ddaf71 100644
--- a/src/main/java/net/imglib2/type/numeric/integer/VolatileShortType.java
+++ b/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
diff --git a/src/main/java/net/imglib2/type/numeric/integer/VolatileUnsignedByteType.java b/src/main/java/net/imglib2/type/numeric/integer/VolatileUnsignedByteType.java
index 2be925f1..4be11a90 100644
--- a/src/main/java/net/imglib2/type/numeric/integer/VolatileUnsignedByteType.java
+++ b/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
diff --git a/src/main/java/net/imglib2/type/numeric/integer/VolatileUnsignedIntType.java b/src/main/java/net/imglib2/type/numeric/integer/VolatileUnsignedIntType.java
index 53ebf01d..84e168fd 100644
--- a/src/main/java/net/imglib2/type/numeric/integer/VolatileUnsignedIntType.java
+++ b/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
diff --git a/src/main/java/net/imglib2/type/numeric/integer/VolatileUnsignedLongType.java b/src/main/java/net/imglib2/type/numeric/integer/VolatileUnsignedLongType.java
index 5be7748b..40a92820 100644
--- a/src/main/java/net/imglib2/type/numeric/integer/VolatileUnsignedLongType.java
+++ b/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
diff --git a/src/main/java/net/imglib2/type/numeric/integer/VolatileUnsignedShortType.java b/src/main/java/net/imglib2/type/numeric/integer/VolatileUnsignedShortType.java
index 8d831e99..7e43ce10 100644
--- a/src/main/java/net/imglib2/type/numeric/integer/VolatileUnsignedShortType.java
+++ b/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
diff --git a/src/main/java/net/imglib2/type/numeric/real/VolatileDoubleType.java b/src/main/java/net/imglib2/type/numeric/real/VolatileDoubleType.java
index 3a5e3f40..dad4ac69 100644
--- a/src/main/java/net/imglib2/type/numeric/real/VolatileDoubleType.java
+++ b/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
diff --git a/src/main/java/net/imglib2/type/numeric/real/VolatileFloatType.java b/src/main/java/net/imglib2/type/numeric/real/VolatileFloatType.java
index c89bb7d3..b7b5b5c5 100644
--- a/src/main/java/net/imglib2/type/numeric/real/VolatileFloatType.java
+++ b/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
--
GitLab