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

Timestamp:

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

Author:

stoecker

Message:

fix #6680, fix #6677 - i18n issues

Location:

trunk/src/org/openstreetmap/josm/gui/progress

Files:

• AbstractProgressMonitor.java (modified) (1 diff)
• NullProgressMonitor.java (modified) (1 diff)
• ProgressMonitor.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java

@@ -181 +181 @@
     }
 
-    public boolean isCancelled() {
+    public boolean isCanceled() {
         return cancelHandler.isCanceled();
     }

trunk/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java

@@ -43 +43 @@
     }
 
-    public boolean isCancelled() {
+    public boolean isCanceled() {
         return false;
     }

trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java

@@ -115 +115 @@
     ProgressMonitor createSubTaskMonitor(int ticks, boolean internal);
 
-    boolean isCancelled();
+    boolean isCanceled();
     void cancel();
     void addCancelListener(CancelListener listener);