Changeset 5163 in josm for trunk


Ignore:
Timestamp:
2012-04-04T23:21:14+02:00 (8 years ago)
Author:
simon04
Message:

fix #7574 - NameTemplate stopped working

Location:
trunk/src/org/openstreetmap/josm
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java

    r5155 r5163  
    8787
    8888        for (TaggingPreset t : TaggingPresetPreference.taggingPresets) {
    89             if (!t.matches(types, tags)) {
     89            if (!t.matches(types, tags, true)) {
    9090                continue;
    9191            }
  • trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

    r5160 r5163  
    16801680    }
    16811681
    1682     public boolean matches(Collection<PresetType> t, Map<String, String> tags) {
    1683         if (!isShowable()) {
     1682    public boolean matches(Collection<PresetType> t, Map<String, String> tags, boolean onlyShowable) {
     1683        if (onlyShowable && !isShowable()) {
    16841684            return false;
    16851685        } else if (t != null && types != null && !types.containsAll(t)) {
  • trunk/src/org/openstreetmap/josm/tools/TaggingPresetNameTemplateList.java

    r5155 r5163  
    3939
    4040        for (TaggingPreset t : presetsWithPattern) {
    41             if (t.matches(EnumSet.of(PresetType.forPrimitive(primitive)), primitive.getKeys())) {
     41            if (t.matches(EnumSet.of(PresetType.forPrimitive(primitive)), primitive.getKeys(), false)) {
    4242                return t;
    4343            }
Note: See TracChangeset for help on using the changeset viewer.