From ab008b25623419ee2f402b85e82c1c044d0c936c Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Mon, 11 Jan 2021 15:39:23 -0500 Subject: [PATCH] 7167 check that content is not artifact --- .../contentviewers/textcontentviewer/StringsTextViewer.java | 3 ++- .../sleuthkit/autopsy/corecomponents/DataContentViewerHex.java | 3 ++- .../autopsy/corecomponents/DataContentViewerUtility.java | 3 --- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/textcontentviewer/StringsTextViewer.java b/Core/src/org/sleuthkit/autopsy/contentviewers/textcontentviewer/StringsTextViewer.java index 1d4a6aef03..666c38d070 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/textcontentviewer/StringsTextViewer.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/textcontentviewer/StringsTextViewer.java @@ -25,6 +25,7 @@ import org.openide.util.lookup.ServiceProvider; import org.sleuthkit.autopsy.corecomponentinterfaces.TextViewer; import org.sleuthkit.autopsy.corecomponents.DataContentViewerUtility; import org.sleuthkit.autopsy.datamodel.StringContent; +import org.sleuthkit.datamodel.BlackboardArtifact; import org.sleuthkit.datamodel.Content; /** @@ -81,7 +82,7 @@ public class StringsTextViewer implements TextViewer { return false; } Content content = DataContentViewerUtility.getDefaultContent(node); - return (content != null && content.getSize() > 0); + return (content != null && !(content instanceof BlackboardArtifact) && content.getSize() > 0); } @Override diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java index be8f854b96..10188826b1 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java @@ -46,6 +46,7 @@ import static org.sleuthkit.autopsy.corecomponents.Bundle.*; import org.sleuthkit.autopsy.coreutils.FileUtil; import org.sleuthkit.autopsy.datamodel.ContentUtils; import org.sleuthkit.autopsy.datamodel.DataConversion; +import org.sleuthkit.datamodel.BlackboardArtifact; import org.sleuthkit.datamodel.Content; import org.sleuthkit.datamodel.TskCoreException; @@ -606,7 +607,7 @@ public class DataContentViewerHex extends javax.swing.JPanel implements DataCont return false; } Content content = DataContentViewerUtility.getDefaultContent(node); - return content != null && content.getSize() > 0; + return content != null && !(content instanceof BlackboardArtifact) && content.getSize() > 0; } @Override diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerUtility.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerUtility.java index d460a16f03..2356a25a3b 100755 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerUtility.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerUtility.java @@ -32,9 +32,6 @@ public class DataContentViewerUtility { * preferring to return any Content object other than a BlackboardArtifact * object. * - * This method was written with the needs of the hex and strings content - * viewers in mind - the algorithm is exactly what those viewers require. - * * @param node A display Node object. * * @return If there are multiple Content objects associated with the Node,