Changeset 16407 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2020-05-13T15:24:14+02:00 (4 years ago)

Author:

GerdP

Message:

fix #18915: "Precondition violation" not fixable from within JOSM

• correct handling of precondition failure responses that contain the word requires so that the correct objects are downloaded. The parents are needed, not the childern.

File:

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

trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java

@@ -8 +8 @@
 import java.net.HttpURLConnection;
 import java.text.DateFormat;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -264 +265 @@
         );
         if (ret == 0) {
-            DownloadReferrersAction.downloadReferrers(MainApplication.getLayerManager().getEditLayer(), Arrays.asList(conflict.a));
+            if (msg.contains("to delete")) {
+                DownloadReferrersAction.downloadReferrers(MainApplication.getLayerManager().getEditLayer(),
+                        Arrays.asList(conflict.a));
+            }
+            if (msg.contains("to upload") && !conflict.b.isEmpty()) {
+                MainApplication.worker.submit(new DownloadPrimitivesTask(
+                        MainApplication.getLayerManager().getEditLayer(), new ArrayList<>(conflict.b), false));
+            }
         }
     }