Changeset 5859 in josm for trunk/src

Timestamp:

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

Author:

akks

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/history/HistoryLoadTask.java (modified) (1 diff)
• io/OsmBzip2Importer.java (modified) (1 diff)
• io/OsmChangeImporter.java (modified) (2 diffs)
• io/OsmGzipImporter.java (modified) (1 diff)
• io/OsmImporter.java (modified) (3 diffs)
• io/OsmReader.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java

@@ -161 +161 @@
     protected void cancel() {
         System.out.println("Cancel!");
-        //OsmApi.getOsmApi().cancel();
-        // fix #8601 : could not cancel when server is extremely slow
         if (reader!=null) reader.cancel();
         canceled = true;

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

@@ -22 +22 @@
     @Override
     public void importData(File file, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
-        importData(getBZip2InputStream(new FileInputStream(file)), file);
+        importData(getBZip2InputStream(new FileInputStream(file)), file, progressMonitor);
     }
 }

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()); 

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

@@ -22 +22 @@
     @Override
     public void importData(File file, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
-        importData(getGZipInputStream(new FileInputStream(file)), file);
+        importData(getGZipInputStream(new FileInputStream(file)), file, progressMonitor);
     }
 }

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

@@ -52 +52 @@
     }
 
+    /**
+     * Imports OSM data from file @param file
+     * This method supports progress monitoring and canceling by using @param progressMonitor
+     */
     @Override
     public void importData(File file, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
@@ -57 +61 @@
         try {
             in = new FileInputStream(file);
-            importData(in, file);
+            importData(in, file, progressMonitor);
         } catch (FileNotFoundException e) {
             e.printStackTrace();
@@ -68 +72 @@
     }
 
+    /**
+     * Imports OSM data from stream @param in , sitle will be generated from name of file @param associatedFile
+     */
     protected void importData(InputStream in, final File associatedFile) throws IllegalDataException {
+        importData(in, associatedFile, NullProgressMonitor.INSTANCE);
+    }
+    
+    /**
+     * Imports OSM data from stream @param in , layer name will be generated from name of file @param associatedFile
+     * This method supports progress monitoring and canceling by using @param progressMonitor
+     */
+    protected void importData(InputStream in, final File associatedFile, ProgressMonitor pm) throws IllegalDataException {
         final OsmImporterData data = loadLayer(in, associatedFile,
-                associatedFile == null ? OsmDataLayer.createNewName() : associatedFile.getName(), NullProgressMonitor.INSTANCE);
+                associatedFile == null ? OsmDataLayer.createNewName() : associatedFile.getName(), pm);
 
         // FIXME: remove UI stuff from IO subsystem

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

@@ -50 +50 @@
     protected XMLStreamReader parser;
 
+    protected boolean cancel;
+
     /** Used by plugins to register themselves as data postprocessors. */
     public static ArrayList<OsmServerReadPostprocessor> postprocessors;
@@ -128 +130 @@
         while (true) {
             int event = parser.next();
+            
+            if (cancel) {
+                cancel = false;
+                throwException(tr("Reading was canceled"));
+            }
+            
             if (event == XMLStreamConstants.START_ELEMENT) {
                 if (parser.getLocalName().equals("bounds")) {
@@ -561 +569 @@
             progressMonitor = NullProgressMonitor.INSTANCE;
         }
+        ProgressMonitor.CancelListener cancelListener = new ProgressMonitor.CancelListener() {
+            @Override public void operationCanceled() {
+                cancel = true;
+            }
+        };
+        progressMonitor.addCancelListener(cancelListener);
         CheckParameterUtil.ensureParameterNotNull(source, "source");
         try {
@@ -603 +617 @@
         } finally {
             progressMonitor.finishTask();
+            progressMonitor.removeCancelListener(cancelListener);
         }
     }