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

trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java

@@ -87 +87 @@
         private List<File> successfullyOpenedFiles = new ArrayList<File>();
         private FileFilter fileFilter;
-        private boolean cancelled;
+        private boolean canceled;
         private boolean recordHistory = false;
 
@@ -114 +114 @@
         @Override
         protected void cancel() {
-            this.cancelled = true;
+            this.canceled = true;
         }
 
@@ -291 +291 @@
         public void importData(FileImporter importer, List<File> files) {
             if (importer.isBatchImporter()) {
-                if (cancelled) return;
+                if (canceled) return;
                 String msg;
                 if (files.size() == 1) {
@@ -305 +305 @@
             } else {
                 for (File f : files) {
-                    if (cancelled) return;
+                    if (canceled) return;
                     getProgressMonitor().indeterminateSubTask(tr("Opening file ''{0}'' ...", f.getAbsolutePath()));
                     if (importer.importDataHandleExceptions(f, getProgressMonitor().createSubTaskMonitor(1, false))) {