diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java index 96b3a85c50..210d5ef422 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java @@ -97,7 +97,7 @@ public class BlackboardArtifactNode extends DisplayableItemNode { this.associated = this.getLookup().lookup(Content.class); this.setName(Long.toString(artifact.getArtifactID())); this.setDisplayName(); - this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/" + getIcon(BlackboardArtifact.ARTIFACT_TYPE.fromID(artifact.getArtifactTypeID()))); //NON-NLS + this.setIconBaseWithExtension(ExtractedContent.getIconFilePath(artifact.getArtifactTypeID())); //NON-NLS } /** @@ -423,65 +423,7 @@ public class BlackboardArtifactNode extends DisplayableItemNode { } return null; } - - // @@@ TODO: Merge with ArtifactTypeNode.getIcon() - private String getIcon(BlackboardArtifact.ARTIFACT_TYPE type) { - switch (type) { - case TSK_WEB_BOOKMARK: - return "bookmarks.png"; //NON-NLS - case TSK_WEB_COOKIE: - return "cookies.png"; //NON-NLS - case TSK_WEB_HISTORY: - return "history.png"; //NON-NLS - case TSK_WEB_DOWNLOAD: - return "downloads.png"; //NON-NLS - case TSK_INSTALLED_PROG: - return "programs.png"; //NON-NLS - case TSK_RECENT_OBJECT: - return "recent_docs.png"; //NON-NLS - case TSK_DEVICE_ATTACHED: - return "usb_devices.png"; //NON-NLS - case TSK_WEB_SEARCH_QUERY: - return "searchquery.png"; //NON-NLS - case TSK_TAG_FILE: - return "blue-tag-icon-16.png"; //NON-NLS - case TSK_TAG_ARTIFACT: - return "green-tag-icon-16.png"; //NON-NLS - case TSK_METADATA_EXIF: - return "camera-icon-16.png"; //NON-NLS - case TSK_EMAIL_MSG: - return "mail-icon-16.png"; //NON-NLS - case TSK_CONTACT: - return "contact.png"; //NON-NLS - case TSK_MESSAGE: - return "message.png"; //NON-NLS - case TSK_CALLLOG: - return "calllog.png"; //NON-NLS - case TSK_CALENDAR_ENTRY: - return "calendar.png"; //NON-NLS - case TSK_SPEED_DIAL_ENTRY: - return "speeddialentry.png"; //NON-NLS - case TSK_BLUETOOTH_PAIRING: - return "bluetooth.png"; //NON-NLS - case TSK_GPS_BOOKMARK: - return "gpsfav.png"; //NON-NLS - case TSK_GPS_LAST_KNOWN_LOCATION: - return "gps-lastlocation.png"; //NON-NLS - case TSK_GPS_SEARCH: - return "gps-search.png"; //NON-NLS - case TSK_SERVICE_ACCOUNT: - return "account-icon-16.png"; //NON-NLS - case TSK_ENCRYPTION_DETECTED: - return "encrypted-file.png"; //NON-NLS - case TSK_EXT_MISMATCH_DETECTED: - return "mismatch-16.png"; //NON-NLS - case TSK_OS_INFO: - return "computer.png"; //NON-NLS - default: - return "artifact-icon.png"; //NON-NLS - } - } - + @Override public boolean isLeafTypeNode() { return true; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java index b1d3d50174..2e03c39a03 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java @@ -84,58 +84,68 @@ public class ExtractedContent implements AutopsyVisitableItem { return skCase; } - static String getIcon(BlackboardArtifact.Type type) { - int typeID = type.getTypeID(); + static String getIconFilePath(int typeID) { + String filePath = "org/sleuthkit/autopsy/images/"; if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_BOOKMARK.getTypeID()) { - return "bookmarks.png"; //NON-NLS + return filePath + "bookmarks.png"; //NON-NLS } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_COOKIE.getTypeID()) { - return "cookies.png"; //NON-NLS + return filePath + "cookies.png"; //NON-NLS } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_HISTORY.getTypeID()) { - return "history.png"; //NON-NLS + return filePath + "history.png"; //NON-NLS } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_DOWNLOAD.getTypeID()) { - return "downloads.png"; //NON-NLS - } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_INSTALLED_PROG.getTypeID()) { - return "programs.png"; //NON-NLS + return filePath + "downloads.png"; //NON-NLS } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_RECENT_OBJECT.getTypeID()) { - return "recent_docs.png"; //NON-NLS + return filePath + "recent_docs.png"; //NON-NLS + } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_TRACKPOINT.getTypeID()) { + return filePath + "gps_trackpoint.png"; //NON-NLS + } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_INSTALLED_PROG.getTypeID()) { + return filePath + "programs.png"; //NON-NLS } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_DEVICE_ATTACHED.getTypeID()) { - return "usb_devices.png"; //NON-NLS - } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_SEARCH_QUERY.getTypeID()) { - return "searchquery.png"; //NON-NLS - } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_METADATA_EXIF.getTypeID()) { - return "camera-icon-16.png"; //NON-NLS + return filePath + "usb_devices.png"; //NON-NLS } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_EMAIL_MSG.getTypeID()) { - return "mail-icon-16.png"; //NON-NLS - } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_CONTACT.getTypeID()) { - return "contact.png"; //NON-NLS - } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_MESSAGE.getTypeID()) { - return "message.png"; //NON-NLS - } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_CALLLOG.getTypeID()) { - return "calllog.png"; //NON-NLS - } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_CALENDAR_ENTRY.getTypeID()) { - return "calendar.png"; //NON-NLS - } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_SPEED_DIAL_ENTRY.getTypeID()) { - return "speeddialentry.png"; //NON-NLS - } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_BLUETOOTH_PAIRING.getTypeID()) { - return "bluetooth.png"; //NON-NLS - } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_BOOKMARK.getTypeID()) { - return "gpsfav.png"; //NON-NLS - } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_LAST_KNOWN_LOCATION.getTypeID()) { - return "gps-lastlocation.png"; //NON-NLS - } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_SEARCH.getTypeID()) { - return "gps-search.png"; //NON-NLS - } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_SERVICE_ACCOUNT.getTypeID()) { - return "account-icon-16.png"; //NON-NLS - } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_ENCRYPTION_DETECTED.getTypeID()) { - return "encrypted-file.png"; //NON-NLS - } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_EXT_MISMATCH_DETECTED.getTypeID()) { - return "mismatch-16.png"; //NON-NLS + return filePath + "mail-icon-16.png"; //NON-NLS + } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_EXTRACTED_TEXT.getTypeID()) { + return filePath + "text-file.png"; //NON-NLS + } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_SEARCH_QUERY.getTypeID()) { + return filePath + "searchquery.png"; //NON-NLS + } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_METADATA_EXIF.getTypeID()) { + return filePath + "camera-icon-16.png"; //NON-NLS } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_OS_INFO.getTypeID()) { - return "computer.png"; //NON-NLS + return filePath + "computer.png"; //NON-NLS + } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_SERVICE_ACCOUNT.getTypeID()) { + return filePath + "account-icon-16.png"; //NON-NLS + } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_CONTACT.getTypeID()) { + return filePath + "contact.png"; //NON-NLS + } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_MESSAGE.getTypeID()) { + return filePath + "message.png"; //NON-NLS + } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_CALLLOG.getTypeID()) { + return filePath + "calllog.png"; //NON-NLS + } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_CALENDAR_ENTRY.getTypeID()) { + return filePath + "calendar.png"; //NON-NLS + } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_SPEED_DIAL_ENTRY.getTypeID()) { + return filePath + "speeddialentry.png"; //NON-NLS + } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_BLUETOOTH_PAIRING.getTypeID()) { + return filePath + "bluetooth.png"; //NON-NLS + } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_BOOKMARK.getTypeID()) { + return filePath + "gpsfav.png"; //NON-NLS + } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_LAST_KNOWN_LOCATION.getTypeID()) { + return filePath + "gps-lastlocation.png"; //NON-NLS + } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_SEARCH.getTypeID()) { + return filePath + "gps-search.png"; //NON-NLS + } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_PROG_RUN.getTypeID()) { + return filePath + "installed.png"; //NON-NLS + } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_ENCRYPTION_DETECTED.getTypeID()) { + return filePath + "encrypted-file.png"; //NON-NLS + } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_EXT_MISMATCH_DETECTED.getTypeID()) { + return filePath + "mismatch-16.png"; //NON-NLS + } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_ROUTE.getTypeID()) { + return filePath + "gps_trackpoint.png"; //NON-NLS + } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_REMOTE_DRIVE.getTypeID()) { + return filePath + "drive_network.png"; //NON-NLS } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_FACE_DETECTED.getTypeID()) { - return "face.png"; //NON-NLS + return filePath + "face.png"; //NON-NLS } - return "artifact-icon.png"; //NON-NLS + return filePath + "artifact-icon.png"; //NON-NLS } public class RootNode extends DisplayableItemNode { @@ -337,7 +347,7 @@ public class ExtractedContent implements AutopsyVisitableItem { super(Children.create(new ArtifactFactory(type), true), Lookups.singleton(type.getDisplayName())); super.setName(type.getTypeName()); this.type = type; - this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/" + ExtractedContent.getIcon(type)); //NON-NLS + this.setIconBaseWithExtension(ExtractedContent.getIconFilePath(type.getTypeID())); //NON-NLS updateDisplayName(); } diff --git a/Core/src/org/sleuthkit/autopsy/images/drive_network.png b/Core/src/org/sleuthkit/autopsy/images/drive_network.png new file mode 100755 index 0000000000..63d2d5d5b1 Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/images/drive_network.png differ diff --git a/Core/src/org/sleuthkit/autopsy/images/gps_trackpoint.png b/Core/src/org/sleuthkit/autopsy/images/gps_trackpoint.png new file mode 100755 index 0000000000..78f1f97dcc Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/images/gps_trackpoint.png differ diff --git a/Core/src/org/sleuthkit/autopsy/images/installed.png b/Core/src/org/sleuthkit/autopsy/images/installed.png new file mode 100755 index 0000000000..b8872bbcf9 Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/images/installed.png differ