Changeset 2319 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2009-10-25T18:22:28+01:00 (17 years ago)

Author:

Gubaer

Message:

fixed #3725: JOSM doesn't provide indication during upload that the server is sending 410 Gone errors
Progress dialog now includes a small log window for use cases like this. Use appendLogMessage() on the progress monitor.

File:

• trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/UploadAction.java

@@ -633 +633 @@
                 // we tried to delete an already deleted primitive.
                 //
-                System.out.println(tr("Warning: primitive ''{0}'' is already deleted on the server. Skipping this primitive and retrying to upload.", p.getDisplayName(DefaultNameFormatter.getInstance())));
+                System.out.println(tr("Warning: object ''{0}'' is already deleted on the server. Skipping this object and retrying to upload.", p.getDisplayName(DefaultNameFormatter.getInstance())));
+                monitor.appendLogMessage(tr("Object ''{0}'' is already deleted. Skipping object in upload.",p.getDisplayName(DefaultNameFormatter.getInstance())));
                 processedPrimitives.addAll(writer.getProcessedPrimitives());
                 processedPrimitives.add(p);
@@ -648 +649 @@
             writer = new OsmServerWriter();
             try {
-                //
                 while(true) {
                     try {
-                        ProgressMonitor monitor = progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false);
-                        writer.uploadOsm(layer.data.version, toUpload, changeset, monitor);
+                        getProgressMonitor().subTask(tr("Uploading {0} objects ...", toUpload.size()));
+                        writer.uploadOsm(layer.data.version, toUpload, changeset, getProgressMonitor().createSubTaskMonitor(1, false));
                         processedPrimitives.addAll(writer.getProcessedPrimitives());
-                        // if we get here we've successfully uploaded the data. We
-                        // can exit the loop.
+                        // if we get here we've successfully uploaded the data. Exit the loop.
                         //
                         break;
@@ -672 +671 @@
             } catch (Exception e) {
                 if (uploadCancelled) {
-                    System.out.println("Ignoring exception caught because upload is cancelled. Exception is: " + e.toString());
+                    System.out.println(tr("Ignoring caught exception because upload is canceled. Exception is: {0}", e.toString()));
                     return;
                 }