diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java index fabb83bac0..5f38eceb80 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java @@ -38,6 +38,7 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.stream.Collectors; import javax.swing.Action; +import javax.swing.SwingUtilities; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.openide.nodes.Sheet; @@ -179,27 +180,7 @@ public class BlackboardArtifactNode extends AbstractContentNode( - Bundle.BlackboardArtifactNode_createSheet_score_name(), - Bundle.BlackboardArtifactNode_createSheet_score_displayName(), - scoData.getScoreAndDescription().getRight(), - scoData.getScoreAndDescription().getLeft())); - } - if (scoData.getComment() != null) { - updateSheet(new NodeProperty<>( - Bundle.BlackboardArtifactNode_createSheet_comment_name(), - Bundle.BlackboardArtifactNode_createSheet_comment_displayName(), - NO_DESCR, scoData.getComment())); - } - if (scoData.getCountAndDescription() != null) { - updateSheet(new NodeProperty<>( - Bundle.BlackboardArtifactNode_createSheet_count_name(), - Bundle.BlackboardArtifactNode_createSheet_count_displayName(), - scoData.getCountAndDescription().getRight(), - scoData.getCountAndDescription().getLeft())); - } + updateSCOColumns((SCOData) evt.getNewValue()); } else if (eventType.equals(FileNameTransTask.getPropertyName())) { /* * Replace the value of the Source File property with the @@ -1224,6 +1205,41 @@ public class BlackboardArtifactNode extends AbstractContentNode( + Bundle.BlackboardArtifactNode_createSheet_score_name(), + Bundle.BlackboardArtifactNode_createSheet_score_displayName(), + scoData.getScoreAndDescription().getRight(), + scoData.getScoreAndDescription().getLeft())); + } + if (scoData.getComment() != null) { + updateSheet(new NodeProperty<>( + Bundle.BlackboardArtifactNode_createSheet_comment_name(), + Bundle.BlackboardArtifactNode_createSheet_comment_displayName(), + NO_DESCR, scoData.getComment())); + } + if (scoData.getCountAndDescription() != null) { + updateSheet(new NodeProperty<>( + Bundle.BlackboardArtifactNode_createSheet_count_name(), + Bundle.BlackboardArtifactNode_createSheet_count_displayName(), + scoData.getCountAndDescription().getRight(), + scoData.getCountAndDescription().getLeft())); + } + } + }); + } /** * Adds the score property for the artifact represented by this node to the