From e96868240ba5eacb263c19ca4923e43957a3d3cf Mon Sep 17 00:00:00 2001 From: Kelly Kelly Date: Mon, 6 May 2019 14:45:43 -0400 Subject: [PATCH] moved relationship browser code into its own package --- .../communications/AccountsBrowser.java | 2 + .../autopsy/communications/Bundle.properties | 15 ------- .../communications/Bundle.properties-MERGED | 44 ------------------- .../communications/ModifiableProxyLookup.java | 4 +- .../autopsy/communications/Utils.java | 6 +-- .../communications/VisualizationPanel.java | 2 + .../AccountSourceContentChildNodeFactory.java | 2 +- .../relationships/Bundle.properties | 15 +++++++ .../relationships/Bundle.properties-MERGED | 44 +++++++++++++++++++ .../ContactDetailsPane.form | 4 ++ .../ContactDetailsPane.java | 4 +- .../{ => relationships}/ContactNode.java | 3 +- .../ContactsChildNodeFactory.java | 2 +- .../{ => relationships}/ContactsViewer.form | 2 +- .../{ => relationships}/ContactsViewer.java | 11 ++--- .../CorrelationCaseChildNodeFactory.java | 2 +- .../MessageDataContent.java | 2 +- .../{ => relationships}/MessageNode.java | 3 +- .../MessagesChildNodeFactory.java | 2 +- .../{ => relationships}/MessagesViewer.form | 0 .../{ => relationships}/MessagesViewer.java | 3 +- .../{ => relationships}/OutlineViewPanel.form | 2 +- .../{ => relationships}/OutlineViewPanel.java | 2 +- .../RelationshipBrowser.form | 0 .../RelationshipBrowser.java | 5 ++- .../RelationshipsViewer.java | 2 +- .../{ => relationships}/SelectionInfo.java | 5 +-- .../{ => relationships}/SummaryViewer.form | 24 +++++----- .../{ => relationships}/SummaryViewer.java | 18 ++++---- .../ThumbnailChildren.java | 2 +- .../{ => relationships}/ThumbnailViewer.form | 0 .../{ => relationships}/ThumbnailViewer.java | 3 +- 32 files changed, 125 insertions(+), 110 deletions(-) rename Core/src/org/sleuthkit/autopsy/communications/{ => relationships}/AccountSourceContentChildNodeFactory.java (98%) create mode 100755 Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties create mode 100755 Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED rename Core/src/org/sleuthkit/autopsy/communications/{ => relationships}/ContactDetailsPane.form (94%) rename Core/src/org/sleuthkit/autopsy/communications/{ => relationships}/ContactDetailsPane.java (94%) rename Core/src/org/sleuthkit/autopsy/communications/{ => relationships}/ContactNode.java (98%) rename Core/src/org/sleuthkit/autopsy/communications/{ => relationships}/ContactsChildNodeFactory.java (98%) rename Core/src/org/sleuthkit/autopsy/communications/{ => relationships}/ContactsViewer.form (94%) rename Core/src/org/sleuthkit/autopsy/communications/{ => relationships}/ContactsViewer.java (95%) rename Core/src/org/sleuthkit/autopsy/communications/{ => relationships}/CorrelationCaseChildNodeFactory.java (99%) rename Core/src/org/sleuthkit/autopsy/communications/{ => relationships}/MessageDataContent.java (96%) rename Core/src/org/sleuthkit/autopsy/communications/{ => relationships}/MessageNode.java (98%) rename Core/src/org/sleuthkit/autopsy/communications/{ => relationships}/MessagesChildNodeFactory.java (98%) rename Core/src/org/sleuthkit/autopsy/communications/{ => relationships}/MessagesViewer.form (100%) rename Core/src/org/sleuthkit/autopsy/communications/{ => relationships}/MessagesViewer.java (98%) rename Core/src/org/sleuthkit/autopsy/communications/{ => relationships}/OutlineViewPanel.form (94%) rename Core/src/org/sleuthkit/autopsy/communications/{ => relationships}/OutlineViewPanel.java (98%) rename Core/src/org/sleuthkit/autopsy/communications/{ => relationships}/RelationshipBrowser.form (100%) rename Core/src/org/sleuthkit/autopsy/communications/{ => relationships}/RelationshipBrowser.java (95%) rename Core/src/org/sleuthkit/autopsy/communications/{ => relationships}/RelationshipsViewer.java (96%) rename Core/src/org/sleuthkit/autopsy/communications/{ => relationships}/SelectionInfo.java (96%) rename Core/src/org/sleuthkit/autopsy/communications/{ => relationships}/SummaryViewer.form (83%) rename Core/src/org/sleuthkit/autopsy/communications/{ => relationships}/SummaryViewer.java (97%) rename Core/src/org/sleuthkit/autopsy/communications/{ => relationships}/ThumbnailChildren.java (98%) rename Core/src/org/sleuthkit/autopsy/communications/{ => relationships}/ThumbnailViewer.form (100%) rename Core/src/org/sleuthkit/autopsy/communications/{ => relationships}/ThumbnailViewer.java (98%) diff --git a/Core/src/org/sleuthkit/autopsy/communications/AccountsBrowser.java b/Core/src/org/sleuthkit/autopsy/communications/AccountsBrowser.java index 4461b45604..fcf64182a3 100644 --- a/Core/src/org/sleuthkit/autopsy/communications/AccountsBrowser.java +++ b/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; diff --git a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties b/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties index 54c65bfc8e..62fc17b917 100644 --- a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties +++ b/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= -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: diff --git a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED index 8739aacaed..b9292e1d14 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED +++ b/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. -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= -SummaryViewer_Creation_Date_Title=Creation Date -SummaryViewer_FileRefNameColumn_Title=Path -SummaryViewer_TabTitle=Summary -ThumbnailViewer_Name=Media 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= -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 diff --git a/Core/src/org/sleuthkit/autopsy/communications/ModifiableProxyLookup.java b/Core/src/org/sleuthkit/autopsy/communications/ModifiableProxyLookup.java index ad3babc504..0eccb8bf10 100644 --- a/Core/src/org/sleuthkit/autopsy/communications/ModifiableProxyLookup.java +++ b/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); } diff --git a/Core/src/org/sleuthkit/autopsy/communications/Utils.java b/Core/src/org/sleuthkit/autopsy/communications/Utils.java index c4a62209c7..4a3e03e1f2 100644 --- a/Core/src/org/sleuthkit/autopsy/communications/Utils.java +++ b/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); } diff --git a/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java b/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java index e87d6464c1..39acafb3a6 100644 --- a/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java +++ b/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; diff --git a/Core/src/org/sleuthkit/autopsy/communications/AccountSourceContentChildNodeFactory.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/AccountSourceContentChildNodeFactory.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/communications/AccountSourceContentChildNodeFactory.java rename to Core/src/org/sleuthkit/autopsy/communications/relationships/AccountSourceContentChildNodeFactory.java index 0b91987a0b..17154e4608 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/AccountSourceContentChildNodeFactory.java +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/AccountSourceContentChildNodeFactory.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.sleuthkit.autopsy.communications; +package org.sleuthkit.autopsy.communications.relationships; import java.util.List; import java.util.Set; diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties new file mode 100755 index 0000000000..6ef03951af --- /dev/null +++ b/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= +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: diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED new file mode 100755 index 0000000000..ed84d8be86 --- /dev/null +++ b/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 +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= +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= +SummaryViewer_Creation_Date_Title=Creation Date +SummaryViewer_FileRefNameColumn_Title=Path +SummaryViewer_TabTitle=Summary +ThumbnailViewer_Name=Media diff --git a/Core/src/org/sleuthkit/autopsy/communications/ContactDetailsPane.form b/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactDetailsPane.form similarity index 94% rename from Core/src/org/sleuthkit/autopsy/communications/ContactDetailsPane.form rename to Core/src/org/sleuthkit/autopsy/communications/relationships/ContactDetailsPane.form index 2cf54c02ea..2ae2165358 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/ContactDetailsPane.form +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactDetailsPane.form @@ -1,6 +1,10 @@
+ + + + diff --git a/Core/src/org/sleuthkit/autopsy/communications/ContactDetailsPane.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactDetailsPane.java similarity index 94% rename from Core/src/org/sleuthkit/autopsy/communications/ContactDetailsPane.java rename to Core/src/org/sleuthkit/autopsy/communications/relationships/ContactDetailsPane.java index a092d41483..1d9746a4f9 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/ContactDetailsPane.java +++ b/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 // //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 diff --git a/Core/src/org/sleuthkit/autopsy/communications/ContactNode.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactNode.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/communications/ContactNode.java rename to Core/src/org/sleuthkit/autopsy/communications/relationships/ContactNode.java index 1f1a54038b..e98e7079e3 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/ContactNode.java +++ b/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.TimeZone; @@ -34,6 +34,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 diff --git a/Core/src/org/sleuthkit/autopsy/communications/ContactsChildNodeFactory.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsChildNodeFactory.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/communications/ContactsChildNodeFactory.java rename to Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsChildNodeFactory.java index 08471c5324..681a572b96 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/ContactsChildNodeFactory.java +++ b/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; diff --git a/Core/src/org/sleuthkit/autopsy/communications/ContactsViewer.form b/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsViewer.form similarity index 94% rename from Core/src/org/sleuthkit/autopsy/communications/ContactsViewer.form rename to Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsViewer.form index efb5c893a3..82fb67dad9 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/ContactsViewer.form +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsViewer.form @@ -36,7 +36,7 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/communications/ContactsViewer.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsViewer.java similarity index 95% rename from Core/src/org/sleuthkit/autopsy/communications/ContactsViewer.java rename to Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsViewer.java index b43aac70b3..12141988fa 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/ContactsViewer.java +++ b/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; @@ -103,7 +104,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)); } @@ -121,7 +122,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); } @@ -160,7 +161,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); @@ -180,7 +181,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 } diff --git a/Core/src/org/sleuthkit/autopsy/communications/CorrelationCaseChildNodeFactory.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/CorrelationCaseChildNodeFactory.java similarity index 99% rename from Core/src/org/sleuthkit/autopsy/communications/CorrelationCaseChildNodeFactory.java rename to Core/src/org/sleuthkit/autopsy/communications/relationships/CorrelationCaseChildNodeFactory.java index 539bc0e028..94a3978814 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/CorrelationCaseChildNodeFactory.java +++ b/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; diff --git a/Core/src/org/sleuthkit/autopsy/communications/MessageDataContent.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/MessageDataContent.java similarity index 96% rename from Core/src/org/sleuthkit/autopsy/communications/MessageDataContent.java rename to Core/src/org/sleuthkit/autopsy/communications/relationships/MessageDataContent.java index 33df9bd3d9..108ce7dc20 100644 --- a/Core/src/org/sleuthkit/autopsy/communications/MessageDataContent.java +++ b/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; diff --git a/Core/src/org/sleuthkit/autopsy/communications/MessageNode.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/MessageNode.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/communications/MessageNode.java rename to Core/src/org/sleuthkit/autopsy/communications/relationships/MessageNode.java index 1b43441a0a..da8e11c7ed 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/MessageNode.java +++ b/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 diff --git a/Core/src/org/sleuthkit/autopsy/communications/MessagesChildNodeFactory.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesChildNodeFactory.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/communications/MessagesChildNodeFactory.java rename to Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesChildNodeFactory.java index 38d5cfa8f0..bb986c3920 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/MessagesChildNodeFactory.java +++ b/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; diff --git a/Core/src/org/sleuthkit/autopsy/communications/MessagesViewer.form b/Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesViewer.form similarity index 100% rename from Core/src/org/sleuthkit/autopsy/communications/MessagesViewer.form rename to Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesViewer.form diff --git a/Core/src/org/sleuthkit/autopsy/communications/MessagesViewer.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesViewer.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/communications/MessagesViewer.java rename to Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesViewer.java index 3d8ce847c1..bbcf14e2d4 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/MessagesViewer.java +++ b/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; diff --git a/Core/src/org/sleuthkit/autopsy/communications/OutlineViewPanel.form b/Core/src/org/sleuthkit/autopsy/communications/relationships/OutlineViewPanel.form similarity index 94% rename from Core/src/org/sleuthkit/autopsy/communications/OutlineViewPanel.form rename to Core/src/org/sleuthkit/autopsy/communications/relationships/OutlineViewPanel.form index 584e1e221d..5efb16c2b1 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/OutlineViewPanel.form +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/OutlineViewPanel.form @@ -44,7 +44,7 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/communications/OutlineViewPanel.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/OutlineViewPanel.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/communications/OutlineViewPanel.java rename to Core/src/org/sleuthkit/autopsy/communications/relationships/OutlineViewPanel.java index 183ebdc0d9..c84c7ae0a7 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/OutlineViewPanel.java +++ b/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; diff --git a/Core/src/org/sleuthkit/autopsy/communications/RelationshipBrowser.form b/Core/src/org/sleuthkit/autopsy/communications/relationships/RelationshipBrowser.form similarity index 100% rename from Core/src/org/sleuthkit/autopsy/communications/RelationshipBrowser.form rename to Core/src/org/sleuthkit/autopsy/communications/relationships/RelationshipBrowser.form diff --git a/Core/src/org/sleuthkit/autopsy/communications/RelationshipBrowser.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/RelationshipBrowser.java similarity index 95% rename from Core/src/org/sleuthkit/autopsy/communications/RelationshipBrowser.java rename to Core/src/org/sleuthkit/autopsy/communications/relationships/RelationshipBrowser.java index aaeafa7c3a..1cdaee8692 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/RelationshipBrowser.java +++ b/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; diff --git a/Core/src/org/sleuthkit/autopsy/communications/RelationshipsViewer.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/RelationshipsViewer.java similarity index 96% rename from Core/src/org/sleuthkit/autopsy/communications/RelationshipsViewer.java rename to Core/src/org/sleuthkit/autopsy/communications/relationships/RelationshipsViewer.java index ed2accee07..25f5c83701 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/RelationshipsViewer.java +++ b/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; diff --git a/Core/src/org/sleuthkit/autopsy/communications/SelectionInfo.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/SelectionInfo.java similarity index 96% rename from Core/src/org/sleuthkit/autopsy/communications/SelectionInfo.java rename to Core/src/org/sleuthkit/autopsy/communications/relationships/SelectionInfo.java index a67b442f51..16c92b3b94 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/SelectionInfo.java +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/SelectionInfo.java @@ -16,13 +16,12 @@ * 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; import java.util.logging.Level; import java.util.logging.Logger; -import org.openide.util.Exceptions; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException; import org.sleuthkit.datamodel.Account; @@ -54,7 +53,7 @@ public final class SelectionInfo { * @param accountDeviceInstances Selected accountDecivedInstances * @param communicationFilter Currently selected communications filters */ - SelectionInfo(Set accountDeviceInstances, CommunicationsFilter communicationFilter) { + public SelectionInfo(Set accountDeviceInstances, CommunicationsFilter communicationFilter) { this.accountDeviceInstances = accountDeviceInstances; this.communicationFilter = communicationFilter; diff --git a/Core/src/org/sleuthkit/autopsy/communications/SummaryViewer.form b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.form similarity index 83% rename from Core/src/org/sleuthkit/autopsy/communications/SummaryViewer.form rename to Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.form index c9c708d871..af02a7dee7 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/SummaryViewer.form +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.form @@ -47,7 +47,7 @@ - + @@ -114,7 +114,7 @@ - + @@ -128,56 +128,56 @@ - + - + - + - + - + - + - + - + @@ -188,7 +188,7 @@ - + @@ -202,7 +202,7 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/communications/SummaryViewer.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java similarity index 97% rename from Core/src/org/sleuthkit/autopsy/communications/SummaryViewer.java rename to Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java index 659dd1aac4..5641fad521 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/SummaryViewer.java +++ b/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(); - caseReferencesPanel = new org.sleuthkit.autopsy.communications.OutlineViewPanel(); + fileReferencesPanel = new org.sleuthkit.autopsy.communications.relationships.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 diff --git a/Core/src/org/sleuthkit/autopsy/communications/ThumbnailChildren.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/ThumbnailChildren.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/communications/ThumbnailChildren.java rename to Core/src/org/sleuthkit/autopsy/communications/relationships/ThumbnailChildren.java index 30a95f35aa..0e89b34d79 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/ThumbnailChildren.java +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/ThumbnailChildren.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; diff --git a/Core/src/org/sleuthkit/autopsy/communications/ThumbnailViewer.form b/Core/src/org/sleuthkit/autopsy/communications/relationships/ThumbnailViewer.form similarity index 100% rename from Core/src/org/sleuthkit/autopsy/communications/ThumbnailViewer.form rename to Core/src/org/sleuthkit/autopsy/communications/relationships/ThumbnailViewer.form diff --git a/Core/src/org/sleuthkit/autopsy/communications/ThumbnailViewer.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/ThumbnailViewer.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/communications/ThumbnailViewer.java rename to Core/src/org/sleuthkit/autopsy/communications/relationships/ThumbnailViewer.java index a4dea6493f..763b6d394d 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/ThumbnailViewer.java +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/ThumbnailViewer.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;