Changeset 7100 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java

Timestamp:

2014-05-11T01:01:33+02:00 (10 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/data/validation/tests/RelationChecker.java (modified) (3 diffs)

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

@@ -24 +24 @@
 import org.openstreetmap.josm.data.validation.Test;
 import org.openstreetmap.josm.data.validation.TestError;
-import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
 import org.openstreetmap.josm.gui.tagging.TaggingPresetItem;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Key;
 import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Role;
-import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Key;
 import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Roles;
 import org.openstreetmap.josm.gui.tagging.TaggingPresetType;
+import org.openstreetmap.josm.gui.tagging.TaggingPresets;
 
 /**
@@ -46 +46 @@
     protected static final int RELATION_UNKNOWN  = 1707;
     protected static final int RELATION_EMPTY    = 1708;
-    
-    /** 
+
+    /**
      * Error message used to group errors related to role problems.
      * @since 6731
@@ -73 +73 @@
      */
     public void initializePresets() {
-        Collection<TaggingPreset> presets = TaggingPresetPreference.taggingPresets;
-        if (presets != null) {
-            for (TaggingPreset p : presets) {
-                for (TaggingPresetItem i : p.data) {
-                    if (i instanceof Roles) {
-                        relationpresets.add(p);
-                        break;
-                    }
+        for (TaggingPreset p : TaggingPresets.getTaggingPresets()) {
+            for (TaggingPresetItem i : p.data) {
+                if (i instanceof Roles) {
+                    relationpresets.add(p);
+                    break;
                 }
             }