Changeset 7100 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2014-05-11T01:01:33+02:00 (11 years ago)

Author:

Don-vip

Message:

refactor tagging presets to allow presets-dependent unit tests to update them correctly at runtime

File:

• trunk/src/org/openstreetmap/josm/tools/TaggingPresetNameTemplateList.java (modified) (3 diffs)

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

@@ -7 +7 @@
 import java.util.List;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetListener;
 import org.openstreetmap.josm.gui.tagging.TaggingPresetType;
+import org.openstreetmap.josm.gui.tagging.TaggingPresets;
 
 /**
  * List of tagging presets with name templates, allows to find appropriate template based on existing primitive
  */
-public final class TaggingPresetNameTemplateList {
+public final class TaggingPresetNameTemplateList implements TaggingPresetListener {
 
     private static TaggingPresetNameTemplateList instance;
 
+    /**
+     * Replies the unique instance.
+     * @return the unique instance
+     */
     public static TaggingPresetNameTemplateList getInstance() {
         if (instance == null) {
             instance = new TaggingPresetNameTemplateList();
+            TaggingPresets.addListener(instance);
         }
         return instance;
     }
+
     private final List<TaggingPreset> presetsWithPattern = new LinkedList<>();
 
     private TaggingPresetNameTemplateList() {
-        if (TaggingPresetPreference.taggingPresets != null) {
-            for (TaggingPreset tp : TaggingPresetPreference.taggingPresets) {
+        buildPresetsWithPattern();
+    }
+
+    private void buildPresetsWithPattern() {
+        synchronized(this) {
+            Main.debug("Building list of presets with name template");
+            presetsWithPattern.clear();
+            for (TaggingPreset tp : TaggingPresets.getTaggingPresets()) {
                 if (tp.nameTemplate != null) {
                     presetsWithPattern.add(tp);
@@ -37 +51 @@
     }
 
+    /**
+     * Finds and returns the first occurence of preset with template name matching the given primitive
+     * @param primitive The primitive to match
+     * @return the first occurence of preset with template name matching the primitive
+     */
     public TaggingPreset findPresetTemplate(OsmPrimitive primitive) {
-
-        for (TaggingPreset t : presetsWithPattern) {
-            Collection<TaggingPresetType> type = Collections.singleton(TaggingPresetType.forPrimitive(primitive));
-            if (t.typeMatches(type)) {
-                if (t.nameTemplateFilter != null) {
-                    if (t.nameTemplateFilter.match(primitive))
+        synchronized(this) {
+            for (TaggingPreset t : presetsWithPattern) {
+                Collection<TaggingPresetType> type = Collections.singleton(TaggingPresetType.forPrimitive(primitive));
+                if (t.typeMatches(type)) {
+                    if (t.nameTemplateFilter != null) {
+                        if (t.nameTemplateFilter.match(primitive))
+                            return t;
+                        else {
+                            continue;
+                        }
+                    } else if (t.matches(type, primitive.getKeys(), false)) {
                         return t;
-                    else {
-                        continue;
                     }
-                } else if (t.matches(type, primitive.getKeys(), false)) {
-                    return t;
                 }
             }
@@ -55 +75 @@
         return null;
     }
+
+    @Override
+    public void taggingPresetsModified() {
+        buildPresetsWithPattern();
+    }
 }