Merge pull request #7067 from wschaeferB/7669-IsSupportedNoCr

7669 simplify logic for isSupported when CR not enabled
This commit is contained in:
Richard Cordovano 2021-06-28 09:52:42 -04:00 committed by GitHub
commit 07d41be3e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -170,7 +170,6 @@ public final class OtherOccurrences {
public static AbstractFile getAbstractFileFromNode(Node node) { public static AbstractFile getAbstractFileFromNode(Node node) {
BlackboardArtifactTag nodeBbArtifactTag = node.getLookup().lookup(BlackboardArtifactTag.class); BlackboardArtifactTag nodeBbArtifactTag = node.getLookup().lookup(BlackboardArtifactTag.class);
ContentTag nodeContentTag = node.getLookup().lookup(ContentTag.class); ContentTag nodeContentTag = node.getLookup().lookup(ContentTag.class);
BlackboardArtifact nodeBbArtifact = node.getLookup().lookup(BlackboardArtifact.class);
AbstractFile nodeAbstractFile = node.getLookup().lookup(AbstractFile.class); AbstractFile nodeAbstractFile = node.getLookup().lookup(AbstractFile.class);
if (nodeBbArtifactTag != null) { if (nodeBbArtifactTag != null) {
@ -180,18 +179,6 @@ public final class OtherOccurrences {
} }
} else if (nodeContentTag != null) { } else if (nodeContentTag != null) {
Content content = nodeContentTag.getContent(); Content content = nodeContentTag.getContent();
if (content instanceof AbstractFile) {
return (AbstractFile) content;
}
} else if (nodeBbArtifact != null) {
Content content;
try {
content = nodeBbArtifact.getSleuthkitCase().getContentById(nodeBbArtifact.getObjectID());
} catch (TskCoreException ex) {
logger.log(Level.SEVERE, "Error retrieving blackboard artifact", ex); // NON-NLS
return null;
}
if (content instanceof AbstractFile) { if (content instanceof AbstractFile) {
return (AbstractFile) content; return (AbstractFile) content;
} }