Version 16, February 2014

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

diff --git a/tim/prune/gui/MediaListModel.java b/tim/prune/gui/MediaListModel.java
index 2d8eb6ed54620596243666bfc84edf3c1edb6b1d..4de374ba179db06a71ca6d553167967f91442309 100644 (file)
--- a/tim/prune/gui/MediaListModel.java
+++ b/tim/prune/gui/MediaListModel.java
@@ -2,13 +2,13 @@ package tim.prune.gui;
 
 import javax.swing.AbstractListModel;
 
-import tim.prune.data.MediaFile;
+import tim.prune.data.MediaObject;
 import tim.prune.data.MediaList;
 
 /**
  * Class to act as list model for the photo list and audio list
  */
-public class MediaListModel extends AbstractListModel
+public class MediaListModel extends AbstractListModel<String>
 {
        /** media list */
        MediaList _media = null;
@@ -31,11 +31,11 @@ public class MediaListModel extends AbstractListModel
        /**
         * @see javax.swing.ListModel#getElementAt(int)
         */
-       public Object getElementAt(int inIndex)
+       public String getElementAt(int inIndex)
        {
-               MediaFile m = _media.getMedia(inIndex);
+               MediaObject m = _media.getMedia(inIndex);
                // * means modified since loading
-               return (m.getCurrentStatus() == m.getOriginalStatus()?"":"* ") + m.getFile().getName();
+               return (m.getCurrentStatus() == m.getOriginalStatus()?"":"* ") + m.getName();
        }
 
        /**