From 1af6c363fd05f589b6e18111891b0cd802ef7fd7 Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Fri, 3 May 2013 12:51:59 -0400
Subject: [PATCH] - fix case when no image to get timezone (for top level virt
 dir) - set icons for virt dirs for reserved virt dir names

---
 .../autopsy/datamodel/ContentUtils.java       |  10 +++++++++-
 .../datamodel/VirtualDirectoryNode.java       |  18 +++++++++++++++++-
 .../autopsy/images/folder-local-icon-16.png   | Bin 0 -> 730 bytes
 3 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 Core/src/org/sleuthkit/autopsy/images/folder-local-icon-16.png

diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java
index 1a804bf6b0..9c1c765006 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java
@@ -33,6 +33,7 @@ import org.sleuthkit.datamodel.ContentVisitor;
 import org.sleuthkit.datamodel.DerivedFile;
 import org.sleuthkit.datamodel.Directory;
 import org.sleuthkit.datamodel.File;
+import org.sleuthkit.datamodel.Image;
 import org.sleuthkit.datamodel.LayoutFile;
 import org.sleuthkit.datamodel.ReadContentInputStream;
 import org.sleuthkit.datamodel.TskException;
@@ -102,7 +103,14 @@ public final class ContentUtils {
 
     public static TimeZone getTimeZone(Content c) {
         try {
-            return TimeZone.getTimeZone(c.getImage().getTimeZone());
+            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();
         }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java
index 9c286077d0..b9badf85be 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java
@@ -43,7 +43,23 @@ public class VirtualDirectoryNode extends AbstractAbstractFileNode<VirtualDirect
         super(ld);
 
         this.setDisplayName(nameForLayoutFile(ld));
-        this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/folder-icon-deleted.png");
+        
+        String name = ld.getName();
+        
+        //set icon for name, special case for some built-ins
+        if (name.equals(VirtualDirectory.NAME_UNALLOC)) {
+            this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/folder-icon-deleted.png");
+        }
+        else if (name.equals(VirtualDirectory.NAME_LOCAL)) {
+            this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/folder-local-icon-16.png");
+        }
+        else if (name.equals(VirtualDirectory.NAME_CARVED)) {
+            this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/Folder-icon.png"); //TODO
+        }
+        else {
+            this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/Folder-icon.png");
+        }
+        
     }
 
     @Override
diff --git a/Core/src/org/sleuthkit/autopsy/images/folder-local-icon-16.png b/Core/src/org/sleuthkit/autopsy/images/folder-local-icon-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..0395815b73ae7ab8e3f917c99e87ffb8bc7f571b
GIT binary patch
literal 730
zcmV<00ww*4P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007^Nkl<Zc-pO#
zTSyd99L9e$J3D*vvg_=wmK9}*WTv!ck%rO*Bzg<UD8vfXg6b)PE*J<#2n9VvC?%*Q
zm7ot&M4$<&1m=TgA(=)#1YzVY&E1{ZnT`dC)Pqn5&cpei|Mxqb?|et%ABXf`0gs>c
zT7PR=y=o1M8&T6hGEFR@iW)k0HToyu%(+p<Kdl9?4<Z3lGJRB(IPi&OSoAm?pxWW(
z^C2pV?MUtI?WKyMH0rvJ&FSaD`4NW4{16C$t`VQ)=k#$88EG<MQxIe@#q59anzKh8
zNNsIxR%&W0t*x!>$SdU1<#!AX$ATsRk|q=y`}YOdvs=ZoNf@FM5unk5K`JX;NG&Zb
zR(g6mnVFf3SKwOBd-?_yqPV~*07g9PHu@>tn}Ex0M>k|b5gQZZLtMY;Mrv+uwz9Ia
zs7l<)iGdDkZVd5eL}hwLn5B5cd9gU-z2xmmMAO_DQ9JYB6+)A5xmB(G0tACWy1Kep
zpSq1JSNoax>SA)*AZ)n776VEQX=woxlj1N@n4OccN5;5&Ga0F=smaR8$@vW^KmC%h
zt}r)m5(ztg0VF5hL@$~z4#}o4^$q;a&)mPW38}um-pb9*rMtVEH5;~4bhsPSv@mq>
z@}^A)gi*2^*%gB`HU^vB&df}dWNns5jhmMMJv}`nug~C6(Tf$Qu;b~zB|v9qCn;&!
zD-uQ`I*Ke4AEzMI)zw+~`T4Xze!}+PHa>hD=Tv#w&xBT1S6jV(uka@%@nvd)ox$u-
zP1RM`vcFJUTWb{*6#Nx%`(A_D+0`rgJRT+%rYJseaJb}1(UxU^hK7bx!!R1d;V`PI
zG9R%Xs*0;jQRTS>Q8PruT~3wR`32&HiBTiU_fV)*^LQUroIGay092U;r4S)v;{X5v
M07*qoM6N<$g5+UR7XSbN

literal 0
HcmV?d00001