From eb2e34e5fcaee5652268c6e448bede53e1e3a7db Mon Sep 17 00:00:00 2001
From: Brian Carrier <carrier@sleuthkit.org>
Date: Sun, 22 Sep 2013 22:20:59 -0400
Subject: [PATCH] Added timezone to times in display

---
 .../autopsy/datamodel/ContentUtils.java       | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java
index a873af4676..6a70800c49 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java
@@ -46,7 +46,7 @@ import org.sleuthkit.datamodel.VirtualDirectory;
 public final class ContentUtils {
 
     private final static Logger logger = Logger.getLogger(ContentUtils.class.getName());
-    private static final SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    private static final SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z");
     private static final SimpleDateFormat dateFormatterISO8601 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
 
     // don't instantiate
@@ -105,12 +105,17 @@ public final class ContentUtils {
 
     public static TimeZone getTimeZone(Content c) {
         try {
-            final Image image = c.getImage();
-            if (image != null) {
-                return TimeZone.getTimeZone(image.getTimeZone());
-            } else {
-                //case such as top level VirtualDirectory
-                return TimeZone.getDefault();
+            if (false) {
+                return TimeZone.getTimeZone("GMT");
+            }
+            else {
+                final Image image = c.getImage();
+                if (image != null) {
+                    return TimeZone.getTimeZone(image.getTimeZone());
+                } else {
+                    //case such as top level VirtualDirectory
+                    return TimeZone.getDefault();
+                }
             }
         } catch (TskException ex) {
             return TimeZone.getDefault();