Index: applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java
===================================================================
--- applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java	(revision 30197)
+++ applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java	(revision 30532)
@@ -37,6 +37,4 @@
 class GPXLayerImportAction extends AbstractAction {
 
-
-    private static final long serialVersionUID = 5794897888911798168L;
     private EditGpxData data;
     public Object importing = new Object(); //used for synchronization
@@ -54,7 +52,7 @@
     public void activateImport() {
         Box panel = Box.createVerticalBox();
-        DefaultListModel dModel= new DefaultListModel();
+        DefaultListModel<GpxLayer> dModel = new DefaultListModel<>();
 
-        final JList layerList = new JList(dModel);
+        final JList<GpxLayer> layerList = new JList<>(dModel);
         Collection<Layer> data = Main.map.mapView.getAllLayers();
         int layerCnt = 0;
@@ -62,5 +60,5 @@
         for (Layer l : data){
             if(l instanceof GpxLayer){
-                dModel.addElement(l);
+                dModel.addElement((GpxLayer) l);
                 layerCnt++;
             }
@@ -69,5 +67,5 @@
             layerList.setSelectionInterval(0, layerCnt-1);
             layerList.setCellRenderer(new DefaultListCellRenderer(){
-                @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+                @Override public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
                     Layer layer = (Layer)value;
                     JLabel label = (JLabel)super.getListCellRendererComponent(list,
@@ -104,6 +102,5 @@
             }
             synchronized(importing) {
-                for (Object o : layerList.getSelectedValues()) {
-                    GpxLayer gpx = (GpxLayer )o;
+                for (GpxLayer gpx : layerList.getSelectedValuesList()) {
                     this.data.load(gpx.data);
                 }