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

Timestamp:

2017-07-22T14:25:19+02:00 (7 years ago)

Author:

bastiK

Message:

see #15013, see #14877 - remember projection when session is saved to a .jos/.joz file

File:

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

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

@@ -501 +501 @@
      */
     private ProjectionChoice setupProjectionCombo() {
-        String pcId = projectionChoice != null ? projectionChoice : PROP_PROJECTION_DEFAULT.get();
+        String pcId = getCurrentProjectionChoiceId();
         ProjectionChoice pc = null;
         for (int i = 0; i < projectionCombo.getItemCount(); ++i) {
             ProjectionChoice pc1 = projectionCombo.getItemAt(i);
-            pc1.setPreferences(getSubprojectionPreference(pc1));
+            pc1.setPreferences(getSubprojectionPreference(pc1.getId()));
             if (pc1.getId().equals(pcId)) {
                 projectionCombo.setSelectedIndex(i);
@@ -524 +524 @@
     }
 
-    private static Collection<String> getSubprojectionPreference(ProjectionChoice pc) {
-        return Main.pref.getCollection("projection.sub."+pc.getId(), null);
+    /**
+     * Get the id of the projection choice that is currently set.
+     * @return id of the projection choice that is currently set
+     */
+    public static String getCurrentProjectionChoiceId() {
+        return projectionChoice != null ? projectionChoice : PROP_PROJECTION_DEFAULT.get();
+    }
+
+    /**
+     * Get the preferences that have been selected the last time for the given
+     * projection choice.
+     * @param pcId id of the projection choice
+     * @return projection choice parameters that have been selected by the user
+     * the last time; null if user has never selected the given projection choice
+     */
+    public static Collection<String> getSubprojectionPreference(String pcId) {
+        return Main.pref.getCollection("projection.sub."+pcId, null);
     }