Changeset 10657 in josm for trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java

Timestamp:

2016-07-27T02:08:34+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11390, see #12890 - use Java 8 Predicates

File:

• trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java

@@ -235 +235 @@
         }
 
-        static PropertiesMembershipDialog showIfNecessary(Iterable<Node> selectedNodes, boolean preselectNew) throws UserCancelException {
+        static PropertiesMembershipDialog showIfNecessary(Collection<Node> selectedNodes, boolean preselectNew) throws UserCancelException {
             final boolean tagged = isTagged(selectedNodes);
             final boolean usedInRelations = isUsedInRelations(selectedNodes);
@@ -249 +249 @@
         }
 
-        private static boolean isTagged(final Iterable<Node> existingNodes) {
-            return Utils.exists(existingNodes, selectedNode -> selectedNode.hasKeys());
-        }
-
-        private static boolean isUsedInRelations(final Iterable<Node> existingNodes) {
-            return Utils.exists(existingNodes, selectedNode -> Utils.exists(selectedNode.getReferrers(), OsmPrimitive.relationPredicate));
+        private static boolean isTagged(final Collection<Node> existingNodes) {
+            return existingNodes.stream().anyMatch(selectedNode -> selectedNode.hasKeys());
+        }
+
+        private static boolean isUsedInRelations(final Collection<Node> existingNodes) {
+            return existingNodes.stream().anyMatch(
+                    selectedNode -> selectedNode.getReferrers().stream().anyMatch(OsmPrimitive.relationPredicate));
         }