Changeset 5169 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

Timestamp:

2012-04-05T17:29:22+02:00 (12 years ago)

Author:

simon04

Message:

(hopefully) fix #7574 - NameTemplate stopped working

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (1 diff)

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

@@ -1692 +1692 @@
     }
 
+    public boolean typeMatches(Collection<PresetType> t) {
+        return t == null || types == null || types.containsAll(t);
+    }
+
     public boolean matches(Collection<PresetType> t, Map<String, String> tags, boolean onlyShowable) {
         if (onlyShowable && !isShowable()) {
             return false;
-        } else if (t != null && types != null && !types.containsAll(t)) {
+        } else if (!typeMatches(t)) {
             return false;
         }