Changeset 15223 in josm for trunk

Timestamp:

2019-07-07T16:46:25+02:00 (5 years ago)

Author:

Don-vip

Message:

see #17881 - use plugin name for plugin classloaders map keys

File:

• trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified) (3 diffs)

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

@@ -304 +304 @@
      * Plugin class loaders.
      */
-    private static final Map<PluginInformation, PluginClassLoader> classLoaders = new HashMap<>();
+    private static final Map<String, PluginClassLoader> classLoaders = new HashMap<>();
 
     private static PluginDownloadTask pluginDownloadTask;
@@ -859 +859 @@
                         PluginHandler.class.getClassLoader(),
                         null));
-                classLoaders.put(info, cl);
+                classLoaders.put(info.name, cl);
             }
 
             // resolve dependencies
             for (PluginInformation info : toLoad) {
-                PluginClassLoader cl = classLoaders.get(info);
+                PluginClassLoader cl = classLoaders.get(info.name);
                 DEPENDENCIES:
                 for (String depName : info.getLocalRequiredPlugins()) {
                     for (PluginInformation depInfo : toLoad) {
                         if (isDependency(depInfo, depName)) {
-                            cl.addDependency(classLoaders.get(depInfo));
+                            cl.addDependency(classLoaders.get(depInfo.name));
                             continue DEPENDENCIES;
                         }
@@ -888 +888 @@
             for (PluginInformation info : toLoad) {
                 monitor.setExtraText(tr("Loading plugin ''{0}''...", info.name));
-                loadPlugin(parent, info, classLoaders.get(info));
+                loadPlugin(parent, info, classLoaders.get(info.name));
                 monitor.worked(1);
             }