OpenJDK / lambda / lambda / jdk
changeset 5966:eaa2a29f3b92 it2-bootstrap
Remove unneeded Splittable interface
| author | briangoetz |
|---|---|
| date | Tue, 04 Sep 2012 12:02:51 -0400 |
| parents | beb45a05989e |
| children | 371fab648ba1 |
| files | make/java/java/FILES_java.gmk src/share/classes/java/util/Splittable.java src/share/classes/java/util/streams/ops/TreeUtils.java |
| diffstat | 3 files changed, 3 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/make/java/java/FILES_java.gmk Tue Sep 04 11:33:42 2012 -0400 +++ b/make/java/java/FILES_java.gmk Tue Sep 04 12:02:51 2012 -0400 @@ -281,7 +281,6 @@ java/util/TimerTask.java \ java/util/Objects.java \ java/util/UUID.java \ - java/util/Splittable.java \ java/util/concurrent/AbstractExecutorService.java \ java/util/concurrent/ArrayBlockingQueue.java \ java/util/concurrent/BlockingDeque.java \
--- a/src/share/classes/java/util/Splittable.java Tue Sep 04 11:33:42 2012 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -package java.util; - -/** - * A decomposable container for elements. - * - * @param <T> the type of elements returned by the sequential iterator - */ -public interface Splittable<T> extends Iterable<T> { - Spliterator<T> spliterator(); -}
--- a/src/share/classes/java/util/streams/ops/TreeUtils.java Tue Sep 04 11:33:42 2012 -0400 +++ b/src/share/classes/java/util/streams/ops/TreeUtils.java Tue Sep 04 12:02:51 2012 -0400 @@ -199,8 +199,10 @@ } } - public static interface Node<T> extends Traversable<T>, Streamable<T>, Splittable<T>, Sized { + public static interface Node<T> extends Traversable<T>, Streamable<T>, Sized, Iterable<T> { void copyTo(T[] array, int offset); + + Spliterator<T> spliterator(); } public static interface InternalNode<T> extends Node<T> {