Changeset 12841 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java

Timestamp:

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

Author:

bastiK

Message:

see #15229 - fix deprecations caused by [12840]

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java

@@ -28 +28 @@
 import org.openstreetmap.josm.data.coor.conversion.CoordinateFormatManager;
 import org.openstreetmap.josm.data.coor.conversion.ICoordinateFormat;
-import org.openstreetmap.josm.data.preferences.CollectionProperty;
+import org.openstreetmap.josm.data.preferences.ListProperty;
 import org.openstreetmap.josm.data.preferences.StringProperty;
 import org.openstreetmap.josm.data.projection.CustomProjection;
@@ -291 +291 @@
     private static final StringProperty PROP_PROJECTION_DEFAULT = new StringProperty("projection.default", mercator.getId());
     private static final StringProperty PROP_COORDINATES = new StringProperty("coordinates", null);
-    private static final CollectionProperty PROP_SUB_PROJECTION_DEFAULT = new CollectionProperty("projection.default.sub", null);
+    private static final ListProperty PROP_SUB_PROJECTION_DEFAULT = new ListProperty("projection.default.sub", null);
     private static final String[] unitsValues = ALL_SYSTEMS.keySet().toArray(new String[ALL_SYSTEMS.size()]);
     private static final String[] unitsValuesTr = new String[unitsValues.length];
@@ -482 +482 @@
         }
         id = pc.getId();
-        Main.pref.putCollection("projection.sub."+id, pref);
+        Main.pref.putList("projection.sub."+id, pref == null ? null : new ArrayList<>(pref));
         if (makeDefault) {
             PROP_PROJECTION_DEFAULT.put(id);
-            PROP_SUB_PROJECTION_DEFAULT.put(pref);
+            PROP_SUB_PROJECTION_DEFAULT.put(pref == null ? null : new ArrayList<>(pref));
         } else {
             projectionChoice = id;
@@ -560 +560 @@
      */
     public static Collection<String> getSubprojectionPreference(String pcId) {
-        return Main.pref.getCollection("projection.sub."+pcId, null);
+        return Main.pref.getList("projection.sub."+pcId, null);
     }