Changeset 26509 in osm for applications/editors/josm/plugins/trustosm

Timestamp:

2011-08-11T00:45:56+02:00 (13 years ago)

Author:

stoecker

Message:

i18n fixes

Location:

applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui

Files:

• DownloadSignedOsmDataTask.java (modified) (6 diffs)
• KeyGenerationTask.java (modified) (6 diffs)

applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java

@@ -25 +25 @@
 public class DownloadSignedOsmDataTask  extends PleaseWaitRunnable {
 
-        private boolean cancelled;
+        private boolean canceled;
         private Exception lastException;
         private final Collection<OsmPrimitive> missing;
@@ -44 +44 @@
         @Override
         protected void cancel() {
-                cancelled = true;
+                canceled = true;
                 synchronized(this) {
                         if (objectReader != null) {
@@ -55 +55 @@
         protected void finish() {
                 Main.map.repaint();
-                if (cancelled)
+                if (canceled)
                         return;
                 if (lastException != null) {
@@ -75 +75 @@
                 try {
                         synchronized (this) {
-                                if (cancelled) return;
+                                if (canceled) return;
                                 objectReader = new MultiFetchServerObjectReader();
                         }
@@ -87 +87 @@
                                 return;
                         synchronized (this) {
-                                if (cancelled) return;
+                                if (canceled) return;
                                 objectReader = null;
                         }
@@ -103 +103 @@
 
                 } catch (Exception e) {
-                        if (cancelled) {
-                                System.out.println(tr("Warning: ignoring exception because task is cancelled. Exception: {0}", e.toString()));
+                        if (canceled) {
+                                System.out.println(tr("Warning: ignoring exception because task is canceled. Exception: {0}", e.toString()));
                                 return;
                         }

applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java

@@ -12 +12 @@
 public class KeyGenerationTask extends PleaseWaitRunnable {
 
-        private boolean cancelled;
+        private boolean canceled;
         private Exception lastException;
 
@@ -21 +21 @@
         @Override
         protected void cancel() {
-                cancelled = true;
+                canceled = true;
                 synchronized(this) {
                         /*              if (objectReader != null) {
@@ -31 +31 @@
         @Override
         protected void finish() {
-                if (cancelled)
+                if (canceled)
                         return;
                 if (lastException != null) {
@@ -44 +44 @@
                 try {
                         /*                      synchronized (this) {
-                                if (cancelled) return;
+                                if (canceled) return;
                                 objectReader = new MultiFetchServerObjectReader();
                         }
@@ -56 +56 @@
                                 return;
                         synchronized (this) {
-                                if (cancelled) return;
+                                if (canceled) return;
                                 objectReader = null;
                         }
@@ -71 +71 @@
                          */
                 } catch (Exception e) {
-                        if (cancelled) {
-                                System.out.println(tr("Warning: ignoring exception because task is cancelled. Exception: {0}", e
+                        if (canceled) {
+                                System.out.println(tr("Warning: ignoring exception because task is canceled. Exception: {0}", e
                                                 .toString()));
                                 return;