Changeset 2569 in josm

Timestamp:

2009-12-04T15:53:55+01:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3684: Add "chunked" upload mode
Removed support for API "0.5" when uploading (there are still 0.5-files around, but I'm not aware of any 0.5-servers)

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/UploadAction.java (modified) (6 diffs)
• src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java (modified) (2 diffs)
• src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/io/UploadDialog.java (modified) (15 diffs)
• src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (modified) (5 diffs)
• src/org/openstreetmap/josm/gui/io/UploadStrategy.java (added)
• src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (added)
• src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java (added)
• src/org/openstreetmap/josm/io/ChangesetClosedException.java (modified) (3 diffs)
• src/org/openstreetmap/josm/io/OsmApi.java (modified) (7 diffs)
• src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) (7 diffs)
• test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified) (2 diffs)
• test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified) (2 diffs)
• test/functional/org/openstreetmap/josm/io/UploadStrategySelectionPanelTest.java (added)

trunk/src/org/openstreetmap/josm/actions/UploadAction.java

@@ -36 +36 @@
 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
 import org.openstreetmap.josm.gui.io.UploadDialog;
+import org.openstreetmap.josm.gui.io.UploadStrategySpecification;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -168 +169 @@
             return;
         Main.worker.execute(
-                createUploadTask(
+                new UploadPrimitivesTask(
+                        UploadDialog.getUploadDialog().getUploadStrategySpecification(),
                         layer,
                         apiData.getPrimitives(),
@@ -552 +554 @@
     }
 
-    public UploadPrimitivesTask createUploadTask(OsmDataLayer layer, Collection<OsmPrimitive> toUpload, Changeset changeset, boolean closeChangesetAfterUpload) {
-        return new UploadPrimitivesTask(layer, toUpload, changeset, closeChangesetAfterUpload);
-    }
-
     /**
      * The task for uploading a collection of primitives
@@ -569 +567 @@
         private boolean closeChangesetAfterUpload;
         private HashSet<OsmPrimitive> processedPrimitives;
+        private UploadStrategySpecification strategy;
 
         /**
-         *
+         * Creates the task
+         * @param strategy the upload strategy
          * @param layer  the OSM data layer for which data is uploaded
          * @param toUpload the collection of primitives to upload
@@ -577 +577 @@
          * @param closeChangesetAfterUpload true, if the changeset is to be closed after uploading
          */
-        private UploadPrimitivesTask(OsmDataLayer layer, Collection <OsmPrimitive> toUpload, Changeset changeset, boolean closeChangesetAfterUpload) {
+        private UploadPrimitivesTask(UploadStrategySpecification strategy, OsmDataLayer layer, Collection <OsmPrimitive> toUpload, Changeset changeset, boolean closeChangesetAfterUpload) {
             super(tr("Uploading data for layer ''{0}''", layer.getName()),false /* don't ignore exceptions */);
             this.toUpload = toUpload;
             this.layer = layer;
             this.changeset = changeset;
+            this.strategy = strategy;
             this.closeChangesetAfterUpload = closeChangesetAfterUpload;
             this.processedPrimitives = new HashSet<OsmPrimitive>();
@@ -628 +629 @@
                     try {
                         getProgressMonitor().subTask(tr("Uploading {0} objects ...", toUpload.size()));
-                        writer.uploadOsm(layer.data.getVersion(), toUpload, changeset, getProgressMonitor().createSubTaskMonitor(1, false));
+                        writer.uploadOsm(strategy, toUpload, changeset, getProgressMonitor().createSubTaskMonitor(1, false));
                         processedPrimitives.addAll(writer.getProcessedPrimitives());
                         // if we get here we've successfully uploaded the data. Exit the loop.

trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java

@@ -73 +73 @@
                         // value
                         System.out.println(
-                                tr("Warning: automatically truncating value of tag ''{0}'' on deleted primitive {1}",
+                                tr("Warning: automatically truncating value of tag ''{0}'' on deleted object {1}",
                                         e.getKey(),
                                         Long.toString(osmPrimitive.getId())
@@ -82 +82 @@
                     }
                     JOptionPane.showMessageDialog(Main.parent,
-                            tr("Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed length {2}. Values length is {3}.",
+                            tr("Length of value for tag ''{0}'' on object {1} exceeds the max. allowed length {2}. Values length is {3}.",
                                     e.getKey(), Long.toString(osmPrimitive.getId()), 255, e.getValue().length()
                             ),

trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java

@@ -68 +68 @@
         super.executeCommand();
 
-        // replace the list of nodes of 'my' way by the list of merged
-        // nodes
+        // replace the list of members of 'my' relation by the list of merged
+        // members
         //
         my.setMembers(mergedMembers);
@@ -87 +87 @@
     public void undoCommand() {
         if (! Main.map.mapView.hasLayer(layer)) {
-            logger.warning(tr("Can't undo command ''{0}'' because layer ''{1}'' is not present any more",
+            logger.warning(tr("Can''t undo command ''{0}'' because layer ''{1}'' is not present any more",
                     this.toString(),
                     layer.toString()

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java

@@ -15 +15 @@
 import java.util.HashMap;
 import java.util.Observable;
-import java.util.logging.Logger;
 
 import javax.swing.AbstractListModel;
@@ -120 +119 @@
         return entries.get(MERGED_ENTRIES);
     }
+
     protected ArrayList<T> getMyEntries() {
         return entries.get(MY_ENTRIES);
     }
+
     protected ArrayList<T> getTheirEntries() {
         return entries.get(THEIR_ENTRIES);

trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.util.ArrayList;
 import java.util.logging.Logger;
 
@@ -16 +17 @@
  * The model for merging two lists of relation members
  *
- *
  */
 public class RelationMemberListMergeModel extends ListMergeModel<RelationMember>{
@@ -24 +24 @@
     @Override
     public boolean isEqualEntry(RelationMember e1, RelationMember e2) {
-        boolean ret = e1.getRole().equals(e2.getRole());
-        if (!e1.getMember().isNew() ) {
-            ret = ret && (e1.getMember().getId() == e2.getMember().getId());
-        } else {
-            ret = ret && (e1 == e2);
-        }
-        return ret;
+        return e1.equals(e2);
     }
 
@@ -119 +113 @@
         if (! isFrozen())
             throw new IllegalArgumentException(tr("Merged nodes not frozen yet. Can't build resolution command"));
-        return new RelationMemberConflictResolverCommand(my, their, getMergedEntries());
+        ArrayList<RelationMember> entries = getMergedEntries();
+        return new RelationMemberConflictResolverCommand(my, their, entries);
     }
 }

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

@@ -298 +298 @@
         public void cancel() {
             switch(model.getMode()) {
-                case EDITING_DATA: cancelWhenInEditingModel(); break;
-                case UPLOADING_AND_SAVING: cancelSafeAndUploadTask(); break;
+            case EDITING_DATA: cancelWhenInEditingModel(); break;
+            case UPLOADING_AND_SAVING: cancelSafeAndUploadTask(); break;
             }
         }
@@ -333 +333 @@
                 Mode mode = (Mode)evt.getNewValue();
                 switch(mode) {
-                    case EDITING_DATA: setEnabled(true); break;
-                    case UPLOADING_AND_SAVING: setEnabled(false); break;
+                case EDITING_DATA: setEnabled(true); break;
+                case UPLOADING_AND_SAVING: setEnabled(false); break;
                 }
             }
@@ -367 +367 @@
                 SaveLayersModel.Mode mode = (SaveLayersModel.Mode)evt.getNewValue();
                 switch(mode) {
-                    case EDITING_DATA: setEnabled(true); break;
-                    case UPLOADING_AND_SAVING: setEnabled(false); break;
+                case EDITING_DATA: setEnabled(true); break;
+                case UPLOADING_AND_SAVING: setEnabled(false); break;
                 }
             }
@@ -408 +408 @@
 
                 currentTask = new UploadLayerTask(
+                        UploadDialog.getUploadDialog().getUploadStrategySpecification(),
                         layerInfo.getLayer(),
                         monitor,

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.io;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trn;
@@ -50 +51 @@
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.SideButton;
@@ -58 +60 @@
 import org.openstreetmap.josm.gui.tagging.TagModel;
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
-import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -192 +193 @@
                 JComponent.WHEN_IN_FOCUSED_WINDOW
         );
-        pnl.add(new SideButton(new ContextSensitiveHelpAction("/Dialogs/UploadDialog")));
-        HelpUtil.setHelpContext(getRootPane(),"/Dialogs/UploadDialog");
+        pnl.add(new SideButton(new ContextSensitiveHelpAction(ht("/Dialogs/UploadDialog"))));
+        HelpUtil.setHelpContext(getRootPane(),ht("/Dialogs/UploadDialog"));
         return pnl;
     }
@@ -293 +294 @@
             pnlLists.add(spDelete, gcList);
         }
+        pnlChangesetSelection.setNumUploadedObjects(add.size() + update.size() + delete.size());
     }
 
@@ -320 +322 @@
         cs.put("comment", getUploadComment());
         return cs;
+    }
+
+    /**
+     * Replies the {@see UploadStrategySpecification} the user entered in the dialog.
+     * 
+     * @return the {@see UploadStrategySpecification} the user entered in the dialog.
+     */
+    public UploadStrategySpecification getUploadStrategySpecification() {
+        return pnlChangesetSelection.getUploadStrategySpecification();
     }
 
@@ -487 +498 @@
 
         protected void warnIllegalUploadComment() {
-            JOptionPane.showMessageDialog(
+            HelpAwareOptionPane.showOptionDialog(
                     UploadDialog.this,
                     tr("Please enter a comment for this upload changeset (min. 3 characters)"),
                     tr("Illegal upload comment"),
-                    JOptionPane.ERROR_MESSAGE
+                    JOptionPane.ERROR_MESSAGE,
+                    ht("/Dialog/UploadDialog#IllegalUploadComment")
 
             );
         }
+
+        protected void warnIllegalChunkSize() {
+            HelpAwareOptionPane.showOptionDialog(
+                    UploadDialog.this,
+                    tr("Please enter a valid chunk size first"),
+                    tr("Illegal chunk size"),
+                    JOptionPane.ERROR_MESSAGE,
+                    ht("/Dialog/UploadDialog#IllegalChunkSize")
+            );
+        }
+
+
         public void actionPerformed(ActionEvent e) {
             if (getUploadComment().trim().length() < 3) {
@@ -502 +526 @@
                 return;
             }
+            UploadStrategySpecification strategy = getUploadStrategySpecification();
+            if (strategy.getStrategy().equals(UploadStrategy.CHUNKED_DATASET_STRATEGY)) {
+                if (strategy.getChunkSize() == UploadStrategySpecification.UNSPECIFIED_CHUNK_SIZE) {
+                    warnIllegalChunkSize();
+                    southTabbedPane.setSelectedIndex(0);
+                    pnlChangesetSelection.initEditingOfChunkSize();
+                    return;
+                }
+            }
             setCanceled(false);
             setVisible(false);
-
         }
     }
@@ -607 +639 @@
         private OpenChangesetModel model;
         private HistoryComboBox cmt;
-        private JCheckBox cbUseAtomicUpload;
+        private UploadStrategySelectionPanel pnlUploadStrategy;
 
         /**
@@ -615 +647 @@
          * @return the panel
          */
-        protected JPanel buildAtomicUploadControlPanel() {
-            JPanel pnl = new JPanel();
-            pnl.setLayout(new GridBagLayout());
-            GridBagConstraints gc = new GridBagConstraints();
-            gc.fill = GridBagConstraints.HORIZONTAL;
-            gc.weightx = 1.0;
-            gc.anchor = GridBagConstraints.FIRST_LINE_START;
-            pnl.add(cbUseAtomicUpload = new JCheckBox(tr("Upload all changes in one request")), gc);
-            cbUseAtomicUpload.setToolTipText(tr("Enable to upload all changes in one request, disable to use one request per changed primitive"));
-            boolean useAtomicUpload = Main.pref.getBoolean("osm-server.atomic-upload", true);
-            cbUseAtomicUpload.setSelected(useAtomicUpload);
-            cbUseAtomicUpload.setEnabled(OsmApi.getOsmApi().hasSupportForDiffUploads());
-            return pnl;
+        protected JPanel buildUploadStrategySelectionPanel() {
+            pnlUploadStrategy = new UploadStrategySelectionPanel();
+            pnlUploadStrategy.initFromPreferences();
+            return pnlUploadStrategy;
         }
 
@@ -678 +701 @@
             gc.weightx = 1.0;
             gc.anchor = GridBagConstraints.FIRST_LINE_START;
-            add(buildAtomicUploadControlPanel(), gc);
+            add(buildUploadStrategySelectionPanel(), gc);
 
             // -- changeset command
@@ -764 +787 @@
             cmt.addCurrentItemToHistory();
             Main.pref.putCollection(HISTORY_KEY, cmt.getHistory());
-            Main.pref.put("osm-server.atomic-upload", cbUseAtomicUpload.isSelected());
+            pnlUploadStrategy.saveToPreferences();
         }
 
@@ -819 +842 @@
         }
 
+        public void initEditingOfChunkSize() {
+            pnlUploadStrategy.initEditingOfChunkSize();
+        }
+
         protected void refreshGUI() {
             rbExisting.setEnabled(model.getSize() > 0);
@@ -848 +875 @@
                 return new Changeset();
             return cs;
+        }
+
+        /**
+         * Replies the {@see UploadStrategySpecification} the user entered in the dialog.
+         * 
+         * @return the {@see UploadStrategySpecification} the user entered in the dialog.
+         */
+        public UploadStrategySpecification getUploadStrategySpecification() {
+            return pnlUploadStrategy.getUploadStrategySpecification();
         }
 
@@ -932 +968 @@
         public boolean isCloseAfterUpload() {
             return cbCloseAfterUpload.isSelected();
+        }
+
+        public void setNumUploadedObjects(int numUploadedObjects) {
+            pnlUploadStrategy.setNumUploadedObjects(numUploadedObjects);
         }
 

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

@@ -44 +44 @@
     private Collection<OsmPrimitive> toUpload;
     private HashSet<OsmPrimitive> processedPrimitives;
+    private UploadStrategySpecification strategy;
 
     /**
-     *
+     * Creates the upload task
+     * 
+     * @param strategy the upload strategy specification
      * @param layer the layer. Must not be null.
      * @param monitor  a progress monitor. If monitor is null, uses {@see NullProgressMonitor#INSTANCE}
@@ -52 +55 @@
      * @param closeChangesetAfterUpload true, if the changeset should be closed after the upload
      * @throws IllegalArgumentException thrown, if layer is null
+     * @throws IllegalArgumentException thrown if strategy is null
      */
-    public UploadLayerTask(OsmDataLayer layer, ProgressMonitor monitor, Changeset changeset, boolean closeChangesetAfterUpload) {
+    public UploadLayerTask(UploadStrategySpecification strategy, OsmDataLayer layer, ProgressMonitor monitor, Changeset changeset, boolean closeChangesetAfterUpload) {
         if (layer == null)
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", layer));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "layer"));
+        if (strategy == null)
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "strategy"));
         if (monitor == null) {
             monitor = NullProgressMonitor.INSTANCE;
@@ -62 +68 @@
         this.monitor = monitor;
         this.changeset = changeset;
+        this.strategy = strategy;
         this.closeChangesetAfterUpload = closeChangesetAfterUpload;
         processedPrimitives = new HashSet<OsmPrimitive>();
@@ -103 +110 @@
     @Override
     public void run() {
-        monitor.subTask(tr("Preparing primitives to upload ..."));
+        monitor.indeterminateSubTask(tr("Preparing primitives to upload ..."));
         APIDataSet ds = new APIDataSet(layer.data);
         try {
@@ -120 +127 @@
                     ProgressMonitor m = monitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false);
                     if (isCancelled()) return;
-                    writer.uploadOsm(layer.data.getVersion(), toUpload, changeset, m);
+                    writer.uploadOsm(strategy, toUpload, changeset, m);
                     processedPrimitives.addAll(writer.getProcessedPrimitives());
                     break;

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

@@ -12 +12 @@
 import java.util.regex.Pattern;
 
+/**
+ * A ChangesetClosedException is thrown if the server replies with a HTTP
+ * return code 409 (Conflict) with the error header {@see #ERROR_HEADER_PATTERN}.
+ *
+ * Depending on the context the exception is thrown in we have to react differently.
+ * <ul>
+ *   <li>if it is thrown when we try to update a changeset, the changeset was most
+ *   likely closed before, either explicitly by the user or because of a timeout</li>
+ *   <li>if it is thrown when we try to upload data to the changeset, the changeset
+ *   was most likely closed because we reached the servers capability limit for the size
+ *   of a changeset.</li>
+ *  </ul>
+ */
 public class ChangesetClosedException extends OsmTransferException {
+    /** the error header pattern for in case of HTTP response 409 indicating
+     * that a changeset was closed
+     */
+    final static public String ERROR_HEADER_PATTERN = "The changeset (\\d+) was closed at (.*)";
+
+    static enum Source {
+        /**
+         * The exception was thrown when a changeset was updated. This most likely means
+         * that the changeset was closed before.
+         */
+        UPDATE_CHANGESET,
+        /**
+         * The exception was thrown when data was uploaded to the changeset. This most
+         * likely means that the servers capability limits for a changeset have been
+         * exceeded.
+         */
+        UPLOAD_DATA,
+        /**
+         * Unspecified source
+         */
+        UNSPECIFIED
+    }
+
+    /**
+     * Replies true if <code>errorHeader</code> matches with {@see #ERROR_HEADER_PATTERN}
+     * 
+     * @param errorHeader the error header
+     * @return true if <code>errorHeader</code> matches with {@see #ERROR_HEADER_PATTERN}
+     */
+    static public boolean errorHeaderMatchesPattern(String errorHeader) {
+        if (errorHeader == null)
+            return false;
+        Pattern p = Pattern.compile(ERROR_HEADER_PATTERN);
+        Matcher m = p.matcher(errorHeader);
+        return m.matches();
+    }
 
     /** the changeset id */
@@ -18 +67 @@
     /** the date on which the changeset was closed */
     private Date closedOn;
+    /** the source */
+    private Source source;
 
     protected void parseErrorHeader(String errorHeader) {
-        String pattern = "The changeset (\\d+) was closed at (.*)";
-        Pattern p = Pattern.compile(pattern);
+        Pattern p = Pattern.compile(ERROR_HEADER_PATTERN);
         Matcher m = p.matcher(errorHeader);
         if (m.matches()) {
@@ -39 +89 @@
     }
 
+    /**
+     * Creates the exception with the given <code>errorHeader</code>
+     * 
+     * @param errorHeader the error header
+     */
     public ChangesetClosedException(String errorHeader) {
         super(errorHeader);
         parseErrorHeader(errorHeader);
+        this.source = Source.UNSPECIFIED;
     }
 
+    /**
+     * Creates the exception with the given error header and the given
+     * source.
+     * 
+     * @param errorHeader the error header
+     * @param source the source for the exception
+     */
+    public ChangesetClosedException(String errorHeader, Source source) {
+        super(errorHeader);
+        parseErrorHeader(errorHeader);
+        this.source = source == null ? Source.UNSPECIFIED : source;
+    }
+
+    /**
+     * Replies the id of the changeset which was closed
+     * 
+     * @return the id of the changeset which was closed
+     */
     public long getChangesetId() {
         return changesetId;
     }
 
+    /**
+     * Replies the date the changeset was closed
+     * 
+     * @return the date the changeset was closed. May be null if the date isn't known.
+     */
     public Date getClosedOn() {
         return closedOn;
     }
+
+    /**
+     * Replies the source where the exception was thrown
+     * 
+     * @return the source
+     */
+    public Source getSource() {
+        return source;
+    }
 }

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

@@ -145 +145 @@
 
     /**
-     * Returns true if the negotiated version supports diff uploads.
-     * @return true if the negotiated version supports diff uploads
-     */
-    public boolean hasSupportForDiffUploads() {
-        return ((version != null) && (version.compareTo("0.6")>=0));
-    }
-
-    /**
      * Initializes this component by negotiating a protocol version with the server.
      *
@@ -168 +160 @@
             if (capabilities.supportsVersion("0.6")) {
                 version = "0.6";
-            } else if (capabilities.supportsVersion("0.5")) {
-                version = "0.5";
             } else {
                 System.err.println(tr("This version of JOSM is incompatible with the configured server."));
-                System.err.println(tr("It supports protocol versions 0.5 and 0.6, while the server says it supports {0} to {1}.",
+                System.err.println(tr("It supports protocol version 0.6, while the server says it supports {0} to {1}.",
                         capabilities.get("version", "minimum"), capabilities.get("version", "maximum")));
                 initialized = false;
@@ -256 +246 @@
 
     /**
-     * Modifies an OSM primitive on the server. For protocols greater than 0.5,
-     * the OsmPrimitive object passed in is modified by giving it the server-assigned
-     * version.
-     *
-     * @param osm the primitive. Must not be null
+     * Modifies an OSM primitive on the server.
+     *
+     * @param osm the primitive. Must not be null.
+     * @param monitor the progress monitor
      * @throws OsmTransferException if something goes wrong
      */
@@ -268 +257 @@
             ensureValidChangeset();
             initialize(monitor);
-            if (version.equals("0.5")) {
-                // legacy mode does not return the new object version.
-                sendRequest("PUT", OsmPrimitiveType.from(osm).getAPIName()+"/" + osm.getId(), toXml(osm, true),monitor);
-            } else {
-                // normal mode (0.6 and up) returns new object version.
-                ret = sendRequest("PUT", OsmPrimitiveType.from(osm).getAPIName()+"/" + osm.getId(), toXml(osm, true), monitor);
-                osm.setOsmId(osm.getId(), Integer.parseInt(ret.trim()));
-            }
+            // normal mode (0.6 and up) returns new object version.
+            ret = sendRequest("PUT", OsmPrimitiveType.from(osm).getAPIName()+"/" + osm.getId(), toXml(osm, true), monitor);
+            osm.setOsmId(osm.getId(), Integer.parseInt(ret.trim()));
         } catch(NumberFormatException e) {
             throw new OsmTransferException(tr("Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''.", osm.getId(), ret));
@@ -359 +343 @@
             );
         } catch(OsmApiException e) {
-            if (e.getResponseCode() == HttpURLConnection.HTTP_CONFLICT)
-                throw new ChangesetClosedException(e.getErrorHeader());
+            if (e.getResponseCode() == HttpURLConnection.HTTP_CONFLICT && ChangesetClosedException.errorHeaderMatchesPattern(e.getErrorHeader()))
+                throw new ChangesetClosedException(e.getErrorHeader(), ChangesetClosedException.Source.UPDATE_CHANGESET);
             throw e;
         } finally {
@@ -569 +553 @@
                 case HttpURLConnection.HTTP_GONE:
                     throw new OsmApiPrimitiveGoneException(errorHeader, errorBody);
+                case HttpURLConnection.HTTP_CONFLICT:
+                    if (ChangesetClosedException.errorHeaderMatchesPattern(errorHeader))
+                        throw new ChangesetClosedException(errorBody, ChangesetClosedException.Source.UPLOAD_DATA);
+                    else
+                        throw new OsmApiException(retCode, errorHeader, errorBody);
                 default:
                     throw new OsmApiException(retCode, errorHeader, errorBody);
@@ -642 +631 @@
         this.changeset = changeset;
     }
-
 }

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

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.logging.Logger;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.gui.io.UploadStrategySpecification;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -36 +39 @@
 
     private OsmApi api = OsmApi.getOsmApi();
+    private boolean canceled = false;
 
     private static final int MSECS_PER_SECOND = 1000;
@@ -42 +46 @@
 
     long uploadStartTime;
+
 
     public String timeLeft(int progress, int list_size) {
@@ -125 +130 @@
 
     /**
+     * Upload all changes in one diff upload
+     *
+     * @param primitives the collection of primitives to upload
+     * @param progressMonitor  the progress monitor
+     * @param chunkSize the size of the individual upload chunks. > 0 required.
+     * @throws IllegalArgumentException thrown if chunkSize <= 0
+     * @throws OsmTransferException thrown if an exception occurs
+     */
+    protected void uploadChangesInChunks(Collection<OsmPrimitive> primitives, ProgressMonitor progressMonitor, int chunkSize) throws OsmTransferException, IllegalArgumentException {
+        if (chunkSize <=0)
+            throw new IllegalArgumentException(tr("Value >0 expected for parameter ''{0}'', got {1}", "chunkSize", chunkSize));
+        try {
+            progressMonitor.beginTask(tr("Starting to upload in chunks..."));
+            List<OsmPrimitive> chunk = new ArrayList<OsmPrimitive>(chunkSize);
+            Iterator<OsmPrimitive> it = primitives.iterator();
+            int numChunks = (int)Math.ceil((double)primitives.size() / (double)chunkSize);
+            int i= 0;
+            while(it.hasNext()) {
+                i++;
+                progressMonitor.setCustomText(tr("({0}/{1}) Uploading {2} objects...", i,numChunks,chunkSize));
+                if (canceled) return;
+                int j = 0;
+                chunk.clear();
+                while(it.hasNext() && j < chunkSize) {
+                    if (canceled) return;
+                    j++;
+                    chunk.add(it.next());
+                }
+                processed.addAll(api.uploadDiff(chunk, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false)));
+            }
+        } catch(OsmTransferException e) {
+            throw e;
+        } catch(Exception e) {
+            throw new OsmTransferException(e);
+        } finally {
+            progressMonitor.finishTask();
+        }
+    }
+
+    /**
      * Send the dataset to the server.
      *
-     * @param apiVersion version of the data set
+     * @param strategy the upload strategy. Must not be null.
      * @param primitives list of objects to send
      * @param changeset the changeset the data is uploaded to. Must not be null.
      * @param monitor the progress monitor. If null, assumes {@see NullProgressMonitor#INSTANCE}
      * @throws IllegalArgumentException thrown if changeset is null
+     * @throws IllegalArgumentException thrown if strategy is null
      * @throws OsmTransferException thrown if something goes wrong
      */
-    public void uploadOsm(String apiVersion, Collection<OsmPrimitive> primitives, Changeset changeset, ProgressMonitor monitor) throws OsmTransferException {
+    public void uploadOsm(UploadStrategySpecification strategy, Collection<OsmPrimitive> primitives, Changeset changeset, ProgressMonitor monitor) throws OsmTransferException {
         if (changeset == null)
             throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", "changeset"));
@@ -143 +189 @@
             api.initialize(monitor);
             // check whether we can use diff upload
-            //
-            boolean canUseDiffUpload = api.hasSupportForDiffUploads();
-            if (apiVersion == null) {
-                System.out.println(tr("WARNING: no API version defined for data to upload. Falling back to version 0.6"));
-                apiVersion = "0.6";
-            }
-            boolean useDiffUpload = Main.pref.getBoolean("osm-server.atomic-upload", apiVersion.compareTo("0.6")>=0);
-            if (useDiffUpload && ! canUseDiffUpload) {
-                System.out.println(tr("WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to use diff uploads, but API is not able to handle them. Ignoring diff upload.", "osm-server.atomic-upload", apiVersion));
-                useDiffUpload = false;
-            }
             if (changeset.getId() == 0) {
                 api.openChangeset(changeset,monitor.createSubTaskMonitor(0, false));
@@ -160 +195 @@
             }
             api.setChangeset(changeset);
-            if (useDiffUpload) {
+            switch(strategy.getStrategy()) {
+            case SINGLE_REQUEST_STRATEGY:
                 uploadChangesAsDiffUpload(primitives,monitor.createSubTaskMonitor(0,false));
-            } else {
+                break;
+            case INDIVIDUAL_OBJECTS_STRATEGY:
                 uploadChangesIndividually(primitives,monitor.createSubTaskMonitor(0,false));
+                break;
+            case CHUNKED_DATASET_STRATEGY:
+                uploadChangesInChunks(primitives,monitor.createSubTaskMonitor(0,false), strategy.getChunkSize());
+                break;
             }
         } catch(OsmTransferException e) {
@@ -186 +227 @@
 
     public void cancel() {
+        this.canceled = true;
         if (api != null) {
             api.cancel();

trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java

@@ -32 +32 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.projection.Mercator;
+import org.openstreetmap.josm.gui.io.UploadStrategySpecification;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 
@@ -124 +125 @@
         OsmServerWriter writer = new OsmServerWriter();
         Changeset cs = new Changeset();
-        writer.uploadOsm("0.6", primitives,cs,NullProgressMonitor.INSTANCE);
+        writer.uploadOsm(UploadStrategySpecification.createSingleRequestUploadStrategy(), primitives,cs,NullProgressMonitor.INSTANCE);
         OsmApi.getOsmApi().closeChangeset(cs, NullProgressMonitor.INSTANCE);
     }

trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

@@ -33 +33 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.projection.Mercator;
+import org.openstreetmap.josm.gui.io.UploadStrategySpecification;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 
@@ -128 +129 @@
         OsmServerWriter writer = new OsmServerWriter();
         Changeset cs  = new Changeset();
-        writer.uploadOsm("0.6", primitives, cs, NullProgressMonitor.INSTANCE);
+        writer.uploadOsm(UploadStrategySpecification.createSingleRequestUploadStrategy(), primitives, cs, NullProgressMonitor.INSTANCE);
         OsmApi.getOsmApi().closeChangeset(cs, NullProgressMonitor.INSTANCE);
     }