X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fcorrelate%2FMediaPreviewTableModel.java;h=26d25f1ca07d359aed0889910b2e4687e910625b;hb=92dad5df664287acb51728e9ea599f150765d34a;hp=78120ec784050a9b697c9bd2e172200e427e0989;hpb=649c5da6ee1bbc590699e11a92316ece2ea8512d;p=GpsPrune.git

diff --git a/tim/prune/correlate/MediaPreviewTableModel.java b/tim/prune/correlate/MediaPreviewTableModel.java
index 78120ec..26d25f1 100644
--- a/tim/prune/correlate/MediaPreviewTableModel.java
+++ b/tim/prune/correlate/MediaPreviewTableModel.java
@@ -1,10 +1,15 @@
 package tim.prune.correlate;
 
-import java.text.NumberFormat;
 import java.util.ArrayList;
+import java.util.TimeZone;
+
 import javax.swing.table.AbstractTableModel;
+
 import tim.prune.I18nManager;
-import tim.prune.data.Distance;
+import tim.prune.config.TimezoneHelper;
+import tim.prune.data.Unit;
+import tim.prune.data.UnitSetLibrary;
+import tim.prune.gui.DisplayUtils;
 
 /**
  * Class to act as the table model for the correlation preview table
@@ -16,24 +21,19 @@ 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;
-	/** Number formatter */
-	private static final NumberFormat FORMAT_ONE_DP = NumberFormat.getNumberInstance();
+	private Unit _distanceUnits = UnitSetLibrary.UNITS_KILOMETRES;
+	/** Current timezone */
+	private TimeZone _timezone = null;
 
 
-	/** Static block to initialise the one d.p. formatter */
-	static
-	{
-		FORMAT_ONE_DP.setMaximumFractionDigits(1);
-		FORMAT_ONE_DP.setMinimumFractionDigits(1);
-	}
-
 	/**
 	 * Constructor
 	 * @param inFirstColumnKey key for first column heading
 	 */
-	public MediaPreviewTableModel(String inFirstColumnKey) {
+	public MediaPreviewTableModel(String inFirstColumnKey)
+	{
 		_firstColumnHeading = I18nManager.getText(inFirstColumnKey);
+		_timezone = TimezoneHelper.getSelectedTimezone();
 	}
 
 	/**
@@ -89,7 +89,10 @@ public class MediaPreviewTableModel extends AbstractTableModel
 		MediaPreviewTableRow row = _list.get(inRowIndex);
 		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(_timezone);
+			}
+			return ""; // media doesn't have a timestamp
 		}
 		else if (inColumnIndex == 2) {
 			if (row.getPointPair().isValid()) {
@@ -99,7 +102,7 @@ public class MediaPreviewTableModel extends AbstractTableModel
 		}
 		else if (inColumnIndex == 3) {
 			if (row.getPointPair().isValid()) {
-				return FORMAT_ONE_DP.format(row.getDistance(_distanceUnits));
+				return DisplayUtils.formatOneDp(row.getDistance(_distanceUnits));
 			}
 			return "";
 		}
@@ -110,7 +113,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;
 	}