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

diff --git a/tim/prune/correlate/MediaPreviewTableModel.java b/tim/prune/correlate/MediaPreviewTableModel.java
index ea93049..3d6efa8 100644
--- a/tim/prune/correlate/MediaPreviewTableModel.java
+++ b/tim/prune/correlate/MediaPreviewTableModel.java
@@ -4,7 +4,8 @@ import java.text.NumberFormat;
 import java.util.ArrayList;
 import javax.swing.table.AbstractTableModel;
 import tim.prune.I18nManager;
-import tim.prune.data.Distance;
+import tim.prune.data.Unit;
+import tim.prune.data.UnitSetLibrary;
 
 /**
  * Class to act as the table model for the correlation preview table
@@ -16,7 +17,7 @@ public class MediaPreviewTableModel extends AbstractTableModel
 	/** ArrayList containing TableRow objects */
 	private ArrayList<MediaPreviewTableRow> _list = new ArrayList<MediaPreviewTableRow>();
 	/** Distance units */
-	private Distance.Units _distanceUnits = Distance.Units.KILOMETRES;
+	private Unit _distanceUnits = UnitSetLibrary.UNITS_KILOMETRES;
 	/** Number formatter */
 	private static final NumberFormat FORMAT_ONE_DP = NumberFormat.getNumberInstance();
 
@@ -87,9 +88,12 @@ public class MediaPreviewTableModel extends AbstractTableModel
 	public Object getValueAt(int inRowIndex, int inColumnIndex)
 	{
 		MediaPreviewTableRow row = _list.get(inRowIndex);
-		if (inColumnIndex == 0) return row.getMedia().getFile().getName();
+		if (inColumnIndex == 0) return row.getMedia().getName();
 		else if (inColumnIndex == 1) {
-			return row.getMedia().getTimestamp().getText();
+			if (row.getMedia().hasTimestamp()) {
+				return row.getMedia().getTimestamp().getText();
+			}
+			return ""; // media doesn't have a timestamp
 		}
 		else if (inColumnIndex == 2) {
 			if (row.getPointPair().isValid()) {
@@ -110,7 +114,7 @@ public class MediaPreviewTableModel extends AbstractTableModel
 	/**
 	 * @param inUnits the distance units to use
 	 */
-	public void setDistanceUnits(Distance.Units inUnits)
+	public void setDistanceUnits(Unit inUnits)
 	{
 		_distanceUnits = inUnits;
 	}