Index: /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ColoredElevationLayer.java
===================================================================
--- /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ColoredElevationLayer.java	(revision 29959)
+++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ColoredElevationLayer.java	(revision 29960)
@@ -59,5 +59,4 @@
     @Override
     public String getToolTipText() {
-	// TODO Auto-generated method stub
 	return null;
     }
Index: /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/DefaultElevationProfileRenderer.java
===================================================================
--- /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/DefaultElevationProfileRenderer.java	(revision 29959)
+++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/DefaultElevationProfileRenderer.java	(revision 29960)
@@ -90,6 +90,4 @@
 			return null;
 		}
-
-		int z = (int) ElevationHelper.getElevation(wpt);
 
 		switch (kind) {
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 29959)
+++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java	(revision 29960)
@@ -74,5 +74,5 @@
 	private JLabel totalTimeLabel;
 	private JLabel distLabel;
-	private JComboBox trackCombo;
+	private JComboBox<IElevationProfile> trackCombo;
 	
 	/* Listener to the elevation model */
@@ -166,5 +166,5 @@
 		trackPanel.add(lbTrack);
 		
-		trackCombo = new JComboBox(new TrackModel());
+		trackCombo = new JComboBox<IElevationProfile>(new TrackModel());
 		trackPanel.add(trackCombo);
 
@@ -420,5 +420,5 @@
 	
 	
-	class TrackModel implements ComboBoxModel {
+	class TrackModel implements ComboBoxModel<IElevationProfile> {
 	    private Collection<ListDataListener> listeners;
 
Index: /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileLayer.java
===================================================================
--- /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileLayer.java	(revision 29959)
+++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileLayer.java	(revision 29960)
@@ -31,5 +31,4 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.plugins.elevation.ElevationHelper;
-import org.openstreetmap.josm.plugins.elevation.IElevationModelListener;
 import org.openstreetmap.josm.plugins.elevation.IElevationProfile;
 import org.openstreetmap.josm.plugins.elevation.gpx.ElevationWayPointKind;