Changeset 14395 in josm for trunk/src/org

Timestamp:

2018-11-01T15:11:16+01:00 (6 years ago)

Author:

Don-vip

Message:

see #16912 - proper resolution of virtual dependencies

File:

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

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

@@ -850 +850 @@
                 for (String depName : info.getLocalRequiredPlugins()) {
                     for (PluginInformation depInfo : toLoad) {
-                        if (depInfo.getName().equals(depName)) {
+                        if (isDependency(depInfo, depName)) {
                             cl.addDependency(classLoaders.get(depInfo));
                             continue DEPENDENCIES;
@@ -856 +856 @@
                     }
                     for (PluginProxy proxy : pluginList) {
-                        if (proxy.getPluginInformation().getName().equals(depName)) {
+                        if (isDependency(proxy.getPluginInformation(), depName)) {
                             cl.addDependency(proxy.getClassLoader());
                             continue DEPENDENCIES;
@@ -876 +876 @@
             monitor.finishTask();
         }
+    }
+
+    private static boolean isDependency(PluginInformation pi, String depName) {
+        return depName.equals(pi.getName()) || depName.equals(pi.provides);
     }