From 95bd13cc9b7ff07997d50a2cc6bd27e19efe2447 Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Tue, 28 Aug 2012 12:00:00 -0400
Subject: [PATCH] Add exif artifact nodes to extr. content Add more missing
 icons

---
 .../sleuthkit/autopsy/images/camera-icon-16.png   | Bin 0 -> 672 bytes
 .../autopsy/datamodel/ArtifactTypeNode.java       |   3 ++-
 .../autopsy/datamodel/BlackboardArtifactNode.java |   6 ++++++
 .../datamodel/ExtractedContentChildren.java       |   1 +
 4 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/camera-icon-16.png

diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/camera-icon-16.png b/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/camera-icon-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..046f049a487675b35e0f28f3ef09ebe7f75ab714
GIT binary patch
literal 672
zcmV;R0$=@!P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007KNkl<Zc-pN~
zO-NKx7(L(noA;hN^VCM9GAl_6`q9u9(#BOGT38V+#D%mh7on5o5J_QBw5!Y(L5K_6
z6!e2uv<L$wXc3B<4QWD6TH|Ch<IH>W?(H@PO06ot&He7Z-#r}8IhXLCMXLtT5@`2p
zn!2X*;`y<^2AJ;MT>L6lbASFjm6flZYB22g5s>`bC<k{_nUzS9bU8I%(ijTSg~mK3
zcw&#^EPMf%P4ILIoD|4NLY3UiQ<q7wxd+;&29P8p9sdX|Hi+xJqcWX6>b1@t%bJhJ
z;!t;WAoZpLrpoZnJdUBM4RDx@?S-FFsr7)iwh3Z7?D<Kk(_OeWz;fx#Vbd2pnjMYX
z97rdjNDd})g19?o0Tuh;N(!{eVU+6;)Ji9jWSU^1z%UGSJxW;AR<HZok7Pv?w&2QK
z7+ycFzHP=-*?!E0Bap<g$I3<Vcs~L=Uw~%&0m%bh1G@SJK;VGpYd>U06F>D~Hq3Q<
z(K%9!LGKR8f)NRslP;mk6G2nn01CeKfsvj8xcPL^qSiXq*LKje#DFuH;^ubrGKTU?
zFcJzw5&-@}KdQct<J7i$u){CGB@KoObU(8#YN?TZr|Z<{Vu~;M%2J4}Z^E64-I&WS
zgd?0Th<-xtmIO*a1dx_JnK@k}+<Kn2sJR-s!Fnl@u$MzAr(N)(YK$&c!r=-^vqQ+4
z>4PIJXTwlAZafh#^mJd*Di$uy=uV`7uLw3VK>5|Xf*f0sD-!#pnjd~`wHDEXhmSYf
zT(4vxKj+BfoC|s2%|!0c)GiQ_ExL#dHmj07yn3JMU+V`S>gDK2#Vj8H0000<MNUMn
GLSTZe^*r4G

literal 0
HcmV?d00001

diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeNode.java b/DataModel/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeNode.java
index 984ea53c56..d198b3c22a 100644
--- a/DataModel/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeNode.java
+++ b/DataModel/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeNode.java
@@ -100,7 +100,8 @@ public class ArtifactTypeNode extends DisplayableItemNode {
                 return "usb_devices.png";
             case TSK_WEB_SEARCH_QUERY:
                 return "searchquery.png";
-
+            case TSK_METADATA_EXIF:
+                return "camera-icon-16.png";
         }
         return "artifact-icon.png";
     }
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java b/DataModel/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
index b96dbedd49..04104e8d8d 100644
--- a/DataModel/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
+++ b/DataModel/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
@@ -228,10 +228,16 @@ public class BlackboardArtifactNode extends DisplayableItemNode {
                 return "programs.png";
             case TSK_RECENT_OBJECT:
                 return "recent_docs.png";
+            case TSK_DEVICE_ATTACHED:
+                return "usb_devices.png";
+            case TSK_WEB_SEARCH_QUERY:
+                return "searchquery.png";
             case TSK_TAG_FILE:
                 return "blue-tag-icon-16.png";
             case TSK_TAG_ARTIFACT:
                 return "green-tag-icon-16.png";
+            case TSK_METADATA_EXIF:
+                return "camera-icon-16.png";
         }
         return "artifact-icon.png";
     }
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/ExtractedContentChildren.java b/DataModel/src/org/sleuthkit/autopsy/datamodel/ExtractedContentChildren.java
index f4e9f7d844..94b65a9d35 100644
--- a/DataModel/src/org/sleuthkit/autopsy/datamodel/ExtractedContentChildren.java
+++ b/DataModel/src/org/sleuthkit/autopsy/datamodel/ExtractedContentChildren.java
@@ -48,6 +48,7 @@ public class ExtractedContentChildren extends ChildFactory<BlackboardArtifact.AR
         list.add(BlackboardArtifact.ARTIFACT_TYPE.TSK_INSTALLED_PROG);
         list.add(BlackboardArtifact.ARTIFACT_TYPE.TSK_DEVICE_ATTACHED);
         list.add(BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_SEARCH_QUERY);
+        list.add(BlackboardArtifact.ARTIFACT_TYPE.TSK_METADATA_EXIF);
         return true;
     }