Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java
===================================================================
--- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java	(revision 30381)
+++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java	(revision 30532)
@@ -63,5 +63,5 @@
     private final JLabel totalTimeLabel;
     private final JLabel distLabel;
-    private final JComboBox trackCombo;
+    private final JComboBox<IElevationProfile> trackCombo;
     private final JButton zoomButton;
 
@@ -170,5 +170,5 @@
         zoomButton.setEnabled(false);
 
-        trackCombo = new JComboBox(new TrackModel());
+        trackCombo = new JComboBox<>(new TrackModel());
         trackCombo.setPreferredSize(new Dimension(200, 24)); // HACK!
         trackCombo.setEnabled(false); // we have no model on startup
@@ -254,5 +254,4 @@
      * that the model has changed.
      */
-    @SuppressWarnings("unchecked") // TODO: Can be removed in Java 1.7
     private void updateView() {
         if (model == null) {
@@ -410,6 +409,5 @@
     }
 
-    @SuppressWarnings("rawtypes") // TODO: Can be removed in Java 1.7
-    class TrackModel implements ComboBoxModel {
+    class TrackModel implements ComboBoxModel<IElevationProfile> {
         private Collection<ListDataListener> listeners;
 
@@ -445,5 +443,5 @@
 
         @Override
-        public Object getSelectedItem() {
+        public IElevationProfile getSelectedItem() {
             if (model == null) return null;
 
@@ -460,5 +458,4 @@
             }
         }
-
     }
 }