Changeset 4310 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java

Timestamp:

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

Author:

stoecker

Message:

fix #6680, fix #6677 - i18n issues

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java

@@ -32 +32 @@
  */
 public class DownloadRelationMemberTask extends PleaseWaitRunnable {
-    private boolean cancelled;
+    private boolean canceled;
     private Exception lastException;
     private final Set<Relation> parents = new HashSet<Relation>();
@@ -72 +72 @@
     @Override
     protected void cancel() {
-        cancelled = true;
+        canceled = true;
         synchronized(this) {
             if (objectReader != null) {
@@ -83 +83 @@
     protected void finish() {
         Main.map.repaint();
-        if (cancelled)
+        if (canceled)
             return;
         if (lastException != null) {
@@ -105 +105 @@
         } else {
             return trn("Downloading {0} incomplete child of {1} parent relations",
-                    "Downloading {0} incomplete children of  {1} parent relations",
+                    "Downloading {0} incomplete children of {1} parent relations",
                     children.size(),
                     children.size(),
@@ -116 +116 @@
         try {
             synchronized (this) {
-                if (cancelled) return;
+                if (canceled) return;
                 objectReader = new MultiFetchServerObjectReader();
             }
@@ -129 +129 @@
             dataSet.deleteInvisible();
             synchronized (this) {
-                if (cancelled) return;
+                if (canceled) return;
                 objectReader = null;
             }
@@ -143 +143 @@
 
         } catch (Exception e) {
-            if (cancelled) {
-                System.out.println(tr("Warning: Ignoring exception because task was cancelled. Exception: {0}", e
+            if (canceled) {
+                System.out.println(tr("Warning: Ignoring exception because task was canceled. Exception: {0}", e
                         .toString()));
                 return;