Changeset 2851 in josm for trunk/src/org/openstreetmap/josm/gui/layer

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/gui/layer/GpxLayer.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -66 +66 @@
 import org.openstreetmap.josm.gui.layer.markerlayer.AudioMarker;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
 import org.openstreetmap.josm.io.JpgImporter;
@@ -284 +285 @@
                     MarkerLayer ml = new MarkerLayer(new GpxData(), tr("Audio markers from {0}", getName()) + names,
                             getAssociatedFile(), me);
-                    if (sel != null) {
-                        double firstStartTime = sel[0].lastModified() / 1000.0 /* ms -> seconds */
-                        - AudioUtil.getCalibratedDuration(sel[0]);
-
-                        Markers m = new Markers();
-                        for (int i = 0; i < sel.length; i++) {
-                            importAudio(sel[i], ml, firstStartTime, m);
-                        }
+                    double firstStartTime = sel[0].lastModified() / 1000.0 /* ms -> seconds */
+                    - AudioUtil.getCalibratedDuration(sel[0]);
+
+                    Markers m = new Markers();
+                    for (int i = 0; i < sel.length; i++) {
+                        importAudio(sel[i], ml, firstStartTime, m);
                     }
                     Main.main.addLayer(ml);
@@ -334 +333 @@
                     return;
                 addRecursiveFiles(files, sel);
-                importer.importDataHandleExceptions(files);
+                importer.importDataHandleExceptions(files, NullProgressMonitor.INSTANCE);
             }
 
@@ -526 +525 @@
          ****************************************************************/
         if ((computeCacheMaxLineLengthUsed != maxLineLength) || (!neutralColor.equals(computeCacheColorUsed))
-                        || (computeCacheColored != colored) || (computeCacheColorTracksTune != colorTracksTune)) {
+                || (computeCacheColored != colored) || (computeCacheColorTracksTune != colorTracksTune)) {
             // System.out.println("(re-)computing gpx line styles, reason: CCIS=" +
             // computeCacheInSync + " CCMLLU=" + (computeCacheMaxLineLengthUsed != maxLineLength) +