Changeset 1632 in josm


Ignore:
Timestamp:
2009-06-02T13:44:16+02:00 (16 years ago)
Author:
stoecker
Message:

fixed #2683 - preset loading error

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

    r1579 r1632  
    539539    public static Collection<TaggingPreset> readFromPreferences() {
    540540        LinkedList<TaggingPreset> allPresets = new LinkedList<TaggingPreset>();
    541         String allTaggingPresets = Main.pref.get("taggingpreset.sources");
    542 
    543         if (Main.pref.getBoolean("taggingpreset.enable-defaults", true))
    544         {
    545             allTaggingPresets = "resource://presets/presets.xml"
    546             + (allTaggingPresets != null ? ";"+allTaggingPresets : "");
    547         }
    548 
    549         for(String source : allTaggingPresets.split(";"))
     541        LinkedList<String> sources = new LinkedList<String>();
     542
     543        if(Main.pref.getBoolean("taggingpreset.enable-defaults", true))
     544            sources.add("resource://presets/presets.xml");
     545        sources.addAll(Main.pref.getCollection("taggingpreset.sources", new LinkedList<String>()));
     546
     547        for(String source : sources)
    550548        {
    551549            try {
Note: See TracChangeset for help on using the changeset viewer.