Changeset 4310 in josm for trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java

Timestamp:

2011-08-11T00:26:21+02:00 (15 years ago)

Author:

stoecker

Message:

fix #6680, fix #6677 - i18n issues

File:

• trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java

@@ -29 +29 @@
 import org.openstreetmap.josm.io.OsmApiPrimitiveGoneException;
 import org.openstreetmap.josm.io.OsmServerWriter;
-import org.openstreetmap.josm.io.OsmTransferCancelledException;
+import org.openstreetmap.josm.io.OsmTransferCanceledException;
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -39 +39 @@
  */
 public class UploadPrimitivesTask extends  AbstractUploadTask {
-    private boolean uploadCancelled = false;
+    private boolean uploadCanceled = false;
     private Exception lastException = null;
     private APIDataSet toUpload;
@@ -236 +236 @@
                     //
                     break;
-                } catch(OsmTransferCancelledException e) {
+                } catch(OsmTransferCanceledException e) {
                     e.printStackTrace();
-                    uploadCancelled = true;
+                    uploadCanceled = true;
                     break uploadloop;
                 } catch(OsmApiPrimitiveGoneException e) {
@@ -283 +283 @@
         }
         } catch (Exception e) {
-            if (uploadCancelled) {
+            if (uploadCanceled) {
                 System.out.println(tr("Ignoring caught exception because upload is canceled. Exception is: {0}", e.toString()));
             } else {
@@ -289 +289 @@
             }
         }
-        if (uploadCancelled && processedPrimitives.isEmpty()) return;
+        if (uploadCanceled && processedPrimitives.isEmpty()) return;
         cleanupAfterUpload();
     }
 
     @Override protected void finish() {
-        if (uploadCancelled)
+        if (uploadCanceled)
             return;
 
@@ -353 +353 @@
 
     @Override protected void cancel() {
-        uploadCancelled = true;
+        uploadCanceled = true;
         synchronized(this) {
             if (writer != null) {