Changeset 4310 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.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/actions/downloadtasks/DownloadReferrersTask.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java

@@ -41 +41 @@
  */
 public class DownloadReferrersTask extends PleaseWaitRunnable {
-    private boolean cancelled;
+    private boolean canceled;
     private Exception lastException;
     private OsmServerReader reader;
@@ -61 +61 @@
         super("Download referrers", false /* don't ignore exception*/);
         CheckParameterUtil.ensureParameterNotNull(targetLayer, "targetLayer");
-        cancelled = false;
+        canceled = false;
         this.children = new HashMap<Long, OsmPrimitiveType>();
         if (children != null) {
@@ -85 +85 @@
         super("Download referrers", false /* don't ignore exception*/);
         CheckParameterUtil.ensureParameterNotNull(targetLayer, "targetLayer");
-        cancelled = false;
+        canceled = false;
         this.children = new HashMap<Long, OsmPrimitiveType>();
         if (children != null) {
@@ -115 +115 @@
             throw new IllegalArgumentException(MessageFormat.format("Id > 0 required, got {0}", id));
         CheckParameterUtil.ensureParameterNotNull(type, "type");
-        cancelled = false;
+        canceled = false;
         this.children = new HashMap<Long, OsmPrimitiveType>();
         this.children.put(id, type);
@@ -136 +136 @@
         if (primitiveId.isNew())
             throw new IllegalArgumentException(MessageFormat.format("Cannot download referrers for new primitives (ID {0})", primitiveId.getUniqueId()));
-        cancelled = false;
+        canceled = false;
         this.children = new HashMap<Long, OsmPrimitiveType>();
         this.children.put(primitiveId.getUniqueId(), primitiveId.getType());
@@ -145 +145 @@
     @Override
     protected void cancel() {
-        cancelled = true;
+        canceled = true;
         synchronized(this) {
             if (reader != null) {
@@ -155 +155 @@
     @Override
     protected void finish() {
-        if (cancelled)
+        if (canceled)
             return;
         if (lastException != null) {
@@ -227 +227 @@
             int i=1;
             for (Entry<Long, OsmPrimitiveType> entry: children.entrySet()) {
-                if (cancelled)
+                if (canceled)
                     return;
                 String msg = "";
@@ -240 +240 @@
             }
         } catch(Exception e) {
-            if (cancelled)
+            if (canceled)
                 return;
             lastException = e;