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

Timestamp:

2010-01-15T23:23:43+01:00 (14 years ago)

Author:

stoecker

Message:

fixed plugin loading stages

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/preferences/PluginPreference.java (modified) (2 diffs)
• plugins/PluginHandler.java (modified) (2 diffs)

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

@@ -15 +15 @@
 import java.awt.event.ComponentEvent;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
@@ -255 +256 @@
             return false;
         if (model.isActivePluginsChanged()) {
-            Main.pref.putCollection("plugins", model.getSelectedPluginNames());
+            LinkedList<String> l = new LinkedList<String>(model.getSelectedPluginNames());
+            Collections.sort(l);
+            Main.pref.putCollection("plugins", l);
             return true;
         }

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

@@ -367 +367 @@
         try {
             monitor.beginTask(tr("Loading plugins ..."));
+            monitor.subTask(tr("Checking plugin preconditions..."));
             List<PluginInformation> toLoad = new LinkedList<PluginInformation>();
+            for (PluginInformation pi: plugins) {
+                if (checkLoadPreconditions(parent, plugins, pi)) {
+                    toLoad.add(pi);
+                }
+            }
             // sort the plugins according to their "staging" equivalence class. The
             // lower the value of "stage" the earlier the plugin should be loaded.
@@ -381 +387 @@
                     }
             );
-            monitor.subTask(tr("Checking plugin preconditions..."));
-            for (PluginInformation pi: plugins) {
-                if (checkLoadPreconditions(parent, plugins, pi)) {
-                    toLoad.add(pi);
-                }
-            }
             if (toLoad.isEmpty())
                 return;