X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fcorrelate%2FMediaSelectionTableModel.java;h=93f8759bfa4c4352d653b489b85bbd649d52eb79;hb=4d5796d02a15808311c09448d79e6e7d1de9d636;hp=b06a05e6356b926eebb9d81da83595f51c2d56c2;hpb=f35b6d628f68e3b5ef19965ad8988d0dd1eb8efa;p=GpsPrune.git

diff --git a/tim/prune/correlate/MediaSelectionTableModel.java b/tim/prune/correlate/MediaSelectionTableModel.java
index b06a05e..93f8759 100644
--- a/tim/prune/correlate/MediaSelectionTableModel.java
+++ b/tim/prune/correlate/MediaSelectionTableModel.java
@@ -3,7 +3,7 @@ package tim.prune.correlate;
 import java.util.ArrayList;
 import javax.swing.table.AbstractTableModel;
 import tim.prune.I18nManager;
-import tim.prune.data.MediaFile;
+import tim.prune.data.MediaObject;
 
 
 /**
@@ -82,8 +82,10 @@ public class MediaSelectionTableModel extends AbstractTableModel
 	{
 		// MAYBE: only show time of photos (not date) if dates all identical
 		MediaSelectionTableRow row = _list.get(inRowIndex);
-		if (inColumnIndex == 0) return row.getMedia().getFile().getName();
-		else if (inColumnIndex == 1) return row.getMedia().getTimestamp().getText();
+		if (inColumnIndex == 0) return row.getMedia().getName();
+		else if (inColumnIndex == 1) {
+			return (row.getMedia().hasTimestamp() ? row.getMedia().getTimestamp().getText() : "");
+		}
 		else if (inColumnIndex == 2) return row.getTimeDiff().getDescription();
 		return (row.getTimeDiff().getIsPositive() ? I18nManager.getText("dialog.about.yes") :
 			I18nManager.getText("dialog.about.no"));
@@ -102,7 +104,7 @@ public class MediaSelectionTableModel extends AbstractTableModel
 	 * @param inMedia item to add
 	 * @param inTimeDiff time difference
 	 */
-	public void addMedia(MediaFile inMedia, long inTimeDiff)
+	public void addMedia(MediaObject inMedia, long inTimeDiff)
 	{
 		_list.add(new MediaSelectionTableRow(inMedia, inTimeDiff));
 	}