Changeset 10123 in josm for trunk/src/org

Timestamp:

2016-04-09T01:35:58+02:00 (9 years ago)

Author:

Don-vip

Message:

fix unit test failing with clean jenkins workspace

Location:

trunk/src/org/openstreetmap/josm/plugins

Files:

• PluginListParser.java (modified) (1 diff)
• ReadLocalPluginInformationTask.java (modified) (2 diffs)

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

@@ -34 +34 @@
      * @throws PluginListParseException if plugin manifest cannot be parsed
      */
-    protected static PluginInformation createInfo(String name, String url, String manifest) throws PluginListParseException {
+    public static PluginInformation createInfo(String name, String url, String manifest) throws PluginListParseException {
         try {
             return new PluginInformation(

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

@@ -16 +16 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.OsmTransferException;
@@ -136 +137 @@
 
     protected void scanLocalPluginRepository(ProgressMonitor monitor, File pluginsDirectory) {
-        if (pluginsDirectory == null) return;
+        if (pluginsDirectory == null)
+            return;
+        if (monitor == null)
+            monitor = NullProgressMonitor.INSTANCE;
         try {
             monitor.beginTask("");