Changeset 30532 in osm for applications/editors/josm/plugins/measurement

Timestamp:

2014-07-14T04:18:06+02:00 (10 years ago)

Author:

donvip

Message:

[josm_plugins] fix compilation warnings

File:

• applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java (modified) (7 diffs)

applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java

@@ -41 +41 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 
-
 /**
  * This is a layer that draws a grid
@@ -206 +205 @@
     }
 
-
     private class GPXLayerImportAction extends AbstractAction {
 
@@ -212 +210 @@
      * The data model for the list component.
      */
-    private DefaultListModel model = new DefaultListModel();
+    private DefaultListModel<GpxLayer> model = new DefaultListModel<>();
 
     /**
@@ -224 +222 @@
     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 +229 @@
         for (Layer l : data){
                 if(l instanceof GpxLayer){
-                    model.addElement(l);
+                    model.addElement((GpxLayer) l);
                     lastLayer = l;
                     layerCnt++;
@@ -242 +240 @@
 
                 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 +291 @@
         }
     }
-
 }