Changeset 2198 in josm for trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java

Timestamp:

2009-09-27T16:29:21+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3249: Resolve conflicts between invisible and deleted primitives automatically

File:

• trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (modified) (6 diffs)

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

@@ -5 +5 @@
 
 import java.util.Collection;
+import java.util.HashSet;
 
+import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException;
 import org.openstreetmap.josm.data.APIDataSet;
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.openstreetmap.josm.io.ChangesetProcessingType;
+import org.openstreetmap.josm.io.OsmApi;
+import org.openstreetmap.josm.io.OsmApiPrimitiveGoneException;
 import org.openstreetmap.josm.io.OsmServerWriter;
+import org.openstreetmap.josm.io.OsmTransferException;
 
 /**
@@ -37 +43 @@
     private Changeset changeset;
     private boolean closeChangesetAfterUpload;
+    private Collection<OsmPrimitive> toUpload;
+    private HashSet<OsmPrimitive> processedPrimitives;
 
     /**
@@ -42 +50 @@
      * @param layer the layer. Must not be null.
      * @param monitor  a progress monitor. If monitor is null, uses {@see NullProgressMonitor#INSTANCE}
-     * @param changeset the changeset to be used if <code>changesetProcessingType</code> indicates that a new
-     *   changeset is to be used
+     * @param changeset the changeset to be used
      * @param closeChangesetAfterUpload true, if the changeset should be closed after the upload
      * @throws IllegalArgumentException thrown, if layer is null
@@ -57 +64 @@
         this.changeset = changeset;
         this.closeChangesetAfterUpload = closeChangesetAfterUpload;
+        processedPrimitives = new HashSet<OsmPrimitive>();
+    }
+
+    protected OsmPrimitive getPrimitive(OsmPrimitiveType type, long id) {
+        for (OsmPrimitive p: toUpload) {
+            if (OsmPrimitiveType.from(p).equals(type) && p.getId() == id)
+                return p;
+        }
+        return null;
+    }
+
+    /**
+     * Retries to recover the upload operation from an exception which was thrown because
+     * an uploaded primitive was already deleted on the server.
+     * 
+     * @param e the exception throw by the API
+     * @param monitor a progress monitor
+     * @throws OsmTransferException  thrown if we can't recover from the exception
+     */
+    protected void recoverFromGoneOnServer(OsmApiPrimitiveGoneException e, ProgressMonitor monitor) throws OsmTransferException{
+        if (!e.isKnownPrimitive()) throw e;
+        OsmPrimitive p = getPrimitive(e.getPrimitiveType(), e.getPrimitiveId());
+        if (p == null) throw e;
+        if (p.isDeleted()) {
+            // we tried to delete an already deleted primitive.
+            //
+            System.out.println(tr("Warning: primitive ''{0}'' is already deleted on the server. Skipping this primitive and retrying to upload.", p.getDisplayName(DefaultNameFormatter.getInstance())));
+            processedPrimitives.addAll(writer.getProcessedPrimitives());
+            processedPrimitives.add(p);
+            toUpload.removeAll(processedPrimitives);
+            return;
+        }
+        // exception was thrown because we tried to *update* an already deleted
+        // primitive. We can't resolve this automatically. Re-throw exception,
+        // a conflict is going to be created later.
+        throw e;
     }
 
@@ -62 +105 @@
     public void run() {
         monitor.subTask(tr("Preparing primitives to upload ..."));
-        Collection<OsmPrimitive> toUpload = new APIDataSet(layer.data).getPrimitives();
+        APIDataSet ds = new APIDataSet(layer.data);
+        try {
+            ds.adjustRelationUploadOrder();
+        } catch(CyclicUploadDependencyException e) {
+            setLastException(e);
+            return;
+        }
+        toUpload = ds.getPrimitives();
         if (toUpload.isEmpty())
             return;
         writer = new OsmServerWriter();
         try {
-            ProgressMonitor m = monitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false);
-            if (isCancelled()) return;
-            writer.uploadOsm(layer.data.version, toUpload, changeset, closeChangesetAfterUpload, m);
+            while(true) {
+                try {
+                    ProgressMonitor m = monitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false);
+                    if (isCancelled()) return;
+                    writer.uploadOsm(layer.data.version, toUpload, changeset, m);
+                    processedPrimitives.addAll(writer.getProcessedPrimitives());
+                    break;
+                } catch(OsmApiPrimitiveGoneException e) {
+                    recoverFromGoneOnServer(e, monitor);
+                }
+            }
+            if (closeChangesetAfterUpload) {
+                if (changeset != null && changeset.getId() > 0) {
+                    OsmApi.getOsmApi().closeChangeset(changeset, monitor.createSubTaskMonitor(0, false));
+                }
+            }
         } catch (Exception sxe) {
             if (isCancelled()) {
@@ -80 +143 @@
         if (isCancelled())
             return;
-        layer.cleanupAfterUpload(writer.getProcessedPrimitives());
+        layer.cleanupAfterUpload(processedPrimitives);
         DataSet.fireSelectionChanged(layer.data.getSelected());
         layer.fireDataChange();
         layer.onPostUploadToServer();
+
+        // don't process exceptions remembered with setLastException().
+        // Caller is supposed to deal with them.
     }
 
     @Override
     public void cancel() {
-        // make sure the the softCancel operation is serialized with
-        // blocks which can be interrupted.
         setCancelled(true);
         if (writer != null) {