From 18c5fecf30122c45e6fc5c94a30127bba9f37200 Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Tue, 12 Sep 2023 11:49:12 -0400 Subject: [PATCH 1/2] include justification in AR tab --- .../analysisresults/AnalysisResultsViewModel.java | 5 ++++- .../contentviewers/analysisresults/Bundle.properties-MERGED | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/analysisresults/AnalysisResultsViewModel.java b/Core/src/org/sleuthkit/autopsy/contentviewers/analysisresults/AnalysisResultsViewModel.java index e556c39e7d..8a3d08ea87 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/analysisresults/AnalysisResultsViewModel.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/analysisresults/AnalysisResultsViewModel.java @@ -175,7 +175,8 @@ public class AnalysisResultsViewModel { "AnalysisResultsViewModel_displayAttributes_score=Score", "AnalysisResultsViewModel_displayAttributes_type=Type", "AnalysisResultsViewModel_displayAttributes_configuration=Configuration", - "AnalysisResultsViewModel_displayAttributes_conclusion=Conclusion" + "AnalysisResultsViewModel_displayAttributes_conclusion=Conclusion", + "AnalysisResultsViewModel_displayAttributes_justification=Justification" }) private ResultDisplayAttributes getDisplayAttributes(AnalysisResult analysisResult) { // The type of BlackboardArtifact.Type of the analysis result. @@ -188,6 +189,8 @@ public class AnalysisResultsViewModel { // The standard attributes to display (score, type, configuration, conclusion) Stream> baseAnalysisAttrs = Stream.of( + Pair.of(Bundle.AnalysisResultsViewModel_displayAttributes_justification(), + normalizeAttr(analysisResult.getJustification())), Pair.of(Bundle.AnalysisResultsViewModel_displayAttributes_score(), normalizeAttr(analysisResult.getScore().getSignificance().getDisplayName())), Pair.of(Bundle.AnalysisResultsViewModel_displayAttributes_type(), diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/analysisresults/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/contentviewers/analysisresults/Bundle.properties-MERGED index ae4d0b3b6b..fc4ba9ee8c 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/analysisresults/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/analysisresults/Bundle.properties-MERGED @@ -8,5 +8,6 @@ AnalysisResultsContentViewer_title=Analysis Results AnalysisResultsContentViewer_tooltip=Viewer for Analysis Results related to the selected node. AnalysisResultsViewModel_displayAttributes_conclusion=Conclusion AnalysisResultsViewModel_displayAttributes_configuration=Configuration +AnalysisResultsViewModel_displayAttributes_justification=Justification AnalysisResultsViewModel_displayAttributes_score=Score AnalysisResultsViewModel_displayAttributes_type=Type From 96fdc77f30f51efd05b4b698958df8057c6aa22a Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Tue, 12 Sep 2023 11:54:17 -0400 Subject: [PATCH 2/2] order change --- .../analysisresults/AnalysisResultsViewModel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/analysisresults/AnalysisResultsViewModel.java b/Core/src/org/sleuthkit/autopsy/contentviewers/analysisresults/AnalysisResultsViewModel.java index 8a3d08ea87..f1a707531a 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/analysisresults/AnalysisResultsViewModel.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/analysisresults/AnalysisResultsViewModel.java @@ -189,8 +189,6 @@ public class AnalysisResultsViewModel { // The standard attributes to display (score, type, configuration, conclusion) Stream> baseAnalysisAttrs = Stream.of( - Pair.of(Bundle.AnalysisResultsViewModel_displayAttributes_justification(), - normalizeAttr(analysisResult.getJustification())), Pair.of(Bundle.AnalysisResultsViewModel_displayAttributes_score(), normalizeAttr(analysisResult.getScore().getSignificance().getDisplayName())), Pair.of(Bundle.AnalysisResultsViewModel_displayAttributes_type(), @@ -198,7 +196,9 @@ public class AnalysisResultsViewModel { Pair.of(Bundle.AnalysisResultsViewModel_displayAttributes_configuration(), normalizeAttr(analysisResult.getConfiguration())), Pair.of(Bundle.AnalysisResultsViewModel_displayAttributes_conclusion(), - normalizeAttr(analysisResult.getConclusion())) + normalizeAttr(analysisResult.getConclusion())), + Pair.of(Bundle.AnalysisResultsViewModel_displayAttributes_justification(), + normalizeAttr(analysisResult.getJustification())) ); // The BlackboardAttributes sorted by type display name.