Changeset 17202 in josm for trunk

Timestamp:

2020-10-15T08:27:39+02:00 (4 years ago)

Author:

GerdP

Message:

see #19920: Cancel doesn't work with "Download All Children"

• let Cancel call MultiFetchServerObjectReader.cancel() instead of OsmApi.getOsmApi().cancel();
• only download child relations

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java

@@ -47 +47 @@
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 import org.openstreetmap.josm.io.MultiFetchServerObjectReader;
-import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -324 +323 @@
         protected int conflictsCount;
         protected Exception lastException;
+        protected MultiFetchServerObjectReader reader;
 
         DownloadTask(String title, Dialog parent) {
@@ -332 +332 @@
         protected void cancel() {
             canceled = true;
-            OsmApi.getOsmApi().cancel();
+            synchronized (this) {
+                if (reader != null) {
+                    reader.cancel();
+                }
+            }
         }
 
@@ -423 +427 @@
         protected void realRun() throws SAXException, IOException, OsmTransferException {
             try {
-                MultiFetchServerObjectReader reader = createReader();
-                reader.append(relation.getMemberPrimitives());
+                reader = createReader();
+                reader.append(relation.getMemberPrimitives(Relation.class));
                 DataSet dataSet = reader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
                 mergeDataSet(dataSet);
@@ -456 +460 @@
         protected void realRun() throws SAXException, IOException, OsmTransferException {
             try {
-                MultiFetchServerObjectReader reader = createReader();
+                reader = createReader();
                 reader.append(relations);
                 DataSet dataSet = reader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));