From 1a9d1f22cd0b503849df91baaf9b3a71163da8ff Mon Sep 17 00:00:00 2001 From: Oliver Spohngellert Date: Wed, 13 Jan 2016 16:35:30 -0500 Subject: [PATCH 1/2] Updated getIconFilePath as per 1855 (implemented in appropriate places --- .../datamodel/BlackboardArtifactNode.java | 2 +- .../autopsy/datamodel/ExtractedContent.java | 96 ++++++++++-------- .../autopsy/images/drive_network.png | Bin 0 -> 585 bytes .../autopsy/images/gps_trackpoint.png | Bin 0 -> 661 bytes .../sleuthkit/autopsy/images/installed.png | Bin 0 -> 1377 bytes 5 files changed, 54 insertions(+), 44 deletions(-) create mode 100755 Core/src/org/sleuthkit/autopsy/images/drive_network.png create mode 100755 Core/src/org/sleuthkit/autopsy/images/gps_trackpoint.png create mode 100755 Core/src/org/sleuthkit/autopsy/images/installed.png diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java index 96b3a85c50..a9aae5e042 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 } /** 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 0000000000000000000000000000000000000000..63d2d5d5b14db0e985bdb96dd5796ae920b7f8a9 GIT binary patch literal 585 zcmV-P0=E5$P)<6hU?M;q=Spa`EfKdc9r) zPauILKg43Oaj{sW^Z88o;39xw7&IDpQ zluRb6R4UPOxopepp_oi25Ak?>TqqQ1zu&74SkNwrLI~0{O;tBdlM;yp4F&^RtyVQ% zzNeE;r_~z~6pcoeaCLttIB&Nb9gjyUm&-Jt&)Yhx91aKC?RI3_wnu<)2Ot3`0$bO0 z%49Oij|5dzp3P>eRVL#Jp-{+605bal3|!t-b^e}wK2N99Nd-fY6h3?@&jB`ku$iax zzssqrikyIF!UN?uYaE8@$J?8@%;1CV^G|G XPW_rzx-w*Y00000NkvXXu0mjf+4B7p literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..78f1f97dcc3026b5cbe20a356df6eb7ea56d97ff GIT binary patch literal 661 zcmV;G0&4wPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf02y>eSaefwW^{L9 za%BKPWN%_+AW3auXJt}lVPtu6$z?nM00IR`L_t(IPmPmJYZFlvhMzmhOoK`lt5P?9 z5UC5HA_Wn_trel*#;Uj}f@0mc7eVkx*p(J>Q57jwH?9OX)e0?C5TT*9>Y~=#*qCI} zNoMZ#Oy&xSO^Of9aPFD+y!YIXQ6}d5eaz3tU^FPjrWhj{2es=Gs{0Dc1V4dTaBLH3SRhKUbP$t|xC1Uo2{U5e!lcV69MaixIAL7q&H^I&=m z+^tCsv4QN9sYx6u$~DD8ex3Pzss1ed@>wb>7T1#8w?ZTunO&=-MrzaXPMfNDg${k$ zey(ecC(CI?HLB8g=rpWOB{g#F%2bw2^l~q%>nP67ciP6NsrkjXnZlmW$q$3a2*+crw8~df1 zriL4F_77rwIo?V|;>$L>k+ue^t5@FJ(0)9QEXwP&nT>2};ARK# vdIs&NHEj(_WuIK_FrPb4kzZ^051N2KzYqffdU?>O00000NkvXXu0mjf+oC0# literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b8872bbcf9f54f7afd563bf0e43fffb387cea35f GIT binary patch literal 1377 zcmbVMZA=?w9KVi@ZM*~oGr*Z~J3_=TdM~uS_Cm$(t~csdB+xnhGPz!_^n~l3*JHG( zlYu&MZ0$@;CSOLj1!iUxqC~P6i6c{VLo&^VE(SEi1zijSJ~&dLJ_U+?KtFiN-Sa&E z=lA=+|F5H}a!-27V<`{>r8_E^YOrR;-z~}Dn?E1pz>=rgYqc8Lt2J|~0NFgUTYw!B zS1(ixoG0|sS3(&CCHX{Gtyb&YNAa?x=i(TBP*MOJg38K+3dc7H8tfM8MZXo9xio~p zqQ{CHFgh`(LJK~zqD2*IS}I+9O9OB5AmvZNWkCukkOYl`gHoeEKn1PHvR(@8<6;zn zmmyk%6#G9vMRtvJyybFCLA^y^tb`D7%aPB0>d#BCs2$m!7<86QWy@eJ_xX; zdc0IM!>-x_CoAI9G=)OZ=H_O7bE#fd>rvcdv7i`%5=03=lmtS4jSH6e0|f~Uj1b^e zQPD)%563lfZn;UbBEZv?5G2LvTvO~1tR@Pi3=MJ$it8~{lHzeKqXSyC@V6W5q64mw zBB0emKyFfbP!DfGf(&x^--hBq;0^VxDuSYLjf~7UNrGQT%e~@uEL2 zi5F-kUPe&GLxP7@WeHx+FeR?z0m~RHxS6yO_-f=N&h9qbj5JLUY$;(!R=J-4lQk4L zgT~wAAMKJ5fgX%+*P0(3*2YKhgPBpmaQytyi7*7|!Vbpf3f^)58H<%C6}EOf?tEfg zv7D5ks=%X>u6Fm+uW)aeGC$3JKlDgu>Df!&l}`J>24BVI9i#p5Xv!Vkjqk74eQ|-5 zb6xN5|GGbK!>zIx4i-liX2Qo#9U1H!;$ufMX6T7mAC7dNIoIjlvhU;0uAKSdhWq79 z(dhPT5Ig1D_+r|&tgM3tBV%7Ge=IG2v+KU&fURrOHSN90p^KNdk4$`ieQZ3saJP5Q zy`7U&xLY^<&cMvXmGn?_DXIPV?F)0Uw9eE`OjBLg;*p2Zp`qApZ&GAukGr_%x0DY& znVC1emt)hv(h+a>@k!g<^w#j!y{(1k-=4S;acTVE!cVEg9pi;_-<`O3Yk2Brw*Hyi zRzrJM$Lnnw^QYyUyw47Y#va^_lHEP8)rEHG_9t)a38&>xTxmP1OTFl=LPE23skc9Q z@XN52hO=%WyXa8&lYJSv>_AcS;NYO56HP_l&F<&UUq5y7>h$TpwyxiMbHW)*OS6l` tkyz@R&%ZUw$oW4~(7D5Bk0ou)g?bnJe-OWYnTh}O9QI1)!`*dle*s^~^UMGM literal 0 HcmV?d00001 From 1c89bef2a8df99430217eea6d8bb8c36d9bcdbda Mon Sep 17 00:00:00 2001 From: Oliver Spohngellert Date: Wed, 13 Jan 2016 16:56:31 -0500 Subject: [PATCH 2/2] Got rid of getIcon method in BlackboardArtifactNode --- .../datamodel/BlackboardArtifactNode.java | 60 +------------------ 1 file changed, 1 insertion(+), 59 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java index a9aae5e042..210d5ef422 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java @@ -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;