Changeset 2025 in josm for trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java

Timestamp:

2009-09-02T21:17:52+02:00 (15 years ago)

Author:

Gubaer

Message:

new: improved dialog for uploading/saving modified layers on exit
new: improved dialog for uploading/saving modified layers if layers are deleted
new: new progress monitor which can delegate rendering to any Swing component
more setters/getters for properties in OSM data classes (fields are @deprecated); started to update references in the code base

File:

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

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

@@ -95 +95 @@
                 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(
@@ -105 +105 @@
                                 primitives.size(),
                                 time_left_str,
-                                osm.getName() == null ? osm.id : osm.getName(),
-                                        osm.id));
+                                osm.getName() == null ? osm.getId() : osm.getName(),
+                                        osm.getId()));
                 makeApiRequest(osm,progressMonitor);
                 processed.add(osm);
@@ -117 +117 @@
         } finally {
             try {
-                api.stopChangeset(progressMonitor.createSubTaskMonitor(0, false));
+                // 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(progressMonitor.createSubTaskMonitor(0, false));
+                }
             } catch(Exception e) {
                 Changeset changeset = api.getCurrentChangeset();
-                String changesetId = (changeset == null ? tr("unknown") : Long.toString(changeset.id));
+                String changesetId = (changeset == null ? tr("unknown") : Long.toString(changeset.getId()));
                 logger.warning(tr("Failed to close changeset {0}, will be closed by server after timeout. Exception was: {1}",
                         changesetId, e.toString()));
@@ -149 +155 @@
             } catch (Exception ee) {
                 Changeset changeset = api.getCurrentChangeset();
-                String changesetId = (changeset == null ? tr("unknown") : Long.toString(changeset.id));
+                String changesetId = (changeset == null ? tr("unknown") : Long.toString(changeset.getId()));
                 logger.warning(tr("Failed to close changeset {0}, will be closed by server after timeout. Exception was: {1}",
                         changesetId, ee.toString()));
@@ -166 +172 @@
 
         api.initialize();
-
-        progressMonitor.beginTask("");
 
         try {
@@ -180 +184 @@
 
             if (useChangeset) {
+                progressMonitor.beginTask(tr("Starting to upload in one request ..."));
                 uploadChangesAsDiffUpload(primitives, progressMonitor);
             } else {
+                progressMonitor.beginTask(tr("Starting to upload with one request per primitive ..."));
                 uploadChangesIndividually(primitives, progressMonitor);
             }
@@ -190 +196 @@
 
     void makeApiRequest(OsmPrimitive osm, ProgressMonitor progressMonitor) throws OsmTransferException {
-        if (osm.deleted) {
+        if (osm.isDeleted()) {
             api.deletePrimitive(osm, progressMonitor);
-        } else if (osm.id == 0) {
+        } else if (osm.getId() == 0) {
             api.createPrimitive(osm);
         } else {