From 49e844dd6de36e90da9051ae900b5588a973334c Mon Sep 17 00:00:00 2001 From: Kelly Kelly Date: Thu, 16 Jul 2020 14:42:06 -0400 Subject: [PATCH 1/7] Switch the CVT SummaryViewer file reference container to JList --- .../relationships/Bundle.properties | 3 +- .../relationships/Bundle.properties-MERGED | 4 +- .../relationships/Bundle_ja.properties | 1 - .../relationships/SummaryViewer.form | 98 +++++++++-- .../relationships/SummaryViewer.java | 164 ++++++++++++------ 5 files changed, 199 insertions(+), 71 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties index b14d8a2688..f6b99d656d 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties @@ -9,7 +9,6 @@ SummaryViewer.callLogsLabel.text=Call Logs: ThreadRootMessagePanel.showAllCheckBox.text=Show All Messages ThreadPane.backButton.text=<--- SummaryViewer.caseReferencesPanel.border.title=Other Occurrences -SummaryViewer.fileReferencesPanel.border.title=File References in Current Case MessageViewer.threadsLabel.text=Select a Thread to View MessageViewer.threadNameLabel.text= MessageViewer.showingMessagesLabel.text=Showing Messages for Thread: @@ -27,3 +26,5 @@ SummaryViewer.referencesLabel.text=Communication References: SummaryViewer.referencesDataLabel.text= SummaryViewer.contactsLabel.text=Book Entries: SummaryViewer.accountCountry.text= +SummaryViewer.fileRefPane.border.title=File Referernce(s) in Current Case +SummaryViewer.selectAccountFileRefLabel.text= SummaryViewer_FileRefNameColumn_Title=Path SummaryViewer_TabTitle=Summary ThreadRootMessagePanel.showAllCheckBox.text=Show All Messages ThreadPane.backButton.text=<--- SummaryViewer.caseReferencesPanel.border.title=Other Occurrences -SummaryViewer.fileReferencesPanel.border.title=File References in Current Case MessageViewer.threadsLabel.text=Select a Thread to View MessageViewer.threadNameLabel.text= MessageViewer.showingMessagesLabel.text=Showing Messages for Thread: @@ -73,3 +73,5 @@ SummaryViewer.referencesLabel.text=Communication References: SummaryViewer.referencesDataLabel.text= SummaryViewer.contactsLabel.text=Book Entries: SummaryViewer.accountCountry.text= +SummaryViewer.fileRefPane.border.title=File Referernce(s) in Current Case +SummaryViewer.selectAccountFileRefLabel.text= diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.form b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.form index e5ce2cdd80..b0a30df433 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.form +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.form @@ -273,7 +273,7 @@ - + @@ -288,6 +288,10 @@ + + + + @@ -297,6 +301,10 @@ + + + + @@ -326,6 +334,10 @@ + + + + diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java index 6b40bfed6b..94fb1bca86 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java @@ -268,10 +268,10 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi referencesDataLabel = new javax.swing.JLabel(); caseReferencesPanel = new org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel(); fileRefPane = new javax.swing.JPanel(); - fileRefScrolPanel = new javax.swing.JPanel(); - scrollPane = new javax.swing.JScrollPane(); + javax.swing.JPanel fileRefScrolPanel = new javax.swing.JPanel(); + javax.swing.JScrollPane scrollPane = new javax.swing.JScrollPane(); fileRefList = new javax.swing.JList<>(); - selectAccountPane = new javax.swing.JPanel(); + javax.swing.JPanel selectAccountPane = new javax.swing.JPanel(); selectAccountFileRefLabel = new javax.swing.JLabel(); setLayout(new java.awt.GridBagLayout()); @@ -487,14 +487,11 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi private javax.swing.JPanel countsPanel; private javax.swing.JList fileRefList; private javax.swing.JPanel fileRefPane; - private javax.swing.JPanel fileRefScrolPanel; private javax.swing.JLabel messagesDataLabel; private javax.swing.JLabel messagesLabel; private javax.swing.JLabel referencesDataLabel; private javax.swing.JLabel referencesLabel; - private javax.swing.JScrollPane scrollPane; private javax.swing.JLabel selectAccountFileRefLabel; - private javax.swing.JPanel selectAccountPane; private javax.swing.JPanel summaryPanel; private javax.swing.JLabel thumbnailCntLabel; private javax.swing.JLabel thumbnailsDataLabel; From 0ee01e78782a42d875bf514872d3149fb8f98589 Mon Sep 17 00:00:00 2001 From: Kelly Kelly Date: Mon, 20 Jul 2020 10:37:21 -0400 Subject: [PATCH 3/7] Fixed typo --- .../autopsy/communications/relationships/Bundle.properties | 2 +- .../autopsy/communications/relationships/SummaryViewer.form | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties index b94fbe8065..6ecb170c10 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties @@ -26,5 +26,5 @@ SummaryViewer.referencesLabel.text=Communication References: SummaryViewer.referencesDataLabel.text= SummaryViewer.contactsLabel.text=Book Entries: SummaryViewer.accountCountry.text= -SummaryViewer.fileRefPane.border.title=File Referernces in Current Case +SummaryViewer.fileRefPane.border.title=File References in Current Case SummaryViewer.selectAccountFileRefLabel.text=