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

Timestamp:

2013-06-12T20:55:17+02:00 (11 years ago)

Author:

Don-vip

Message:

include early plugins in the plugin classloader, allowing late plugins to rely on early ones

File:

• trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified) (1 diff)

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

@@ -482 +482 @@
         List<URL> allPluginLibraries = new LinkedList<URL>();
         File pluginDir = Main.pref.getPluginsDirectory();
-        for (PluginInformation info : plugins) {
+        
+        // Add all plugins already loaded (to include early plugins in the classloader, allowing late plugins to rely on early ones)
+        Collection<PluginInformation> allPlugins = new HashSet<PluginInformation>(plugins);
+        for (PluginProxy proxy : pluginList) {
+            allPlugins.add(proxy.getPluginInformation());
+        }
+        
+        for (PluginInformation info : allPlugins) {
             if (info.libraries == null) {
                 continue;