Changeset 1685 in josm for trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

Timestamp:

21.06.2009 12:02:15 (3 years ago)

Author:

stoecker

Message:

fixed audio handling a bit

File:

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

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

@@ -203 +203 @@
                         Main.pref.put("markers.lastaudiodirectory", fc.getCurrentDirectory().getAbsolutePath());
 
-                    MarkerLayer ml = new MarkerLayer(new GpxData(), tr("Audio markers from {0}", name), getAssociatedFile(), me);
                     File sel[] = fc.getSelectedFiles();
                     if(sel != null) {
@@ -214 +213 @@
                             });
                         }
+                    }
+
+                    String names = null;
+                    for (int i = 0; i < sel.length; i++) {
+                        if(names == null)
+                            names = " (";
+                        else
+                            names += ", ";
+                        names += sel[i].getName();
+                    }
+                    if(names != null)
+                        names += ")";
+                    else
+                        names = "";
+                    MarkerLayer ml = new MarkerLayer(new GpxData(), tr("Audio markers from {0}", name) + names,
+                    getAssociatedFile(), me);
+                    if(sel != null)
+                    {
                         double firstStartTime = sel[0].lastModified()/1000.0 /* ms -> seconds */ - AudioUtil.getCalibratedDuration(sel[0]);
                         for (int i = 0; i < sel.length; i++) {