Changeset 4310 in josm for trunk/src/org/openstreetmap/josm/gui/history

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/history/HistoryLoadTask.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java

@@ -47 +47 @@
 public class HistoryLoadTask extends PleaseWaitRunnable {
 
-    private boolean cancelled = false;
+    private boolean canceled = false;
     private Exception lastException  = null;
     private HashSet<PrimitiveId> toLoad;
@@ -160 +160 @@
     protected void cancel() {
         OsmApi.getOsmApi().cancel();
-        cancelled = true;
+        canceled = true;
     }
 
     @Override
     protected void finish() {
-        if (isCancelled())
+        if (isCanceled())
             return;
         if (lastException != null) {
@@ -179 +179 @@
         try {
             for(PrimitiveId pid: toLoad) {
-                if (cancelled) {
+                if (canceled) {
                     break;
                 }
@@ -196 +196 @@
                     ds = reader.parseHistory(progressMonitor.createSubTaskMonitor(1, false));
                 } catch(OsmTransferException e) {
-                    if (cancelled)
+                    if (canceled)
                         return;
                     throw e;
@@ -208 +208 @@
     }
 
-    public boolean isCancelled() {
-        return cancelled;
+    public boolean isCanceled() {
+        return canceled;
     }