Changeset 33568 in osm for applications/editors/josm/plugins/pbf/src

Timestamp:

2017-08-27T20:20:53+02:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12671

Location:

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

Files:

• PbfPlugin.java (modified) (2 diffs)
• action/DownloadPbfTask.java (modified) (2 diffs)
• io/PbfExporter.java (modified) (1 diff)
• io/PbfImporter.java (modified) (1 diff)
• io/PbfReader.java (modified) (3 diffs)

applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/PbfPlugin.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.pbf;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.io.OverpassDownloadReader;
 import org.openstreetmap.josm.io.OverpassDownloadReader.OverpassOutpoutFormat;
@@ -30 +30 @@
         ExtensionFileFilter.addExporter(new PbfExporter());
         // Allow JOSM to download remote *.osm.pbf files
-        Main.main.menu.openLocation.addDownloadTaskClass(DownloadPbfTask.class);
+        MainApplication.getMenu().openLocation.addDownloadTaskClass(DownloadPbfTask.class);
         // Alow JOSM to download PBF data from Overpass API
         OverpassDownloadReader.registerOverpassOutpoutFormatReader(OverpassOutpoutFormat.PBF, PbfReader.class);

applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/action/DownloadPbfTask.java

@@ -6 +6 @@
 import java.util.concurrent.Future;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.plugins.pbf.PbfConstants;
@@ -28 +28 @@
         // We need submit instead of execute so we can wait for it to finish and get the error
         // message if necessary. If no one calls getErrorMessage() it just behaves like execute.
-        return Main.worker.submit(downloadTask);
+        return MainApplication.worker.submit(downloadTask);
     }
 

applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfExporter.java

@@ -7 +7 @@
 import java.io.OutputStream;
 
+import org.openstreetmap.josm.gui.io.importexport.OsmExporter;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.io.OsmExporter;
 import org.openstreetmap.josm.plugins.pbf.PbfConstants;
 

applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfImporter.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.CachedFile;
 import org.openstreetmap.josm.io.IllegalDataException;
-import org.openstreetmap.josm.io.OsmImporter;
 import org.openstreetmap.josm.plugins.pbf.PbfConstants;
 

applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfReader.java

@@ -13 +13 @@
 import java.util.Map;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.DataSource;
@@ -31 +30 @@
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Logging;
 
 import crosby.binary.BinaryParser;
@@ -82 +82 @@
                     ds.addDataSource(new DataSource(b, header.getSource()));
                 } else {
-                    Main.error("Invalid Bounds: "+b);
+                    Logging.error("Invalid Bounds: "+b);
                 }
             }