Changeset 2851 in josm for trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java

Timestamp:

2010-01-13T20:20:07+01:00 (14 years ago)

Author:

jttt

Message:

Added progress monitor to JpgImporter, allow to cancel importing

File:

• trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (modified) (4 diffs)

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

@@ -23 +23 @@
 import org.openstreetmap.josm.io.AllFormatsImporter;
 import org.openstreetmap.josm.io.FileImporter;
-import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.MultiMap;
@@ -110 +109 @@
                 chosenImporter = null;
             }
-            getProgressMonitor().setTicks(files.size());
+            getProgressMonitor().setTicksCount(files.size());
 
             if (chosenImporter != null) { // The importer was expicitely chosen, so use it.
@@ -132 +131 @@
             else {    // find apropriate importer
                 MultiMap<FileImporter, File> map = new MultiMap<FileImporter, File>();
-                while (! files.isEmpty()) {
-                    File f = files.get(0);
-                    for (FileImporter importer : ExtensionFileFilter.importers) {
-                        if (importer.acceptFile(f)) {
-                            map.add(importer, f);
-                            files.remove(f);
+                FILES:
+                    for (File f: files) {
+                        for (FileImporter importer : ExtensionFileFilter.importers) {
+                            if (importer.acceptFile(f)) {
+                                map.add(importer, f);
+                                continue FILES;
+                            }
                         }
+                        throw new RuntimeException(); // no importer found
                     }
-                    if (files.contains(f))
-                        throw new RuntimeException(); // no importer found
-                }
                 List<FileImporter> ims = new ArrayList<FileImporter>(map.keySet());
                 Collections.sort(ims);
@@ -165 +163 @@
                 }
                 getProgressMonitor().indeterminateSubTask(msg);
-                importer.importDataHandleExceptions(files);
-                getProgressMonitor().worked(files.size());
+                importer.importDataHandleExceptions(files, getProgressMonitor().createSubTaskMonitor(files.size(), false));
             } else {
                 for (File f : files) {
                     if (cancelled) return;
                     getProgressMonitor().indeterminateSubTask(tr("Opening file ''{0}'' ...", f.getAbsolutePath()));
-                    importer.importDataHandleExceptions(f);
-                    getProgressMonitor().worked(1);
+                    importer.importDataHandleExceptions(f, getProgressMonitor().createSubTaskMonitor(1, false));
                 }
             }