OpenJDK / lambda / lambda / jdk
changeset 5978:9a3dcf47cde2 it2-bootstrap
trim back patch.
| author | mduigou |
|---|---|
| date | Wed, 05 Sep 2012 14:23:46 -0700 |
| parents | 595508a2d66f |
| children | 250842824019 |
| files | src/share/classes/java/util/streams/Sink.java src/share/classes/java/util/streams/TerminalSink.java src/share/classes/java/util/streams/ops/ForEachOp.java |
| diffstat | 3 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/util/streams/Sink.java Wed Sep 05 12:45:01 2012 -0700 +++ b/src/share/classes/java/util/streams/Sink.java Wed Sep 05 14:23:46 2012 -0700 @@ -61,6 +61,8 @@ void apply(K k, V v) default { accept(k, v); } public interface OfLinear<T> extends Sink<T, Object, Object> { + @Override + void begin(int size) default {} } public static abstract class ChainedLinear<T> implements OfLinear<T> {
--- a/src/share/classes/java/util/streams/TerminalSink.java Wed Sep 05 12:45:01 2012 -0700 +++ b/src/share/classes/java/util/streams/TerminalSink.java Wed Sep 05 14:23:46 2012 -0700 @@ -35,6 +35,10 @@ */ public interface TerminalSink<T, R> extends Sink<T, Object, Object> { + /** + * @@@ consider removing default + * @param size + */ @Override void begin(int size) default { }
--- a/src/share/classes/java/util/streams/ops/ForEachOp.java Wed Sep 05 12:45:01 2012 -0700 +++ b/src/share/classes/java/util/streams/ops/ForEachOp.java Wed Sep 05 14:23:46 2012 -0700 @@ -47,11 +47,7 @@ public static<T> ForEachOp<T> make(final Block<? super T> block) { return new ForEachOp<>(new TerminalSink<T, Void>() { - - @Override - public void begin(int size) { } - - @Override + @Override public void accept(T t) { block.apply(t); } @@ -67,9 +63,6 @@ Objects.requireNonNull(block); return new ForEachOp<>(new TerminalSink<Mapping<K,V>, Void>() { @Override - public void begin(int size) { } - - @Override public void accept(Object k, Object v) { block.apply((K) k, (V) v); }