Changeset 1632 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-06-02T13:44:16+02:00 (15 years ago)

Author:

stoecker

Message:

fixed #2683 - preset loading error

File:

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

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

@@ -539 +539 @@
     public static Collection<TaggingPreset> readFromPreferences() {
         LinkedList<TaggingPreset> allPresets = new LinkedList<TaggingPreset>();
-        String allTaggingPresets = Main.pref.get("taggingpreset.sources");
-
-        if (Main.pref.getBoolean("taggingpreset.enable-defaults", true))
-        {
-            allTaggingPresets = "resource://presets/presets.xml"
-            + (allTaggingPresets != null ? ";"+allTaggingPresets : "");
-        }
-
-        for(String source : allTaggingPresets.split(";"))
+        LinkedList<String> sources = new LinkedList<String>();
+
+        if(Main.pref.getBoolean("taggingpreset.enable-defaults", true))
+            sources.add("resource://presets/presets.xml");
+        sources.addAll(Main.pref.getCollection("taggingpreset.sources", new LinkedList<String>()));
+
+        for(String source : sources)
         {
             try {