Changeset 2569 in josm for trunk/src/org/openstreetmap/josm/io/OsmApi.java

Timestamp:

2009-12-04T15:53:55+01:00 (14 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)

File:

• trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified) (7 diffs)

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;
     }
-
 }