Changeset 10716 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java

Timestamp:

2016-08-03T15:30:04+02:00 (8 years ago)

Author:

simon04

Message:

see #11390, see #12890 - Deprecate predicates in OsmPrimitive class

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java

@@ -20 +20 @@
 import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -199 +200 @@
     public void prepareDefaultRelationDecisions() {
 
-        if (primitives.stream().allMatch(OsmPrimitive.nodePredicate)) {
+        if (primitives.stream().allMatch(Node.class::isInstance)) {
             final Collection<OsmPrimitive> primitivesInDecisions = new HashSet<>();
             for (final RelationMemberConflictDecision i : decisions) {