Changeset 10691 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2016-07-31T17:58:31+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11390, fix #12890 - finish transition to Java 8 predicates/functions

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/properties/PropertiesDialog.java (modified) (1 diff)
• mappaint/mapcss/ExpressionFactory.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -896 +896 @@
                 positionString = Utils.getPositionListString(position);
                 // if not all objects from the selection are member of this relation
-                if (selection.stream().anyMatch(Predicates.not(Predicates.inCollection(members)))) {
+                if (selection.stream().anyMatch(Predicates.inCollection(members).negate())) {
                     positionString += ",\u2717";
                 }

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

@@ -1135 +1135 @@
         public Float aggregateList(List<?> lst) {
             final List<Float> floats = Utils.transform(lst, (Function<Object, Float>) x -> Cascade.convertTo(x, float.class));
-            final Collection<Float> nonNullList = SubclassFilteredCollection.filter(floats, Predicates.not(Predicates.isNull()));
+            final Collection<Float> nonNullList = SubclassFilteredCollection.filter(floats, Predicates.<Float>isNull().negate());
             return nonNullList.isEmpty() ? (Float) Float.NaN : computeMax ? Collections.max(nonNullList) : Collections.min(nonNullList);
         }