Changeset 9932 in josm for trunk/src

Timestamp:

2016-03-05T17:57:04+01:00 (8 years ago)

Author:

simon04

Message:

see #8460 - fix typo from r9931, fix matching, improve conditions, add unit test

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/RelationChecker.java (modified) (2 diffs)
• gui/tagging/presets/TaggingPreset.java (modified) (1 diff)
• gui/tagging/presets/TaggingPresetItem.java (modified) (1 diff)

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

@@ -25 +25 @@
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetType;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
-import org.openstreetmap.josm.gui.tagging.presets.items.Key;
+import org.openstreetmap.josm.gui.tagging.presets.items.KeyedItem;
 import org.openstreetmap.josm.gui.tagging.presets.items.Roles;
 import org.openstreetmap.josm.gui.tagging.presets.items.Roles.Role;
@@ -145 +145 @@
 
         for (TaggingPreset p : relationpresets) {
-            boolean matches = true;
-            Roles r = null;
-            for (TaggingPresetItem i : p.data) {
-                if (i instanceof Key) {
-                    Key k = (Key) i;
-                    if (!k.value.equals(n.get(k.key))) {
-                        matches = false;
-                        break;
-                    }
-                } else if (i instanceof Roles) {
-                    r = (Roles) i;
-                }
-            }
+            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) {

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

@@ -562 +562 @@
         else if (!typeMatches(t))
             return false;
-        boolean atLeastOnePositiveMatch = false;
-        for (TaggingPresetItem item : data) {
-            Boolean m = item.matches(tags);
-            if (m != null && !m)
-                return false;
-            else if (m != null) {
-                atLeastOnePositiveMatch = true;
-            }
-        }
-        return atLeastOnePositiveMatch;
+        else
+            return TaggingPresetItem.matches(data, tags);
     }
 

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

@@ -134 +134 @@
         return imgProv.get();
     }
+
+    /**
+     * Determine whether the given preset items match the tags
+     * @param data the preset items
+     * @param tags the tags to match
+     * @return whether the given preset items match the tags
+     * @sice 9932
+     */
+    public static boolean matches(Iterable<? extends TaggingPresetItem> data, Map<String, String> tags) {
+        boolean atLeastOnePositiveMatch = false;
+        for (TaggingPresetItem item : data) {
+            Boolean m = item.matches(tags);
+            if (m != null && !m)
+                return false;
+            else if (m != null) {
+                atLeastOnePositiveMatch = true;
+            }
+        }
+        return atLeastOnePositiveMatch;
+    }
 }