Changeset 29551 in osm for applications/editors/josm/plugins/reverter/src

Timestamp:

2013-05-01T00:35:12+02:00 (12 years ago)

Author:

donvip

Message:

[josm_reverter] fix #josm8040 - handling of redacted versions

File:

• applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java (modified) (3 diffs)

applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.net.HttpURLConnection;
 import java.util.Arrays;
 import java.util.Collections;
@@ -34 +35 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.MultiFetchServerObjectReader;
+import org.openstreetmap.josm.io.OsmApiException;
 import org.openstreetmap.josm.io.OsmTransferException;
 
@@ -186 +188 @@
                 for (HistoryOsmPrimitive entry : collection) {
                     PrimitiveId id = entry.getPrimitiveId();
-                    rdr.readObject(id, cds.getEarliestVersion(id)-1, progressMonitor.createSubTaskMonitor(1, true));
+                    int version = cds.getEarliestVersion(id)-1;
+                    boolean readOK = false;
+                    while (!readOK && version >= 1) {
+                        try {
+                            rdr.readObject(id, version, progressMonitor.createSubTaskMonitor(1, true));
+                            readOK = true;
+                        } catch (OsmApiException e) {
+                            if (e.getResponseCode() != HttpURLConnection.HTTP_FORBIDDEN) {
+                                throw e;
+                            }
+                            String message = "Version "+version+" of "+id+" is unauthorized";
+                            if (version > 1) {
+                                message += ", requesting previous one";
+                            }
+                            Main.info(message);
+                            version--;
+                        }
+                    }
+                    if (!readOK) {
+                        Main.warn("Cannot retrieve any previous version of "+id);
+                    }
                     if (progressMonitor.isCanceled()) return;
                 }