Changeset 5609 in josm for trunk/src/org

Timestamp:

2012-12-03T20:11:59+01:00 (12 years ago)

Author:

Don-vip

Message:

fix #8246 - Recursive dependencies resolution at plugin selection

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java

@@ -112 +112 @@
             this.cb = cb;
         }
+        protected void selectRequiredPlugins(PluginInformation info) {
+            if (info != null && info.requires != null) {
+                for (String s : info.getRequiredPlugins()) {
+                    if (!model.isSelectedPlugin(s)) {
+                        model.setPluginSelected(s, true);
+                        selectRequiredPlugins(model.getPluginInformation(s));
+                    }
+                }
+            }
+        }
         public void actionPerformed(ActionEvent e) {
             // Select/unselect corresponding plugin in the model
@@ -118 +128 @@
             if (cb.isSelected() && cb.pi.requires != null) {
                 // Select required plugins
-                for (String s : cb.pi.getRequiredPlugins()) {
-                    model.setPluginSelected(s, true);
-                }
+                selectRequiredPlugins(cb.pi);
                 // Alert user if plugin requirements are not met
                 PluginHandler.checkRequiredPluginsPreconditions(PluginListPanel.this, model.getAvailablePlugins(), cb.pi, false);