Changeset 2491 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2009-11-21T15:48:35+01:00 (15 years ago)

Author:

stoecker

Message:

fix for subprojections

File:

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

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

@@ -164 +164 @@
             coll = null;
             Main.proj = new Mercator();
+            name = Main.proj.getClass().getName();
         }
         if(!Main.proj.equals(oldProj) && b != null)
@@ -171 +172 @@
         }
         Main.pref.putCollection("projection.sub", coll);
-        if(coll != null && projHasPrefs(Main.proj))
+        String sname = name.substring(name.lastIndexOf(".")+1);
+        Main.pref.putCollection("projection.sub."+sname, coll);
+        if(projHasPrefs(Main.proj))
             ((ProjectionSubPrefs) Main.proj).setPreferences(coll);
     }
@@ -205 +208 @@
         for (int i = 0; i < projectionCombo.getItemCount(); ++i) {
             Projection proj = (Projection)projectionCombo.getItemAt(i);
-            if (proj.getClass().getName().equals(Main.pref.get("projection", Mercator.class.getName()))) {
+            String name = proj.getClass().getName();
+            String sname = name.substring(name.lastIndexOf(".")+1);
+            if(projHasPrefs(proj))
+                ((ProjectionSubPrefs) proj).setPreferences(Main.pref.getCollection("projection.sub."+sname, null));
+            if (name.equals(Main.pref.get("projection", Mercator.class.getName()))) {
                 projectionCombo.setSelectedIndex(i);
                 selectedProjectionChanged(proj);