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

Timestamp:

2011-02-09T00:30:01+01:00 (14 years ago)

Author:

framm

Message:

rather ugly hack to allow using plugin-defined projection classes.
this ought to be replaced by something that properly engages the plugin's
class loader.

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java (modified) (1 diff)

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

@@ -206 +206 @@
             Main.proj = (Projection)Class.forName(name).newInstance();
         } catch (final Exception e) {
-            JOptionPane.showMessageDialog(
-                    Main.parent,
-                    tr("The projection {0} could not be activated. Using Mercator", name),
-                    tr("Error"),
-                    JOptionPane.ERROR_MESSAGE
-            );
-            coll = null;
-            Main.proj = new Mercator();
-            name = Main.proj.getClass().getName();
+            // backup plan: if we cannot instantiate this, maybe we have an instance already.
+            Main.proj = null;
+            for (Projection p : Projections.getProjections()) {
+                if (p.getClass().getName().equals(name)) {
+                    Main.proj = p; break;
+                } 
+            }
+            if (Main.proj == null) {
+                JOptionPane.showMessageDialog(
+                        Main.parent,
+                        tr("The projection {0} could not be activated. Using Mercator", name),
+                        tr("Error"),
+                        JOptionPane.ERROR_MESSAGE
+                );
+                coll = null;
+                Main.proj = new Mercator();
+                name = Main.proj.getClass().getName();
+            }
         }
         PROP_SUB_PROJECTION.put(coll);