X-Git-Url: http://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fcorrelate%2FMediaPreviewTableModel.java;fp=tim%2Fprune%2Fcorrelate%2FMediaPreviewTableModel.java;h=26d25f1ca07d359aed0889910b2e4687e910625b;hp=e562ff9f4ff32fc764f70bbec9f6ea09207caa32;hb=92dad5df664287acb51728e9ea599f150765d34a;hpb=81843c3d8d0771bf00d0f26034a13aa515465c78 diff --git a/tim/prune/correlate/MediaPreviewTableModel.java b/tim/prune/correlate/MediaPreviewTableModel.java index e562ff9..26d25f1 100644 --- a/tim/prune/correlate/MediaPreviewTableModel.java +++ b/tim/prune/correlate/MediaPreviewTableModel.java @@ -1,9 +1,12 @@ package tim.prune.correlate; 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; @@ -19,14 +22,18 @@ public class MediaPreviewTableModel extends AbstractTableModel private ArrayList _list = new ArrayList(); /** Distance units */ private Unit _distanceUnits = UnitSetLibrary.UNITS_KILOMETRES; + /** Current timezone */ + private TimeZone _timezone = null; /** * Constructor * @param inFirstColumnKey key for first column heading */ - public MediaPreviewTableModel(String inFirstColumnKey) { + public MediaPreviewTableModel(String inFirstColumnKey) + { _firstColumnHeading = I18nManager.getText(inFirstColumnKey); + _timezone = TimezoneHelper.getSelectedTimezone(); } /** @@ -83,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 }