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

Timestamp:

2017-07-22T11:52:23+02:00 (7 years ago)

Author:

bastiK

Message:

remember projection choice sub-preferences (e.g. last selected UTM zone) across sessions (not just when changing the default projection) (closes #15013, see #14877)

File:

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

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

@@ -273 +273 @@
 
     private static String projectionChoice;
-    private static final Map<String, Collection<String>> projectionChoicesSub = new HashMap<>();
     
     private static final StringProperty PROP_PROJECTION_DEFAULT = new StringProperty("projection.default", mercator.getId());
@@ -463 +462 @@
         }
         id = pc.getId();
+        Main.pref.putCollection("projection.sub."+id, pref);
         if (makeDefault) {
             PROP_PROJECTION_DEFAULT.put(id);
             PROP_SUB_PROJECTION_DEFAULT.put(pref);
-            Main.pref.putCollection("projection.default.sub."+id, pref);
         } else {
             projectionChoice = id;
-            projectionChoicesSub.put(id, pref);
         }
         pc.setPreferences(pref);
@@ -527 +525 @@
 
     private static Collection<String> getSubprojectionPreference(ProjectionChoice pc) {
-        Collection<String> sessionValue = projectionChoicesSub.get(pc.getId());
-        if (sessionValue != null)
-            return sessionValue;
-        return Main.pref.getCollection("projection.default.sub."+pc.getId(), null);
+        return Main.pref.getCollection("projection.sub."+pc.getId(), null);
     }