Changeset 13056 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2017-10-30T01:20:53+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #6135 - Correlate GPX with image: fix incorrect drop-down list initialization after using "try again" button + smarter selection of initial GPX track

File:

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

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -546 +546 @@
         // Construct the list of loaded GPX tracks
         Collection<Layer> layerLst = MainApplication.getLayerManager().getLayers();
+        gpxLst.clear();
         GpxDataWrapper defaultItem = null;
         for (Layer cur : layerLst) {
@@ -574 +575 @@
         if (defaultItem != null) {
             cbGpx.setSelectedItem(defaultItem);
+        } else {
+            // select first GPX track associated to a file
+            for (GpxDataWrapper item : gpxLst) {
+                if (item.file != null) {
+                    cbGpx.setSelectedItem(item);
+                    break;
+                }
+            }
         }
         cbGpx.addActionListener(statusBarUpdaterWithRepaint);