Changeset 4310 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.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/layer/geoimage/GeoImageLayer.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -90 +90 @@
     private static final class Loader extends PleaseWaitRunnable {
 
-        private boolean cancelled = false;
+        private boolean canceled = false;
         private GeoImageLayer layer;
         private Collection<File> selection;
@@ -118 +118 @@
             }
 
-            if (cancelled)
+            if (canceled)
                 return;
             progressMonitor.subTask(tr("Read photos..."));
@@ -131 +131 @@
             for (File f : files) {
 
-                if (cancelled) {
+                if (canceled) {
                     break;
                 }
@@ -161 +161 @@
             for (File f : sel) {
 
-                if(cancelled) {
+                if(canceled) {
                     break;
                 }
@@ -241 +241 @@
                 }
 
-                if (! cancelled && layer.data.size() > 0) {
+                if (! canceled && layer.data.size() > 0) {
                     boolean noGeotagFound = true;
                     for (ImageEntry e : layer.data) {
@@ -256 +256 @@
 
         @Override protected void cancel() {
-            cancelled = true;
+            canceled = true;
         }
     }