Version 19, May 2018

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

diff --git a/tim/prune/correlate/MediaSelectionTableModel.java b/tim/prune/correlate/MediaSelectionTableModel.java
index b06a05e6356b926eebb9d81da83595f51c2d56c2..1b90e86b25f3432736bf21a7504856913786e295 100644 (file)
--- a/tim/prune/correlate/MediaSelectionTableModel.java
+++ b/tim/prune/correlate/MediaSelectionTableModel.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.data.MediaFile;
+import tim.prune.config.TimezoneHelper;
+import tim.prune.data.MediaObject;
 
 
 /**
@@ -18,6 +21,8 @@ public class MediaSelectionTableModel extends AbstractTableModel
        private String _lastColumnHeading = null;
        /** List of rows */
        private ArrayList<MediaSelectionTableRow> _list = new ArrayList<MediaSelectionTableRow>();
+       /** Current timezone */
+       private TimeZone _timezone = null;
 
 
        /**
@@ -29,6 +34,7 @@ public class MediaSelectionTableModel extends AbstractTableModel
        {
                _firstColumnHeading = I18nManager.getText(inFirstColumnKey);
                _lastColumnHeading = I18nManager.getText(inLastColumnKey);
+               _timezone = TimezoneHelper.getSelectedTimezone();
        }
 
        /**
@@ -82,8 +88,11 @@ 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(_timezone) : "");
+               }
                else if (inColumnIndex == 2) return row.getTimeDiff().getDescription();
                return (row.getTimeDiff().getIsPositive() ? I18nManager.getText("dialog.about.yes") :
                        I18nManager.getText("dialog.about.no"));
@@ -102,7 +111,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));
        }