Merge pull request #4771 from kellykelly3/1239-relationships-package

1239 relationships package

Core/src/org/sleuthkit/autopsy/communications/AccountsBrowser.java

@@ -38,6 +38,8 @@ import org.openide.util.Lookup;
 import org.openide.util.lookup.ProxyLookup;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
+import org.sleuthkit.autopsy.communications.relationships.RelationshipBrowser;
+import org.sleuthkit.autopsy.communications.relationships.SelectionInfo;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.datamodel.AccountDeviceInstance;
 import org.sleuthkit.datamodel.CommunicationsFilter;

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

@@ -39,24 +39,9 @@ VisualizationPanel.organicLayoutButton.text=Organic
 VisualizationPanel.hierarchyLayoutButton.text=Hierarchical
 VisualizationPanel.clearVizButton.text_1=
 VisualizationPanel.snapshotButton.text_1=Snapshot Report
-ContactDetailsPane.nameLabel.text=jLabel1
 VisualizationPanel.clearVizButton.actionCommand=
 VisualizationPanel.backButton.toolTipText=Click to go back
 VisualizationPanel.forwardButton.toolTipText=Click to go forward
 VisualizationPanel.fastOrganicLayoutButton.toolTipText=Click to redraw the chart
 VisualizationPanel.clearVizButton.toolTipText=Click to clear the chart
 VisualizationPanel.forwardButton.text=
-SummaryViewer.countsPanel.border.title=Counts
-SummaryViewer.emailLabel.text=Emails:
-SummaryViewer.contactsLabel.text=Contacts:
-SummaryViewer.attachmentsLabel.text=Attachments:
-SummaryViewer.fileReferencesPanel.border.title=File References in Current Case
-SummaryViewer.caseReferencesPanel.border.title=Other Occurrences
-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/Bundle.properties-MERGED

@@ -3,17 +3,6 @@ AccountNode.accountType=Type
 AccountNode.device=Device
 AccountNode.messageCount=Msgs
 applyText=Apply
-ContactNode_Email=Email Address
-ContactNode_Home_Number=Home Number
-ContactNode_Mobile_Number=Mobile Number
-ContactNode_Name=Name
-ContactNode_Office_Number=Office Number
-ContactNode_Phone=Phone Number
-ContactNode_URL=URL
-ContactsViewer_columnHeader_Email=Email
-ContactsViewer_columnHeader_Name=Name
-ContactsViewer_columnHeader_Phone=Phone
-ContactsViewer_tabTitle=Contacts
 CTL_OpenCVTAction=Communications
 CVTTopComponent.name=\ Communications Visualization
 CVTTopComponent.TabConstraints.tabTitle=Visualize
@@ -33,30 +22,12 @@ FiltersPanel.refreshButton.text=Refresh
 FiltersPanel.deviceRequiredLabel.text=Select at least one.
 FiltersPanel.accountTypeRequiredLabel.text=Select at least one.
 FiltersPanel.needsRefreshLabel.text=Displayed data is out of date. Press Refresh.
-MediaViewer_Name=Media
-MessageNode_Node_Property_Attms=Attachments
-MessageNode_Node_Property_Date=Date
-MessageNode_Node_Property_From=From
-MessageNode_Node_Property_Subject=Subject
-MessageNode_Node_Property_To=To
-MessageNode_Node_Property_Type=Type
-MessageViewer_columnHeader_Attms=Attachments
-MessageViewer_columnHeader_Date=Date
-MessageViewer_columnHeader_From=From
-MessageViewer_columnHeader_Subject=Subject
-MessageViewer_columnHeader_To=To
-MessageViewer_tabTitle=Messages
 OpenCVTAction.displayName=Communications
 PinAccountsAction.pluralText=Add Selected Accounts to Visualization
 PinAccountsAction.singularText=Add Selected Account to Visualization
 refreshText=Refresh Results
 ResetAndPinAccountsAction.pluralText=Visualize Only Selected Accounts
 ResetAndPinAccountsAction.singularText=Visualize Only Selected Account
-SummaryViewer_CaseRefNameColumn_Title=Case Name
-SummaryViewer_CentralRepository_Message=<Enable Central Resposity to see Case References>
-SummaryViewer_Creation_Date_Title=Creation Date
-SummaryViewer_FileRefNameColumn_Title=Path
-SummaryViewer_TabTitle=Summary
 UnpinAccountsAction.pluralText=Remove Selected Accounts
 UnpinAccountsAction.singularText=Remove Selected Account
 VisalizationPanel.paintingError=Problem painting visualization.
@@ -111,27 +82,12 @@ VisualizationPanel.organicLayoutButton.text=Organic
 VisualizationPanel.hierarchyLayoutButton.text=Hierarchical
 VisualizationPanel.clearVizButton.text_1=
 VisualizationPanel.snapshotButton.text_1=Snapshot Report
-ContactDetailsPane.nameLabel.text=jLabel1
 VisualizationPanel.clearVizButton.actionCommand=
 VisualizationPanel.backButton.toolTipText=Click to go back
 VisualizationPanel.forwardButton.toolTipText=Click to go forward
 VisualizationPanel.fastOrganicLayoutButton.toolTipText=Click to redraw the chart
 VisualizationPanel.clearVizButton.toolTipText=Click to clear the chart
 VisualizationPanel.forwardButton.text=
-SummaryViewer.countsPanel.border.title=Counts
-SummaryViewer.emailLabel.text=Emails:
-SummaryViewer.contactsLabel.text=Contacts:
-SummaryViewer.attachmentsLabel.text=Attachments:
-SummaryViewer.fileReferencesPanel.border.title=File References in Current Case
-SummaryViewer.caseReferencesPanel.border.title=Other Occurrences
-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:
 VisualizationPanel_action_dialogs_title=Communications
 VisualizationPanel_action_name_text=Snapshot Report
 VisualizationPanel_module_name=Communications

Core/src/org/sleuthkit/autopsy/communications/ModifiableProxyLookup.java

@@ -26,9 +26,9 @@ import org.openide.util.lookup.ProxyLookup;
  * delegated to.
  *
  */
-final class ModifiableProxyLookup extends ProxyLookup {
+final public class ModifiableProxyLookup extends ProxyLookup {
 
-    ModifiableProxyLookup(final Lookup... lookups) {
+    public ModifiableProxyLookup(final Lookup... lookups) {
         super(lookups);
     }
 

Core/src/org/sleuthkit/autopsy/communications/Utils.java

@@ -28,12 +28,12 @@ import org.sleuthkit.datamodel.Account;
 /**
  * Utility class with helpers for dealing with accounts.
  */
-class Utils {
+public final class Utils {
 
     private Utils() {
     }
 
-    static ZoneId getUserPreferredZoneId() {
+    static public ZoneId getUserPreferredZoneId() {
         ZoneId zone = UserPreferences.displayTimesInLocalTime() ?
                 ZoneOffset.systemDefault() : TimeZone.getTimeZone(UserPreferences.getTimeZoneForDisplays()).toZoneId();
         return zone;
@@ -44,7 +44,7 @@ class Utils {
      *
      * @return The path of the icon for the given Account Type.
      */
-    static final String getIconFilePath(Account.Type type) {
+    static public final String getIconFilePath(Account.Type type) {
         return Accounts.getIconFilePath(type);
     }
 

Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java

@@ -101,6 +101,8 @@ import org.openide.util.NbBundle;
 import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
+import org.sleuthkit.autopsy.communications.relationships.RelationshipBrowser;
+import org.sleuthkit.autopsy.communications.relationships.SelectionInfo;
 import org.sleuthkit.autopsy.communications.snapshot.CommSnapShotReportWriter;
 import org.sleuthkit.autopsy.coreutils.FileUtil;
 import org.sleuthkit.autopsy.coreutils.Logger;

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.communications;
+package org.sleuthkit.autopsy.communications.relationships;
 
 import java.util.List;
 import java.util.Set;

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.communications;
+package org.sleuthkit.autopsy.communications.relationships;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -53,10 +53,10 @@ final class AttachmentsChildren extends Children.Keys<AbstractFile> {
      */
     AttachmentsChildren(Set<BlackboardArtifact> artifacts) {
         super(false);
-        
+
         this.artifacts = artifacts;
-        
+
-       
+
     }
 
     @Override
@@ -67,7 +67,7 @@ final class AttachmentsChildren extends Children.Keys<AbstractFile> {
     @Override
     protected void addNotify() {
         super.addNotify();
-        
+
         Set<AbstractFile> thumbnails = new TreeSet<>((AbstractFile file1, AbstractFile file2) -> {
             int result = Long.compare(file1.getSize(), file2.getSize());
             if (result == 0) {
@@ -88,7 +88,7 @@ final class AttachmentsChildren extends Children.Keys<AbstractFile> {
                 logger.log(Level.WARNING, "Unable to get children from artifact.", ex); //NON-NLS
             }
         });
-        
+
         setKeys(thumbnails);
     }
 

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

@@ -0,0 +1,15 @@
+ContactDetailsPane.nameLabel.text=Placeholder
+SummaryViewer.countsPanel.border.title=Counts
+SummaryViewer.emailLabel.text=Emails:
+SummaryViewer.contactsLabel.text=Contacts:
+SummaryViewer.attachmentsLabel.text=Attachments:
+SummaryViewer.fileReferencesPanel.border.title=File References in Current Case
+SummaryViewer.caseReferencesPanel.border.title=Other Occurrences
+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

@@ -0,0 +1,44 @@
+ContactDetailsPane.nameLabel.text=Placeholder
+ContactNode_Email=Email Address
+ContactNode_Home_Number=Home Number
+ContactNode_Mobile_Number=Mobile Number
+ContactNode_Name=Name
+ContactNode_Office_Number=Office Number
+ContactNode_Phone=Phone Number
+ContactNode_URL=URL
+ContactsViewer_columnHeader_Email=Email
+ContactsViewer_columnHeader_Name=Name
+ContactsViewer_columnHeader_Phone=Phone
+ContactsViewer_tabTitle=Contacts
+MediaViewer_Name=Media
+MessageNode_Node_Property_Attms=Attachments
+MessageNode_Node_Property_Date=Date
+MessageNode_Node_Property_From=From
+MessageNode_Node_Property_Subject=Subject
+MessageNode_Node_Property_To=To
+MessageNode_Node_Property_Type=Type
+MessageViewer_columnHeader_Attms=Attachments
+MessageViewer_columnHeader_Date=Date
+MessageViewer_columnHeader_From=From
+MessageViewer_columnHeader_Subject=Subject
+MessageViewer_columnHeader_To=To
+MessageViewer_tabTitle=Messages
+SummaryViewer.countsPanel.border.title=Counts
+SummaryViewer.emailLabel.text=Emails:
+SummaryViewer.contactsLabel.text=Contacts:
+SummaryViewer.attachmentsLabel.text=Attachments:
+SummaryViewer.fileReferencesPanel.border.title=File References in Current Case
+SummaryViewer.caseReferencesPanel.border.title=Other Occurrences
+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:
+SummaryViewer_CaseRefNameColumn_Title=Case Name
+SummaryViewer_CentralRepository_Message=<Enable Central Resposity to see Case References>
+SummaryViewer_Creation_Date_Title=Creation Date
+SummaryViewer_FileRefNameColumn_Title=Path
+SummaryViewer_TabTitle=Summary

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

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.5" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+  <NonVisualComponents>
+    <Component class="org.sleuthkit.autopsy.contentviewers.MessageContentViewer" name="messageContentViewer1">
+    </Component>
+  </NonVisualComponents>
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
     <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.communications;
+package org.sleuthkit.autopsy.communications.relationships;
 
 import org.openide.explorer.ExplorerManager;
 import org.openide.nodes.Node;
@@ -74,6 +74,7 @@ public final class ContactDetailsPane extends javax.swing.JPanel implements Expl
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
 
+        messageContentViewer1 = new org.sleuthkit.autopsy.contentviewers.MessageContentViewer();
         nameLabel = new javax.swing.JLabel();
         propertySheet = new org.openide.explorer.propertysheet.PropertySheet();
 
@@ -108,6 +109,7 @@ public final class ContactDetailsPane extends javax.swing.JPanel implements Expl
 
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
+    private org.sleuthkit.autopsy.contentviewers.MessageContentViewer messageContentViewer1;
     private javax.swing.JLabel nameLabel;
     private org.openide.explorer.propertysheet.PropertySheet propertySheet;
     // End of variables declaration//GEN-END:variables

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.communications;
+package org.sleuthkit.autopsy.communications.relationships;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -35,6 +35,7 @@ import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_NAM
 import static org.sleuthkit.datamodel.BlackboardAttribute.TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.DATETIME;
 import org.sleuthkit.datamodel.TimeUtilities;
 import org.sleuthkit.datamodel.TskCoreException;
+import org.sleuthkit.autopsy.communications.Utils;
 
 /**
  * Extends BlackboardArtifactNode to override createSheet to create a contact

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.communications;
+package org.sleuthkit.autopsy.communications.relationships;
 
 import java.util.List;
 import java.util.Set;

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

@@ -36,7 +36,7 @@
         <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new org.openide.explorer.view.OutlineView()"/>
       </AuxValues>
     </Component>
-    <Component class="org.sleuthkit.autopsy.communications.ContactDetailsPane" name="contactPane">
+    <Component class="org.sleuthkit.autopsy.communications.relationships.ContactDetailsPane" name="contactPane">
     </Component>
   </SubComponents>
 </Form>

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.communications;
+package org.sleuthkit.autopsy.communications.relationships;
 
 import java.awt.Component;
 import java.awt.KeyboardFocusManager;
@@ -35,6 +35,7 @@ import org.openide.nodes.Node;
 import org.openide.util.Lookup;
 import org.openide.util.NbBundle;
 import org.openide.util.lookup.ServiceProvider;
+import org.sleuthkit.autopsy.communications.ModifiableProxyLookup;
 import org.sleuthkit.autopsy.corecomponents.TableFilterNode;
 import org.sleuthkit.autopsy.directorytree.DataResultFilterNode;
 import org.sleuthkit.datamodel.BlackboardAttribute;
@@ -102,7 +103,7 @@ public final class ContactsViewer extends JPanel implements RelationshipsViewer,
                 contactPane.setNode(nodes);
             }
         });
-        
+
         tableEM.setRootContext(new TableFilterNode(new DataResultFilterNode(new AbstractNode(Children.create(nodeFactory, true)), getExplorerManager()), true));
     }
 
@@ -120,7 +121,7 @@ public final class ContactsViewer extends JPanel implements RelationshipsViewer,
     public void setSelectionInfo(SelectionInfo info) {
         contactPane.setNode(new Node[]{new AbstractNode(Children.LEAF)});
         contactPane.setEnabled(false);
-        
+
         nodeFactory.refresh(info);
     }
 
@@ -159,7 +160,7 @@ public final class ContactsViewer extends JPanel implements RelationshipsViewer,
     private void initComponents() {
 
         outlineView = new org.openide.explorer.view.OutlineView();
-        contactPane = new org.sleuthkit.autopsy.communications.ContactDetailsPane();
+        contactPane = new org.sleuthkit.autopsy.communications.relationships.ContactDetailsPane();
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
@@ -179,7 +180,7 @@ public final class ContactsViewer extends JPanel implements RelationshipsViewer,
 
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
-    private org.sleuthkit.autopsy.communications.ContactDetailsPane contactPane;
+    private org.sleuthkit.autopsy.communications.relationships.ContactDetailsPane contactPane;
     private org.openide.explorer.view.OutlineView outlineView;
     // End of variables declaration//GEN-END:variables
 }

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.communications;
+package org.sleuthkit.autopsy.communications.relationships;
 
 import java.util.HashMap;
 import java.util.List;

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.communications;
+package org.sleuthkit.autopsy.communications.relationships;
 
 import java.awt.Component;
 import java.awt.KeyboardFocusManager;
@@ -35,6 +35,7 @@ import org.openide.util.Lookup;
 import org.openide.util.NbBundle.Messages;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
+import org.sleuthkit.autopsy.communications.ModifiableProxyLookup;
 import org.sleuthkit.autopsy.corecomponents.TableFilterNode;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.datamodel.BlackboardArtifactNode;
@@ -93,7 +94,7 @@ final class MediaViewer extends JPanel implements RelationshipsViewer, ExplorerM
                 handleNodeSelectionChange();
             }
         });
-        
+
         thumbnailViewer.resetComponent();
     }
 
@@ -125,7 +126,7 @@ final class MediaViewer extends JPanel implements RelationshipsViewer, ExplorerM
         } catch (TskCoreException | NoCurrentCaseException ex) {
             logger.log(Level.WARNING, "Unable to update selection." , ex);
         }
-        
+
         if(artifactList.size() == 0) {
             thumbnailViewer.resetComponent();
         }

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.communications;
+package org.sleuthkit.autopsy.communications.relationships;
 
 import java.beans.PropertyChangeEvent;
 import org.openide.explorer.ExplorerManager;

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.communications;
+package org.sleuthkit.autopsy.communications.relationships;
 
 import java.util.List;
 import java.util.TimeZone;
@@ -43,6 +43,7 @@ import static org.sleuthkit.datamodel.BlackboardAttribute.TSK_BLACKBOARD_ATTRIBU
 import org.sleuthkit.datamodel.Tag;
 import org.sleuthkit.datamodel.TimeUtilities;
 import org.sleuthkit.datamodel.TskCoreException;
+import org.sleuthkit.autopsy.communications.Utils;
 
 /**
  * Wraps a BlackboardArtifact as an AbstractNode for use in an OutlookView

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.communications;
+package org.sleuthkit.autopsy.communications.relationships;
 
 import java.util.List;
 import java.util.Set;

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.communications;
+package org.sleuthkit.autopsy.communications.relationships;
 
 import java.awt.Component;
 import java.awt.KeyboardFocusManager;
@@ -35,6 +35,7 @@ import org.openide.nodes.Node;
 import org.openide.util.Lookup;
 import org.openide.util.NbBundle.Messages;
 import org.openide.util.lookup.ServiceProvider;
+import org.sleuthkit.autopsy.communications.ModifiableProxyLookup;
 import org.sleuthkit.autopsy.corecomponents.TableFilterNode;
 import org.sleuthkit.autopsy.directorytree.DataResultFilterNode;
 

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

@@ -44,7 +44,7 @@
           <Properties>
             <Property name="horizontalAlignment" type="int" value="0"/>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/communications/Bundle.properties" key="OutlineViewPanel.messageLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/communications/relationships/Bundle.properties" key="OutlineViewPanel.messageLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
             <Property name="enabled" type="boolean" value="false"/>
           </Properties>

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.communications;
+package org.sleuthkit.autopsy.communications.relationships;
 
 import java.awt.CardLayout;
 import org.openide.explorer.ExplorerManager;

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

@@ -16,17 +16,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.communications;
+package org.sleuthkit.autopsy.communications.relationships;
 
 import java.awt.Component;
 import javax.swing.JPanel;
 import org.openide.util.Lookup;
+import org.sleuthkit.autopsy.communications.ModifiableProxyLookup;
 
 /**
  * Displays the Relationship information for the currently selected accounts.
  *
  */
-final class RelationshipBrowser extends JPanel implements Lookup.Provider {
+public final class RelationshipBrowser extends JPanel implements Lookup.Provider {
 
     private SelectionInfo currentSelection;
     

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.communications;
+package org.sleuthkit.autopsy.communications.relationships;
 
 import javax.swing.JPanel;
 import org.openide.util.Lookup;

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.communications;
+package org.sleuthkit.autopsy.communications.relationships;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -53,7 +53,7 @@ public final class SelectionInfo {
      * @param accountDeviceInstances Selected accountDecivedInstances
      * @param communicationFilter    Currently selected communications filters
      */
-    SelectionInfo(Set<AccountDeviceInstance> accountDeviceInstances, CommunicationsFilter communicationFilter) {
+    public SelectionInfo(Set<AccountDeviceInstance> accountDeviceInstances, CommunicationsFilter communicationFilter) {
         this.accountDeviceInstances = accountDeviceInstances;
         this.communicationFilter = communicationFilter;
         

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

@@ -47,7 +47,7 @@
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
           <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
             <TitledBorder title="Counts">
-              <ResourceString PropertyName="titleX" bundle="org/sleuthkit/autopsy/communications/Bundle.properties" key="SummaryViewer.countsPanel.border.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString PropertyName="titleX" bundle="org/sleuthkit/autopsy/communications/relationships/Bundle.properties" key="SummaryViewer.countsPanel.border.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </TitledBorder>
           </Border>
         </Property>
@@ -114,7 +114,7 @@
         <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/Bundle.properties" key="SummaryViewer.emailLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <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>
@@ -128,56 +128,56 @@
         <Component class="javax.swing.JLabel" name="messagesLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/communications/Bundle.properties" key="SummaryViewer.messagesLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/communications/relationships/Bundle.properties" key="SummaryViewer.messagesLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="callLogsLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/communications/Bundle.properties" key="SummaryViewer.callLogsLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/communications/relationships/Bundle.properties" key="SummaryViewer.callLogsLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="attachmentsLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/communications/Bundle.properties" key="SummaryViewer.attachmentsLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/communications/relationships/Bundle.properties" key="SummaryViewer.attachmentsLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="attachmentsDataLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/communications/Bundle.properties" key="SummaryViewer.attachmentsDataLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/communications/relationships/Bundle.properties" key="SummaryViewer.attachmentsDataLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="messagesDataLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/communications/Bundle.properties" key="SummaryViewer.messagesDataLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/communications/relationships/Bundle.properties" key="SummaryViewer.messagesDataLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="callLogsDataLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/communications/Bundle.properties" key="SummaryViewer.callLogsDataLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/communications/relationships/Bundle.properties" key="SummaryViewer.callLogsDataLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="contactsDataLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/communications/Bundle.properties" key="SummaryViewer.contactsDataLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/communications/relationships/Bundle.properties" key="SummaryViewer.contactsDataLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </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/Bundle.properties" key="SummaryViewer.emailDataLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <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>
@@ -188,7 +188,7 @@
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
           <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
             <TitledBorder title="File References in Current Case">
-              <ResourceString PropertyName="titleX" bundle="org/sleuthkit/autopsy/communications/Bundle.properties" key="SummaryViewer.fileReferencesPanel.border.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString PropertyName="titleX" bundle="org/sleuthkit/autopsy/communications/relationships/Bundle.properties" key="SummaryViewer.fileReferencesPanel.border.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </TitledBorder>
           </Border>
         </Property>
@@ -202,7 +202,7 @@
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
           <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
             <TitledBorder title="Other Occurrences">
-              <ResourceString PropertyName="titleX" bundle="org/sleuthkit/autopsy/communications/Bundle.properties" key="SummaryViewer.caseReferencesPanel.border.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString PropertyName="titleX" bundle="org/sleuthkit/autopsy/communications/relationships/Bundle.properties" key="SummaryViewer.caseReferencesPanel.border.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </TitledBorder>
           </Border>
         </Property>

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.communications;
+package org.sleuthkit.autopsy.communications.relationships;
 
 import java.util.Set;
 import javax.swing.JPanel;
@@ -28,7 +28,7 @@ import org.openide.nodes.Children;
 import org.openide.util.Lookup;
 import org.openide.util.NbBundle.Messages;
 import org.sleuthkit.autopsy.centralrepository.datamodel.EamDb;
-import org.sleuthkit.autopsy.communications.SelectionInfo.SelectionSummary;
+import org.sleuthkit.autopsy.communications.relationships.SelectionInfo.SelectionSummary;
 import org.sleuthkit.datamodel.Account;
 
 /**
@@ -68,7 +68,7 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
 
         outline.setRootVisible(false);
         ((DefaultOutlineModel) outline.getOutlineModel()).setNodesColumnLabel(Bundle.SummaryViewer_CaseRefNameColumn_Title());
-        
+
         clearControls();
     }
 
@@ -91,7 +91,7 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
             caseReferencesPanel.showOutlineView();
         }
 
-        // Request is that the SummaryViewer only show information if one 
+        // Request is that the SummaryViewer only show information if one
         // account is selected
         if (info.getAccounts().size() != 1) {
             setEnabled(false);
@@ -120,7 +120,7 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
 
     /**
      * Sets whether or not the text fields are enabled.
-     * 
+     *
      * @param enabled true if this component should be enabled, false otherwise
      */
     @Override
@@ -190,8 +190,8 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
         callLogsDataLabel = new javax.swing.JLabel();
         contactsDataLabel = new javax.swing.JLabel();
         emailDataLabel = new javax.swing.JLabel();
-        fileReferencesPanel = new org.sleuthkit.autopsy.communications.OutlineViewPanel();
+        fileReferencesPanel = new org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel();
-        caseReferencesPanel = new org.sleuthkit.autopsy.communications.OutlineViewPanel();
+        caseReferencesPanel = new org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel();
 
         countsPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(SummaryViewer.class, "SummaryViewer.countsPanel.border.title"))); // NOI18N
 
@@ -299,13 +299,13 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi
     private javax.swing.JLabel attachmentsLabel;
     private javax.swing.JLabel callLogsDataLabel;
     private javax.swing.JLabel callLogsLabel;
-    private org.sleuthkit.autopsy.communications.OutlineViewPanel caseReferencesPanel;
+    private org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel caseReferencesPanel;
     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.OutlineViewPanel fileReferencesPanel;
+    private org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel fileReferencesPanel;
     private javax.swing.JLabel messagesDataLabel;
     private javax.swing.JLabel messagesLabel;
     // End of variables declaration//GEN-END:variables

branding/core/core.jar/org/netbeans/core/startup/Bundle.properties

@@ -1,5 +1,5 @@
 #Updated by build script
-#Wed, 01 May 2019 14:38:52 -0400
+#Wed, 08 May 2019 21:37:02 -0400
 LBL_splash_window_title=Starting Autopsy
 SPLASH_HEIGHT=314
 SPLASH_WIDTH=538

branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties

@@ -1,4 +1,4 @@
 #Updated by build script
-#Wed, 01 May 2019 14:38:52 -0400
+#Wed, 08 May 2019 21:37:02 -0400
 CTL_MainWindow_Title=Autopsy 4.11.0
 CTL_MainWindow_Title_No_Project=Autopsy 4.11.0