Changeset 12841 in josm for trunk/src/org/openstreetmap/josm/data/preferences

Timestamp:

2017-09-13T16:30:27+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - fix deprecations caused by [12840]

Location:

trunk/src/org/openstreetmap/josm/data/preferences/sources

Files:

• MapPaintPrefHelper.java (modified) (3 diffs)
• SourcePrefHelper.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/preferences/sources/MapPaintPrefHelper.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -52 +53 @@
         boolean changed = false;
 
-        Collection<String> knownDefaults = new TreeSet<>(Main.pref.getCollection("mappaint.style.known-defaults"));
+        Collection<String> knownDefaults = new TreeSet<>(Main.pref.getList("mappaint.style.known-defaults"));
 
         Collection<ExtendedSourceEntry> defaults = getDefault();
@@ -70 +71 @@
             knownDefaults.add(def.url);
         }
-        Main.pref.putCollection("mappaint.style.known-defaults", knownDefaults);
+        Main.pref.putList("mappaint.style.known-defaults", new ArrayList<>(knownDefaults));
 
         // XML style is not bundled anymore

trunk/src/org/openstreetmap/josm/data/preferences/sources/SourcePrefHelper.java

@@ -58 +58 @@
     public List<SourceEntry> get() {
 
-        Collection<Map<String, String>> src = Main.pref.getListOfStructs(pref, (Collection<Map<String, String>>) null);
+        List<Map<String, String>> src = Main.pref.getListOfMaps(pref, null);
         if (src == null)
             return new ArrayList<>(getDefault());
@@ -78 +78 @@
      */
     public boolean put(Collection<? extends SourceEntry> entries) {
-        Collection<Map<String, String>> setting = serializeList(entries);
-        boolean unset = Main.pref.getListOfStructs(pref, (Collection<Map<String, String>>) null) == null;
+        List<Map<String, String>> setting = serializeList(entries);
+        boolean unset = Main.pref.getListOfMaps(pref, null) == null;
         if (unset) {
             Collection<Map<String, String>> def = serializeList(getDefault());
@@ -85 +85 @@
                 return false;
         }
-        return Main.pref.putListOfStructs(pref, setting);
+        return Main.pref.putListOfMaps(pref, setting);
     }
 
-    private Collection<Map<String, String>> serializeList(Collection<? extends SourceEntry> entries) {
-        Collection<Map<String, String>> setting = new ArrayList<>(entries.size());
+    private List<Map<String, String>> serializeList(Collection<? extends SourceEntry> entries) {
+        List<Map<String, String>> setting = new ArrayList<>(entries.size());
         for (SourceEntry e : entries) {
             setting.add(serialize(e));