Changeset 10121 in josm for trunk/src/org/openstreetmap/josm/plugins

Timestamp:

2016-04-08T19:52:27+02:00 (8 years ago)

Author:

Don-vip

Message:

add more debug messages + assertions to debug failing unit test

File:

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

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

@@ -881 +881 @@
         try {
             monitor.beginTask(tr("Determine plugins to load..."));
-            Set<String> plugins = new HashSet<>();
-            plugins.addAll(Main.pref.getCollection("plugins", new LinkedList<String>()));
-            if (System.getProperty("josm.plugins") != null) {
-                plugins.addAll(Arrays.asList(System.getProperty("josm.plugins").split(",")));
+            Set<String> plugins = new HashSet<>(Main.pref.getCollection("plugins", new LinkedList<String>()));
+            if (Main.isDebugEnabled()) {
+                Main.debug("Plugins list initialized to " + plugins);
+            }
+            String systemProp = System.getProperty("josm.plugins");
+            if (systemProp != null) {
+                plugins.addAll(Arrays.asList(systemProp.split(",")));
+                if (Main.isDebugEnabled()) {
+                    Main.debug("josm.plugins system property set to '" + systemProp+"'. Plugins list is now " + plugins);
+                }
             }
             monitor.subTask(tr("Removing deprecated plugins..."));
@@ -890 +896 @@
             monitor.subTask(tr("Removing unmaintained plugins..."));
             filterUnmaintainedPlugins(parent, plugins);
+            if (Main.isDebugEnabled()) {
+                Main.debug("Plugins list is finally set to " + plugins);
+            }
             Map<String, PluginInformation> infos = loadLocallyAvailablePluginInformation(monitor.createSubTaskMonitor(1, false));
             List<PluginInformation> ret = new LinkedList<>();