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

Timestamp:

2009-09-06T23:07:33+02:00 (15 years ago)

Author:

Gubaer

Message:

new: rewrite of CombineWay action
new: conflict resolution dialog for CombineWay, including conflicts for different relation memberships
cleanup: cleanup in OsmReader, reduces memory footprint and reduces parsing time
cleanup: made most of the public fields in OsmPrimitive @deprecated, added accessors and changed the code
cleanup: replaced usages of @deprecated constructors for ExtendedDialog
fixed #3208: Combine ways brokes relation order

WARNING: this changeset touches a lot of code all over the code base. "latest" might become slightly unstable in the next days. Also experience incompatibility issues with plugins in the next few days.

File:

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

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

@@ -233 +233 @@
         try {
             ret = sendRequest("PUT", OsmPrimitiveType.from(osm).getAPIName()+"/create", toXml(osm, true),monitor);
-            osm.id = Long.parseLong(ret.trim());
-            osm.version = 1;
+            osm.setOsmId(Long.parseLong(ret.trim()), 1);
         } catch(NumberFormatException e){
             throw new OsmTransferException(tr("unexpected format of id replied by the server, got ''{0}''", ret));
@@ -258 +257 @@
             try {
                 ret = sendRequest("PUT", OsmPrimitiveType.from(osm).getAPIName()+"/" + osm.getId(), toXml(osm, true), monitor);
-                osm.version = Integer.parseInt(ret.trim());
+                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));
@@ -341 +340 @@
                     return;
                 }
-                changeset.id = this.changeset.getId();
-                this.changeset.cloneFrom(changeset);
+                this.changeset.setKeys(changeset.getKeys());
                 progressMonitor.setCustomText(tr("Updating changeset {0}...", changeset.getId()));
                 sendRequest(
@@ -473 +471 @@
      */
     private String sendRequest(String requestMethod, String urlSuffix,String requestBody, ProgressMonitor monitor) throws OsmTransferException {
-
         StringBuffer responseBody = new StringBuffer();