Changeset 8074 in josm for trunk/src/org/openstreetmap/josm/gui/preferences

Timestamp:

2015-02-16T15:40:51+01:00 (9 years ago)

Author:

bastiK

Message:

#11090 - do not load plugins unless dependencies can be loaded
(or are already loaded)

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

@@ -12 +12 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -58 +60 @@
 import org.openstreetmap.josm.plugins.PluginHandler;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.plugins.PluginProxy;
 import org.openstreetmap.josm.tools.BugReportExceptionHandler;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -384 +387 @@
                         }
                     }
+                    // check if plugin dependences can also be loaded
+                    Collection<PluginInformation> allPlugins = new HashSet<>(toLoad);
+                    for (PluginProxy proxy : PluginHandler.pluginList) {
+                        allPlugins.add(proxy.getPluginInformation());
+                    }
+                    boolean removed;
+                    do {
+                        removed = false;
+                        Iterator<PluginInformation> it = toLoad.iterator();
+                        while (it.hasNext()) {
+                            if (!PluginHandler.checkRequiredPluginsPreconditions(null, allPlugins, it.next(), requiresRestart)) {
+                                it.remove();
+                                removed = true;
+                            }
+                        }
+                    } while (removed);
+                    
                     if (!toLoad.isEmpty()) {
-                        PluginHandler.loadPlugins(PreferenceTabbedPane.this, toLoad, null); // FIXME: progress bar
+                        PluginHandler.loadPlugins(PreferenceTabbedPane.this, toLoad, null);
                     }
                 }