Version 19, May 2018

[GpsPrune.git] / tim / prune / correlate / MediaPreviewTableModel.java

diff --git a/tim/prune/correlate/MediaPreviewTableModel.java b/tim/prune/correlate/MediaPreviewTableModel.java
index 3d6efa8196c1ca57cf47aced06d83b211577c5f8..26d25f1ca07d359aed0889910b2e4687e910625b 100644 (file)
--- a/tim/prune/correlate/MediaPreviewTableModel.java
+++ b/tim/prune/correlate/MediaPreviewTableModel.java
@@ -1,11 +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.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
@@ -18,23 +22,18 @@ public class MediaPreviewTableModel extends AbstractTableModel
        private ArrayList<MediaPreviewTableRow> _list = new ArrayList<MediaPreviewTableRow>();
        /** Distance units */
        private Unit _distanceUnits = UnitSetLibrary.UNITS_KILOMETRES;
-       /** Number formatter */
-       private static final NumberFormat FORMAT_ONE_DP = NumberFormat.getNumberInstance();
-
+       /** 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();
        }
 
        /**
@@ -91,7 +90,7 @@ public class MediaPreviewTableModel extends AbstractTableModel
                if (inColumnIndex == 0) return row.getMedia().getName();
                else if (inColumnIndex == 1) {
                        if (row.getMedia().hasTimestamp()) {
-                               return row.getMedia().getTimestamp().getText();
+                               return row.getMedia().getTimestamp().getText(_timezone);
                        }
                        return ""; // media doesn't have a timestamp
                }
@@ -103,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 "";
                }