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 0000000000..046f049a48 Binary files /dev/null and b/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/camera-icon-16.png differ 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