changeset 9578:fa73fcb2b3d1

Sync with method sigs in tl. (although i am not sure they actually convey any advantage)
author psandoz
date Tue, 03 Sep 2013 16:31:38 +0200
parents b73937e96ae0
children f8eba70e0d80
files src/share/classes/java/util/stream/ReferencePipeline.java src/share/classes/java/util/stream/Stream.java
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/java/util/stream/ReferencePipeline.java	Mon Sep 02 11:59:57 2013 +0200
+++ b/src/share/classes/java/util/stream/ReferencePipeline.java	Tue Sep 03 16:31:38 2013 +0200
@@ -500,7 +500,7 @@
 
     @Override
     @SuppressWarnings("unchecked")
-    public final <R, A> R collect(Collector<? super P_OUT, A, R> collector) {
+    public final <R, A> R collect(Collector<? super P_OUT, A, ? extends R> collector) {
         A container;
         if (isParallel()
                 && (collector.characteristics().contains(Collector.Characteristics.CONCURRENT))
--- a/src/share/classes/java/util/stream/Stream.java	Mon Sep 02 11:59:57 2013 +0200
+++ b/src/share/classes/java/util/stream/Stream.java	Tue Sep 03 16:31:38 2013 +0200
@@ -714,7 +714,7 @@
      * @see #collect(Supplier, BiConsumer, BiConsumer)
      * @see Collectors
      */
-    <R, A> R collect(Collector<? super T, A, R> collector);
+    <R, A> R collect(Collector<? super T, A, ? extends R> collector);
 
     /**
      * Returns the minimum element of this stream according to the provided