Changeset 26202 in osm for applications/editors/josm/plugins

Timestamp:

2011-06-29T21:47:54+02:00 (13 years ago)

Author:

glebius

Message:

• Make it possible to select multiple GPX layers when importing.
• By default select all of them.

File:

• applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java (modified) (3 diffs)

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java

@@ -58 +58 @@
         final JList layerList = new JList(dModel);
         Collection<Layer> data = Main.map.mapView.getAllLayers();
-        Layer lastLayer = null;
         int layerCnt = 0;
 
@@ -64 +63 @@
             if(l instanceof GpxLayer){
                 dModel.addElement(l);
-                lastLayer = l;
                 layerCnt++;
             }
         }
-        if(layerCnt == 1){
-            layerList.setSelectedValue(lastLayer, true);
-        }
         if(layerCnt > 0){
+            layerList.setSelectionInterval(0, layerCnt-1);
             layerList.setCellRenderer(new DefaultListCellRenderer(){
                 @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
@@ -103 +99 @@
             }
 
-            GpxLayer gpx = (GpxLayer)layerList.getSelectedValue();
-
-            synchronized(importing) {
-                this.data.load(gpx.data, dropFirst.isSelected());
+            for (Object o : layerList.getSelectedValues()) {
+                GpxLayer gpx = (GpxLayer )o;
+                synchronized(importing) {
+                    this.data.load(gpx.data, dropFirst.isSelected());
+                }
             }
             Main.map.mapView.repaint();