changeset 6029:3fffb5b9ab11

additional cleanups for BiMatchOp Fix broken old make
author mduigou
date Mon, 17 Sep 2012 20:03:56 -0700
parents 01404a1c0e85
children ad8c1985b8b2
files make/java/java/FILES_java.gmk src/share/classes/java/util/streams/MapPipeline.java
diffstat 2 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/make/java/java/FILES_java.gmk	Mon Sep 17 17:42:58 2012 -0700
+++ b/make/java/java/FILES_java.gmk	Mon Sep 17 20:03:56 2012 -0700
@@ -405,7 +405,7 @@
     java/util/streams/StreamShape.java \
     java/util/streams/Sink.java \
     java/util/streams/MapStreamable.java \
-    java/util/streams/ops/BiAnyMatchOp.java \
+    java/util/streams/ops/BiMatchOp.java \
     java/util/streams/ops/MapMapValuesOp.java \
     java/util/streams/ops/FlatMapOp.java \
     java/util/streams/ops/BiFilterOp.java \
@@ -418,7 +418,6 @@
     java/util/streams/ops/MapSortedOp.java \
     java/util/streams/ops/SortedOp.java \
     java/util/streams/ops/ShortCircuitTerminalOp.java \
-    java/util/streams/ops/BiAllMatchOp.java \
     java/util/streams/ops/ReduceByOp.java \
     java/util/streams/ops/FoldOp.java \
     java/util/streams/ops/TeeOp.java \
--- a/src/share/classes/java/util/streams/MapPipeline.java	Mon Sep 17 17:42:58 2012 -0700
+++ b/src/share/classes/java/util/streams/MapPipeline.java	Mon Sep 17 20:03:56 2012 -0700
@@ -145,17 +145,17 @@
 
     @Override
     public boolean noneMatch(BiPredicate<? super K, ? super V> predicate) {
-        return allMatch(predicate.negate());
+        return pipeline(new BiMatchOp<>(predicate, BiMatchOp.MatchKind.NONE));
     }
 
     @Override
     public boolean allMatch(BiPredicate<? super K, ? super V> predicate) {
-        return pipeline(new BiAllMatchOp<>(predicate));
+        return pipeline(new BiMatchOp<>(predicate, BiMatchOp.MatchKind.ALL));
     }
 
     @Override
     public boolean anyMatch(BiPredicate<? super K, ? super V> predicate) {
-        return pipeline(new BiAnyMatchOp<>(predicate));
+        return pipeline(new BiMatchOp<>(predicate, BiMatchOp.MatchKind.ANY));
     }
 
     @Override