Changeset 5163 in josm for trunk/src

Timestamp:

2012-04-04T23:21:14+02:00 (13 years ago)

Author:

simon04

Message:

fix #7574 - NameTemplate stopped working

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/dialogs/properties/PresetListPanel.java (modified) (1 diff)
• gui/tagging/TaggingPreset.java (modified) (1 diff)
• tools/TaggingPresetNameTemplateList.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java

@@ -87 +87 @@
 
         for (TaggingPreset t : TaggingPresetPreference.taggingPresets) {
-            if (!t.matches(types, tags)) {
+            if (!t.matches(types, tags, true)) {
                 continue;
             }

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

@@ -1680 +1680 @@
     }
 
-    public boolean matches(Collection<PresetType> t, Map<String, String> tags) {
-        if (!isShowable()) {
+    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)) {

trunk/src/org/openstreetmap/josm/tools/TaggingPresetNameTemplateList.java

@@ -39 +39 @@
 
         for (TaggingPreset t : presetsWithPattern) {
-            if (t.matches(EnumSet.of(PresetType.forPrimitive(primitive)), primitive.getKeys())) {
+            if (t.matches(EnumSet.of(PresetType.forPrimitive(primitive)), primitive.getKeys(), false)) {
                 return t;
             }