Index: applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java
===================================================================
--- applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java	(revision 30353)
+++ applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java	(revision 30532)
@@ -41,5 +41,4 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 
-
 /**
  * This is a layer that draws a grid
@@ -206,5 +205,4 @@
     }
 
-
     private class GPXLayerImportAction extends AbstractAction {
 
@@ -212,5 +210,5 @@
      * The data model for the list component.
      */
-    private DefaultListModel model = new DefaultListModel();
+    private DefaultListModel<GpxLayer> model = new DefaultListModel<>();
 
     /**
@@ -224,5 +222,5 @@
     public void actionPerformed(ActionEvent e) {
         Box panel = Box.createVerticalBox();
-        final JList layerList = new JList(model);
+        final JList<GpxLayer> layerList = new JList<>(model);
         Collection<Layer> data = Main.map.mapView.getAllLayers();
         Layer lastLayer = null;
@@ -231,5 +229,5 @@
         for (Layer l : data){
                 if(l instanceof GpxLayer){
-                    model.addElement(l);
+                    model.addElement((GpxLayer) l);
                     lastLayer = l;
                     layerCnt++;
@@ -242,5 +240,5 @@
 
                 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,
@@ -293,4 +291,3 @@
         }
     }
-
 }