Add default getType impl for Sampler and IterableRealInterval

imglib · May 7, 2024 · 6d46513 · 6d46513
1 parent eb42ae1
commit 6d46513
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/src/main/java/net/imglib2/IterableRealInterval.java b/src/main/java/net/imglib2/IterableRealInterval.java
@@ -122,11 +122,11 @@ default T firstElement() // TODO: fix places where it is not necessary to implem
 	 * NB: We cannot have a default implementation here because of
 	 * https://bugs.openjdk.org/browse/JDK-7120669
 	 */
-//	@Override
-//	default T getType()
-//	{
-//		return firstElement();
-//	}
+	@Override
+	default T getType()
+	{
+		return firstElement();
+	}
 
 	/**
 	 * Returns the iteration order of this {@link IterableRealInterval}. If the

diff --git a/src/main/java/net/imglib2/KDTree.java b/src/main/java/net/imglib2/KDTree.java
@@ -117,6 +117,7 @@ private static < A > Iterable< RealLocalizable > positionsIterable( IterableReal
 	{
 		return new AbstractConvertedIterableRealInterval< A, RealLocalizable >( sourceInterval )
 		{
+
 			class Cursor extends AbstractConvertedRealCursor< A, RealLocalizable >
 			{
 				Cursor( final RealCursor< A > source )
@@ -143,12 +144,6 @@ public RealLocalizable getType()
 				}
 			}
 
-			@Override
-			public RealLocalizable getType()
-			{
-				return firstElement();
-			}
-
 			@Override
 			public AbstractConvertedRealCursor< A, RealLocalizable > cursor()
 			{

diff --git a/src/main/java/net/imglib2/Sampler.java b/src/main/java/net/imglib2/Sampler.java
@@ -74,8 +74,9 @@ public interface Sampler< T > extends Typed< T >
 	 */
 	Sampler< T > copy();
 
-//	@Override default T getType() // TODO GET-TYPE: do we want a default implementation here?
-//	{
-//		return get();
-//	}
+	@Override
+	default T getType()
+	{
+		return get();
+	}
 }