X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fgui%2FWaypointListModel.java;h=3d5dd1fb62bafaa222df382109ead68756ad0605;hb=326f489e36aa7f235bc19409a57bf4955cd50f24;hp=10f16a95af7d808891cca2ed247d00fdfb1b5f11;hpb=23959e65a6a0d581e657b07186d18b7a1ac5afeb;p=GpsPrune.git

diff --git a/tim/prune/gui/WaypointListModel.java b/tim/prune/gui/WaypointListModel.java
index 10f16a9..3d5dd1f 100644
--- a/tim/prune/gui/WaypointListModel.java
+++ b/tim/prune/gui/WaypointListModel.java
@@ -9,10 +9,10 @@ import tim.prune.data.Track;
 /**
  * Class to act as list model for the waypoint list
  */
-public class WaypointListModel extends AbstractListModel
+public class WaypointListModel extends AbstractListModel<String>
 {
 	Track _track = null;
-	ArrayList _waypoints = null;
+	ArrayList<DataPoint> _waypoints = null;
 
 	/**
 	 * Constructor giving Track object
@@ -21,7 +21,7 @@ public class WaypointListModel extends AbstractListModel
 	public WaypointListModel(Track inTrack)
 	{
 		_track = inTrack;
-		_waypoints = new ArrayList();
+		_waypoints = new ArrayList<DataPoint>();
 		_track.getWaypoints(_waypoints);
 	}
 
@@ -36,9 +36,13 @@ public class WaypointListModel extends AbstractListModel
 	/**
 	 * @see javax.swing.ListModel#getElementAt(int)
 	 */
-	public Object getElementAt(int inIndex)
+	public String getElementAt(int inIndex)
 	{
-		return ((DataPoint)_waypoints.get(inIndex)).getWaypointName();
+		DataPoint p = null;
+		if (inIndex < 0 || inIndex >= getSize()
+			|| _waypoints == null || (p = _waypoints.get(inIndex)) == null)
+			return "";
+		return p.getWaypointName();
 	}
 
 	/**
@@ -48,7 +52,7 @@ public class WaypointListModel extends AbstractListModel
 	 */
 	public DataPoint getWaypoint(int inIndex)
 	{
-		return (DataPoint) _waypoints.get(inIndex);
+		return _waypoints.get(inIndex);
 	}
 
 	/**