Merge pull request #7421 from sleuthkit/develop

Merge develop into new_table_load

Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationAttributeUtil.java

@@ -135,14 +135,18 @@ public class CorrelationAttributeUtil {
      *
      * @return A list, possibly empty, of correlation attribute instances for
      *         the AnalysisResult.
+     *
+     * @SuppressWarnings("deprecation") - we need to support already existing
+     * interesting file and artifact hits.
      */
+    @SuppressWarnings("deprecation")
     public static List<CorrelationAttributeInstance> makeCorrAttrsForSearch(AnalysisResult analysisResult) {
         List<CorrelationAttributeInstance> correlationAttrs = new ArrayList<>();
 
         if (CentralRepository.isEnabled()) {
             try {
                 int artifactTypeID = analysisResult.getArtifactTypeID();
-                if (artifactTypeID == ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getTypeID()) {
+                if (artifactTypeID == ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getTypeID() || artifactTypeID == ARTIFACT_TYPE.TSK_INTERESTING_ITEM.getTypeID()) {
                     //because this attribute retrieval is only occuring when the analysis result is an interesting artifact hit 
                     //and only one attribute is being retrieved the analysis result's own get attribute method can be used efficently
                     BlackboardAttribute assocArtifactAttr = analysisResult.getAttribute(BlackboardAttribute.Type.TSK_ASSOCIATED_ARTIFACT);

Core/src/org/sleuthkit/autopsy/contentviewers/annotations/AnnotationUtils.java

@@ -73,6 +73,7 @@ public class AnnotationUtils {
         "AnnotationUtils.fileHitEntry.artifactCommentTitle=Artifact Comment",
         "AnnotationUtils.fileHitEntry.hashSetHitTitle=Hash Set Hit Comments",
         "AnnotationUtils.fileHitEntry.interestingFileHitTitle=Interesting File Hit Comments",
+        "AnnotationUtils.fileHitEntry.interestingItemTitle=Interesting Item Comments",
         "AnnotationUtils.fileHitEntry.setName=Set Name:",
         "AnnotationUtils.fileHitEntry.comment=Comment:",
         "AnnotationUtils.sourceFile.title=Source File",
@@ -94,8 +95,8 @@ public class AnnotationUtils {
     private static final SectionConfig<Tag> TAG_CONFIG
             = new SectionConfig<>(Bundle.AnnotationUtils_tagEntry_title(), TAG_ENTRIES);
 
-    // file set attributes and table configurations
+    // Item set attributes and table configurations
-    private static final List<ItemEntry<BlackboardArtifact>> FILESET_HIT_ENTRIES = Arrays.asList(
+    private static final List<ItemEntry<BlackboardArtifact>> ITEMSET_HIT_ENTRIES = Arrays.asList(
             new ItemEntry<>(Bundle.AnnotationUtils_fileHitEntry_setName(),
                     (bba) -> tryGetAttribute(bba, BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME)),
             new ItemEntry<>(Bundle.AnnotationUtils_fileHitEntry_comment(),
@@ -103,13 +104,16 @@ public class AnnotationUtils {
     );
 
     private static final SectionConfig<BlackboardArtifact> INTERESTING_FILE_CONFIG
-            = new SectionConfig<>(Bundle.AnnotationUtils_fileHitEntry_interestingFileHitTitle(), FILESET_HIT_ENTRIES);
+            = new SectionConfig<>(Bundle.AnnotationUtils_fileHitEntry_interestingFileHitTitle(), ITEMSET_HIT_ENTRIES);
+
+    private static final SectionConfig<BlackboardArtifact> INTERESTING_ITEM_CONFIG
+            = new SectionConfig<>(Bundle.AnnotationUtils_fileHitEntry_interestingItemTitle(), ITEMSET_HIT_ENTRIES);
 
     private static final SectionConfig<BlackboardArtifact> HASHSET_CONFIG
-            = new SectionConfig<>(Bundle.AnnotationUtils_fileHitEntry_hashSetHitTitle(), FILESET_HIT_ENTRIES);
+            = new SectionConfig<>(Bundle.AnnotationUtils_fileHitEntry_hashSetHitTitle(), ITEMSET_HIT_ENTRIES);
 
     private static final SectionConfig<BlackboardArtifact> ARTIFACT_COMMENT_CONFIG
-            = new SectionConfig<>(Bundle.AnnotationUtils_fileHitEntry_artifactCommentTitle(), FILESET_HIT_ENTRIES);
+            = new SectionConfig<>(Bundle.AnnotationUtils_fileHitEntry_artifactCommentTitle(), ITEMSET_HIT_ENTRIES);
 
     // central repository attributes and table configuration
     private static final List<ItemEntry<CorrelationAttributeInstance>> CR_COMMENTS_ENTRIES = Arrays.asList(
@@ -199,7 +203,11 @@ public class AnnotationUtils {
      *                      comes.
      *
      * @return If any content was actually rendered.
+     *
+     * @SuppressWarnings("deprecation") - we need to support already existing
+     * interesting file and artifact hits.
      */
+    @SuppressWarnings("deprecation")
     private static boolean renderArtifact(Element parent, BlackboardArtifact bba, Content sourceContent) {
         boolean contentRendered = appendEntries(parent, TAG_CONFIG, getTags(bba), false, true);
 
@@ -211,7 +219,7 @@ public class AnnotationUtils {
 
         // if artifact is a hashset hit or interesting file and has a non-blank comment
         if ((BlackboardArtifact.ARTIFACT_TYPE.TSK_HASHSET_HIT.getTypeID() == bba.getArtifactTypeID()
-                || BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID() == bba.getArtifactTypeID())
+                || BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID() == bba.getArtifactTypeID() || BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ITEM.getTypeID() == bba.getArtifactTypeID())
                 && (hasTskComment(bba))) {
 
             boolean filesetRendered = appendEntries(parent, ARTIFACT_COMMENT_CONFIG, Arrays.asList(bba), false, !contentRendered);
@@ -242,7 +250,11 @@ public class AnnotationUtils {
      *                      subheader as opposed to a top-level header.
      *
      * @return If any content was actually rendered.
+     *
+     * @SuppressWarnings("deprecation") - we need to support already existing
+     * interesting file and artifact hits.
      */
+    @SuppressWarnings("deprecation")
     private static boolean renderContent(Element parent, Content sourceContent, boolean isSubheader) {
         boolean contentRendered = appendEntries(parent, TAG_CONFIG, getTags(sourceContent), isSubheader, true);
 
@@ -266,7 +278,12 @@ public class AnnotationUtils {
                     isSubheader,
                     !contentRendered);
 
-            contentRendered = contentRendered || hashsetRendered || interestingFileRendered;
+            boolean interestingItemRendered = appendEntries(parent, INTERESTING_ITEM_CONFIG,
+                    getFileSetHits(sourceFile, BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ITEM),
+                    isSubheader,
+                    !contentRendered);
+
+            contentRendered = contentRendered || hashsetRendered || interestingFileRendered || interestingItemRendered;
         }
         return contentRendered;
     }

Core/src/org/sleuthkit/autopsy/contentviewers/annotations/AnnotationsContentViewer.java

@@ -73,9 +73,15 @@ public class AnnotationsContentViewer extends javax.swing.JPanel implements Data
 
     private static final Set<IngestManager.IngestModuleEvent> INGEST_MODULE_EVENTS_OF_INTEREST = EnumSet.of(IngestManager.IngestModuleEvent.DATA_ADDED);
 
+    /**
+     * @SuppressWarnings("deprecation") - we need to support already existing
+     * interesting file and artifact hits.
+     */
+    @SuppressWarnings("deprecation")
     private static final Set<BlackboardArtifact.Type> ARTIFACT_TYPES_OF_INTEREST = ImmutableSet.of(
             BlackboardArtifact.Type.TSK_HASHSET_HIT,
-            BlackboardArtifact.Type.TSK_INTERESTING_FILE_HIT
+            BlackboardArtifact.Type.TSK_INTERESTING_FILE_HIT,
+            BlackboardArtifact.Type.TSK_INTERESTING_ITEM
     );
 
     private final PropertyChangeListener ingestEventListener = (evt) -> {

Core/src/org/sleuthkit/autopsy/contentviewers/annotations/Bundle.properties-MERGED

@@ -10,6 +10,7 @@ AnnotationUtils.fileHitEntry.artifactCommentTitle=Artifact Comment
 AnnotationUtils.fileHitEntry.comment=Comment:
 AnnotationUtils.fileHitEntry.hashSetHitTitle=Hash Set Hit Comments
 AnnotationUtils.fileHitEntry.interestingFileHitTitle=Interesting File Hit Comments
+AnnotationUtils.fileHitEntry.interestingItemTitle=Interesting Item Comments
 AnnotationUtils.fileHitEntry.setName=Set Name:
 AnnotationUtils.onEmpty=No annotations were found for this particular item.
 AnnotationUtils.sourceFile.title=Source File

Core/src/org/sleuthkit/autopsy/datamodel/Artifacts.java

@@ -64,6 +64,7 @@ import static org.sleuthkit.datamodel.BlackboardArtifact.Type.TSK_INTERESTING_AR
 import static org.sleuthkit.datamodel.BlackboardArtifact.Type.TSK_INTERESTING_FILE_HIT;
 import static org.sleuthkit.datamodel.BlackboardArtifact.Type.TSK_GEN_INFO;
 import static org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE.TSK_DOWNLOAD_SOURCE;
+import static org.sleuthkit.datamodel.BlackboardArtifact.Type.TSK_INTERESTING_ITEM;
 import static org.sleuthkit.datamodel.BlackboardArtifact.Type.TSK_TL_EVENT;
 import static org.sleuthkit.datamodel.BlackboardArtifact.Type.TSK_ASSOCIATED_OBJECT;
 import static org.sleuthkit.datamodel.BlackboardArtifact.Type.TSK_KEYWORD_HIT;
@@ -239,7 +240,11 @@ public class Artifacts {
          *                is less than or equal to 0, no filtering will occur.
          *
          * @return The generated key.
+         *
+         * @SuppressWarnings("deprecation") - we need to support already
+         * existing interesting file and artifact hits.
          */
+        @SuppressWarnings("deprecation")
         private static TypeNodeKey getTypeKey(BlackboardArtifact.Type type, SleuthkitCase skCase, long dsObjId) {
             int typeId = type.getTypeID();
             if (TSK_EMAIL_MSG.getTypeID() == typeId) {
@@ -254,6 +259,9 @@ public class Artifacts {
                 KeywordHits.RootNode keywordsNode = new KeywordHits(skCase, dsObjId).new RootNode();
                 return new TypeNodeKey(keywordsNode, TSK_KEYWORD_HIT);
 
+            } else if (TSK_INTERESTING_ITEM.getTypeID() == typeId) {
+                InterestingHits.RootNode interestingHitsNode = new InterestingHits(skCase, TSK_INTERESTING_ITEM, dsObjId).new RootNode();
+                return new TypeNodeKey(interestingHitsNode, TSK_INTERESTING_ITEM);
             } else if (TSK_INTERESTING_ARTIFACT_HIT.getTypeID() == typeId) {
                 InterestingHits.RootNode interestingHitsNode = new InterestingHits(skCase, TSK_INTERESTING_ARTIFACT_HIT, dsObjId).new RootNode();
                 return new TypeNodeKey(interestingHitsNode, TSK_INTERESTING_ARTIFACT_HIT);

Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java

@@ -149,9 +149,14 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     /*
      * Artifact types for which the file metadata of the artifact's source file
      * should be displayed in the node's property sheet.
+     *
+     * @SuppressWarnings("deprecation") - we need to support already existing
+     * interesting file and artifact hits.
      */
+    @SuppressWarnings("deprecation")
     private static final Integer[] SHOW_FILE_METADATA = new Integer[]{
-        BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID()
+        BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID(),
+        BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ITEM.getTypeID()
     };
 
     private final BlackboardArtifact artifact;
@@ -868,6 +873,11 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         "BlackboardArtifactNode.createSheet.path.displayName=Path",
         "BlackboardArtifactNode.createSheet.path.name=Path"
     })
+    /*
+     * @SuppressWarnings("deprecation") - we need to support already existing
+     * interesting file and artifact hits.
+     */
+    @SuppressWarnings("deprecation")
     @Override
     protected Sheet createSheet() {
         /*
@@ -925,7 +935,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
          * hit, add the type and description of the interesting artifact to the
          * sheet.
          */
-        if (artifact.getArtifactTypeID() == ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getTypeID()) {
+        if (artifact.getArtifactTypeID() == ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getTypeID() || artifact.getArtifactTypeID() == ARTIFACT_TYPE.TSK_INTERESTING_ITEM.getTypeID()) {
             try {
                 BlackboardAttribute attribute = artifact.getAttribute(new BlackboardAttribute.Type(ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT));
                 if (attribute != null) {
@@ -946,7 +956,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                             associatedArtifact.getShortDescription()));
                 }
             } catch (TskCoreException | NoCurrentCaseException ex) {
-                logger.log(Level.SEVERE, MessageFormat.format("Error getting associated artifact of TSK_INTERESTING_ARTIFACT_HIT artifact (objID={0}))", artifact.getId()), ex); //NON-NLS
+                logger.log(Level.SEVERE, MessageFormat.format("Error getting associated artifact with type " + artifact.getArtifactTypeName() + " artifact (objID={0}))", artifact.getId()), ex); //NON-NLS
             }
         }
 

Core/src/org/sleuthkit/autopsy/datasourcesummary/datamodel/AnalysisSummary.java

@@ -106,9 +106,13 @@ public class AnalysisSummary {
      *
      * @throws SleuthkitCaseProviderException
      * @throws TskCoreException
+     *
+     * @SuppressWarnings("deprecation") - we need to support already existing
+     * interesting file and artifact hits.
      */
+    @SuppressWarnings("deprecation")
     public List<Pair<String, Long>> getInterestingItemCounts(DataSource dataSource) throws SleuthkitCaseProviderException, TskCoreException {
-        return getCountsData(dataSource, TYPE_SET_NAME, ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT, ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT);
+        return getCountsData(dataSource, TYPE_SET_NAME, ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT, ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT, ARTIFACT_TYPE.TSK_INTERESTING_ITEM);
     }
 
     /**

Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/AnalysisSummaryGetter.java

@@ -38,9 +38,15 @@ import org.sleuthkit.datamodel.TskCoreException;
  */
 public class AnalysisSummaryGetter implements DefaultArtifactUpdateGovernor {
 
+    /**
+     * @SuppressWarnings("deprecation") - we need to support already existing
+     * interesting file and artifact hits.
+     */
+    @SuppressWarnings("deprecation")
     private static final Set<Integer> ARTIFACT_UPDATE_TYPE_IDS = new HashSet<>(Arrays.asList(
             ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID(),
             ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getTypeID(),
+            ARTIFACT_TYPE.TSK_INTERESTING_ITEM.getTypeID(),
             ARTIFACT_TYPE.TSK_HASHSET_HIT.getTypeID(),
             ARTIFACT_TYPE.TSK_KEYWORD_HIT.getTypeID()
     ));

Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/PastCasesSummaryGetter.java

@@ -38,9 +38,15 @@ import org.sleuthkit.datamodel.TskCoreException;
  */
 public class PastCasesSummaryGetter implements DefaultArtifactUpdateGovernor {
 
+    /**
+     * @SuppressWarnings("deprecation") - we need to support already existing
+     * interesting file and artifact hits.
+     */
+    @SuppressWarnings("deprecation")
     private static final Set<Integer> ARTIFACT_UPDATE_TYPE_IDS = new HashSet<>(Arrays.asList(
             ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID(),
-            ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getTypeID()
+            ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getTypeID(),
+            ARTIFACT_TYPE.TSK_INTERESTING_ITEM.getTypeID()
     ));
 
     private final PastCasesSummary pastSummary;

Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java

@@ -1340,7 +1340,11 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
      * DirectoryTreeTopComponent.viewArtifact, ViewContextAction
      *
      * @param art The artifact.
+     *
+     * @SuppressWarnings("deprecation") - we need to support already existing
+     * interesting file and artifact hits.
      */
+    @SuppressWarnings("deprecation")
     public void viewArtifact(final BlackboardArtifact art) {
         int typeID = art.getArtifactTypeID();
         String typeName = art.getArtifactTypeName();
@@ -1367,6 +1371,8 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
             treeNode = getInterestingItemNode(typesChildren, BlackboardArtifact.Type.TSK_INTERESTING_FILE_HIT, art);
         } else if (typeID == BlackboardArtifact.Type.TSK_INTERESTING_ARTIFACT_HIT.getTypeID()) {
             treeNode = getInterestingItemNode(typesChildren, BlackboardArtifact.Type.TSK_INTERESTING_ARTIFACT_HIT, art);
+        } else if (typeID == BlackboardArtifact.Type.TSK_INTERESTING_ITEM.getTypeID()) {
+            treeNode = getInterestingItemNode(typesChildren, BlackboardArtifact.Type.TSK_INTERESTING_ITEM, art);
         } else if (typeID == BlackboardArtifact.Type.TSK_EMAIL_MSG.getTypeID()) {
             treeNode = getEmailNode(typesChildren, art);
         } else if (typeID == BlackboardArtifact.Type.TSK_ACCOUNT.getTypeID()) {

Core/src/org/sleuthkit/autopsy/discovery/search/DiscoveryAttributes.java

@@ -791,8 +791,8 @@ public class DiscoveryAttributes {
                 CentralRepository centralRepoDb, SearchContext context) throws DiscoveryException, SearchCancellationException {
 
             // Get pairs of (object ID, interesting item set name) for all files in the list of files that have
-            // interesting file set hits.
+            // interesting item set hits.
-            String selectQuery = createSetNameClause(results, BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID(),
+            String selectQuery = createSetNameClause(results, BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ITEM.getTypeID(),
                     BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME.getTypeID());
 
             InterestingFileSetNamesCallback callback = new InterestingFileSetNamesCallback(results);

Core/src/org/sleuthkit/autopsy/discovery/search/SearchFiltering.java

@@ -870,13 +870,19 @@ public class SearchFiltering {
             this.setNames = setNames;
         }
 
+        /**
+         * @SuppressWarnings("deprecation") - we need to support already
+         * existing interesting file and artifact hits.
+         */
+        @SuppressWarnings("deprecation")
         @Override
         public String getWhereClause() {
             String intItemSetPart = concatenateNamesForSQL(setNames);
 
             String queryStr = "(obj_id IN (SELECT obj_id from blackboard_artifacts WHERE artifact_id IN "
-                    + "(SELECT artifact_id FROM blackboard_attributes WHERE artifact_type_id = " + BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID()
+                    + "(SELECT artifact_id FROM blackboard_attributes WHERE (artifact_type_id = " + BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID()
-                    + " AND attribute_type_ID = " + BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME.getTypeID() + " "
+                    + " OR artifact_type_id = " + BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ITEM.getTypeID()
+                    + ") AND attribute_type_ID = " + BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME.getTypeID() + " "
                     + "AND (" + intItemSetPart + "))))";  // NON-NLS
 
             return queryStr;
@@ -946,6 +952,11 @@ public class SearchFiltering {
             this.scores = scores;
         }
 
+        /**
+         * @SuppressWarnings("deprecation") - we need to support already
+         * existing interesting file and artifact hits.
+         */
+        @SuppressWarnings("deprecation")
         @Override
         public String getWhereClause() {
 
@@ -964,6 +975,7 @@ public class SearchFiltering {
             if (scores.contains(Score.INTERESTING)) {
                 // Matches interesting item artifact
                 intItemQueryPart = " (obj_id IN (SELECT obj_id from blackboard_artifacts WHERE artifact_type_id = "
+                        + BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ITEM.getTypeID() + " OR artifact_type_id = "
                         + BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID() + ")) ";
             }
 

Core/src/org/sleuthkit/autopsy/discovery/ui/DiscoveryDialog.java

@@ -720,8 +720,12 @@ final class DiscoveryDialog extends javax.swing.JDialog {
      */
     private class ModuleChangeListener implements PropertyChangeListener {
 
+        /**
+         * @SuppressWarnings("deprecation") - we need to support already
+         * existing interesting file and artifact hits.
+         */
+        @SuppressWarnings("deprecation")
         @Override
-        @SuppressWarnings("fallthrough")
         public void propertyChange(PropertyChangeEvent evt) {
             if (!shouldUpdate) {
                 String eventType = evt.getPropertyName();
@@ -746,7 +750,8 @@ final class DiscoveryDialog extends javax.swing.JDialog {
                                 shouldUpdate = shouldUpdateFilters(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DESCRIPTION.getTypeID(), eventData, objectsDetected);
                             } else if (eventData.getBlackboardArtifactType().getTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_HASHSET_HIT.getTypeID()) {
                                 shouldUpdate = shouldUpdateFilters(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME.getTypeID(), eventData, hashSets);
-                            } else if (eventData.getBlackboardArtifactType().getTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID()
+                            } else if (eventData.getBlackboardArtifactType().getTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ITEM.getTypeID()
+                                    || eventData.getBlackboardArtifactType().getTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID()
                                     || eventData.getBlackboardArtifactType().getTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getTypeID()) {
                                 shouldUpdate = shouldUpdateFilters(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME.getTypeID(), eventData, interestingItems);
                             }

Core/src/org/sleuthkit/autopsy/discovery/ui/InterestingItemsFilterPanel.java

@@ -58,7 +58,7 @@ final class InterestingItemsFilterPanel extends AbstractDiscoveryFilterPanel {
     private void setUpInterestingItemsFilter() {
         try {
             interestingItemsList.clearList();
-            List<String> setNames = DiscoveryUiUtils.getSetNames(BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT,
+            List<String> setNames = DiscoveryUiUtils.getSetNames(BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ITEM,
                     BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME);
             for (String name : setNames) {
                 interestingItemsList.addElement(name, null, name);

Core/src/org/sleuthkit/autopsy/logicalimager/dsp/AddLogicalImageTask.java

@@ -443,7 +443,7 @@ final class AddLogicalImageTask implements Runnable {
         BlackboardArtifact artifact;
         try {
             artifact = this.blackboard.newAnalysisResult(
-                    BlackboardArtifact.Type.TSK_INTERESTING_FILE_HIT, fileId, dataSourceId,
+                    BlackboardArtifact.Type.TSK_INTERESTING_ITEM, fileId, dataSourceId,
                     Score.SCORE_LIKELY_NOTABLE,
                     null, ruleSetName, null,
                     Arrays.asList(

Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java

@@ -69,7 +69,7 @@ import org.sleuthkit.autopsy.modules.filetypeid.FileTypeDetector;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Blackboard;
 import org.sleuthkit.datamodel.BlackboardArtifact;
-import static org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT;
+import static org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ITEM;
 import org.sleuthkit.datamodel.BlackboardAttribute;
 import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_COMMENT;
 import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DESCRIPTION;
@@ -327,10 +327,10 @@ class SevenZipExtractor {
                             TSK_COMMENT, MODULE_NAME,
                             details));
 
-            if (!blackboard.artifactExists(archiveFile, TSK_INTERESTING_FILE_HIT, attributes)) {
+            if (!blackboard.artifactExists(archiveFile, TSK_INTERESTING_ITEM, attributes)) {
  
                 BlackboardArtifact artifact = rootArchive.getArchiveFile().newAnalysisResult(
-                        BlackboardArtifact.Type.TSK_INTERESTING_FILE_HIT, Score.SCORE_LIKELY_NOTABLE, 
+                        BlackboardArtifact.Type.TSK_INTERESTING_ITEM, Score.SCORE_LIKELY_NOTABLE, 
                         null, setName, null, 
                         attributes)
                         .getAnalysisResult();

Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdIngestModule.java

@@ -36,7 +36,7 @@ import org.sleuthkit.autopsy.modules.filetypeid.CustomFileTypesManager.CustomFil
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Blackboard;
 import org.sleuthkit.datamodel.BlackboardArtifact;
-import static org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT;
+import static org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ITEM;
 import org.sleuthkit.datamodel.BlackboardAttribute;
 import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_CATEGORY;
 import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME;
@@ -194,9 +194,9 @@ public class FileTypeIdIngestModule implements FileIngestModule {
 
             Blackboard tskBlackboard = currentCase.getSleuthkitCase().getBlackboard();
             // Create artifact if it doesn't already exist.
-            if (!tskBlackboard.artifactExists(file, TSK_INTERESTING_FILE_HIT, attributes)) {
+            if (!tskBlackboard.artifactExists(file, TSK_INTERESTING_ITEM, attributes)) {
                 BlackboardArtifact artifact = file.newAnalysisResult(
-                        BlackboardArtifact.Type.TSK_INTERESTING_FILE_HIT, Score.SCORE_LIKELY_NOTABLE, 
+                        BlackboardArtifact.Type.TSK_INTERESTING_ITEM, Score.SCORE_LIKELY_NOTABLE, 
                         null, fileType.getInterestingFilesSetName(), null, 
                         attributes)
                         .getAnalysisResult();
@@ -208,12 +208,12 @@ public class FileTypeIdIngestModule implements FileIngestModule {
                      */
                     tskBlackboard.postArtifact(artifact, FileTypeIdModuleFactory.getModuleName(), jobId);
                 } catch (Blackboard.BlackboardException ex) {
-                    logger.log(Level.SEVERE, String.format("Unable to index TSK_INTERESTING_FILE_HIT blackboard artifact %d (file obj_id=%d)", artifact.getArtifactID(), file.getId()), ex); //NON-NLS
+                    logger.log(Level.SEVERE, String.format("Unable to index TSK_INTERESTING_ITEM blackboard artifact %d (file obj_id=%d)", artifact.getArtifactID(), file.getId()), ex); //NON-NLS
                 }
             }
 
         } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, String.format("Unable to create TSK_INTERESTING_FILE_HIT artifact for file (obj_id=%d)", file.getId()), ex); //NON-NLS
+            logger.log(Level.SEVERE, String.format("Unable to create TSK_INTERESTING_ITEM artifact for file (obj_id=%d)", file.getId()), ex); //NON-NLS
         } catch (NoCurrentCaseException ex) {
             logger.log(Level.SEVERE, "Exception while getting open case.", ex); //NON-NLS
         }

Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesIdentifierIngestModule.java

@@ -39,7 +39,7 @@ import org.sleuthkit.autopsy.ingest.IngestServices;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Blackboard;
 import org.sleuthkit.datamodel.BlackboardArtifact;
-import static org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT;
+import static org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ITEM;
 import org.sleuthkit.datamodel.BlackboardAttribute;
 import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_CATEGORY;
 import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME;
@@ -142,9 +142,9 @@ final class FilesIdentifierIngestModule implements FileIngestModule {
                     );
 
                     // Create artifact if it doesn't already exist.
-                    if (!blackboard.artifactExists(file, TSK_INTERESTING_FILE_HIT, attributes)) {
+                    if (!blackboard.artifactExists(file, TSK_INTERESTING_ITEM, attributes)) {
                         BlackboardArtifact artifact = file.newAnalysisResult(
-                                BlackboardArtifact.Type.TSK_INTERESTING_FILE_HIT, Score.SCORE_LIKELY_NOTABLE, 
+                                BlackboardArtifact.Type.TSK_INTERESTING_ITEM, Score.SCORE_LIKELY_NOTABLE, 
                                 null, filesSet.getName(), null, 
                                 attributes)
                                 .getAnalysisResult();

Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseInterestingItemsListPanel.java

@@ -93,8 +93,12 @@ class PortableCaseInterestingItemsListPanel extends javax.swing.JPanel {
     @NbBundle.Messages({
         "PortableCaseInterestingItemsListPanel.error.errorTitle=Error getting intesting item set names for case",
         "PortableCaseInterestingItemsListPanel.error.noOpenCase=There is no case open",
-        "PortableCaseInterestingItemsListPanel.error.errorLoadingTags=Error loading interesting item set names",  
+        "PortableCaseInterestingItemsListPanel.error.errorLoadingTags=Error loading interesting item set names",})
-    })    
+    /**
+     * @SuppressWarnings("deprecation") - we need to support already existing
+     * interesting file and artifact hits.
+     */
+    @SuppressWarnings("deprecation")
     private void customizeComponents() {
 
         // Get the set names in use for the current case.
@@ -108,6 +112,7 @@ class PortableCaseInterestingItemsListPanel extends javax.swing.JPanel {
             try {
                 // Get all SET_NAMEs from interesting item artifacts
                 String innerSelect = "SELECT (value_text) AS set_name FROM blackboard_attributes WHERE (artifact_type_id = '"
+                        + BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ITEM.getTypeID() + "' OR artifact_type_id = '"
                         + BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID() + "' OR artifact_type_id = '"
                         + BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getTypeID() + "') AND attribute_type_id = '"
                         + BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME.getTypeID() + "'"; // NON-NLS
@@ -159,7 +164,8 @@ class PortableCaseInterestingItemsListPanel extends javax.swing.JPanel {
     }
 
     /**
-     * Save the current selections and enabled/disable the finish button as needed.
+     * Save the current selections and enabled/disable the finish button as
+     * needed.
      */
     private void updateSetNameList() {
         settings.updateSetNames(getSelectedSetNames());
@@ -194,9 +200,11 @@ class PortableCaseInterestingItemsListPanel extends javax.swing.JPanel {
     }
 
     /**
-     * This class renders the items in the set names JList component as JCheckbox components.
+     * This class renders the items in the set names JList component as
+     * JCheckbox components.
      */
     private class SetNamesListCellRenderer extends JCheckBox implements ListCellRenderer<String> {
+
         private static final long serialVersionUID = 1L;
 
         @Override
@@ -217,7 +225,8 @@ class PortableCaseInterestingItemsListPanel extends javax.swing.JPanel {
     }
 
     /**
-     * Gets the subset of the interesting item set names in use selected by the user.
+     * Gets the subset of the interesting item set names in use selected by the
+     * user.
      *
      * @return A list, possibly empty, of String data transfer objects (DTOs).
      */

Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportGenerator.java

@@ -1135,7 +1135,11 @@ class TableReportGenerator {
          *         not defined in artifact
          *
          * @throws TskCoreException
+         *
+         * @SuppressWarnings("deprecation") - we need to support already
+         * existing interesting file and artifact hits.
          */
+        @SuppressWarnings("deprecation")
         private List<String> getOrderedRowDataAsStrings() throws TskCoreException {
 
             List<String> orderedRowData = new ArrayList<>();
@@ -1160,8 +1164,9 @@ class TableReportGenerator {
                 }
                 orderedRowData.add(makeCommaSeparatedList(getTags()));
 
-            } else if (BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID() == getArtifact().getArtifactTypeID()) {
+            } else if (BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID() == getArtifact().getArtifactTypeID()
-                String[] attributeDataArray = new String[5];
+                    || BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ITEM.getTypeID() == getArtifact().getArtifactTypeID()) {
+                String[] attributeDataArray = new String[7];
                 // Array is used so that order of the attributes is maintained.
                 for (BlackboardAttribute attr : attributes) {
                     if (attr.getAttributeType().equals(new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME))) {
@@ -1172,6 +1177,10 @@ class TableReportGenerator {
                         attributeDataArray[3] = attr.getDisplayString();
                     } else if (attr.getAttributeType().equals(new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DESCRIPTION))) {
                         attributeDataArray[4] = attr.getDisplayString();
+                    } else if (attr.getAttributeType().equals(new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT))) {
+                        attributeDataArray[5] = attr.getDisplayString();
+                    } else if (attr.getAttributeType().equals(new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PROG_NAME))) {
+                        attributeDataArray[6] = attr.getDisplayString();
                     }
                 }
 
@@ -1707,6 +1716,28 @@ class TableReportGenerator {
             columns.add(new AttributeColumn(NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.program"),
                     new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PROG_NAME)));
 
+        } else if (BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ITEM.getTypeID() == artifactTypeId) {
+            columns.add(new AttributeColumn(NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.tskSetName"),
+                    new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME)));
+
+            columns.add(new AttributeColumn(NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.associatedArtifact"),
+                    new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT)));
+
+            columns.add(new AttributeColumn(NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.program"),
+                    new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PROG_NAME)));
+
+            columns.add(new AttributeColumn(NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.tskInterestingFilesCategory"),
+                    new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_CATEGORY)));
+
+            columns.add(new AttributeColumn(NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.tskPath"),
+                    new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PATH)));
+
+            columns.add(new AttributeColumn(NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.comment"),
+                    new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_COMMENT)));
+
+            columns.add(new AttributeColumn(NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.description"),
+                    new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DESCRIPTION)));
+
         } else if (BlackboardArtifact.ARTIFACT_TYPE.TSK_PROG_RUN.getTypeID() == artifactTypeId) {
             columns.add(new AttributeColumn(NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.program"),
                     new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PROG_NAME)));

Core/src/org/sleuthkit/autopsy/report/modules/html/HTMLReport.java

@@ -326,9 +326,10 @@ public class HTMLReport implements TableReportModule {
                     in = getClass().getResourceAsStream("/org/sleuthkit/autopsy/images/mismatch-16.png"); //NON-NLS
                     break;
                 case TSK_INTERESTING_ARTIFACT_HIT:
-                    in = getClass().getResourceAsStream("/org/sleuthkit/autopsy/images/interesting_item.png"); //NON-NLS
+                //fall through deprecated type to TSK_INTERESTING_ITEM
-                    break;
                 case TSK_INTERESTING_FILE_HIT:
+                //fall through deprecated type to TSK_INTERESTING_ITEM
+                case TSK_INTERESTING_ITEM:
                     in = getClass().getResourceAsStream("/org/sleuthkit/autopsy/images/interesting_item.png"); //NON-NLS
                     break;
                 case TSK_PROG_RUN:
@@ -825,6 +826,7 @@ public class HTMLReport implements TableReportModule {
      * Finds all associated image tags.
      *
      * @param contentTags
+     *
      * @return
      */
     private List<ImageTagRegion> getTaggedRegions(List<ContentTag> contentTags) {

Core/src/org/sleuthkit/autopsy/report/modules/portablecase/PortableCaseReportModule.java

@@ -242,7 +242,11 @@ public class PortableCaseReportModule implements ReportModule {
         "PortableCaseReportModule.generateReport.compressingCase=Compressing case...",
         "PortableCaseReportModule_generateReport_copyingAutopsy=Copying application..."
     })
-
+    /**
+     * @SuppressWarnings("deprecation") - we need to support already existing
+     * interesting file and artifact hits.
+     */
+    @SuppressWarnings("deprecation")
     public void generateReport(String reportPath, PortableCaseReportModuleSettings options, ReportProgressPanel progressPanel) {
         this.settings = options;
         progressPanel.setIndeterminate(true);
@@ -444,6 +448,24 @@ public class PortableCaseReportModule implements ReportModule {
                 handleError("Error copying interesting results", Bundle.PortableCaseReportModule_generateReport_errorCopyingInterestingResults(), ex, progressPanel); // NON-NLS
                 return;
             }
+
+            try {
+                List<AnalysisResult> interestingResults = currentCase.getSleuthkitCase().getBlackboard().getAnalysisResultsByType(BlackboardArtifact.Type.TSK_INTERESTING_ITEM.getTypeID());
+                for (AnalysisResult art : interestingResults) {
+                    // Check for cancellation 
+                    if (progressPanel.getStatus() == ReportProgressPanel.ReportStatus.CANCELED) {
+                        handleCancellation(progressPanel);
+                        return;
+                    }
+                    BlackboardAttribute setAttr = art.getAttribute(new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME));
+                    if (setNames.contains(setAttr.getValueString())) {
+                        copyContentToPortableCase(art, progressPanel);
+                    }
+                }
+            } catch (TskCoreException ex) {
+                handleError("Error copying interesting items", Bundle.PortableCaseReportModule_generateReport_errorCopyingInterestingResults(), ex, progressPanel); // NON-NLS
+                return;
+            }
         }
 
         // Check for cancellation 
@@ -586,7 +608,11 @@ public class PortableCaseReportModule implements ReportModule {
      * Load all interesting BlackboardArtifacts that belong to the selected
      * SET_NAME. This operation would be duplicated for every data source, since
      * the Sleuthkit API does not have a notion of searching by data source id.
+     *
+     * @SuppressWarnings("deprecation") - we need to support already existing
+     * interesting file and artifact hits.
      */
+    @SuppressWarnings("deprecation")
     private Multimap<Long, BlackboardArtifact> getInterestingArtifactsBySetName(SleuthkitCase skCase, List<String> setNames) throws TskCoreException {
         Multimap<Long, BlackboardArtifact> artifactsWithSetName = ArrayListMultimap.create();
         if (!setNames.isEmpty()) {
@@ -594,6 +620,8 @@ public class PortableCaseReportModule implements ReportModule {
                     BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT);
             allArtifacts.addAll(skCase.getBlackboardArtifacts(
                     BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT));
+            allArtifacts.addAll(skCase.getBlackboardArtifacts(
+                    BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ITEM));
 
             for (BlackboardArtifact bArt : allArtifacts) {
                 BlackboardAttribute setAttr = bArt.getAttribute(
@@ -650,6 +678,11 @@ public class PortableCaseReportModule implements ReportModule {
         return false;
     }
 
+    /**
+     * @SuppressWarnings("deprecation") - we need to support already existing
+     * interesting file and artifact hits.
+     */
+    @SuppressWarnings("deprecation")
     private List<String> getAllInterestingItemsSets() throws NoCurrentCaseException, TskCoreException {
 
         // Get the set names in use for the current case.
@@ -660,6 +693,7 @@ public class PortableCaseReportModule implements ReportModule {
         // Get all SET_NAMEs from interesting item artifacts
         String innerSelect = "SELECT (value_text) AS set_name FROM blackboard_attributes WHERE (artifact_type_id = '"
                 + BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID() + "' OR artifact_type_id = '"
+                + BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ITEM.getTypeID() + "' OR artifact_type_id = '"
                 + BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getTypeID() + "') AND attribute_type_id = '"
                 + BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME.getTypeID() + "'"; // NON-NLS
 
@@ -1008,7 +1042,6 @@ public class PortableCaseReportModule implements ReportModule {
             newDataSourceId = copyContent(artifactToCopy.getDataSource());
         }
 
-        
         // Create the new artifact
         int newArtifactTypeId = getNewArtifactTypeId(artifactToCopy);
         BlackboardArtifact.Type newArtifactType = portableSkCase.getBlackboard().getArtifactType(newArtifactTypeId);
@@ -1278,11 +1311,13 @@ public class PortableCaseReportModule implements ReportModule {
     }
 
     /**
-     * Copy a host into the portable case and add it to the oldHostIdToNewHost map.
+     * Copy a host into the portable case and add it to the oldHostIdToNewHost
+     * map.
      *
      * @param oldHost The host to copy
      *
      * @return The new host
+     *
      * @throws TskCoreException
      */
     private Host copyHost(Host oldHost) throws TskCoreException {
@@ -1297,8 +1332,8 @@ public class PortableCaseReportModule implements ReportModule {
     }
 
     /**
-     * Copy an OS Account to the new case and add it to the oldOsAccountIdToNewOsAccountId map.
+     * Copy an OS Account to the new case and add it to the
-     * Will also copy the associated realm.
+     * oldOsAccountIdToNewOsAccountId map. Will also copy the associated realm.
      *
      * @param oldOsAccountId The OS account id in the current case.
      */
@@ -1364,7 +1399,8 @@ public class PortableCaseReportModule implements ReportModule {
     /**
      * Copy path ID attribute to new case along with the referenced file.
      *
-     * @param newArtifact The new artifact in the portable case. Should not have a TSK_PATH_ID attribute.
+     * @param newArtifact The new artifact in the portable case. Should not have
+     *                    a TSK_PATH_ID attribute.
      * @param oldArtifact The old artifact.
      *
      * @throws TskCoreException
@@ -1387,9 +1423,11 @@ public class PortableCaseReportModule implements ReportModule {
     /**
      * Copy attachments to the portable case.
      *
-     * @param newArtifact The new artifact in the portable case. Should not have a TSK_ATTACHMENTS attribute.
+     * @param newArtifact The new artifact in the portable case. Should not have
+     *                    a TSK_ATTACHMENTS attribute.
      * @param oldArtifact The old artifact.
-     * @param newFile     The new file in the portable case associated with the artifact.
+     * @param newFile     The new file in the portable case associated with the
+     *                    artifact.
      *
      * @throws TskCoreException
      */
@@ -1426,8 +1464,7 @@ public class PortableCaseReportModule implements ReportModule {
                 CommunicationArtifactsHelper communicationArtifactsHelper = new CommunicationArtifactsHelper(currentCase.getSleuthkitCase(),
                         newSourceStr, newFile, Account.Type.EMAIL, null);
                 communicationArtifactsHelper.addAttachments(newArtifact, new MessageAttachments(newFileAttachments, msgAttachments.getUrlAttachments()));
-            } 
+            } catch (BlackboardJsonAttrUtil.InvalidJsonException ex) {
-            catch (BlackboardJsonAttrUtil.InvalidJsonException ex) {
                 throw new TskCoreException(String.format("Unable to parse json for MessageAttachments object in artifact: %s", oldArtifact.getName()), ex);
             }
         } else {    // backward compatibility - email message attachments are derived files, children of the message.

Core/src/org/sleuthkit/autopsy/test/InterestingArtifactCreatorIngestModule.java

@@ -48,8 +48,8 @@ final class InterestingArtifactCreatorIngestModule extends FileIngestModuleAdapt
     private static final String MODULE_NAME = InterestingArtifactCreatorIngestModuleFactory.getModuleName();
     private static final String[] ARTIFACT_TYPE_NAMES = {"TSK_WEB_BOOKMARK", "TSK_KEYWORD_HIT", "TSK_CALLLOG"};
     private static final String[] ARTIFACT_DISPLAY_NAMES = {"Web Bookmarks", "Keyword Hits", "Call Logs"};
-    private static final String INT_ARTIFACT_TYPE_NAME = BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getLabel();
+    private static final String INT_ARTIFACT_TYPE_NAME = BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ITEM.getLabel();
-    private static final String INT_ARTIFACT_DISPLAY_NAME = BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getDisplayName();
+    private static final String INT_ARTIFACT_DISPLAY_NAME = BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ITEM.getDisplayName();
     private BlackboardArtifact.Type artifactType;
 
     @Override

Core/test/qa-functional/src/org/sleuthkit/autopsy/ingest/EmbeddedFileTest.java

@@ -134,7 +134,7 @@ public class EmbeddedFileTest extends NbTestCase {
                     ArrayList<BlackboardArtifact> artifacts = file.getAllArtifacts();
                     assertEquals("Zip bomb " + file.getName() + " has incorrect number of artifacts", 1, artifacts.size());
                     for (BlackboardArtifact artifact : artifacts) {
-                        assertEquals("Artifact for Zip bomb " + file.getName() + " has incorrect type ID", artifact.getArtifactTypeID(), BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID());
+                        assertEquals("Artifact for Zip bomb " + file.getName() + " has incorrect type ID", artifact.getArtifactTypeID(), BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ITEM.getTypeID());
                         BlackboardAttribute attribute = artifact.getAttribute(new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME));
                         assertNotNull("No attribute found for artifact on zip bomb " + file.getName(), attribute);
                         assertEquals("Interesting artifact on file, " + file.getName() + ", does not reflect it being a zip bomb", zipBombSetName, attribute.getDisplayString());

Experimental/src/org/sleuthkit/autopsy/experimental/volatilityDSP/VolatilityProcessor.java

@@ -381,9 +381,9 @@ class VolatilityProcessor {
                         Collection<BlackboardAttribute> attributes = singleton(new BlackboardAttribute(TSK_SET_NAME, VOLATILITY, setName));
 
                         // Create artifact if it doesn't already exist.
-                        if (!blackboard.artifactExists(resolvedFile, BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT, attributes)) {
+                        if (!blackboard.artifactExists(resolvedFile, BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ITEM, attributes)) {
                             BlackboardArtifact volArtifact = resolvedFile.newAnalysisResult(
-                                    BlackboardArtifact.Type.TSK_INTERESTING_FILE_HIT, Score.SCORE_LIKELY_NOTABLE, 
+                                    BlackboardArtifact.Type.TSK_INTERESTING_ITEM, Score.SCORE_LIKELY_NOTABLE, 
                                     null, setName, null, 
                                     attributes)
                                     .getAnalysisResult();

docs/doxygen/modFileIngestTutorial.dox

@@ -82,9 +82,9 @@ Now that we have found the files, we want to do something with them. In our situ
 
 A list of standard artifact types can be found in the <a href="http://sleuthkit.org/sleuthkit/docs/jni-docs/latest/artifact_catalog_page.html">artifact catalog</a>. It is important to note the catagory for the artifact you want to since this affects which method you will use to create the artifact.
 
-For our example, we are going to make an artifact of type "TSK_INTERESTING_FILE", which is an analysis result, whenever we find a big and round file. These are one of the most generic artifact types and are simply a way of alerting the user that a file is interesting for some reason. Once you make the artifact, it will be shown in the UI. The below code makes an artifact for the file and puts it into the set of "Big and Round Files". You can create whatever set names you want. The Autopsy GUI organizes Interesting Files by their set name.
+For our example, we are going to make an artifact of type "TSK_INTERESTING_ITEM", which is an analysis result, whenever we find a big and round file. These are one of the most generic artifact types and are simply a way of alerting the user that a file is interesting for some reason. Once you make the artifact, it will be shown in the UI. The below code makes an artifact for the file and puts it into the set of "Big and Round Files". You can create whatever set names you want. The Autopsy GUI organizes Interesting Files by their set name.
 \verbatim            
-    art = file.newAnalysisResult(BlackboardArtifact.Type.TSK_INTERESTING_FILE_HIT, Score.SCORE_LIKELY_NOTABLE,
+    art = file.newAnalysisResult(BlackboardArtifact.Type.TSK_INTERESTING_ITEM, Score.SCORE_LIKELY_NOTABLE,
         None, "Big and Round Files", None,
         Arrays.asList(
             BlackboardAttribute(BlackboardAttribute.Type.TSK_SET_NAME,
@@ -111,9 +111,9 @@ That's it. Your process() method should look something like this:
         # Look for files bigger than 10MB that are a multiple of 4096            
         if ((file.getSize() > 10485760) and ((file.getSize() % 4096) == 0)):
 
-            # Make an artifact on the blackboard.  TSK_INTERESTING_FILE_HIT is a generic type of
+            # Make an artifact on the blackboard.  TSK_INTERESTING_ITEM is a generic type of
             # artifact.  Refer to the developer docs for other examples.
-            art = file.newAnalysisResult(BlackboardArtifact.Type.TSK_INTERESTING_FILE_HIT, Score.SCORE_LIKELY_NOTABLE,
+            art = file.newAnalysisResult(BlackboardArtifact.Type.TSK_INTERESTING_ITEM, Score.SCORE_LIKELY_NOTABLE,
                                          None, "Big and Round Files", None,
                                          Arrays.asList(
                                              BlackboardAttribute(BlackboardAttribute.Type.TSK_SET_NAME,

pythonExamples/July2015FileTutorial_BigRound/FindBigRoundFiles.py

@@ -124,9 +124,9 @@ class FindBigRoundFilesIngestModule(FileIngestModule):
         # Look for files bigger than 10MB that are a multiple of 4096            
         if ((file.getSize() > 10485760) and ((file.getSize() % 4096) == 0)):
 
-            # Make an artifact on the blackboard.  TSK_INTERESTING_FILE_HIT is a generic type of
+            # Make an artifact on the blackboard.  TSK_INTERESTING_ITEM is a generic type of
             # artifact.  Refer to the developer docs for other examples.
-            art = file.newAnalysisResult(BlackboardArtifact.Type.TSK_INTERESTING_FILE_HIT, Score.SCORE_LIKELY_NOTABLE,
+            art = file.newAnalysisResult(BlackboardArtifact.Type.TSK_INTERESTING_ITEM, Score.SCORE_LIKELY_NOTABLE,
                                          None, "Big and Round Files", None,
                                          Arrays.asList(
                                              BlackboardAttribute(BlackboardAttribute.Type.TSK_SET_NAME,

pythonExamples/dataSourceIngestModule.py

@@ -137,12 +137,12 @@ class SampleJythonDataSourceIngestModule(DataSourceIngestModule):
             self.log(Level.INFO, "Processing file: " + file.getName())
             fileCount += 1
 
-            # Make an artifact on the blackboard.  TSK_INTERESTING_FILE_HIT is a generic type of
+            # Make an artifact on the blackboard.  TSK_INTERESTING_ITEM is a generic type of
-            # artfiact.  Refer to the developer docs for other examples.
+            # artifact.  Refer to the developer docs for other examples.
             attrs = Arrays.asList(BlackboardAttribute(BlackboardAttribute.Type.TSK_SET_NAME,
                                                       SampleJythonDataSourceIngestModuleFactory.moduleName,
                                                       "Test file"))
-            art = file.newAnalysisResult(BlackboardArtifact.Type.TSK_INTERESTING_FILE_HIT, Score.SCORE_LIKELY_NOTABLE,
+            art = file.newAnalysisResult(BlackboardArtifact.Type.TSK_INTERESTING_ITEM, Score.SCORE_LIKELY_NOTABLE,
                                          None, "Test file", None, attrs).getAnalysisResult()
 
             try:

pythonExamples/fileIngestModule.py

@@ -129,12 +129,12 @@ class SampleJythonFileIngestModule(FileIngestModule):
             self.log(Level.INFO, "Found a text file: " + file.getName())
             self.filesFound+=1
 
-            # Make an artifact on the blackboard.  TSK_INTERESTING_FILE_HIT is a generic type of
+            # Make an artifact on the blackboard.  TSK_INTERESTING_ITEM is a generic type of
             # artifact.  Refer to the developer docs for other examples.
             attrs = Arrays.asList(BlackboardAttribute(BlackboardAttribute.Type.TSK_SET_NAME,
                   SampleJythonFileIngestModuleFactory.moduleName, "Text Files"))
 
-            art = file.newAnalysisResult(BlackboardArtifact.Type.TSK_INTERESTING_FILE_HIT, Score.SCORE_LIKELY_NOTABLE,
+            art = file.newAnalysisResult(BlackboardArtifact.Type.TSK_INTERESTING_ITEM, Score.SCORE_LIKELY_NOTABLE,
                                          None, "Text Files", None, attrs).getAnalysisResult()
 
             try:
@@ -145,7 +145,7 @@ class SampleJythonFileIngestModule(FileIngestModule):
             # For the example (this wouldn't be needed normally), we'll query the blackboard for data that was added
             # by other modules. We then iterate over its attributes.  We'll just print them, but you would probably
             # want to do something with them.
-            artifactList = file.getArtifacts(BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT)
+            artifactList = file.getArtifacts(BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ITEM)
             for artifact in artifactList:
                 attributeList = artifact.getAttributes()
                 for attrib in attributeList: