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

Timestamp:

2009-09-13T19:30:36+02:00 (16 years ago)

Author:

Gubaer

Message:

new: reading open changesets from the server
new: reading user info from the server
new: any open changeset can be used when uploading
new: generic dialog for closing changesets
fixed #3427: JOSM can't keep many changesets open at once
fixed #3408: Allow continuing opened changeset even after restarting JOSM
fixed #3476: Default selection in upload dialog should be different for unclosed changesets. (Upload dialog now looks different)

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• ChangesetQuery.java (added)
• OsmApi.java (modified) (12 diffs)
• OsmChangesetParser.java (added)
• OsmDataParsingException.java (modified) (1 diff)
• OsmReader.java (modified) (5 diffs)
• OsmServerChangesetReader.java (added)
• OsmServerUserInfoReader.java (added)
• OsmServerWriter.java (modified) (7 diffs)
• OsmWriter.java (modified) (4 diffs)

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

@@ -23 +23 @@
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Properties;
 
 import javax.xml.parsers.SAXParserFactory;
@@ -32 +31 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.visitor.CreateOsmChangeVisitor;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.xml.sax.Attributes;
@@ -205 +205 @@
 
     /**
+     * Makes an XML string from an OSM primitive. Uses the OsmWriter class.
+     * @param o the OSM primitive
+     * @param addBody true to generate the full XML, false to only generate the encapsulating tag
+     * @return XML string
+     */
+    private String toXml(Changeset s) {
+        swriter.getBuffer().setLength(0);
+        osmWriter.header();
+        s.visit(osmWriter);
+        osmWriter.footer();
+        osmWriter.out.flush();
+        return swriter.toString();
+    }
+
+    /**
      * Returns the base URL for API requests, including the negotiated version number.
      * @return base URL string
@@ -229 +244 @@
      */
     public void createPrimitive(OsmPrimitive osm, ProgressMonitor monitor) throws OsmTransferException {
-        initialize(monitor);
         String ret = "";
         try {
+            ensureValidChangeset();
+            initialize(monitor);
             ret = sendRequest("PUT", OsmPrimitiveType.from(osm).getAPIName()+"/create", toXml(osm, true),monitor);
             osm.setOsmId(Long.parseLong(ret.trim()), 1);
@@ -244 +260 @@
      * version.
      *
-     * @param osm the primitive
+     * @param osm the primitive. Must not be null
      * @throws OsmTransferException if something goes wrong
      */
     public void modifyPrimitive(OsmPrimitive osm, ProgressMonitor monitor) throws OsmTransferException {
-        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 {
-            String ret = null;
-            // normal mode (0.6 and up) returns new object version.
-            try {
+        String ret = null;
+        try {
+            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()));
-            } catch(NumberFormatException e) {
-                throw new OsmTransferException(tr("unexpected format of new version of modified primitive ''{0}'', got ''{1}''", osm.getId(), ret));
             }
+        } catch(NumberFormatException e) {
+            throw new OsmTransferException(tr("unexpected format of new version of modified primitive ''{0}'', got ''{1}''", osm.getId(), ret));
         }
     }
@@ -270 +287 @@
      */
     public void deletePrimitive(OsmPrimitive osm, ProgressMonitor monitor) throws OsmTransferException {
+        ensureValidChangeset();
         initialize(monitor);
         // can't use a the individual DELETE method in the 0.6 API. Java doesn't allow
@@ -280 +298 @@
 
     /**
-     * Creates a new changeset based on the keys in <code>changeset</code>
-     * 
-     * @param changeset the changeset to be used for uploading
+     * Creates a new changeset based on the keys in <code>changeset</code>. If this
+     * method succeeds, changeset.getId() replies the id the server assigned to the new
+     * changeset
+     * 
+     * The changeset must not be null, but its key/value-pairs may be empty.
+     * 
+     * @param changeset the changeset toe be created. Must not be null.
      * @param progressMonitor the progress monitor
      * @throws OsmTransferException signifying a non-200 return code, or connection errors
-     */
-    public void createChangeset(Changeset changeset, ProgressMonitor progressMonitor) throws OsmTransferException {
+     * @throws IllegalArgumentException thrown if changeset is null
+     */
+    public void openChangeset(Changeset changeset, ProgressMonitor progressMonitor) throws OsmTransferException {
+        if (changeset == null)
+            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "changeset"));
         try {
             progressMonitor.beginTask((tr("Creating changeset...")));
-            createPrimitive(changeset, progressMonitor);
-            this.changeset = changeset;
-            progressMonitor.setCustomText((tr("Successfully opened changeset {0}",this.changeset.getId())));
+            initialize(progressMonitor);
+            String ret = "";
+            try {
+                ret = sendRequest("PUT", "changeset/create", toXml(changeset),progressMonitor);
+                changeset.setId(Long.parseLong(ret.trim()));
+                changeset.setOpen(true);
+            } catch(NumberFormatException e){
+                throw new OsmTransferException(tr("unexpected format of id replied by the server, got ''{0}''", ret));
+            }
+            progressMonitor.setCustomText((tr("Successfully opened changeset {0}",changeset.getId())));
         } finally {
             progressMonitor.finishTask();
@@ -298 +330 @@
 
     /**
-     * Updates the current changeset with the keys in  <code>changesetUpdate</code>.
-     *
-     * @param changesetUpdate the changeset to update
-     * @param progressMonitor the progress monitor
+     * Updates a changeset with the keys in  <code>changesetUpdate</code>. The changeset must not
+     * be null and id > 0 must be true.
+     *
+     * @param changeset the changeset to update. Must not be null.
+     * @param monitor the progress monitor. If null, uses the {@see NullProgressMonitor#INSTANCE}.
      * 
      * @throws OsmTransferException if something goes wrong.
-     */
-    public void updateChangeset(Changeset changesetUpdate, ProgressMonitor progressMonitor) throws OsmTransferException {
+     * @throws IllegalArgumentException if changeset is null
+     * @throws IllegalArgumentException if changeset.getId() == 0
+     * 
+     */
+    public void updateChangeset(Changeset changeset, ProgressMonitor monitor) throws OsmTransferException {
+        if (changeset == null)
+            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "changeset"));
+        if (monitor == null) {
+            monitor = NullProgressMonitor.INSTANCE;
+        }
+        if (changeset.getId() <= 0)
+            throw new IllegalArgumentException(tr("id of changeset > 0 required. Got {0}", changeset.getId()));
         try {
-            progressMonitor.beginTask(tr("Updating changeset..."));
-            initialize(progressMonitor);
-            if (this.changeset != null && this.changeset.getId() > 0) {
-                if (this.changeset.hasEqualSemanticAttributes(changesetUpdate)) {
-                    progressMonitor.setCustomText(tr("Changeset {0} is unchanged. Skipping update.", changesetUpdate.getId()));
-                    return;
-                }
-                this.changeset.setKeys(changesetUpdate.getKeys());
-                progressMonitor.setCustomText(tr("Updating changeset {0}...", this.changeset.getId()));
-                sendRequest(
-                        "PUT",
-                        OsmPrimitiveType.from(changesetUpdate).getAPIName() + "/" + this.changeset.getId(),
-                        toXml(this.changeset, true),
-                        progressMonitor
-                );
-            } else
-                throw new OsmTransferException(tr("Failed to update changeset. Either there is no current changeset or the id of the current changeset is 0"));
+            monitor.beginTask(tr("Updating changeset..."));
+            initialize(monitor);
+            monitor.setCustomText(tr("Updating changeset {0}...", changeset.getId()));
+            sendRequest(
+                    "PUT",
+                    "changeset/" + this.changeset.getId(),
+                    toXml(this.changeset),
+                    monitor
+            );
         } finally {
-            progressMonitor.finishTask();
-        }
-    }
-
-    /**
-     * Closes a changeset on the server.
-     *
-     * @param changesetProcessingType how changesets are currently handled
-     * @param progressMonitor the progress monitor
+            monitor.finishTask();
+        }
+    }
+
+
+    /**
+     * Closes a changeset on the server. Sets changeset.setOpen(false) if this operation
+     * succeeds.
+     *
+     * @param changeset the changeset to be closed. Must not be null. changeset.getId() > 0 required.
+     * @param monitor the progress monitor. If null, uses {@see NullProgressMonitor#INSTANCE}
      * 
      * @throws OsmTransferException if something goes wrong.
-     */
-    public void stopChangeset(ChangesetProcessingType changesetProcessingType, ProgressMonitor progressMonitor) throws OsmTransferException {
-        if (changesetProcessingType == null) {
-            changesetProcessingType = ChangesetProcessingType.USE_NEW_AND_CLOSE;
-        }
+     * @throws IllegalArgumentException thrown if changeset is null
+     * @throws IllegalArgumentException thrown if changeset.getId() <= 0
+     */
+    public void closeChangeset(Changeset changeset, ProgressMonitor monitor) throws OsmTransferException {
+        if (changeset == null)
+            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "changeset"));
+        if (monitor == null) {
+            monitor = NullProgressMonitor.INSTANCE;
+        }
+        if (changeset.getId() <= 0)
+            throw new IllegalArgumentException(tr("id of changeset > 0 required. Got {0}", changeset.getId()));
         try {
-            progressMonitor.beginTask(tr("Closing changeset..."));
-            initialize(progressMonitor);
-            if (changesetProcessingType.isCloseAfterUpload()) {
-                progressMonitor.setCustomText(tr("Closing changeset {0}...", changeset.getId()));
-                if (this.changeset != null && this.changeset.getId() > 0) {
-                    sendRequest("PUT", "changeset" + "/" + changeset.getId() + "/close", null, progressMonitor);
-                    changeset = null;
-                }
-            } else {
-                progressMonitor.setCustomText(tr("Leaving changeset {0} open...", changeset.getId()));
-            }
+            monitor.beginTask(tr("Closing changeset..."));
+            initialize(monitor);
+            sendRequest("PUT", "changeset" + "/" + changeset.getId() + "/close", null, monitor);
+            changeset.setOpen(false);
         } finally {
-            progressMonitor.finishTask();
+            monitor.finishTask();
         }
     }
@@ -365 +401 @@
      * @throws OsmTransferException if something is wrong
      */
-    public Collection<OsmPrimitive> uploadDiff(final Collection<OsmPrimitive> list, ProgressMonitor progressMonitor) throws OsmTransferException {
-
-        progressMonitor.beginTask("", list.size() * 2);
+    public Collection<OsmPrimitive> uploadDiff(Collection<OsmPrimitive> list, ProgressMonitor progressMonitor) throws OsmTransferException {
         try {
+            progressMonitor.beginTask("", list.size() * 2);
             if (changeset == null)
                 throw new OsmTransferException(tr("No changeset present for diff upload"));
@@ -385 +420 @@
 
             String diff = duv.getDocument();
-            try {
-                String diffresult = sendRequest("POST", "changeset/" + changeset.getId() + "/upload", diff,progressMonitor);
-                DiffResultReader.parseDiffResult(diffresult, list, processed, duv.getNewIdMap(),
-                        progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
-            } catch(OsmTransferException e) {
-                throw e;
-            } catch(Exception e) {
-                throw new OsmTransferException(e);
-            }
-
+            String diffresult = sendRequest("POST", "changeset/" + changeset.getId() + "/upload", diff,progressMonitor);
+            DiffResultReader.parseDiffResult(diffresult, list, processed, duv.getNewIdMap(),
+                    progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
             return processed;
+        } catch(OsmTransferException e) {
+            throw e;
+        } catch(Exception e) {
+            throw new OsmTransferException(e);
         } finally {
             progressMonitor.finishTask();
@@ -536 +568 @@
                 }
                 throw new OsmTransferException(e);
+            } catch(OsmTransferException e) {
+                throw e;
             } catch (Exception e) {
-                if (e instanceof OsmTransferException) throw (OsmTransferException) e;
                 throw new OsmTransferException(e);
             }
@@ -552 +585 @@
     }
 
-    /**
-     * Replies the current changeset
-     * 
-     * @return the current changeset
-     */
-    public Changeset getCurrentChangeset() {
+
+    /**
+     * Ensures that the current changeset can be used for uploading data
+     * 
+     * @throws OsmTransferException thrown if the current changeset can't be used for
+     * uploading data
+     */
+    protected void ensureValidChangeset() throws OsmTransferException {
+        if (changeset == null)
+            throw new OsmTransferException(tr("current changeset is null. Can't upload data."));
+        if (changeset.getId() <= 0)
+            throw new OsmTransferException(tr("id of current changeset > required. Current id is {0}", changeset.getId()));
+    }
+    /**
+     * Replies the changeset data uploads are currently directed to
+     * 
+     * @return the changeset data uploads are currently directed to
+     */
+    public Changeset getChangeset() {
         return changeset;
     }
+
+    /**
+     * Sets the changesets to which further data uploads are directed. The changeset
+     * can be null. If it isn't null it must have been created, i.e. id > 0 is required. Furthermore,
+     * it must be open.
+     * 
+     * @param changeset the changeset
+     * @throws IllegalArgumentException thrown if changeset.getId() <= 0
+     * @throws IllegalArgumentException thrown if !changeset.isOpen()
+     */
+    public void setChangeset(Changeset changeset) {
+        if (changeset == null) {
+            this.changeset = null;
+            return;
+        }
+        if (changeset.getId() <= 0)
+            throw new IllegalArgumentException(tr("Changeset id > 0 expected. Got {0}", changeset.getId()));
+        if (!changeset.isOpen())
+            throw new IllegalArgumentException(tr("Open changeset expected. Got closed changeset with id {0}", changeset.getId()));
+        this.changeset = changeset;
+    }
+
 }

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

@@ -7 +7 @@
 import org.xml.sax.SAXException;
 
-/**
- * Represents a parsing error in an OSM data file.
- * 
- * Use {@see #getColumnNumber()} and {@see #getLineNumber()} to locate
- * the position in the file where the parsing error occured.
- * 
- */
 public class OsmDataParsingException extends SAXException {
     private int columnNumber;

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

@@ -36 +36 @@
 
 /**
- * Parser for the Osm Api. Read from an input stream and constructs a dataset out of it.
+ * Parser for the Osm Api. Read from an input stream and construct a dataset out of it.
  *
  */
@@ -80 +80 @@
     }
 
+    private static class OsmPrimitiveData {
+        public long id = 0;
+        public boolean modified = false;
+        public boolean deleted = false;
+        public Date timestamp = new Date();
+        public User user = null;
+        public boolean visible = true;
+        public int version = 0;
+        public LatLon latlon = new LatLon(0,0);
+        private OsmPrimitive primitive;
+
+        public void copyTo(OsmPrimitive osm) {
+            osm.setModified(modified);
+            osm.setDeleted(deleted);
+            //  id < 0 possible if read from a file
+            if (id <= 0) {
+                osm.clearOsmId();
+            } else {
+                osm.setOsmId(id, version);
+            }
+            osm.setTimestamp(timestamp);
+            osm.user = user;
+            osm.setVisible(visible);
+            osm.mappaintStyle = null;
+        }
+
+        public Node createNode() {
+            Node node = new Node();
+            node.setCoor(latlon);
+            copyTo(node);
+            primitive = node;
+            return node;
+        }
+
+        public Way createWay() {
+            Way way = new Way();
+            copyTo(way);
+            primitive = way;
+            return way;
+        }
+        public Relation createRelation() {
+            Relation relation= new Relation();
+            copyTo(relation);
+            primitive = relation;
+            return relation;
+        }
+
+        public void rememberTag(String key, String value) {
+            primitive.put(key, value);
+        }
+    }
 
     /**
@@ -100 +151 @@
      */
     private Map<Long, Collection<RelationMemberData>> relations = new HashMap<Long, Collection<RelationMemberData>>();
-
 
     private class Parser extends DefaultHandler {
@@ -241 +291 @@
                 current.rememberTag(key, value);
             } else {
-                System.out.println(tr("Warning: Undefined element ''{0}'' found in input stream. Skipping.", qName));
+                throwException(tr("Undefined element ''{0}'' found in input stream. Aborting.", qName));
             }
         }
@@ -503 +553 @@
         }
     }
-
-    /**
-     * Temporarily holds data for a parsed {@see OsmPrimitive} and provides
-     * methods for creating an {@see OsmPrimitive} based on this data.
-     */
-    private static class OsmPrimitiveData {
-        public long id = 0;
-        public boolean modified = false;
-        public boolean deleted = false;
-        public Date timestamp = new Date();
-        public User user = null;
-        public boolean visible = true;
-        public int version = 0;
-        public LatLon latlon = new LatLon(0,0);
-        private OsmPrimitive primitive;
-
-        public void copyTo(OsmPrimitive osm) {
-            //  id < 0 possible if read from a file
-            if (id <= 0) {
-                osm.clearOsmId();
-            } else {
-                osm.setOsmId(id, version);
-            }
-            osm.setDeleted(deleted);
-            osm.setModified(modified);
-            osm.setTimestamp(timestamp);
-            osm.user = user;
-            osm.setVisible(visible);
-            osm.mappaintStyle = null;
-        }
-
-        public Node createNode() {
-            Node node = new Node();
-            node.setCoor(latlon);
-            copyTo(node);
-            primitive = node;
-            return node;
-        }
-
-        public Way createWay() {
-            Way way = new Way();
-            copyTo(way);
-            primitive = way;
-            return way;
-        }
-        public Relation createRelation() {
-            Relation relation= new Relation();
-            copyTo(relation);
-            primitive = relation;
-            return relation;
-        }
-
-        public void rememberTag(String key, String value) {
-            primitive.put(key, value);
-        }
-    }
 }

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

@@ -65 +65 @@
      * 
      * @param primitives the collection of primitives to upload
-     * @param changeset the changeset to be used if <code>changesetProcessingType</code> indicates that
-     *   a new changeset should be opened
-     * @param changesetProcessingType how we handle changesets
      * @param progressMonitor the progress monitor
      * @throws OsmTransferException thrown if an exception occurs
      */
-    protected void uploadChangesIndividually(Collection<OsmPrimitive> primitives, Changeset changeset, ChangesetProcessingType changesetProcessingType, ProgressMonitor progressMonitor) throws OsmTransferException {
+    protected void uploadChangesIndividually(Collection<OsmPrimitive> primitives, ProgressMonitor progressMonitor) throws OsmTransferException {
         try {
             progressMonitor.beginTask(tr("Starting to upload with one request per primitive ..."));
             progressMonitor.setTicksCount(primitives.size());
-            if (changesetProcessingType.isUseNew()) {
-                api.createChangeset(changeset,progressMonitor.createSubTaskMonitor(0, false));
-            } else {
-                api.updateChangeset(changeset,progressMonitor.createSubTaskMonitor(0, false));
-            }
             uploadStartTime = System.currentTimeMillis();
             for (OsmPrimitive osm : primitives) {
@@ -86 +78 @@
                 String msg = "";
                 switch(OsmPrimitiveType.from(osm)) {
-                case NODE: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"); break;
-                case WAY: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"); break;
-                case RELATION: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"); break;
+                    case NODE: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"); break;
+                    case WAY: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"); break;
+                    case RELATION: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"); break;
                 }
                 progressMonitor.subTask(
@@ -107 +99 @@
             throw new OsmTransferException(e);
         } finally {
-            try {
-                // starting the changeset may have failed, for instance because the user
-                // cancelled the upload task. Only close the changeset if we currently have
-                // an open changeset
-
-                if (api.getCurrentChangeset() != null && api.getCurrentChangeset().getId() > 0) {
-                    api.stopChangeset(changesetProcessingType, progressMonitor.createSubTaskMonitor(0, false));
-                }
-            } catch(Exception e) {
-                OsmChangesetCloseException closeException = new OsmChangesetCloseException(e);
-                closeException.setChangeset(api.getCurrentChangeset());
-                throw closeException;
-            } finally {
-                progressMonitor.finishTask();
-            }
+            progressMonitor.finishTask();
         }
     }
@@ -132 +110 @@
      * @throws OsmTransferException thrown if an exception occurs
      */
-    protected void uploadChangesAsDiffUpload(Collection<OsmPrimitive> primitives, Changeset changeset, ChangesetProcessingType changesetProcessingType, ProgressMonitor progressMonitor) throws OsmTransferException {
+    protected void uploadChangesAsDiffUpload(Collection<OsmPrimitive> primitives, ProgressMonitor progressMonitor) throws OsmTransferException {
         // upload everything in one changeset
         //
         try {
             progressMonitor.beginTask(tr("Starting to upload in one request ..."));
-            if (changesetProcessingType.isUseNew()) {
-                api.createChangeset(changeset,progressMonitor.createSubTaskMonitor(0, false));
-            } else {
-                api.updateChangeset(changeset,progressMonitor.createSubTaskMonitor(0, false));
-            }
             processed.addAll(api.uploadDiff(primitives, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false)));
         } catch(OsmTransferException e) {
@@ -148 +121 @@
             throw new OsmTransferException(e);
         } finally {
-            try {
-                api.stopChangeset(changesetProcessingType, progressMonitor.createSubTaskMonitor(0, false));
-            } catch (Exception ee) {
-                OsmChangesetCloseException closeException = new OsmChangesetCloseException(ee);
-                closeException.setChangeset(api.getCurrentChangeset());
-                throw closeException;
-            } finally {
-                progressMonitor.finishTask();
-            }
-
+            progressMonitor.finishTask();
         }
     }
@@ -167 +131 @@
      * @param primitives list of objects to send
      */
-    public void uploadOsm(String apiVersion, Collection<OsmPrimitive> primitives, Changeset changeset, ChangesetProcessingType changesetProcessingType, ProgressMonitor progressMonitor) throws OsmTransferException {
+    public void uploadOsm(String apiVersion, Collection<OsmPrimitive> primitives, Changeset changeset, boolean closeChangesetAfterUpload, ProgressMonitor progressMonitor) throws OsmTransferException {
         processed = new LinkedList<OsmPrimitive>();
         progressMonitor.beginTask(tr("Uploading data ..."));
@@ -184 +148 @@
                 useDiffUpload = false;
             }
-
+            if (changeset == null) {
+                changeset = new Changeset();
+            }
+            if (changeset.getId() == 0) {
+                api.openChangeset(changeset,progressMonitor.createSubTaskMonitor(0, false));
+            } else {
+                api.updateChangeset(changeset,progressMonitor.createSubTaskMonitor(0, false));
+            }
+            api.setChangeset(changeset);
             if (useDiffUpload) {
-                uploadChangesAsDiffUpload(primitives,changeset, changesetProcessingType, progressMonitor.createSubTaskMonitor(0,false));
+                uploadChangesAsDiffUpload(primitives,progressMonitor.createSubTaskMonitor(0,false));
             } else {
-                uploadChangesIndividually(primitives,changeset,changesetProcessingType,  progressMonitor.createSubTaskMonitor(0,false));
-            }
+                uploadChangesIndividually(primitives,progressMonitor.createSubTaskMonitor(0,false));
+            }
+        } catch(OsmTransferException e) {
+            throw e;
+        } catch(Exception e) {
+            throw new OsmTransferException(e);
         } finally {
-            progressMonitor.finishTask();
+            try {
+                if (closeChangesetAfterUpload && api.getChangeset() != null && api.getChangeset().getId() > 0) {
+                    api.closeChangeset(changeset,progressMonitor.createSubTaskMonitor(0, false));
+                    api.setChangeset(null);
+                }
+            } catch (Exception ee) {
+                OsmChangesetCloseException closeException = new OsmChangesetCloseException(ee);
+                closeException.setChangeset(api.getChangeset());
+                throw closeException;
+            } finally {
+                progressMonitor.finishTask();
+            }
         }
     }

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

@@ -6 +6 @@
 import java.util.Map.Entry;
 
+import org.openstreetmap.josm.data.coor.CoordinateFormat;
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -14 +15 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.data.osm.User;
+import org.openstreetmap.josm.data.osm.Tagged;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
@@ -143 +144 @@
 
     public void visit(Changeset cs) {
-        addCommon(cs, "changeset");
-        out.println(">\n");
-        addTags(cs, "changeset", false);
-    }
-
-    public final void footer(PrintWriter out) {
-        out.println("</osm>");
+        out.print("  <changeset ");
+        out.print(" id='"+cs.getId()+"'");
+        if (cs.getUser() != null) {
+            out.print(" user='"+cs.getUser().getName() +"'");
+            out.print(" uid='"+cs.getUser().getId() +"'");
+        }
+        if (cs.getCreatedAt() != null) {
+            out.print(" created_at='"+DateUtils.fromDate(cs.getCreatedAt()) +"'");
+        }
+        if (cs.getClosedAt() != null) {
+            out.print(" closed_at='"+DateUtils.fromDate(cs.getClosedAt()) +"'");
+        }
+        out.print(" open='"+ (cs.isOpen() ? "true" : "false") +"'");
+        if (cs.getMin() != null) {
+            out.print(" min_lon='"+ cs.getMin().lonToString(CoordinateFormat.DECIMAL_DEGREES) +"'");
+            out.print(" min_lat='"+ cs.getMin().latToString(CoordinateFormat.DECIMAL_DEGREES) +"'");
+        }
+        if (cs.getMax() != null) {
+            out.print(" max_lon='"+ cs.getMin().lonToString(CoordinateFormat.DECIMAL_DEGREES) +"'");
+            out.print(" max_lat='"+ cs.getMin().latToString(CoordinateFormat.DECIMAL_DEGREES) +"'");
+        }
+        out.println(">");
+        addTags(cs, "changeset", false); // also writes closing </changeset>
     }
 
@@ -164 +181 @@
     }
 
-    private void addTags(OsmPrimitive osm, String tagname, boolean tagOpen) {
+    private void addTags(Tagged osm, String tagname, boolean tagOpen) {
         if (osm.hasKeys()) {
             if (tagOpen) {
                 out.println(">");
             }
-            for (Entry<String, String> e : osm.entrySet()) {
+            for (Entry<String, String> e : osm.getKeys().entrySet()) {
                 if ((osm instanceof Changeset) || !("created_by".equals(e.getKey()))) {
                     out.println("    <tag k='"+ XmlWriter.encode(e.getKey()) +