Changeset 15907 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

2020-02-23T00:29:49+01:00 (4 years ago)

Author:

simon04

Message:

ExpressionFactory: use Stream API

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

@@ -182 +182 @@
         @Override
         public Object evaluate(Environment env) {
-            for (Expression arg : args) {
-                Boolean b = Cascade.convertTo(arg.evaluate(env), boolean.class);
-                if (b == null || !b) {
-                    return Boolean.FALSE;
-                }
-            }
-            return Boolean.TRUE;
+            return args.stream()
+                    .map(arg -> Cascade.convertTo(arg.evaluate(env), boolean.class))
+                    .allMatch(Boolean.TRUE::equals);
         }
     }
@@ -209 +205 @@
         @Override
         public Object evaluate(Environment env) {
-            for (Expression arg : args) {
-                Boolean b = Cascade.convertTo(arg.evaluate(env), boolean.class);
-                if (b != null && b) {
-                    return Boolean.TRUE;
-                }
-            }
-            return Boolean.FALSE;
+            return args.stream()
+                    .map(arg -> Cascade.convertTo(arg.evaluate(env), boolean.class))
+                    .anyMatch(Boolean.TRUE::equals);
         }
     }