Changeset 1894 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2009-08-03T15:00:34+02:00 (16 years ago)

Author:

Gubaer

Message:

fixed #3158: modify status is not removed for partial uploads

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• OsmApi.java (modified) (1 diff)
• OsmServerWriter.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/io/OsmApi.java

@@ -507 +507 @@
     }
 
+    /**
+     * Replies the current changeset
+     * 
+     * @return the current changeset
+     */
+    public Changeset getCurrentChangeset() {
+        return changeset;
+    }
 }

trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java

@@ -5 +5 @@
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
@@ -11 +12 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.UploadAction;
+import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -34 +36 @@
      * than where passed in the list to upload*.
      */
-    public Collection<OsmPrimitive> processed;
+    private Collection<OsmPrimitive> processed;
 
     private OsmApi api = OsmApi.getOsmApi();
@@ -79 +81 @@
 
     /**
+     * Uploads the changes individually. Invokes one API call per uploaded primitmive.
+     * 
+     * @param primitives the collection of primitives to upload
+     * @param progressMonitor the progress monitor
+     * @throws OsmTransferException thrown if an exception occurs
+     */
+    protected void uploadChangesIndividually(Collection<OsmPrimitive> primitives, ProgressMonitor progressMonitor) throws OsmTransferException {
+        try {
+            progressMonitor.setTicksCount(primitives.size());
+            api.createChangeset(getChangesetComment(), progressMonitor.createSubTaskMonitor(0, false));
+            uploadStartTime = System.currentTimeMillis();
+            for (OsmPrimitive osm : primitives) {
+                int progress = progressMonitor.getTicks();
+                String time_left_str = timeLeft(progress, primitives.size());
+                progressMonitor.subTask(
+                        tr("{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})",
+                                Math.round(100.0*progress/primitives.size()), progress,
+                                primitives.size(), time_left_str,
+                                OsmPrimitiveType.from(osm).getLocalizedDisplayNameSingular(),
+                                NAME_FORMATTER.getName(osm),
+                                osm.id));
+                makeApiRequest(osm,progressMonitor);
+                processed.add(osm);
+                progressMonitor.worked(1);
+            }
+        } catch(OsmTransferException e) {
+            throw e;
+        } catch(Exception e) {
+            throw new OsmTransferException(e);
+        } finally {
+            try {
+                api.stopChangeset(progressMonitor.createSubTaskMonitor(0, false));
+            } catch(Exception e) {
+                Changeset changeset = api.getCurrentChangeset();
+                String changesetId = (changeset == null ? tr("unknown") : Long.toString(changeset.id));
+                logger.warning(tr("Failed to close changeset {0}, will be closed by server after timeout. Exception was: {1}",
+                        changesetId, e.toString()));
+            }
+        }
+    }
+
+    /**
+     * Upload all changes in one diff upload
+     * 
+     * @param primitives the collection of primitives to upload
+     * @param progressMonitor  the progress monitor
+     * @throws OsmTransferException thrown if an exception occurs
+     */
+    protected void uploadChangesAsDiffUpload(Collection<OsmPrimitive> primitives, ProgressMonitor progressMonitor) throws OsmTransferException {
+        // upload everything in one changeset
+        //
+        try {
+            api.createChangeset(getChangesetComment(), progressMonitor.createSubTaskMonitor(0, false));
+            processed.addAll(api.uploadDiff(primitives, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false)));
+        } catch(OsmTransferException e) {
+            throw e;
+        } catch(Exception e) {
+            throw new OsmTransferException(e);
+        } finally {
+            try {
+                api.stopChangeset(progressMonitor.createSubTaskMonitor(0, false));
+            } catch (Exception ee) {
+                Changeset changeset = api.getCurrentChangeset();
+                String changesetId = (changeset == null ? tr("unknown") : Long.toString(changeset.id));
+                logger.warning(tr("Failed to close changeset {0}, will be closed by server after timeout. Exception was: {1}",
+                        changesetId, ee.toString()));
+            }
+        }
+    }
+
+    /**
      * Send the dataset to the server.
      *
@@ -92 +165 @@
 
         try {
-
             // check whether we can use changeset
             //
@@ -103 +175 @@
 
             if (useChangeset) {
-                // upload everything in one changeset
-                //
-                try {
-                    api.createChangeset(getChangesetComment(), progressMonitor.createSubTaskMonitor(0, false));
-                    processed.addAll(api.uploadDiff(primitives, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false)));
-                } catch(OsmTransferException e) {
-                    throw e;
-                } finally {
-                    try {
-                        if (canUseChangeset) {
-                            api.stopChangeset(progressMonitor.createSubTaskMonitor(0, false));
-                        }
-                    } catch (Exception ee) {
-                        ee.printStackTrace();
-                        // ignore nested exception
-                    }
-                }
+                uploadChangesAsDiffUpload(primitives, progressMonitor);
             } else {
-                // upload changes individually (90% of code is for the status display...)
-                //
-                progressMonitor.setTicksCount(primitives.size());
-                api.createChangeset(getChangesetComment(), progressMonitor.createSubTaskMonitor(0, false));
-                uploadStartTime = System.currentTimeMillis();
-                for (OsmPrimitive osm : primitives) {
-                    int progress = progressMonitor.getTicks();
-                    String time_left_str = timeLeft(progress, primitives.size());
-                    progressMonitor.subTask(
-                            tr("{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})",
-                                    Math.round(100.0*progress/primitives.size()), progress,
-                                    primitives.size(), time_left_str,
-                                    OsmPrimitiveType.from(osm).getLocalizedDisplayNameSingular(),
-                                    NAME_FORMATTER.getName(osm),
-                                    osm.id));
-                    makeApiRequest(osm,progressMonitor);
-                    processed.add(osm);
-                    progressMonitor.worked(1);
-                }
-                api.stopChangeset(progressMonitor.createSubTaskMonitor(0, false));
-            }
-
+                uploadChangesIndividually(primitives, progressMonitor);
+            }
         } finally {
             progressMonitor.finishTask();
@@ -163 +199 @@
         }
     }
+
+    /**
+     * Replies the collection of successfully processed primitives
+     * 
+     * @return the collection of successfully processed primitives
+     */
+    public Collection<OsmPrimitive> getProcessedPrimitives() {
+        return processed;
+    }
 }