diff --git a/src/main/java/net/imglib2/img/array/ArrayLocalizingSpliterator.java b/src/main/java/net/imglib2/img/array/ArrayLocalizingSpliterator.java index bcfe6dd67..104fb1b81 100644 --- a/src/main/java/net/imglib2/img/array/ArrayLocalizingSpliterator.java +++ b/src/main/java/net/imglib2/img/array/ArrayLocalizingSpliterator.java @@ -80,17 +80,6 @@ public boolean tryAdvance( final Consumer< ? super T > action ) return false; } - @Override - public boolean tryAdvance() - { - if ( index.get() < fence - 1 ) - { - fwd(); - return true; - } - return false; - } - private void fwd() { index.inc(); diff --git a/src/main/java/net/imglib2/img/array/ArraySpliterator.java b/src/main/java/net/imglib2/img/array/ArraySpliterator.java index 35d2e3940..1253fcb26 100644 --- a/src/main/java/net/imglib2/img/array/ArraySpliterator.java +++ b/src/main/java/net/imglib2/img/array/ArraySpliterator.java @@ -77,17 +77,6 @@ public boolean tryAdvance( final Consumer< ? super T > action ) return false; } - @Override - public boolean tryAdvance() - { - if ( index.get() < fence - 1 ) - { - index.inc(); - return true; - } - return false; - } - @Override public void forEachRemaining( final Consumer< ? super T > action ) { diff --git a/src/main/java/net/imglib2/img/cell/CellSpliterator.java b/src/main/java/net/imglib2/img/cell/CellSpliterator.java index 8f47cc5a9..e7ee6c949 100644 --- a/src/main/java/net/imglib2/img/cell/CellSpliterator.java +++ b/src/main/java/net/imglib2/img/cell/CellSpliterator.java @@ -119,27 +119,16 @@ private void cellUpdated() type.updateContainer( currentCell ); } - @Override public boolean tryAdvance( final Consumer< ? super T > action ) { if ( action == null ) throw new NullPointerException(); - if ( tryAdvance() ) - { - action.accept( type ); - return true; - } - return false; - } - - @Override - public boolean tryAdvance() - { if ( index.get() < lastIndexInCurrentCell ) { index.inc(); + action.accept( type ); return true; } else if ( currentCell.index() < lastCell ) @@ -147,6 +136,7 @@ else if ( currentCell.index() < lastCell ) currentCell.fwd(); cellUpdated(); index.set( 0 ); + action.accept( type ); return true; } else diff --git a/src/main/java/net/imglib2/img/planar/PlanarSpliterator.java b/src/main/java/net/imglib2/img/planar/PlanarSpliterator.java index 8c2912a83..6b9b0cb65 100644 --- a/src/main/java/net/imglib2/img/planar/PlanarSpliterator.java +++ b/src/main/java/net/imglib2/img/planar/PlanarSpliterator.java @@ -113,17 +113,6 @@ public boolean tryAdvance( final Consumer< ? super T > action ) if ( action == null ) throw new NullPointerException(); - if ( tryAdvance() ) - { - action.accept( type ); - return true; - } - return false; - } - - @Override - public boolean tryAdvance() - { if ( slice >= lastSlice && index.get() >= lastIndexInLastSlice ) return false; @@ -138,6 +127,7 @@ public boolean tryAdvance() type.updateContainer( this ); } + action.accept( type ); return true; } diff --git a/src/main/java/net/imglib2/stream/CursorSpliterator.java b/src/main/java/net/imglib2/stream/CursorSpliterator.java index 64e06cc63..f6462122c 100644 --- a/src/main/java/net/imglib2/stream/CursorSpliterator.java +++ b/src/main/java/net/imglib2/stream/CursorSpliterator.java @@ -69,18 +69,6 @@ public boolean tryAdvance( final Consumer< ? super T > action ) return false; } - @Override - public boolean tryAdvance() - { - if ( index >= 0 && index < fence ) - { - ++index; - cursor.fwd(); - return true; - } - return false; - } - @Override public CursorSpliterator< T > trySplit() { diff --git a/src/main/java/net/imglib2/stream/LocalizableSamplerWrapper.java b/src/main/java/net/imglib2/stream/LocalizableSamplerWrapper.java index 338330a6f..26852e944 100644 --- a/src/main/java/net/imglib2/stream/LocalizableSamplerWrapper.java +++ b/src/main/java/net/imglib2/stream/LocalizableSamplerWrapper.java @@ -30,19 +30,13 @@ public LocalizableSamplerWrapper< T > copy() @Override public void forEachRemaining( final Consumer< ? super LocalizableSampler< T > > action ) { - delegate.forEachRemaining( () -> action.accept( this ) ); + delegate.forEachRemaining( t -> action.accept( this ) ); } @Override public boolean tryAdvance( final Consumer< ? super LocalizableSampler< T > > action ) { - if ( delegate.tryAdvance() ) - { - action.accept( this ); - return true; - } - else - return false; + return delegate.tryAdvance( t -> action.accept( this ) ); } @Override diff --git a/src/main/java/net/imglib2/stream/RealCursorSpliterator.java b/src/main/java/net/imglib2/stream/RealCursorSpliterator.java index ffbe81205..9a0db2c24 100644 --- a/src/main/java/net/imglib2/stream/RealCursorSpliterator.java +++ b/src/main/java/net/imglib2/stream/RealCursorSpliterator.java @@ -67,18 +67,6 @@ public boolean tryAdvance( final Consumer< ? super T > action ) return false; } - @Override - public boolean tryAdvance() - { - if ( index >= 0 && index < fence ) - { - ++index; - cursor.fwd(); - return true; - } - return false; - } - @Override public RealCursorSpliterator< T > trySplit() { diff --git a/src/main/java/net/imglib2/stream/RealLocalizableSamplerWrapper.java b/src/main/java/net/imglib2/stream/RealLocalizableSamplerWrapper.java index 8dfdf48a5..c31e8d3fb 100644 --- a/src/main/java/net/imglib2/stream/RealLocalizableSamplerWrapper.java +++ b/src/main/java/net/imglib2/stream/RealLocalizableSamplerWrapper.java @@ -29,19 +29,13 @@ public RealLocalizableSamplerWrapper< T > copy() @Override public void forEachRemaining( final Consumer< ? super RealLocalizableSampler< T > > action ) { - delegate.forEachRemaining( () -> action.accept( this ) ); + delegate.forEachRemaining( t -> action.accept( this ) ); } @Override public boolean tryAdvance( final Consumer< ? super RealLocalizableSampler< T > > action ) { - if ( delegate.tryAdvance() ) - { - action.accept( this ); - return true; - } - else - return false; + return delegate.tryAdvance( t -> action.accept( this ) ); } @Override diff --git a/src/main/java/net/imglib2/stream/RealLocalizableSpliterator.java b/src/main/java/net/imglib2/stream/RealLocalizableSpliterator.java index 6617a02c0..52b6290b7 100644 --- a/src/main/java/net/imglib2/stream/RealLocalizableSpliterator.java +++ b/src/main/java/net/imglib2/stream/RealLocalizableSpliterator.java @@ -6,13 +6,6 @@ public interface RealLocalizableSpliterator< T > extends Spliterator< T >, RealLocalizable, Sampler< T > { - boolean tryAdvance(); - - default void forEachRemaining( final Runnable action ) - { - forEachRemaining( t -> action.run() ); - } - @Override RealLocalizableSpliterator< T > trySplit();