Merge pull request #4961 from wschaeferB/5268-CVTSummaryTweaks

5268 cvt summary tweaks

Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties

@@ -1,13 +1,11 @@
 ContactDetailsPane.nameLabel.text=Placeholder
 SummaryViewer.countsPanel.border.title=Counts
-SummaryViewer.emailLabel.text=Emails:
 SummaryViewer.contactsLabel.text=Contacts:
-SummaryViewer.attachmentsLabel.text=Attachments:
+SummaryViewer.attachmentsLabel.text=Media Attachments:
 OutlineViewPanel.messageLabel.text=<Control Disabled>
 SummaryViewer.messagesDataLabel.text=messages
 SummaryViewer.callLogsDataLabel.text=callLogs
 SummaryViewer.contactsDataLabel.text=contacts
-SummaryViewer.emailDataLabel.text=emails
 SummaryViewer.attachmentsDataLabel.text=attachments
 SummaryViewer.messagesLabel.text=Messages:
 SummaryViewer.callLogsLabel.text=Call Logs:

Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED

@@ -11,7 +11,7 @@ ContactsViewer_columnHeader_Name=Name
 ContactsViewer_columnHeader_Phone=Phone
 ContactsViewer_noContacts_message=<No contacts found for selected account>
 ContactsViewer_tabTitle=Contacts
-MediaViewer_Name=Media
+MediaViewer_Name=Media Attachments
 MessageNode_Node_Property_Attms=Attachments
 MessageNode_Node_Property_Date=Date
 MessageNode_Node_Property_From=From
@@ -30,14 +30,12 @@ MessageViewer_viewMessage_all=All
 MessageViewer_viewMessage_selected=Selected
 MessageViewer_viewMessage_unthreaded=Unthreaded
 SummaryViewer.countsPanel.border.title=Counts
-SummaryViewer.emailLabel.text=Emails:
 SummaryViewer.contactsLabel.text=Contacts:
-SummaryViewer.attachmentsLabel.text=Attachments:
+SummaryViewer.attachmentsLabel.text=Media Attachments:
 OutlineViewPanel.messageLabel.text=<Control Disabled>
 SummaryViewer.messagesDataLabel.text=messages
 SummaryViewer.callLogsDataLabel.text=callLogs
 SummaryViewer.contactsDataLabel.text=contacts
-SummaryViewer.emailDataLabel.text=emails
 SummaryViewer.attachmentsDataLabel.text=attachments
 SummaryViewer.messagesLabel.text=Messages:
 SummaryViewer.callLogsLabel.text=Call Logs:

Core/src/org/sleuthkit/autopsy/communications/relationships/MediaViewer.java

@@ -59,7 +59,7 @@ final class MediaViewer extends JPanel implements RelationshipsViewer, ExplorerM
     private final ModifiableProxyLookup proxyLookup;
 
     @Messages({
-        "MediaViewer_Name=Media"
+        "MediaViewer_Name=Media Attachments"
     })
     /**
      * Creates new form ThumbnailViewer

Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.form

@@ -11,7 +11,7 @@
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
-    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,3,70,0,0,4,-35"/>
+    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,4,7,0,0,4,-35"/>
   </AuxValues>
 
   <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
@@ -38,21 +38,19 @@
               <Group type="102" attributes="0">
                   <EmptySpace max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="0" attributes="0">
-                      <Component id="attachmentsLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                       <Component id="messagesLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                       <Component id="callLogsLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                       <Component id="contactsLabel" alignment="0" min="-2" max="-2" attributes="0"/>
-                      <Component id="emailLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+                      <Component id="attachmentsLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace type="separate" max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="0" attributes="0">
-                      <Component id="emailDataLabel" min="-2" max="-2" attributes="0"/>
+                      <Component id="attachmentsDataLabel" min="-2" max="-2" attributes="0"/>
                       <Component id="contactsDataLabel" min="-2" max="-2" attributes="0"/>
                       <Component id="callLogsDataLabel" min="-2" max="-2" attributes="0"/>
                       <Component id="messagesDataLabel" min="-2" max="-2" attributes="0"/>
-                      <Component id="attachmentsDataLabel" min="-2" max="-2" attributes="0"/>
                   </Group>
-                  <EmptySpace max="32767" attributes="0"/>
+                  <EmptySpace pref="959" max="32767" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
@@ -60,11 +58,6 @@
           <Group type="103" groupAlignment="0" attributes="0">
               <Group type="102" alignment="0" attributes="0">
                   <EmptySpace min="-2" pref="7" max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="3" attributes="0">
-                      <Component id="attachmentsLabel" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="attachmentsDataLabel" alignment="3" min="-2" max="-2" attributes="0"/>
-                  </Group>
-                  <EmptySpace max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="3" attributes="0">
                       <Component id="messagesLabel" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="messagesDataLabel" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -81,8 +74,8 @@
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="3" attributes="0">
-                      <Component id="emailLabel" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="attachmentsLabel" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="emailDataLabel" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="attachmentsDataLabel" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace max="32767" attributes="0"/>
               </Group>
@@ -90,13 +83,6 @@
         </DimensionLayout>
       </Layout>
       <SubComponents>
-        <Component class="javax.swing.JLabel" name="emailLabel">
-          <Properties>
-            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/communications/relationships/Bundle.properties" key="SummaryViewer.emailLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-            </Property>
-          </Properties>
-        </Component>
         <Component class="javax.swing.JLabel" name="contactsLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
@@ -153,13 +139,6 @@
             </Property>
           </Properties>
         </Component>
-        <Component class="javax.swing.JLabel" name="emailDataLabel">
-          <Properties>
-            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/communications/relationships/Bundle.properties" key="SummaryViewer.emailDataLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-            </Property>
-          </Properties>
-        </Component>
       </SubComponents>
     </Container>
     <Component class="org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel" name="fileReferencesPanel">

Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java

@@ -47,8 +47,7 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
         "SummaryViewer_CaseRefNameColumn_Title=Case Name",
         "SummaryViewer_CentralRepository_Message=<Enable Central Resposity to see Other Occurrences>",
         "SummaryViewer_Creation_Date_Title=Creation Date",
-        "SummeryViewer_FileRef_Message=<Select one Accout to see File References>",
+        "SummeryViewer_FileRef_Message=<Select one Accout to see File References>",})
-    })
 
     /**
      * Creates new form SummaryViewer
@@ -71,7 +70,7 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
         ((DefaultOutlineModel) outline.getOutlineModel()).setNodesColumnLabel(Bundle.SummaryViewer_CaseRefNameColumn_Title());
 
         clearControls();
-        
+
         caseReferencesPanel.hideOutlineView(Bundle.SummaryViewer_CentralRepository_Message());
         fileReferencesPanel.hideOutlineView(Bundle.SummeryViewer_FileRef_Message());
     }
@@ -100,7 +99,7 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
         if (info.getAccounts().size() != 1) {
             setEnabled(false);
             clearControls();
-            
+
             fileReferencesPanel.hideOutlineView(Bundle.SummeryViewer_FileRef_Message());
         } else {
             SelectionSummary summaryDetails = info.getSummary();
@@ -108,9 +107,8 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
             attachmentsDataLabel.setText(Integer.toString(summaryDetails.getAttachmentCnt()));
             callLogsDataLabel.setText(Integer.toString(summaryDetails.getCallLogCnt()));
             contactsDataLabel.setText(Integer.toString(summaryDetails.getContactsCnt()));
-            emailDataLabel.setText(Integer.toString(summaryDetails.getEmailCnt()));
+            messagesDataLabel.setText(Integer.toString(summaryDetails.getMessagesCnt() + summaryDetails.getEmailCnt()));
-            messagesDataLabel.setText(Integer.toString(summaryDetails.getMessagesCnt()));
+
-            
             fileReferencesPanel.showOutlineView();
 
             fileReferencesPanel.setNode(new AbstractNode(Children.create(new AccountSourceContentChildNodeFactory(info.getAccounts()), true)));
@@ -136,7 +134,6 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
         attachmentsLabel.setEnabled(enabled);
         callLogsLabel.setEnabled(enabled);
         contactsLabel.setEnabled(enabled);
-        emailLabel.setEnabled(enabled);
         messagesLabel.setEnabled(enabled);
         caseReferencesPanel.setEnabled(enabled);
         fileReferencesPanel.setEnabled(enabled);
@@ -150,7 +147,6 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
         attachmentsDataLabel.setText("");
         callLogsDataLabel.setText("");
         contactsDataLabel.setText("");
-        emailDataLabel.setText("");
         messagesDataLabel.setText("");
 
         fileReferencesPanel.setNode(new AbstractNode(Children.LEAF));
@@ -188,7 +184,6 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
         java.awt.GridBagConstraints gridBagConstraints;
 
         countsPanel = new javax.swing.JPanel();
-        emailLabel = new javax.swing.JLabel();
         contactsLabel = new javax.swing.JLabel();
         messagesLabel = new javax.swing.JLabel();
         callLogsLabel = new javax.swing.JLabel();
@@ -197,7 +192,6 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
         messagesDataLabel = new javax.swing.JLabel();
         callLogsDataLabel = new javax.swing.JLabel();
         contactsDataLabel = new javax.swing.JLabel();
-        emailDataLabel = new javax.swing.JLabel();
         fileReferencesPanel = new org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel();
         caseReferencesPanel = new org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel();
 
@@ -205,8 +199,6 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
 
         countsPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.countsPanel.border.title"))); // NOI18N
 
-        org.openide.awt.Mnemonics.setLocalizedText(emailLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.emailLabel.text")); // NOI18N
-
         org.openide.awt.Mnemonics.setLocalizedText(contactsLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.contactsLabel.text")); // NOI18N
 
         org.openide.awt.Mnemonics.setLocalizedText(messagesLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.messagesLabel.text")); // NOI18N
@@ -223,8 +215,6 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
 
         org.openide.awt.Mnemonics.setLocalizedText(contactsDataLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.contactsDataLabel.text")); // NOI18N
 
-        org.openide.awt.Mnemonics.setLocalizedText(emailDataLabel, org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.emailDataLabel.text")); // NOI18N
-
         javax.swing.GroupLayout countsPanelLayout = new javax.swing.GroupLayout(countsPanel);
         countsPanel.setLayout(countsPanelLayout);
         countsPanelLayout.setHorizontalGroup(
@@ -232,28 +222,22 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
             .addGroup(countsPanelLayout.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(countsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(attachmentsLabel)
                     .addComponent(messagesLabel)
                     .addComponent(callLogsLabel)
                     .addComponent(contactsLabel)
-                    .addComponent(emailLabel))
+                    .addComponent(attachmentsLabel))
                 .addGap(18, 18, 18)
                 .addGroup(countsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(emailDataLabel)
+                    .addComponent(attachmentsDataLabel)
                     .addComponent(contactsDataLabel)
                     .addComponent(callLogsDataLabel)
-                    .addComponent(messagesDataLabel)
+                    .addComponent(messagesDataLabel))
-                    .addComponent(attachmentsDataLabel))
+                .addContainerGap(959, Short.MAX_VALUE))
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, 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(attachmentsLabel)
-                    .addComponent(attachmentsDataLabel))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(countsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(messagesLabel)
                     .addComponent(messagesDataLabel))
@@ -267,8 +251,8 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
                     .addComponent(contactsDataLabel))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(countsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(emailLabel)
+                    .addComponent(attachmentsLabel)
-                    .addComponent(emailDataLabel))
+                    .addComponent(attachmentsDataLabel))
                 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
 
@@ -311,8 +295,6 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
     private javax.swing.JLabel contactsDataLabel;
     private javax.swing.JLabel contactsLabel;
     private javax.swing.JPanel countsPanel;
-    private javax.swing.JLabel emailDataLabel;
-    private javax.swing.JLabel emailLabel;
     private org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel fileReferencesPanel;
     private javax.swing.JLabel messagesDataLabel;
     private javax.swing.JLabel messagesLabel;