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

Timestamp:

2011-02-09T09:53:35+01:00 (15 years ago)

Author:

bastiK

Message:

use classloader to find projections from plugins

File:

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

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

@@ -30 +30 @@
 import org.openstreetmap.josm.data.projection.ProjectionSubPrefs;
 import org.openstreetmap.josm.gui.NavigatableComponent;
+import org.openstreetmap.josm.plugins.PluginHandler;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -203 +204 @@
         Projection oldProj = Main.proj;
 
-        try {
-            Main.proj = (Projection)Class.forName(name).newInstance();
-        } catch (final Exception e) {
-            // 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();
-            }
+        Projection p = null;
+        for (ClassLoader cl : PluginHandler.getResourceClassLoaders()) {
+            try {
+                p = (Projection) Class.forName(name, true, cl).newInstance();
+            } catch (final Exception e) {
+            }
+            if (p != null) {
+                Main.proj = p;
+                break;
+            }
+        }
+        if (p == 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);
@@ -285 +286 @@
      */
     private void setupProjectionCombo() {
+        boolean found = false;
         for (int i = 0; i < projectionCombo.getItemCount(); ++i) {
             Projection proj = (Projection)projectionCombo.getItemAt(i);
@@ -294 +296 @@
                 projectionCombo.setSelectedIndex(i);
                 selectedProjectionChanged(proj);
+                found = true;
                 break;
             }
         }
+        if (!found)
+            throw new RuntimeException("Couldn't find the current projection in the list of available projections!");
 
         projectionCombo.addActionListener(new ActionListener() {