Changeset 35398 in osm for applications

Timestamp:

2020-03-27T15:42:18+01:00 (5 years ago)

Author:

gerdp

Message:

see #josm10873: Loses everything already downloaded when encountering an error
Collect missing primitives and show dialog with a list of them similar to the download objects dialog
Requires JOSM r16205 or later.

Location:

applications/editors/josm/plugins/undelete

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/undelete/UndeleteAction.java (modified) (9 diffs)

applications/editors/josm/plugins/undelete/build.xml

@@ -4 +4 @@
     <property name="commit.message" value="adapt to core changes (backwards compatible)"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="14763"/>
+    <property name="plugin.main.version" value="16205"/>
 
     <property name="plugin.author" value="Nakor"/>

applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/UndeleteAction.java

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.awt.event.ActionEvent;
@@ -35 +36 @@
 import org.openstreetmap.josm.data.osm.history.HistoryWay;
 import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.history.HistoryLoadTask;
 import org.openstreetmap.josm.gui.io.DownloadPrimitivesTask;
+import org.openstreetmap.josm.gui.io.DownloadPrimitivesWithReferrersTask;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -58 +59 @@
         private Set<OsmPrimitive> restored;
 
-        private Worker(OsmPrimitive parent, OsmDataLayer layer, List<PrimitiveId> ids, Set<OsmPrimitive> restored) {
-            this.parent = parent;
-            this.layer = layer;
-            this.ids = ids;
-            this.restored = restored != null ? restored : new LinkedHashSet<>();
-        }
+                private Set<PrimitiveId> missingPrimitives;
+
+                private Worker(OsmPrimitive parent, OsmDataLayer layer, List<PrimitiveId> ids, Set<OsmPrimitive> restored,
+                                HistoryLoadTask task) {
+                        this.parent = parent;
+                        this.layer = layer;
+                        this.ids = ids;
+                        this.restored = restored;
+                        this.missingPrimitives = task.getMissingPrimitives();
+                }
 
         @Override
@@ -69 +74 @@
             List<Node> nodes = new ArrayList<>();
             for (PrimitiveId pid : ids) {
+                                if (missingPrimitives == null || missingPrimitives.contains(pid)) {
+                                        continue;
+                                }
+
                 OsmPrimitive primitive = layer.data.getPrimitiveById(pid);
                 if (primitive == null) {
@@ -77 +86 @@
                         History h = HistoryDataSet.getInstance().getHistory(id, type);
 
-                        if (h == null) {
-                            Logging.warn("Cannot find history for " + type + " " + id);
-                            return;
-                        }
+                                                if (h == null) {
+                                                        Logging.warn("Cannot find history for " + type + " " + id);
+                                                        return;
+                                                }
 
                         HistoryOsmPrimitive hPrimitive1 = h.getLatest();
@@ -186 +195 @@
                                 layer.data.addPrimitive(primitive);
                                 restored.add(primitive);
-                            } else {
-                              final String msg = OsmPrimitiveType.NODE == type
-                                  ? tr("Unable to undelete node {0}. Object has likely been redacted", id)
-                                  : OsmPrimitiveType.WAY == type
-                                  ? tr("Unable to undelete way {0}. Object has likely been redacted", id)
-                                  : OsmPrimitiveType.RELATION == type
-                                  ? tr("Unable to undelete relation {0}. Object has likely been redacted", id)
-                                  : null;
-                                GuiHelper.runInEDT(() -> new Notification(msg).setIcon(JOptionPane.WARNING_MESSAGE).show());
-                                Logging.warn(msg);
                             }
                         }
@@ -215 +214 @@
                 });
             }
+            if (missingPrimitives != null && !missingPrimitives.isEmpty()) {
+                GuiHelper.runInEDTAndWait(() -> DownloadPrimitivesWithReferrersTask.reportProblemDialog(missingPrimitives,
+                        trn("Object could not be undeleted", "Some objects could not be undeleted", missingPrimitives.size()),
+                        trn("One object could not be undeleted.<br>",
+                                "{0} objects could not be undeleted.<br>",
+                                missingPrimitives.size(),
+                                missingPrimitives.size())
+                                + tr("The server replied with response code 404.<br>"
+                                     + "This usually means, the server does not know an object with the requested id. Maybe it was redacted."),
+                        tr("missing objects:"),
+                        JOptionPane.ERROR_MESSAGE
+                        ).showDialog());
+
+            }
         }
+
     }
 
@@ -255 +269 @@
         HistoryLoadTask task = new HistoryLoadTask();
         task.setChangesetDataNeeded(false);
+        task.setCollectMissing(true);
         for (PrimitiveId id : ids) {
             task.add(id);
@@ -260 +275 @@
 
         MainApplication.worker.execute(task);
-        MainApplication.worker.submit(new Worker(parent, layer, ids, restored));
+        MainApplication.worker.submit(new Worker(parent, layer, ids, restored, task));
     }
 }