From 08d30ecf349d1f2d879e45492803c84c8527d7bb Mon Sep 17 00:00:00 2001
From: Ethan Roseman <eroseman@basistech.com>
Date: Tue, 31 Mar 2020 13:28:51 -0400
Subject: [PATCH] 6163 Addressing PR comments

---
 .../datamodel/BlackboardArtifactNode.java     |  3 +-
 .../autopsy/datamodel/ExtractedContent.java   | 82 +------------------
 .../autopsy/datamodel/utils/IconsUtil.java    |  2 +-
 .../autopsy/geolocation/GeoFilterPanel.java   |  5 +-
 4 files changed, 8 insertions(+), 84 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
index 8358dd7d34..15bc46a8da 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
@@ -75,6 +75,7 @@ import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.datamodel.Tag;
 import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskData;
+import org.sleuthkit.autopsy.datamodel.utils.IconsUtil;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepository;
 import static org.sleuthkit.autopsy.datamodel.AbstractContentNode.NO_DESCR;
 import org.sleuthkit.autopsy.texttranslation.TextTranslationService;
@@ -270,7 +271,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
      * @param artifact The artifact to represent.
      */
     public BlackboardArtifactNode(BlackboardArtifact artifact) {
-        this(artifact, ExtractedContent.getIconFilePath(artifact.getArtifactTypeID()));
+        this(artifact, IconsUtil.getIconFilePath(artifact.getArtifactTypeID()));
     }
 
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java
index ac1aace216..2aac379ceb 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java
@@ -37,6 +37,7 @@ import org.openide.util.lookup.Lookups;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.autopsy.datamodel.utils.IconsUtil;
 import org.sleuthkit.autopsy.ingest.IngestManager;
 import org.sleuthkit.autopsy.ingest.ModuleDataEvent;
 import org.sleuthkit.datamodel.Blackboard;
@@ -98,85 +99,6 @@ public class ExtractedContent implements AutopsyVisitableItem {
         return skCase;
     }
 
-    @SuppressWarnings("deprecation")
-    static String getIconFilePath(int typeID) {
-        String filePath = "org/sleuthkit/autopsy/images/"; //NON-NLS
-        if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_BOOKMARK.getTypeID()) {
-            return filePath + "bookmarks.png"; //NON-NLS
-        } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_COOKIE.getTypeID()) {
-            return filePath + "cookies.png"; //NON-NLS
-        } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_HISTORY.getTypeID()) {
-            return filePath + "history.png"; //NON-NLS
-        } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_DOWNLOAD.getTypeID()) {
-            return filePath + "downloads.png"; //NON-NLS
-        } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_RECENT_OBJECT.getTypeID()) {
-            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 filePath + "usb_devices.png"; //NON-NLS
-        } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_EMAIL_MSG.getTypeID()) {
-            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 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()
-                || typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_ENCRYPTION_SUSPECTED.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()
-                || typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_TRACK.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 filePath + "face.png"; //NON-NLS
-        } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_WIFI_NETWORK.getTypeID()) {
-            return filePath + "network-wifi.png"; //NON-NLS
-        } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_WIFI_NETWORK_ADAPTER.getTypeID()) {
-            return filePath + "network-wifi.png"; //NON-NLS
-        } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_SIM_ATTACHED.getTypeID()) {
-            return filePath + "sim_card.png"; //NON-NLS
-        } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_BLUETOOTH_ADAPTER.getTypeID()) {
-            return filePath + "Bluetooth.png"; //NON-NLS
-        } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_DEVICE_INFO.getTypeID()) {
-            return filePath + "devices.png"; //NON-NLS
-        } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_VERIFICATION_FAILED.getTypeID()) {
-            return filePath + "validationFailed.png"; //NON-NLS
-        }
-        return filePath + "artifact-icon.png"; //NON-NLS
-    }
-
     public class RootNode extends DisplayableItemNode {
 
         public RootNode(SleuthkitCase skCase) {
@@ -368,7 +290,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(ExtractedContent.getIconFilePath(type.getTypeID())); //NON-NLS
+            this.setIconBaseWithExtension(IconsUtil.getIconFilePath(type.getTypeID())); //NON-NLS
             updateDisplayName();
         }
 
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/utils/IconsUtil.java b/Core/src/org/sleuthkit/autopsy/datamodel/utils/IconsUtil.java
index a40ce7046b..8f6dde74b3 100755
--- a/Core/src/org/sleuthkit/autopsy/datamodel/utils/IconsUtil.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/utils/IconsUtil.java
@@ -26,7 +26,7 @@ import org.sleuthkit.datamodel.BlackboardArtifact;
 public class IconsUtil {
     @SuppressWarnings("deprecation")
     public static String getIconFilePath(int typeID) {
-        String filePath = "org/sleuthkit/autopsy/images/"; //NON-NLS
+        String filePath = "/org/sleuthkit/autopsy/images/"; //NON-NLS
         if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_BOOKMARK.getTypeID()) {
             return filePath + "bookmarks.png"; //NON-NLS
         } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_COOKIE.getTypeID()) {
diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/GeoFilterPanel.java b/Core/src/org/sleuthkit/autopsy/geolocation/GeoFilterPanel.java
index 54c4982aef..ca8ff5d872 100755
--- a/Core/src/org/sleuthkit/autopsy/geolocation/GeoFilterPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/geolocation/GeoFilterPanel.java
@@ -66,7 +66,8 @@ class GeoFilterPanel extends javax.swing.JPanel {
         ARTIFACT_TYPE.TSK_GPS_ROUTE,
         ARTIFACT_TYPE.TSK_GPS_SEARCH,
         ARTIFACT_TYPE.TSK_GPS_TRACK,
-        ARTIFACT_TYPE.TSK_GPS_TRACKPOINT
+        ARTIFACT_TYPE.TSK_GPS_TRACKPOINT,
+        ARTIFACT_TYPE.TSK_METADATA_EXIF
     };
 
     /**
@@ -523,7 +524,7 @@ class GeoFilterPanel extends javax.swing.JPanel {
                 }
                 for (Map.Entry<ARTIFACT_TYPE, Long> entry : sources.artifactTypes.entrySet()) {
                     String dispName = entry.getKey().getDisplayName() + " (" + entry.getValue() + ")";
-                    String iconPath = File.separator + IconsUtil.getIconFilePath(entry.getKey().getTypeID());
+                    String iconPath = IconsUtil.getIconFilePath(entry.getKey().getTypeID());
                     Icon icon = new ImageIcon(getClass().getResource(iconPath));
                     atCheckboxPanel.addElement(dispName, icon, entry.getKey());
                 }