Changeset 3796 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

Timestamp:

2011-01-21T12:42:29+01:00 (13 years ago)

Author:

bastiK

Message:

Changed the mappaint and tagging preset preference format from a list of URLs to array preference to store more parameters for each source entry. (The flag "active" will be used for a dialog to quickly switch mappaint styles on and off.)
Removed the "mappaint.style.enable-defaults" and "taggingpreset.enable-defaults" property - the default (internal) source is now included in the normal list of sources. (The old preference entries are not removed yet, this should probably be changed, when the migration has been tested a little.)
Rearranged gui elements in mappaint and preset pref dialog to use the available space better and make the structure more clear. Strings that have been the same in mappaint and preset pref dialog are now different for each dialog.

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (2 diffs)

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

@@ -64 +64 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.preferences.SourceEntry;
+import org.openstreetmap.josm.gui.preferences.TaggingPresetPreference.PresetPrefMigration;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPritority;
@@ -1228 +1230 @@
         LinkedList<String> sources = new LinkedList<String>();
 
-        if(Main.pref.getBoolean("taggingpreset.enable-defaults", true)) {
-            sources.add("resource://data/defaultpresets.xml");
-        }
-        sources.addAll(Main.pref.getCollection("taggingpreset.sources", new LinkedList<String>()));
+        for (SourceEntry e : (new PresetPrefMigration()).get()) {
+            sources.add(e.url);
+        }
+
         return sources;
     }