Changeset 10611 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss

Timestamp:

2016-07-23T18:46:45+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11390 - sonar - squid:S1604 - Java 8: Anonymous inner classes containing only one method should become lambdas

File:

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

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

@@ -39 +39 @@
 import org.openstreetmap.josm.tools.RightAndLefthandTraffic;
 import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.Utils.Function;
 
 /**
@@ -1127 +1128 @@
 
         public Float aggregateList(List<?> lst) {
-            final List<Float> floats = Utils.transform(lst, new Utils.Function<Object, Float>() {
-                @Override
-                public Float apply(Object x) {
-                    return Cascade.convertTo(x, float.class);
-                }
-            });
+            final List<Float> floats = Utils.transform(lst, (Function<Object, Float>) x -> Cascade.convertTo(x, float.class));
             final Collection<Float> nonNullList = Utils.filter(floats, Predicates.not(Predicates.isNull()));
             return nonNullList.isEmpty() ? (Float) Float.NaN : computeMax ? Collections.max(nonNullList) : Collections.min(nonNullList);
@@ -1141 +1137 @@
             List<?> l = Cascade.convertTo(args.get(0).evaluate(env), List.class);
             if (args.size() != 1 || l == null)
-                l = Utils.transform(args, new Utils.Function<Expression, Object>() {
-                    @Override
-                    public Object apply(Expression x) {
-                        return x.evaluate(env);
-                    }
-                });
+                l = Utils.transform(args, (Function<Expression, Object>) x -> x.evaluate(env));
             return aggregateList(l);
         }