From d545ad46b3ab17593c5556cfa7349d6f15dba0af Mon Sep 17 00:00:00 2001 From: Kelly Kelly Date: Thu, 19 Sep 2019 10:44:32 -0400 Subject: [PATCH 1/6] Inital changes to summary view --- .../autopsy/communications/Bundle.properties | 1 + .../communications/Bundle.properties-MERGED | 1 + .../relationships/Bundle.properties | 11 +- .../relationships/Bundle.properties-MERGED | 15 +- .../relationships/SummaryViewer.form | 228 ++++++++++----- .../relationships/SummaryViewer.java | 266 ++++++++++++------ 6 files changed, 357 insertions(+), 165 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties b/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties index 1b2dd9ae37..6ac5b46b39 100644 --- a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties @@ -49,3 +49,4 @@ VisualizationPanel.forwardButton.text= VisualizationPanel.zoomPercentLabel.text=100% VisualizationPanel.zoomLabel.text=Zoom: VisualizationPanel.snapshotButton.toolTipText=Generate Snapshot report. +SummaryViewer.contactsLabel.text=Book Entries: diff --git a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED index 2ad2305d38..a872eac7ea 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED @@ -92,6 +92,7 @@ VisualizationPanel.forwardButton.text= VisualizationPanel.zoomPercentLabel.text=100% VisualizationPanel.zoomLabel.text=Zoom: VisualizationPanel.snapshotButton.toolTipText=Generate Snapshot report. +SummaryViewer.contactsLabel.text=Book Entries: VisualizationPanel_action_dialogs_title=Communications VisualizationPanel_action_name_text=Snapshot Report VisualizationPanel_module_name=Communications diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties index 4d0b858691..56ccc314d8 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties @@ -1,6 +1,6 @@ ContactDetailsPane.nameLabel.text=Placeholder -SummaryViewer.countsPanel.border.title=Counts -SummaryViewer.contactsLabel.text=Contacts: +SummaryViewer.countsPanel.border.title=Communications +SummaryViewer.contactsLabel.text=Book Entries: OutlineViewPanel.messageLabel.text= SummaryViewer.messagesDataLabel.text=messages SummaryViewer.callLogsDataLabel.text=callLogs @@ -18,6 +18,11 @@ MessageViewer.backButton.AccessibleContext.accessibleDescription= MessageViewer.backButton.text=Threads MessageViewer.showAllButton.text=All Messages SummaryViewer.thumbnailCntLabel.text=Media Attachments: -SummaryViewer.attachmentsLable.text=Total Attachments: SummaryViewer.thumbnailsDataLabel.text=attachments SummaryViewer.attachmentDataLabel.text=count +SummaryViewer.accountLabel.text= +SummaryViewer.contanctsPanel.border.title=Contacts +SummaryViewer.accoutDescriptionLabel.text= +SummaryViewer.mentionsLabel.text=Account Mentions: +SummaryViewer.mentionsDataLabel.text= +SummaryViewer.attachmentsLabel.text=Total Attachments: diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED index f79bdaa464..f6b0121ed3 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED @@ -35,20 +35,22 @@ MessageViewer_viewMessage_all=All MessageViewer_viewMessage_calllogs=Call Logs MessageViewer_viewMessage_selected=Selected MessageViewer_viewMessage_unthreaded=Unthreaded -SummaryViewer.countsPanel.border.title=Counts -SummaryViewer.contactsLabel.text=Contacts: +SummaryViewer.countsPanel.border.title=Communications +SummaryViewer.contactsLabel.text=Book Entries: OutlineViewPanel.messageLabel.text= SummaryViewer.messagesDataLabel.text=messages SummaryViewer.callLogsDataLabel.text=callLogs SummaryViewer.contactsDataLabel.text=contacts SummaryViewer.messagesLabel.text=Messages: SummaryViewer.callLogsLabel.text=Call Logs: +SummaryViewer_Account_Description=This account represents a device in the case. SummaryViewer_CaseRefNameColumn_Title=Case Name SummaryViewer_CentralRepository_Message= SummaryViewer_Creation_Date_Title=Creation Date +SummaryViewer_Device_Account_Description=This account was referenced by a device in the case. +SummaryViewer_FileRef_Message= ThreadRootMessagePanel.showAllCheckBox.text=Show All Messages ThreadPane.backButton.text=<--- SummaryViewer.caseReferencesPanel.border.title=Other Occurrences @@ -60,6 +62,11 @@ MessageViewer.backButton.AccessibleContext.accessibleDescription= MessageViewer.backButton.text=Threads MessageViewer.showAllButton.text=All Messages SummaryViewer.thumbnailCntLabel.text=Media Attachments: -SummaryViewer.attachmentsLable.text=Total Attachments: SummaryViewer.thumbnailsDataLabel.text=attachments SummaryViewer.attachmentDataLabel.text=count +SummaryViewer.accountLabel.text= +SummaryViewer.contanctsPanel.border.title=Contacts +SummaryViewer.accoutDescriptionLabel.text= +SummaryViewer.mentionsLabel.text=Account Mentions: +SummaryViewer.mentionsDataLabel.text= +SummaryViewer.attachmentsLabel.text=Total Attachments: diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.form b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.form index 73ef1a68ba..1f35a08bdb 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.form +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.form @@ -11,7 +11,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -28,80 +28,23 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - + + + + + @@ -109,6 +52,11 @@ + + + + + @@ -116,6 +64,11 @@ + + + + + @@ -123,6 +76,11 @@ + + + + + @@ -130,6 +88,11 @@ + + + + + @@ -137,20 +100,23 @@ + + + + + - + - - - - - - - - + + + + + + @@ -158,6 +124,11 @@ + + + + + @@ -173,7 +144,7 @@ - + @@ -189,9 +160,112 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java index 539c1eb2d3..b58fbc6031 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java @@ -47,7 +47,10 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi "SummaryViewer_CaseRefNameColumn_Title=Case Name", "SummaryViewer_CentralRepository_Message=", "SummaryViewer_Creation_Date_Title=Creation Date", - "SummeryViewer_FileRef_Message=", + "SummaryViewer_Device_Account_Description=This account was referenced by a device in the case.", + "SummaryViewer_Account_Description=This account represents a device in the case.", + }) /** * Creates new form SummaryViewer @@ -72,7 +75,7 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi clearControls(); caseReferencesPanel.hideOutlineView(Bundle.SummaryViewer_CentralRepository_Message()); - fileReferencesPanel.hideOutlineView(Bundle.SummeryViewer_FileRef_Message()); + fileReferencesPanel.hideOutlineView(Bundle.SummaryViewer_FileRef_Message()); } @Override @@ -100,8 +103,19 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi setEnabled(false); clearControls(); - fileReferencesPanel.hideOutlineView(Bundle.SummeryViewer_FileRef_Message()); + fileReferencesPanel.hideOutlineView(Bundle.SummaryViewer_FileRef_Message()); } else { + Account[] accountArray = info.getAccounts().toArray(new Account[1]); + Account account = accountArray[0]; + + accountLabel.setText(account.getTypeSpecificID()); + + if (account.getAccountType().equals(Account.Type.DEVICE)) { + accoutDescriptionLabel.setText(Bundle.SummaryViewer_Account_Description()); + } else { + accoutDescriptionLabel.setText(Bundle.SummaryViewer_Device_Account_Description()); + } + SelectionSummary summaryDetails = info.getSummary(); thumbnailsDataLabel.setText(Integer.toString(summaryDetails.getThumbnailCnt())); @@ -139,6 +153,8 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi caseReferencesPanel.setEnabled(enabled); fileReferencesPanel.setEnabled(enabled); countsPanel.setEnabled(enabled); + messagesLabel.setEnabled(enabled); + attachmentsLabel.setEnabled(enabled); } /** @@ -150,7 +166,10 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi contactsDataLabel.setText(""); messagesDataLabel.setText(""); attachmentDataLabel.setText(""); - + accountLabel.setText(""); + accoutDescriptionLabel.setText(""); + messagesDataLabel.setText(""); + fileReferencesPanel.setNode(new AbstractNode(Children.LEAF)); caseReferencesPanel.setNode(new AbstractNode(Children.LEAF)); } @@ -186,131 +205,216 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi java.awt.GridBagConstraints gridBagConstraints; countsPanel = new javax.swing.JPanel(); - contactsLabel = new javax.swing.JLabel(); messagesLabel = new javax.swing.JLabel(); callLogsLabel = new javax.swing.JLabel(); thumbnailCntLabel = new javax.swing.JLabel(); thumbnailsDataLabel = new javax.swing.JLabel(); messagesDataLabel = new javax.swing.JLabel(); callLogsDataLabel = new javax.swing.JLabel(); - contactsDataLabel = new javax.swing.JLabel(); - attachmentsLable = new javax.swing.JLabel(); + attachmentsLabel = new javax.swing.JLabel(); attachmentDataLabel = new javax.swing.JLabel(); fileReferencesPanel = new org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel(); caseReferencesPanel = new org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel(); + summaryPanel = new javax.swing.JPanel(); + accountLabel = new javax.swing.JLabel(); + accoutDescriptionLabel = new javax.swing.JLabel(); + contanctsPanel = new javax.swing.JPanel(); + contactsLabel = new javax.swing.JLabel(); + contactsDataLabel = new javax.swing.JLabel(); + mentionsLabel = new javax.swing.JLabel(); + mentionsDataLabel = new javax.swing.JLabel(); setLayout(new java.awt.GridBagLayout()); countsPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.countsPanel.border.title"))); // NOI18N - - org.openide.awt.Mnemonics.setLocalizedText(contactsLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.contactsLabel.text")); // NOI18N + countsPanel.setLayout(new java.awt.GridBagLayout()); org.openide.awt.Mnemonics.setLocalizedText(messagesLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.messagesLabel.text")); // NOI18N - - org.openide.awt.Mnemonics.setLocalizedText(callLogsLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.callLogsLabel.text")); // NOI18N - - org.openide.awt.Mnemonics.setLocalizedText(thumbnailCntLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.thumbnailCntLabel.text")); // NOI18N - - org.openide.awt.Mnemonics.setLocalizedText(thumbnailsDataLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.thumbnailsDataLabel.text")); // NOI18N - - org.openide.awt.Mnemonics.setLocalizedText(messagesDataLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.messagesDataLabel.text")); // NOI18N - - org.openide.awt.Mnemonics.setLocalizedText(callLogsDataLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.callLogsDataLabel.text")); // NOI18N - - org.openide.awt.Mnemonics.setLocalizedText(contactsDataLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.contactsDataLabel.text")); // NOI18N - - org.openide.awt.Mnemonics.setLocalizedText(attachmentsLable, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.attachmentsLable.text")); // NOI18N - - org.openide.awt.Mnemonics.setLocalizedText(attachmentDataLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.attachmentDataLabel.text")); // NOI18N - - javax.swing.GroupLayout countsPanelLayout = new javax.swing.GroupLayout(countsPanel); - countsPanel.setLayout(countsPanelLayout); - countsPanelLayout.setHorizontalGroup( - countsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(countsPanelLayout.createSequentialGroup() - .addContainerGap() - .addGroup(countsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(messagesLabel) - .addComponent(callLogsLabel) - .addComponent(contactsLabel) - .addComponent(thumbnailCntLabel) - .addComponent(attachmentsLable)) - .addGap(18, 18, 18) - .addGroup(countsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(attachmentDataLabel) - .addComponent(thumbnailsDataLabel) - .addComponent(contactsDataLabel) - .addComponent(callLogsDataLabel) - .addComponent(messagesDataLabel)) - .addContainerGap(845, Short.MAX_VALUE)) - ); - countsPanelLayout.setVerticalGroup( - countsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(countsPanelLayout.createSequentialGroup() - .addGap(7, 7, 7) - .addGroup(countsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(messagesLabel) - .addComponent(messagesDataLabel)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(countsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(callLogsLabel) - .addComponent(callLogsDataLabel)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(countsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(contactsLabel) - .addComponent(contactsDataLabel)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(countsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(thumbnailCntLabel) - .addComponent(thumbnailsDataLabel)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addGroup(countsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(attachmentsLable) - .addComponent(attachmentDataLabel))) - ); - gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 0; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.weightx = 1.0; - add(countsPanel, gridBagConstraints); + gridBagConstraints.insets = new java.awt.Insets(9, 15, 9, 15); + countsPanel.add(messagesLabel, gridBagConstraints); - fileReferencesPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.fileReferencesPanel.border.title"))); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(callLogsLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.callLogsLabel.text")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 1; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.insets = new java.awt.Insets(0, 15, 9, 15); + countsPanel.add(callLogsLabel, gridBagConstraints); + + org.openide.awt.Mnemonics.setLocalizedText(thumbnailCntLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.thumbnailCntLabel.text")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.insets = new java.awt.Insets(0, 15, 9, 15); + countsPanel.add(thumbnailCntLabel, gridBagConstraints); + + org.openide.awt.Mnemonics.setLocalizedText(thumbnailsDataLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.thumbnailsDataLabel.text")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.insets = new java.awt.Insets(0, 0, 9, 15); + countsPanel.add(thumbnailsDataLabel, gridBagConstraints); + + org.openide.awt.Mnemonics.setLocalizedText(messagesDataLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.messagesDataLabel.text")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 0; gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; gridBagConstraints.weightx = 1.0; - gridBagConstraints.weighty = 1.0; - add(fileReferencesPanel, gridBagConstraints); + gridBagConstraints.insets = new java.awt.Insets(9, 0, 9, 15); + countsPanel.add(messagesDataLabel, gridBagConstraints); + + org.openide.awt.Mnemonics.setLocalizedText(callLogsDataLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.callLogsDataLabel.text")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 1; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.insets = new java.awt.Insets(0, 0, 9, 15); + countsPanel.add(callLogsDataLabel, gridBagConstraints); + + org.openide.awt.Mnemonics.setLocalizedText(attachmentsLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.attachmentsLabel.text")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 3; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.insets = new java.awt.Insets(0, 15, 9, 15); + countsPanel.add(attachmentsLabel, gridBagConstraints); + + org.openide.awt.Mnemonics.setLocalizedText(attachmentDataLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.attachmentDataLabel.text")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 3; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.insets = new java.awt.Insets(0, 0, 9, 15); + countsPanel.add(attachmentDataLabel, gridBagConstraints); - caseReferencesPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.caseReferencesPanel.border.title"))); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 2; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; gridBagConstraints.weightx = 1.0; + gridBagConstraints.insets = new java.awt.Insets(9, 0, 0, 0); + add(countsPanel, gridBagConstraints); + + fileReferencesPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.fileReferencesPanel.border.title"))); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 3; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.weightx = 1.0; gridBagConstraints.weighty = 1.0; + gridBagConstraints.insets = new java.awt.Insets(9, 0, 0, 0); + add(fileReferencesPanel, gridBagConstraints); + + caseReferencesPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.caseReferencesPanel.border.title"))); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 4; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.weightx = 1.0; + gridBagConstraints.weighty = 1.0; + gridBagConstraints.insets = new java.awt.Insets(9, 0, 0, 0); add(caseReferencesPanel, gridBagConstraints); + + summaryPanel.setLayout(new java.awt.GridBagLayout()); + + org.openide.awt.Mnemonics.setLocalizedText(accountLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.accountLabel.text")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 0; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.insets = new java.awt.Insets(15, 9, 0, 9); + summaryPanel.add(accountLabel, gridBagConstraints); + + org.openide.awt.Mnemonics.setLocalizedText(accoutDescriptionLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.accoutDescriptionLabel.text")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 1; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.weightx = 1.0; + gridBagConstraints.insets = new java.awt.Insets(15, 9, 15, 9); + summaryPanel.add(accoutDescriptionLabel, gridBagConstraints); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 0; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.SOUTHWEST; + gridBagConstraints.weightx = 1.0; + add(summaryPanel, gridBagConstraints); + + contanctsPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.contanctsPanel.border.title"))); // NOI18N + contanctsPanel.setLayout(new java.awt.GridBagLayout()); + + org.openide.awt.Mnemonics.setLocalizedText(contactsLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.contactsLabel.text")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 0; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.insets = new java.awt.Insets(9, 15, 9, 15); + contanctsPanel.add(contactsLabel, gridBagConstraints); + + org.openide.awt.Mnemonics.setLocalizedText(contactsDataLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.contactsDataLabel.text")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 0; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.weightx = 1.0; + gridBagConstraints.insets = new java.awt.Insets(9, 0, 9, 15); + contanctsPanel.add(contactsDataLabel, gridBagConstraints); + + org.openide.awt.Mnemonics.setLocalizedText(mentionsLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.mentionsLabel.text")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 1; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.insets = new java.awt.Insets(0, 15, 9, 15); + contanctsPanel.add(mentionsLabel, gridBagConstraints); + + org.openide.awt.Mnemonics.setLocalizedText(mentionsDataLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.mentionsDataLabel.text")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 1; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.insets = new java.awt.Insets(0, 0, 9, 15); + contanctsPanel.add(mentionsDataLabel, gridBagConstraints); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 1; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + add(contanctsPanel, gridBagConstraints); }// //GEN-END:initComponents // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JLabel accountLabel; + private javax.swing.JLabel accoutDescriptionLabel; private javax.swing.JLabel attachmentDataLabel; - private javax.swing.JLabel attachmentsLable; + private javax.swing.JLabel attachmentsLabel; private javax.swing.JLabel callLogsDataLabel; private javax.swing.JLabel callLogsLabel; private org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel caseReferencesPanel; private javax.swing.JLabel contactsDataLabel; private javax.swing.JLabel contactsLabel; + private javax.swing.JPanel contanctsPanel; private javax.swing.JPanel countsPanel; private org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel fileReferencesPanel; + private javax.swing.JLabel mentionsDataLabel; + private javax.swing.JLabel mentionsLabel; private javax.swing.JLabel messagesDataLabel; private javax.swing.JLabel messagesLabel; + private javax.swing.JPanel summaryPanel; private javax.swing.JLabel thumbnailCntLabel; private javax.swing.JLabel thumbnailsDataLabel; // End of variables declaration//GEN-END:variables From cb08fc67b9fc0bc1bb300443e387b6cf3274159e Mon Sep 17 00:00:00 2001 From: Kelly Kelly Date: Tue, 24 Sep 2019 12:37:36 -0400 Subject: [PATCH 2/6] Updated summary book changes --- .../AccountDeviceInstanceNodeFactory.java | 1 - .../autopsy/communications/Bundle.properties | 2 +- .../communications/Bundle.properties-MERGED | 2 +- .../relationships/Bundle.properties | 3 ++- .../relationships/Bundle.properties-MERGED | 3 ++- .../relationships/SummaryViewer.form | 12 ++++++++++ .../relationships/SummaryViewer.java | 23 +++++++++++++++++-- 7 files changed, 39 insertions(+), 7 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/communications/AccountDeviceInstanceNodeFactory.java b/Core/src/org/sleuthkit/autopsy/communications/AccountDeviceInstanceNodeFactory.java index 171cc32cb2..ac218ea4ec 100644 --- a/Core/src/org/sleuthkit/autopsy/communications/AccountDeviceInstanceNodeFactory.java +++ b/Core/src/org/sleuthkit/autopsy/communications/AccountDeviceInstanceNodeFactory.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import org.openide.nodes.ChildFactory; import org.openide.nodes.Node; import org.sleuthkit.autopsy.coreutils.Logger; -import org.sleuthkit.datamodel.Account; import org.sleuthkit.datamodel.AccountDeviceInstance; import org.sleuthkit.datamodel.CommunicationsFilter; import org.sleuthkit.datamodel.CommunicationsManager; diff --git a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties b/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties index 6ac5b46b39..d3d0bd2ebc 100644 --- a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties @@ -49,4 +49,4 @@ VisualizationPanel.forwardButton.text= VisualizationPanel.zoomPercentLabel.text=100% VisualizationPanel.zoomLabel.text=Zoom: VisualizationPanel.snapshotButton.toolTipText=Generate Snapshot report. -SummaryViewer.contactsLabel.text=Book Entries: +SummaryViewer.contactsLabel.text=Entries in Book: diff --git a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED index a872eac7ea..51a95f04c8 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED @@ -92,7 +92,7 @@ VisualizationPanel.forwardButton.text= VisualizationPanel.zoomPercentLabel.text=100% VisualizationPanel.zoomLabel.text=Zoom: VisualizationPanel.snapshotButton.toolTipText=Generate Snapshot report. -SummaryViewer.contactsLabel.text=Book Entries: +SummaryViewer.contactsLabel.text=Entries in Book*: VisualizationPanel_action_dialogs_title=Communications VisualizationPanel_action_name_text=Snapshot Report VisualizationPanel_module_name=Communications diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties index 56ccc314d8..23e7688d2d 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties @@ -23,6 +23,7 @@ SummaryViewer.attachmentDataLabel.text=count SummaryViewer.accountLabel.text= SummaryViewer.contanctsPanel.border.title=Contacts SummaryViewer.accoutDescriptionLabel.text= -SummaryViewer.mentionsLabel.text=Account Mentions: +SummaryViewer.mentionsLabel.text=References: SummaryViewer.mentionsDataLabel.text= SummaryViewer.attachmentsLabel.text=Total Attachments: +SummaryViewer.jLabel1.text=*Only accounts which represent a device will have contact entries, all other accounts reference contacts. diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED index f6b0121ed3..ef44413658 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED @@ -67,6 +67,7 @@ SummaryViewer.attachmentDataLabel.text=count SummaryViewer.accountLabel.text= SummaryViewer.contanctsPanel.border.title=Contacts SummaryViewer.accoutDescriptionLabel.text= -SummaryViewer.mentionsLabel.text=Account Mentions: +SummaryViewer.mentionsLabel.text=References: SummaryViewer.mentionsDataLabel.text= SummaryViewer.attachmentsLabel.text=Total Attachments: +SummaryViewer.jLabel1.text=*Only accounts which represent a device will have contact entries, all other types of accouts reference contacts. diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.form b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.form index 1f35a08bdb..86585e1ae2 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.form +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.form @@ -265,6 +265,18 @@ + + + + + + + + + + + + diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java index b58fbc6031..edf61f5bce 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java @@ -123,6 +123,14 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi contactsDataLabel.setText(Integer.toString(summaryDetails.getContactsCnt())); messagesDataLabel.setText(Integer.toString(summaryDetails.getMessagesCnt() + summaryDetails.getEmailCnt())); attachmentDataLabel.setText(Integer.toString(summaryDetails.getAttachmentCnt())); + + if (account.getAccountType().equals(Account.Type.DEVICE)) { + contactsDataLabel.setText(Integer.toString(summaryDetails.getContactsCnt())); + mentionsDataLabel.setText("0"); + } else { + mentionsDataLabel.setText(Integer.toString(summaryDetails.getContactsCnt())); + contactsDataLabel.setText("0"); + } fileReferencesPanel.showOutlineView(); @@ -153,7 +161,7 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi caseReferencesPanel.setEnabled(enabled); fileReferencesPanel.setEnabled(enabled); countsPanel.setEnabled(enabled); - messagesLabel.setEnabled(enabled); + mentionsLabel.setEnabled(enabled); attachmentsLabel.setEnabled(enabled); } @@ -168,7 +176,7 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi attachmentDataLabel.setText(""); accountLabel.setText(""); accoutDescriptionLabel.setText(""); - messagesDataLabel.setText(""); + mentionsDataLabel.setText(""); fileReferencesPanel.setNode(new AbstractNode(Children.LEAF)); caseReferencesPanel.setNode(new AbstractNode(Children.LEAF)); @@ -223,6 +231,7 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi contactsDataLabel = new javax.swing.JLabel(); mentionsLabel = new javax.swing.JLabel(); mentionsDataLabel = new javax.swing.JLabel(); + jLabel1 = new javax.swing.JLabel(); setLayout(new java.awt.GridBagLayout()); @@ -388,6 +397,15 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi gridBagConstraints.insets = new java.awt.Insets(0, 0, 9, 15); contanctsPanel.add(mentionsDataLabel, gridBagConstraints); + org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.jLabel1.text")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 2; + gridBagConstraints.gridwidth = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.insets = new java.awt.Insets(0, 15, 0, 0); + contanctsPanel.add(jLabel1, gridBagConstraints); + gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 1; @@ -410,6 +428,7 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi private javax.swing.JPanel contanctsPanel; private javax.swing.JPanel countsPanel; private org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel fileReferencesPanel; + private javax.swing.JLabel jLabel1; private javax.swing.JLabel mentionsDataLabel; private javax.swing.JLabel mentionsLabel; private javax.swing.JLabel messagesDataLabel; From 8233edc070f510da36648ea0b9fae6c03e97a38d Mon Sep 17 00:00:00 2001 From: Kelly Kelly Date: Fri, 27 Sep 2019 11:31:07 -0400 Subject: [PATCH 3/6] Simplified the contact pane for release --- .../relationships/Bundle.properties | 5 +-- .../relationships/Bundle.properties-MERGED | 5 +-- .../relationships/SummaryViewer.form | 36 ---------------- .../relationships/SummaryViewer.java | 41 +------------------ 4 files changed, 3 insertions(+), 84 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties index 23e7688d2d..74977be715 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties @@ -1,6 +1,6 @@ ContactDetailsPane.nameLabel.text=Placeholder SummaryViewer.countsPanel.border.title=Communications -SummaryViewer.contactsLabel.text=Book Entries: +SummaryViewer.contactsLabel.text=Total Count: OutlineViewPanel.messageLabel.text= SummaryViewer.messagesDataLabel.text=messages SummaryViewer.callLogsDataLabel.text=callLogs @@ -23,7 +23,4 @@ SummaryViewer.attachmentDataLabel.text=count SummaryViewer.accountLabel.text= SummaryViewer.contanctsPanel.border.title=Contacts SummaryViewer.accoutDescriptionLabel.text= -SummaryViewer.mentionsLabel.text=References: -SummaryViewer.mentionsDataLabel.text= SummaryViewer.attachmentsLabel.text=Total Attachments: -SummaryViewer.jLabel1.text=*Only accounts which represent a device will have contact entries, all other accounts reference contacts. diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED index ef44413658..08432403e6 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED @@ -36,7 +36,7 @@ MessageViewer_viewMessage_calllogs=Call Logs MessageViewer_viewMessage_selected=Selected MessageViewer_viewMessage_unthreaded=Unthreaded SummaryViewer.countsPanel.border.title=Communications -SummaryViewer.contactsLabel.text=Book Entries: +SummaryViewer.contactsLabel.text=Total Count: OutlineViewPanel.messageLabel.text= SummaryViewer.messagesDataLabel.text=messages SummaryViewer.callLogsDataLabel.text=callLogs @@ -67,7 +67,4 @@ SummaryViewer.attachmentDataLabel.text=count SummaryViewer.accountLabel.text= SummaryViewer.contanctsPanel.border.title=Contacts SummaryViewer.accoutDescriptionLabel.text= -SummaryViewer.mentionsLabel.text=References: -SummaryViewer.mentionsDataLabel.text= SummaryViewer.attachmentsLabel.text=Total Attachments: -SummaryViewer.jLabel1.text=*Only accounts which represent a device will have contact entries, all other types of accouts reference contacts. diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.form b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.form index 86585e1ae2..153a7f1187 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.form +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.form @@ -241,42 +241,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java index edf61f5bce..068c456cff 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java @@ -124,13 +124,7 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi messagesDataLabel.setText(Integer.toString(summaryDetails.getMessagesCnt() + summaryDetails.getEmailCnt())); attachmentDataLabel.setText(Integer.toString(summaryDetails.getAttachmentCnt())); - if (account.getAccountType().equals(Account.Type.DEVICE)) { - contactsDataLabel.setText(Integer.toString(summaryDetails.getContactsCnt())); - mentionsDataLabel.setText("0"); - } else { - mentionsDataLabel.setText(Integer.toString(summaryDetails.getContactsCnt())); - contactsDataLabel.setText("0"); - } + contactsDataLabel.setText(Integer.toString(summaryDetails.getContactsCnt())); fileReferencesPanel.showOutlineView(); @@ -161,7 +155,6 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi caseReferencesPanel.setEnabled(enabled); fileReferencesPanel.setEnabled(enabled); countsPanel.setEnabled(enabled); - mentionsLabel.setEnabled(enabled); attachmentsLabel.setEnabled(enabled); } @@ -176,7 +169,6 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi attachmentDataLabel.setText(""); accountLabel.setText(""); accoutDescriptionLabel.setText(""); - mentionsDataLabel.setText(""); fileReferencesPanel.setNode(new AbstractNode(Children.LEAF)); caseReferencesPanel.setNode(new AbstractNode(Children.LEAF)); @@ -229,9 +221,6 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi contanctsPanel = new javax.swing.JPanel(); contactsLabel = new javax.swing.JLabel(); contactsDataLabel = new javax.swing.JLabel(); - mentionsLabel = new javax.swing.JLabel(); - mentionsDataLabel = new javax.swing.JLabel(); - jLabel1 = new javax.swing.JLabel(); setLayout(new java.awt.GridBagLayout()); @@ -381,31 +370,6 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi gridBagConstraints.insets = new java.awt.Insets(9, 0, 9, 15); contanctsPanel.add(contactsDataLabel, gridBagConstraints); - org.openide.awt.Mnemonics.setLocalizedText(mentionsLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.mentionsLabel.text")); // NOI18N - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 1; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.insets = new java.awt.Insets(0, 15, 9, 15); - contanctsPanel.add(mentionsLabel, gridBagConstraints); - - org.openide.awt.Mnemonics.setLocalizedText(mentionsDataLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.mentionsDataLabel.text")); // NOI18N - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 1; - gridBagConstraints.gridy = 1; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.insets = new java.awt.Insets(0, 0, 9, 15); - contanctsPanel.add(mentionsDataLabel, gridBagConstraints); - - org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.jLabel1.text")); // NOI18N - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 2; - gridBagConstraints.gridwidth = 2; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.insets = new java.awt.Insets(0, 15, 0, 0); - contanctsPanel.add(jLabel1, gridBagConstraints); - gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 1; @@ -428,9 +392,6 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi private javax.swing.JPanel contanctsPanel; private javax.swing.JPanel countsPanel; private org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel fileReferencesPanel; - private javax.swing.JLabel jLabel1; - private javax.swing.JLabel mentionsDataLabel; - private javax.swing.JLabel mentionsLabel; private javax.swing.JLabel messagesDataLabel; private javax.swing.JLabel messagesLabel; private javax.swing.JPanel summaryPanel; From 5e208629ddc318aa0e0a3a481d12dd5b3d1cc1bf Mon Sep 17 00:00:00 2001 From: Kelly Kelly Date: Fri, 27 Sep 2019 13:08:35 -0400 Subject: [PATCH 4/6] Added message per Brian request --- .../communications/relationships/Bundle.properties-MERGED | 1 + .../autopsy/communications/relationships/SummaryViewer.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED index 08432403e6..75c30197eb 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED @@ -44,6 +44,7 @@ SummaryViewer.contactsDataLabel.text=contacts SummaryViewer.messagesLabel.text=Messages: SummaryViewer.callLogsLabel.text=Call Logs: SummaryViewer_Account_Description=This account represents a device in the case. +SummaryViewer_Account_Description_MuliSelect=Summary information is not available when multiple accounts are selected. SummaryViewer_CaseRefNameColumn_Title=Case Name SummaryViewer_CentralRepository_Message= SummaryViewer_Creation_Date_Title=Creation Date diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java index 068c456cff..dee5ccbceb 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java @@ -47,9 +47,10 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi "SummaryViewer_CaseRefNameColumn_Title=Case Name", "SummaryViewer_CentralRepository_Message=", "SummaryViewer_Creation_Date_Title=Creation Date", - "SummaryViewer_FileRef_Message=", "SummaryViewer_Device_Account_Description=This account was referenced by a device in the case.", "SummaryViewer_Account_Description=This account represents a device in the case.", + "SummaryViewer_Account_Description_MuliSelect=Summary information is not available when multiple accounts are selected." }) /** @@ -102,6 +103,8 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi if (info.getAccounts().size() != 1) { setEnabled(false); clearControls(); + + accoutDescriptionLabel.setText(Bundle.SummaryViewer_Account_Description_MuliSelect()); fileReferencesPanel.hideOutlineView(Bundle.SummaryViewer_FileRef_Message()); } else { From d4948c5c4784468c773800161b0ef069a009158b Mon Sep 17 00:00:00 2001 From: Kelly Kelly Date: Fri, 27 Sep 2019 13:47:13 -0400 Subject: [PATCH 5/6] updating bundle files --- Core/src/org/sleuthkit/autopsy/communications/Bundle.properties | 1 - .../sleuthkit/autopsy/communications/Bundle.properties-MERGED | 1 - 2 files changed, 2 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties b/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties index d3d0bd2ebc..1b2dd9ae37 100644 --- a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties @@ -49,4 +49,3 @@ VisualizationPanel.forwardButton.text= VisualizationPanel.zoomPercentLabel.text=100% VisualizationPanel.zoomLabel.text=Zoom: VisualizationPanel.snapshotButton.toolTipText=Generate Snapshot report. -SummaryViewer.contactsLabel.text=Entries in Book: diff --git a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED index 51a95f04c8..2ad2305d38 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED @@ -92,7 +92,6 @@ VisualizationPanel.forwardButton.text= VisualizationPanel.zoomPercentLabel.text=100% VisualizationPanel.zoomLabel.text=Zoom: VisualizationPanel.snapshotButton.toolTipText=Generate Snapshot report. -SummaryViewer.contactsLabel.text=Entries in Book*: VisualizationPanel_action_dialogs_title=Communications VisualizationPanel_action_name_text=Snapshot Report VisualizationPanel_module_name=Communications From f4cd16d6985dfba321a84889ca8299e6c63cb41b Mon Sep 17 00:00:00 2001 From: Kelly Kelly Date: Fri, 27 Sep 2019 13:48:55 -0400 Subject: [PATCH 6/6] Updated bundle file --- .../communications/relationships/Bundle.properties-MERGED | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED index 75c30197eb..e8cf538b5d 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED @@ -49,7 +49,7 @@ SummaryViewer_CaseRefNameColumn_Title=Case Name SummaryViewer_CentralRepository_Message= SummaryViewer_Creation_Date_Title=Creation Date SummaryViewer_Device_Account_Description=This account was referenced by a device in the case. -SummaryViewer_FileRef_Message= SummaryViewer_FileRefNameColumn_Title=Path SummaryViewer_TabTitle=Summary ThreadRootMessagePanel.showAllCheckBox.text=Show All Messages