Added a section to display Other attributes.

Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties

@@ -959,3 +959,4 @@ DefaultArtifactContentViewer.selectAllMenuItem.text=Select All
 ContactArtifactViewer.contactNameLabel.text=Joanna Doe
 ContactArtifactViewer.phonesLabel.text=Phone
 ContactArtifactViewer.emailsLabel.text=Email
+ContactArtifactViewer.othersLabel.text=Other

Core/src/org/sleuthkit/autopsy/contentviewers/ContactArtifactViewer.form

@@ -11,6 +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,1,-27,0,0,1,-112"/>
   </AuxValues>
 
   <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
@@ -18,7 +19,7 @@
     <Container class="javax.swing.JPanel" name="namePanel">
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-          <GridBagConstraints gridX="0" gridY="0" gridWidth="3" gridHeight="1" fill="0" ipadX="227" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
+          <GridBagConstraints gridX="0" gridY="0" gridWidth="4" gridHeight="1" fill="0" ipadX="227" ipadY="-7" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
         </Constraint>
       </Constraints>
 
@@ -66,14 +67,14 @@
       </Properties>
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-          <GridBagConstraints gridX="0" gridY="1" gridWidth="2" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="19" insetsBottom="0" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
+          <GridBagConstraints gridX="0" gridY="1" gridWidth="3" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="18" insetsLeft="19" insetsBottom="0" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
         </Constraint>
       </Constraints>
     </Component>
     <Container class="javax.swing.JPanel" name="phoneNumbersPanel">
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-          <GridBagConstraints gridX="0" gridY="2" gridWidth="3" gridHeight="1" fill="0" ipadX="400" ipadY="101" insetsTop="6" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
+          <GridBagConstraints gridX="0" gridY="2" gridWidth="4" gridHeight="1" fill="0" ipadX="400" ipadY="101" insetsTop="6" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
         </Constraint>
       </Constraints>
 
@@ -90,14 +91,38 @@
       </Properties>
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-          <GridBagConstraints gridX="0" gridY="3" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="6" insetsLeft="19" insetsBottom="0" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
+          <GridBagConstraints gridX="0" gridY="3" gridWidth="2" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="6" insetsLeft="19" insetsBottom="0" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
         </Constraint>
       </Constraints>
     </Component>
     <Container class="javax.swing.JPanel" name="emailsPanel">
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-          <GridBagConstraints gridX="0" gridY="4" gridWidth="3" gridHeight="1" fill="0" ipadX="400" ipadY="106" insetsTop="9" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
+          <GridBagConstraints gridX="0" gridY="4" gridWidth="4" gridHeight="1" fill="0" ipadX="400" ipadY="106" insetsTop="9" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
+        </Constraint>
+      </Constraints>
+
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
+    </Container>
+    <Component class="javax.swing.JLabel" name="othersLabel">
+      <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+          <Font name="Dialog" size="14" style="1"/>
+        </Property>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/Bundle.properties" key="ContactArtifactViewer.othersLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+      <Constraints>
+        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+          <GridBagConstraints gridX="0" gridY="5" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="18" insetsLeft="19" insetsBottom="0" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
+        </Constraint>
+      </Constraints>
+    </Component>
+    <Container class="javax.swing.JPanel" name="otherAttrsPanel">
+      <Constraints>
+        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+          <GridBagConstraints gridX="0" gridY="6" gridWidth="4" gridHeight="1" fill="0" ipadX="400" ipadY="100" insetsTop="6" insetsLeft="0" insetsBottom="29" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
         </Constraint>
       </Constraints>
 

Core/src/org/sleuthkit/autopsy/contentviewers/ContactArtifactViewer.java

@@ -62,6 +62,8 @@ public class ContactArtifactViewer extends javax.swing.JPanel implements Artifac
         phoneNumbersPanel = new javax.swing.JPanel();
         emailsLabel = new javax.swing.JLabel();
         emailsPanel = new javax.swing.JPanel();
+        othersLabel = new javax.swing.JLabel();
+        otherAttrsPanel = new javax.swing.JPanel();
 
         setLayout(new java.awt.GridBagLayout());
 
@@ -88,8 +90,9 @@ public class ContactArtifactViewer extends javax.swing.JPanel implements Artifac
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 0;
         gridBagConstraints.gridy = 0;
-        gridBagConstraints.gridwidth = 3;
+        gridBagConstraints.gridwidth = 4;
         gridBagConstraints.ipadx = 227;
+        gridBagConstraints.ipady = -7;
         gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
         add(namePanel, gridBagConstraints);
 
@@ -98,16 +101,16 @@ public class ContactArtifactViewer extends javax.swing.JPanel implements Artifac
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 0;
         gridBagConstraints.gridy = 1;
-        gridBagConstraints.gridwidth = 2;
+        gridBagConstraints.gridwidth = 3;
         gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
-        gridBagConstraints.insets = new java.awt.Insets(12, 19, 0, 0);
+        gridBagConstraints.insets = new java.awt.Insets(18, 19, 0, 0);
         add(phonesLabel, gridBagConstraints);
 
         phoneNumbersPanel.setLayout(new java.awt.GridBagLayout());
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 0;
         gridBagConstraints.gridy = 2;
-        gridBagConstraints.gridwidth = 3;
+        gridBagConstraints.gridwidth = 4;
         gridBagConstraints.ipadx = 400;
         gridBagConstraints.ipady = 101;
         gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
@@ -119,6 +122,7 @@ public class ContactArtifactViewer extends javax.swing.JPanel implements Artifac
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 0;
         gridBagConstraints.gridy = 3;
+        gridBagConstraints.gridwidth = 2;
         gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
         gridBagConstraints.insets = new java.awt.Insets(6, 19, 0, 0);
         add(emailsLabel, gridBagConstraints);
@@ -127,12 +131,32 @@ public class ContactArtifactViewer extends javax.swing.JPanel implements Artifac
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 0;
         gridBagConstraints.gridy = 4;
-        gridBagConstraints.gridwidth = 3;
+        gridBagConstraints.gridwidth = 4;
         gridBagConstraints.ipadx = 400;
         gridBagConstraints.ipady = 106;
         gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
         gridBagConstraints.insets = new java.awt.Insets(9, 0, 0, 0);
         add(emailsPanel, gridBagConstraints);
+
+        othersLabel.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(othersLabel, org.openide.util.NbBundle.getMessage(ContactArtifactViewer.class, "ContactArtifactViewer.othersLabel.text")); // NOI18N
+        gridBagConstraints = new java.awt.GridBagConstraints();
+        gridBagConstraints.gridx = 0;
+        gridBagConstraints.gridy = 5;
+        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
+        gridBagConstraints.insets = new java.awt.Insets(18, 19, 0, 0);
+        add(othersLabel, gridBagConstraints);
+
+        otherAttrsPanel.setLayout(new java.awt.GridBagLayout());
+        gridBagConstraints = new java.awt.GridBagConstraints();
+        gridBagConstraints.gridx = 0;
+        gridBagConstraints.gridy = 6;
+        gridBagConstraints.gridwidth = 4;
+        gridBagConstraints.ipadx = 400;
+        gridBagConstraints.ipady = 100;
+        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
+        gridBagConstraints.insets = new java.awt.Insets(6, 0, 29, 0);
+        add(otherAttrsPanel, gridBagConstraints);
     }// </editor-fold>//GEN-END:initComponents
 
     @Override
@@ -148,11 +172,8 @@ public class ContactArtifactViewer extends javax.swing.JPanel implements Artifac
         List<BlackboardAttribute> otherList = new ArrayList<>();
 
         
-        
-        
-        //BlackboardAttribute bba = new BlackboardAttribute();
         try {
-            // RAMAN TBD: populate the display components from the artifact
+            // Get all the attributes and group them by the panels they go in
             for (BlackboardAttribute bba : artifact.getAttributes()) {
                 if (bba.getAttributeType().getTypeName().startsWith("TSK_PHONE")) {
                     phoneNumList.add(bba);
@@ -184,7 +205,7 @@ public class ContactArtifactViewer extends javax.swing.JPanel implements Artifac
 
         updateEmailAddressesPanel(emailList);
 
-        // TBD: update the other attributes panel
+        updateOtherAttributesPanel(otherList);
         // repaint
         this.revalidate();
     }
@@ -339,20 +360,75 @@ public class ContactArtifactViewer extends javax.swing.JPanel implements Artifac
         emailsPanel.revalidate();
     }
      
+     private void updateOtherAttributesPanel(List<BlackboardAttribute> otherAttributesList) {
         
-    private String getAttributeLabel(BlackboardAttribute bba) {
+        if (otherAttributesList.isEmpty()) {
-        // TBD if not found, should probably strip TSK_ and convert to camel case,
+            this.othersLabel.setVisible(false);
-        //return ATTR_LABELS_MAP.getOrDefault(bba.getAttributeType(), c);
+            this.otherAttrsPanel.setVisible(false);
-        
+            return;
-        return bba.getAttributeType().getDisplayName();
         }
         
+        GridBagLayout gridBagLayout = new GridBagLayout();
+        GridBagConstraints constraints = new GridBagConstraints();
+        constraints.fill = GridBagConstraints.HORIZONTAL;
+        constraints.gridx = 0;
+        constraints.gridy = -1;
+        constraints.weighty = .0;
+        constraints.anchor = GridBagConstraints.LINE_START;
+
+        Dimension horizSpacerBlockDimension = new Dimension(12, 4); 
+         
+        for (BlackboardAttribute bba : otherAttributesList) {
+            constraints.weightx = 0;
+            constraints.gridy++;
+            constraints.gridx = 0; 
+            
+            // Add a label for attribute type
+            javax.swing.JLabel attrTypeLabel = new javax.swing.JLabel();
+            String attrLabel = bba.getAttributeType().getDisplayName();
+            attrTypeLabel.setText(attrLabel);
+           
+            // RAMAN TBD: set the size/font/style for label
+            
+            gridBagLayout.setConstraints(attrTypeLabel, constraints);
+            otherAttrsPanel.add(attrTypeLabel);
+            
+            // Add horizontal space
+            constraints.gridx++; 
+            Box.Filler spacer = new Box.Filler(horizSpacerBlockDimension, horizSpacerBlockDimension, horizSpacerBlockDimension);
+            gridBagLayout.setConstraints(spacer, constraints);
+            otherAttrsPanel.add(spacer);
+            
+            // Add the attribute value
+            constraints.gridx++; 
+            javax.swing.JLabel attrValueLabel = new javax.swing.JLabel();
+            attrValueLabel.setText(bba.getValueString());
+            gridBagLayout.setConstraints(attrValueLabel, constraints);
+            otherAttrsPanel.add(attrValueLabel);
+        }
+        
+        
+        //constraints.gridy++;
+        //constraints.gridx = 0;
+        //constraints.weighty = 1;
+        //Component vertGlue = createVerticalGlue();
+        //emailsPanel.add(vertGlue);
+        //gridBagLayout.setConstraints(vertGlue, constraints);
+        
+        
+        otherAttrsPanel.setLayout(gridBagLayout);
+        otherAttrsPanel.revalidate();
+    }
+          
+    
     
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JLabel contactNameLabel;
     private javax.swing.JLabel emailsLabel;
     private javax.swing.JPanel emailsPanel;
     private javax.swing.JPanel namePanel;
+    private javax.swing.JPanel otherAttrsPanel;
+    private javax.swing.JLabel othersLabel;
     private javax.swing.JPanel phoneNumbersPanel;
     private javax.swing.JLabel phonesLabel;
     // End of variables declaration//GEN-END:variables