Changeset 2146 in josm for trunk

Timestamp:

2009-09-16T17:50:07+02:00 (15 years ago)

Author:

stoecker

Message:

applied #3425 - patch by dmuecke - Import Audio gives excessive warnings

File:

• trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified) (4 diffs)

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

@@ -81 +81 @@
     private boolean isLocalFile;
 
+    private class Markers {
+        public boolean timedMarkersOmitted = false;
+        public boolean untimedMarkersOmitted = false;
+    }
+
     public GpxLayer(GpxData d) {
         super((String) d.attr.get("name"));
@@ -261 +266 @@
                         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);
+                            importAudio(sel[i], ml, firstStartTime, m);
                         }
                     }
@@ -949 +956 @@
      * a single marker at the beginning of the track
      * @param wavFile : the file to be associated with the markers in the new marker layer
+     * @param markers : keeps track of warning messages to avoid repeated warnings
      */
-    private void importAudio(File wavFile, MarkerLayer ml, double firstStartTime) {
+    private void importAudio(File wavFile, MarkerLayer ml, double firstStartTime, Markers markers) {
         String uri = "file:".concat(wavFile.getAbsolutePath());
         Collection<WayPoint> waypoints = new ArrayList<WayPoint>();
@@ -1151 +1159 @@
         }
 
-        if (timedMarkersOmitted) {
+        if (timedMarkersOmitted && !markers.timedMarkersOmitted) {
             JOptionPane
             .showMessageDialog(
                     Main.parent,
                     tr("Some waypoints with timestamps from before the start of the track or after the end were omitted or moved to the start."));
-        }
-        if (untimedMarkersOmitted) {
+            markers.timedMarkersOmitted = timedMarkersOmitted;
+        }
+        if (untimedMarkersOmitted && !markers.untimedMarkersOmitted) {
             JOptionPane
             .showMessageDialog(
                     Main.parent,
                     tr("Some waypoints which were too far from the track to sensibly estimate their time were omitted."));
+            markers.untimedMarkersOmitted = untimedMarkersOmitted;
         }
     }