Changeset 15640 in josm for trunk/src/org/openstreetmap/josm/gui/tagging

Timestamp:

2020-01-05T21:09:21+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #18455 - detect objects not matching their presets object type (info level)

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -23 +23 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 import javax.swing.AbstractAction;
@@ -525 +526 @@
     public Collection<OsmPrimitive> createSelection(Collection<OsmPrimitive> participants) {
         originalSelectionEmpty = participants.isEmpty();
-        Collection<OsmPrimitive> sel = new LinkedList<>();
-        for (OsmPrimitive osm : participants) {
-            if (typeMatches(EnumSet.of(TaggingPresetType.forPrimitive(osm)))) {
-                sel.add(osm);
-            }
-        }
-        return sel;
+        return participants.stream().filter(this::typeMatches).collect(Collectors.toList());
     }
 
@@ -540 +535 @@
     public List<Tag> getChangedTags() {
         List<Tag> result = new ArrayList<>();
-        for (TaggingPresetItem i: data) {
-            i.addCommands(result);
-        }
+        data.forEach(i -> i.addCommands(result));
         return result;
     }
@@ -585 +578 @@
     public String toString() {
         return (types == null ? "" : types.toString()) + ' ' + name;
+    }
+
+    /**
+     * Determines whether this preset matches the OSM primitive type.
+     * @param primitive The OSM primitive for which type must match
+     * @return <code>true</code> if type matches.
+     * @since 15640
+     */
+    public final boolean typeMatches(IPrimitive primitive) {
+        return typeMatches(EnumSet.of(TaggingPresetType.forPrimitive(primitive)));
     }