Changeset 35269 in osm for applications/editors/josm/plugins/opendata/src/org/openstreetmap

Timestamp:

2020-01-11T16:18:11+01:00 (5 years ago)

Author:

donvip

Message:

update to JOSM 15419 + add unit test for Toulouse module

Location:

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata

Files:

• OdPlugin.java (modified) (3 diffs)
• core/datasets/DataSetUpdater.java (modified) (2 diffs)
• core/modules/ModuleHandler.java (modified) (2 diffs)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java

@@ -51 +51 @@
 import org.openstreetmap.josm.plugins.opendata.core.modules.ModuleInformation;
 import org.openstreetmap.josm.plugins.opendata.core.util.OdUtils;
-import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Pair;
-
+import org.openstreetmap.josm.tools.ResourceProvider;
+
+/**
+ * Open data plugin.
+ */
 public final class OdPlugin extends Plugin {
 
@@ -64 +67 @@
     private OdDialog dialog;
 
-    public final List<AbstractImporter> importers =  Arrays.asList(new AbstractImporter[]{
+    public final List<AbstractImporter> importers = Arrays.asList(new AbstractImporter[] {
             new CsvImporter(), new OdsImporter(), new XlsImporter(), // Tabular file formats
             new KmlKmzImporter(), new ShpImporter(), new MifTabImporter(), new GmlImporter(), // Geographic file formats
@@ -74 +77 @@
     public OdPlugin(PluginInformation info) {
         super(info);
-        ImageProvider.addAdditionalClassLoaders(ModuleHandler.getResourceClassLoaders());
+        ResourceProvider.addAdditionalClassLoaders(ModuleHandler.getResourceClassLoaders());
         if (instance == null) {
             instance = this;

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/DataSetUpdater.java

@@ -23 +23 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 
+/**
+ * Data set updater.
+ */
 public abstract class DataSetUpdater {
 
@@ -43 +46 @@
             // Simplify ways geometries
             for (Way w : dataSet.getWays()) {
-                SequenceCommand command = SimplifyWayAction.simplifyWay(w, 0.25);
+                SequenceCommand command = SimplifyWayAction.createSimplifyCommand(w, 0.25);
                 if (command != null) {
                     command.executeCommand();

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleHandler.java

@@ -52 +52 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.ResourceProvider;
 
 /**
@@ -289 +290 @@
             ClassLoader moduleClassLoader = createClassLoader(toLoad);
             sources.add(0, moduleClassLoader);
-            ImageProvider.addAdditionalClassLoader(moduleClassLoader);
+            ResourceProvider.addAdditionalClassLoader(moduleClassLoader);
             monitor.setTicksCount(toLoad.size());
             for (ModuleInformation info : toLoad) {