Changeset 3874 in josm for trunk/src/org/openstreetmap/josm/plugins

Timestamp:

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

Author:

bastiK

Message:

use classloader to find projections from plugins

Location:

trunk/src/org/openstreetmap/josm/plugins

Files:

• PluginHandler.java (modified) (2 diffs)
• ReadLocalPluginInformationTask.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -159 +159 @@
 
     /**
+     * Add here all ClassLoader whose resource should be searched.
+     */
+    private static final List<ClassLoader> sources = new LinkedList<ClassLoader>();
+
+    static {
+        try {
+            sources.add(ClassLoader.getSystemClassLoader());
+            sources.add(org.openstreetmap.josm.gui.MainApplication.class.getClassLoader());
+        } catch (SecurityException ex) {
+            sources.add(ImageProvider.class.getClassLoader());
+        }
+    }
+
+    public static Collection<ClassLoader> getResourceClassLoaders() {
+        return Collections.unmodifiableCollection(sources);
+    }
+
+    /**
      * Removes deprecated plugins from a collection of plugins. Modifies the
      * collection <code>plugins</code>.
@@ -516 +534 @@
 
             ClassLoader pluginClassLoader = createClassLoader(toLoad);
-            ImageProvider.sources.add(0, pluginClassLoader);
+            sources.add(0, pluginClassLoader);
             monitor.setTicksCount(toLoad.size());
             for (PluginInformation info : toLoad) {

trunk/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java

@@ -65 +65 @@
             availablePlugins.put(info.getName(), info);
         } else {
-            availablePlugins.get(info.getName()).localversion = info.version;
+            PluginInformation current = availablePlugins.get(info.getName());
+            current.localversion = info.version;
             if (info.icon != null) {
-                availablePlugins.get(info.getName()).icon = info.icon;
-            }
+                current.icon = info.icon;
+            }
+            current.early = info.early;
+            current.className = info.className;
+            current.libraries = info.libraries;
+            current.stage = info.stage;
+            current.requires = info.requires;
         }
     }