Changeset 14170 in josm for trunk/src/org

Timestamp:

2018-08-20T00:02:11+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16542 - don't display error dialog when notes upload is canceled

File:

• trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java

@@ -18 +18 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.OsmApi;
+import org.openstreetmap.josm.io.OsmTransferCanceledException;
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.Logging;
@@ -109 +110 @@
                 Logging.error("Failed to upload note to server: {0}", note.getId());
                 Logging.error(e);
-                failedNotes.put(note, e);
+                if (!(e instanceof OsmTransferCanceledException)) {
+                    failedNotes.put(note, e);
+                }
             }
         }