From 2dc4351c21c152b5d1b3a8d8dd07c5d3fd75b38c Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Fri, 15 Mar 2019 16:57:00 -0400 Subject: [PATCH] 3956 change is supported method for hex and string viewer to lookup content using DataContentViewerUtility --- .../autopsy/corecomponents/DataContentViewerHex.java | 10 +++------- .../corecomponents/DataContentViewerString.java | 4 ++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java index 601d74293d..a092186318 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java @@ -1,7 +1,7 @@ /* * Autopsy Forensic Browser * - * Copyright 2011-2018 Basis Technology Corp. + * Copyright 2011-2019 Basis Technology Corp. * Contact: carrier sleuthkit org * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -605,12 +605,8 @@ public class DataContentViewerHex extends javax.swing.JPanel implements DataCont if (node == null) { return false; } - Content content = node.getLookup().lookup(Content.class); - if (content != null && content.getSize() > 0) { - return true; - } - - return false; + Content content = DataContentViewerUtility.getDefaultContent(node); + return content != null && content.getSize() > 0; } @Override diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java index bc0980c58c..919be9856c 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java @@ -1,7 +1,7 @@ /* * Autopsy Forensic Browser * - * Copyright 2011-2018 Basis Technology Corp. + * Copyright 2011-2019 Basis Technology Corp. * Contact: carrier sleuthkit org * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -498,7 +498,7 @@ public class DataContentViewerString extends javax.swing.JPanel implements DataC if (node == null) { return false; } - Content content = node.getLookup().lookup(Content.class); + Content content = DataContentViewerUtility.getDefaultContent(node); return (content != null && content.getSize() > 0); }