Changeset 15719 in josm for trunk/src/org/openstreetmap/josm/data/validation

Timestamp:

2020-01-18T14:14:04+01:00 (4 years ago)

Author:

simon04

Message:

Java 8: deprecate Utils.exists, Utils.find

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java

@@ -34 +34 @@
 import org.openstreetmap.josm.gui.tagging.presets.items.Roles;
 import org.openstreetmap.josm.gui.tagging.presets.items.Roles.Role;
+import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -173 +174 @@
         for (TaggingPreset p : relationpresets) {
             final boolean matches = TaggingPresetItem.matches(Utils.filteredCollection(p.data, KeyedItem.class), n.getKeys());
-            final Roles r = Utils.find(p.data, Roles.class);
-            if (matches && r != null) {
-                for (Role role: r.roles) {
+            final SubclassFilteredCollection<TaggingPresetItem, Roles> roles = Utils.filteredCollection(p.data, Roles.class);
+            if (matches && !roles.isEmpty()) {
+                for (Role role: roles.iterator().next().roles) {
                     allroles.put(role, p.name);
                 }