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

Timestamp:

2009-07-08T21:50:32+02:00 (17 years ago)

Author:

Gubaer

Message:

new: replaced global conflict list by conflict list per layer, similar to datasets

Location:

trunk/src/org/openstreetmap/josm/io

Files:

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

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

@@ -330 +330 @@
             String diffresult = sendRequest("POST", "changeset/" + changeset.id + "/upload", diff);
             DiffResultReader.parseDiffResult(diffresult, list, processed, duv.getNewIdMap(), Main.pleaseWaitDlg);
+        } catch(OsmTransferException e) {
+            throw e;
         } catch(Exception e) {
             throw new OsmTransferException(e);
@@ -443 +445 @@
 
                 if (retCode != 200)
-                    throw new OsmApiException(retCode,errorHeader,responseBody.toString());
+                    throw new OsmApiException(retCode,errorHeader.trim(),responseBody.toString().trim());
 
                 return responseBody.toString();

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

@@ -94 +94 @@
         boolean useChangeset = Main.pref.getBoolean("osm-server.atomic-upload", apiVersion.compareTo("0.6")>=0);
         if (useChangeset && ! canUseChangeset) {
-            System.out.println(tr("WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to use changesets, but API is not handle them. Ignoring changesets.", "osm-server.atomic-upload", apiVersion));
+            System.out.println(tr("WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to use changesets, but API is not able to handle them. Ignoring changesets.", "osm-server.atomic-upload", apiVersion));
             useChangeset = false;
         }