Make RealRandomAccess a RandomAccess

Author: gselzer

src/main/java/net/imglib2/RealRandomAccess.java

@@ -39,7 +39,7 @@
  * @author Stephan Preibisch
  * @author Stephan Saalfeld
  */
-public interface RealRandomAccess< T > extends RealLocalizable, RealPositionable, Sampler< T >
+public interface RealRandomAccess< T > extends RealLocalizable, RealPositionable, RandomAccess<T>
 {
 	// NB: Ideally, we would utilize covariant inheritance to narrow the return
 	// type of a single copy() method here, rather than needing separate methods
@@ -168,4 +168,9 @@ default T setPositionAndGet( final RealLocalizable position )
 		return get();
 	}
 
+	@Override
+	default long getLongPosition(int d) {
+		return (long) getDoublePosition(d);
+	}
+
 }

src/main/java/net/imglib2/RealRandomAccessible.java

@@ -148,161 +148,12 @@ default RealRandomAccessibleView< T > realView()
 
 	@Override
 	default RandomAccess< T > randomAccess() {
-		return randomAccess(null);
+		return realRandomAccess();
 	}
 
 	@Override
 	default RandomAccess< T > randomAccess(final Interval interval) {
-		final RealRandomAccess<T> sourceAccess = interval == null ? realRandomAccess() : realRandomAccess(interval);
-		final int n = numDimensions();
-		return new RandomAccess<T>() {
-
-			@Override
-			public void localize( final int[] position )
-			{
-				for ( int d = 0; d < n; ++d )
-					position[ d ] = ( int ) Math.round( sourceAccess.getDoublePosition( d ) );
-			}
-
-			@Override
-			public void localize( final long[] position )
-			{
-				for ( int d = 0; d < n; ++d )
-					position[ d ] = Math.round( sourceAccess.getDoublePosition( d ) );
-			}
-
-			@Override
-			public int getIntPosition( final int d )
-			{
-				return ( int ) Math.round( sourceAccess.getDoublePosition( d ) );
-			}
-
-			@Override
-			public long getLongPosition( final int d )
-			{
-				return Math.round( sourceAccess.getDoublePosition( d ) );
-			}
-
-			@Override
-			public void localize( final float[] position )
-			{
-				sourceAccess.localize( position );
-			}
-
-			@Override
-			public void localize( final double[] position )
-			{
-				sourceAccess.localize( position );
-			}
-
-			@Override
-			public float getFloatPosition( final int d )
-			{
-				return sourceAccess.getFloatPosition( d );
-			}
-
-			@Override
-			public double getDoublePosition( final int d )
-			{
-				return sourceAccess.getDoublePosition( d );
-			}
-
-			@Override
-			public void fwd( final int d )
-			{
-				sourceAccess.fwd( d );
-			}
-
-			@Override
-			public void bck( final int d )
-			{
-				sourceAccess.bck( d );
-			}
-
-			@Override
-			public void move( final int distance, final int d )
-			{
-				sourceAccess.move( distance, d );
-			}
-
-			@Override
-			public void move( final long distance, final int d )
-			{
-				sourceAccess.move( distance, d );
-			}
-
-			@Override
-			public void move( final Localizable localizable )
-			{
-				sourceAccess.move( localizable );
-			}
-
-			@Override
-			public void move( final int[] distance )
-			{
-				sourceAccess.move( distance );
-			}
-
-			@Override
-			public void move( final long[] distance )
-			{
-				sourceAccess.move( distance );
-			}
-
-			@Override
-			public void setPosition( final Localizable localizable )
-			{
-				sourceAccess.setPosition( localizable );
-			}
-
-			@Override
-			public void setPosition( final int[] position )
-			{
-				sourceAccess.setPosition( position );
-			}
-
-			@Override
-			public void setPosition( final long[] position )
-			{
-				sourceAccess.setPosition( position );
-			}
-
-			@Override
-			public void setPosition( final int position, final int d )
-			{
-				sourceAccess.setPosition( position, d );
-			}
-
-			@Override
-			public void setPosition( final long position, final int d )
-			{
-				sourceAccess.setPosition( position, d );
-			}
-
-			@Override
-			public T get()
-			{
-				return sourceAccess.get();
-			}
-
-			@Override
-			public T getType()
-			{
-				return sourceAccess.getType();
-			}
-
-			@Override
-			public RandomAccess<T> copy()
-			{
-				return randomAccess();
-			}
-
-			@Override
-			public int numDimensions()
-			{
-				return n;
-			}
-		};
+		return realRandomAccess(interval);
 	}
 
 	/*