Changeset 10657 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• ReverseWayAction.java (modified) (2 diffs)
• UnGlueAction.java (modified) (2 diffs)
• relation/DownloadMembersAction.java (modified) (2 diffs)
• relation/DownloadSelectedIncompleteMembersAction.java (modified) (3 diffs)
• search/SearchCompiler.java (modified) (3 diffs)

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

@@ -28 +28 @@
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.UserCancelException;
-import org.openstreetmap.josm.tools.Utils;
 
 public final class ReverseWayAction extends JosmAction {
@@ -135 +134 @@
     @Override
     protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
-        setEnabled(Utils.exists(selection, OsmPrimitive.wayPredicate));
+        setEnabled(selection.stream().anyMatch(OsmPrimitive.wayPredicate));
     }
 }

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));
         }
 

trunk/src/org/openstreetmap/josm/actions/relation/DownloadMembersAction.java

@@ -13 +13 @@
 import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 
 /**
@@ -40 +40 @@
     public void setPrimitives(Collection<? extends OsmPrimitive> primitives) {
         // selected non-new relations
-        this.relations = Utils.filter(getRelations(primitives), r -> !r.isNew());
+        this.relations = SubclassFilteredCollection.filter(getRelations(primitives), r -> !r.isNew());
         updateEnabledState();
     }

trunk/src/org/openstreetmap/josm/actions/relation/DownloadSelectedIncompleteMembersAction.java

@@ -15 +15 @@
 import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 
 /**
@@ -42 +42 @@
         Set<OsmPrimitive> ret = new HashSet<>();
         for (Relation r : rels) {
-            ret.addAll(Utils.filter(r.getIncompleteMembers(), osm -> !osm.isNew()));
+            ret.addAll(SubclassFilteredCollection.filter(r.getIncompleteMembers(), osm -> !osm.isNew()));
         }
         return ret;
@@ -59 +59 @@
     public void setPrimitives(Collection<? extends OsmPrimitive> primitives) {
         // selected relations with incomplete members
-        this.relations = Utils.filter(getRelations(primitives), r -> r.hasIncompleteMembers());
+        this.relations = SubclassFilteredCollection.filter(getRelations(primitives), r -> r.hasIncompleteMembers());
         this.incompleteMembers = buildSetOfIncompleteMembers(relations);
         updateEnabledState();

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -15 +15 @@
 import java.util.Locale;
 import java.util.Map;
+import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -38 +39 @@
 import org.openstreetmap.josm.tools.AlphanumComparator;
 import org.openstreetmap.josm.tools.Geometry;
-import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.UncheckedParseException;
 import org.openstreetmap.josm.tools.Utils;
@@ -298 +298 @@
 
         @Override
-        public final boolean evaluate(OsmPrimitive object) {
+        public final boolean test(OsmPrimitive object) {
             return match(object);
         }