Changeset 17404 in josm for trunk

Timestamp:

2020-12-12T15:07:10+01:00 (4 years ago)

Author:

GerdP

Message:

fix #19006: Incorrect plugins path used
revert r3130, only scan directory returned by Preferences.main().getPluginsDirectory()

File:

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

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

@@ -11 +11 @@
 import java.nio.file.InvalidPathException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
@@ -194 +194 @@
     @Override
     protected void realRun() throws SAXException, IOException, OsmTransferException {
-        Collection<String> pluginLocations = PluginInformation.getPluginLocations();
-        getProgressMonitor().setTicksCount(pluginLocations.size() + 2);
+        getProgressMonitor().setTicksCount(3);
         if (canceled) return;
-        for (String location : pluginLocations) {
-            scanLocalPluginRepository(
-                    getProgressMonitor().createSubTaskMonitor(1, false),
-                    new File(location)
-            );
-            getProgressMonitor().worked(1);
-            if (canceled) return;
-        }
+        scanLocalPluginRepository(
+                getProgressMonitor().createSubTaskMonitor(1, false),
+                Preferences.main().getPluginsDirectory()
+        );
+        getProgressMonitor().worked(1);
+        if (canceled) return;
         analyseInProcessPlugins();
         getProgressMonitor().worked(1);