Changeset 5859 in josm for trunk/src/org/openstreetmap/josm/io/OsmChangeImporter.java

Timestamp:

2013-04-14T19:10:11+02:00 (11 years ago)

Author:

akks

Message:

see #8274, #8601 : cancel now works while parsing OSM

File:

• trunk/src/org/openstreetmap/josm/io/OsmChangeImporter.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/OsmChangeImporter.java

@@ -38 +38 @@
             
             if (file.getName().endsWith(".osc")) {
-                importData(in, file);
+                importData(in, file, progressMonitor);
             } else if (file.getName().endsWith(".gz")) {
-                importData(getGZipInputStream(in), file);
+                importData(getGZipInputStream(in), file, progressMonitor);
             } else {
-                importData(getBZip2InputStream(in), file);
+                importData(getBZip2InputStream(in), file, progressMonitor);
             }
             
@@ -52 +52 @@
 
     protected void importData(InputStream in, final File associatedFile) throws IllegalDataException {
-        final DataSet dataSet = OsmChangeReader.parseDataSet(in, NullProgressMonitor.INSTANCE);
+        importData(in, associatedFile, NullProgressMonitor.INSTANCE);
+    }
+    
+    protected void importData(InputStream in, final File associatedFile, ProgressMonitor  progressMonitor) throws IllegalDataException {
+        final DataSet dataSet = OsmChangeReader.parseDataSet(in, progressMonitor);
         final OsmDataLayer layer = new OsmDataLayer(dataSet, associatedFile.getName(), associatedFile);
         addDataLayer(dataSet, layer, associatedFile.getPath());