Changeset 33566 in osm for applications

Timestamp:

2017-08-27T20:14:23+02:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12671

Location:

applications/editors/josm/plugins/o5m

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/o5m/io/O5mImporter.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/o5m/io/O5mReader.java (modified) (2 diffs)

applications/editors/josm/plugins/o5m/build.xml

@@ -5 +5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="11919"/>
+    <property name="plugin.main.version" value="12671"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/o5m/src/org/openstreetmap/josm/plugins/o5m/io/O5mImporter.java

@@ -6 +6 @@
 
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.io.importexport.OsmImporter;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.io.CachedFile;
-import org.openstreetmap.josm.io.OsmImporter;
 import org.openstreetmap.josm.plugins.o5m.O5mConstants;
 

applications/editors/josm/plugins/o5m/src/org/openstreetmap/josm/plugins/o5m/io/O5mReader.java

@@ -31 +31 @@
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -222 +223 @@
                 ds.addDataSource(new DataSource(b, header));
             } else {
-                Main.error("Invalid Bounds: "+b);
+                Logging.error("Invalid Bounds: "+b);
             }
         }