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

Timestamp:

2010-05-15T14:40:08+02:00 (14 years ago)

Author:

stoecker

Message:

expose some preset functions a bit more

File:

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

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

@@ -636 +636 @@
     }
 
-    public static Collection<TaggingPreset> readFromPreferences() {
+    public static Collection<TaggingPreset> readAll(Collection<String> sources) {
         LinkedList<TaggingPreset> allPresets = new LinkedList<TaggingPreset>();
-        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(String source : sources)
         {
@@ -685 +678 @@
     }
 
+    public static LinkedList<String> getPresetSources() {
+        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>()));
+        return sources;
+    }
+
+    public static Collection<TaggingPreset> readFromPreferences() {
+        return readAll(getPresetSources());
+    }
+
     private static class PresetPanel extends JPanel {
         boolean hasElements = false;