Version 13, August 2011

[GpsPrune.git] / tim / prune / gui / WaypointListModel.java

diff --git a/tim/prune/gui/WaypointListModel.java b/tim/prune/gui/WaypointListModel.java
index 10f16a95af7d808891cca2ed247d00fdfb1b5f11..350869713c0a2851ad5b47a17502b2422f303d11 100644 (file)
--- a/tim/prune/gui/WaypointListModel.java
+++ b/tim/prune/gui/WaypointListModel.java
@@ -12,7 +12,7 @@ import tim.prune.data.Track;
 public class WaypointListModel extends AbstractListModel
 {
        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);
        }
 
@@ -38,7 +38,11 @@ public class WaypointListModel extends AbstractListModel
         */
        public Object 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);
        }
 
        /**