From 82ed9b8c56ef3b5c1661b08e60f1c0bd80c897cc Mon Sep 17 00:00:00 2001 From: Kelly Kelly Date: Thu, 16 May 2019 15:24:44 -0400 Subject: [PATCH] Added messages to MessageView and ContactsView --- .../AccountDeviceInstanceNode.java | 2 +- .../communications/Bundle.properties-MERGED | 2 +- .../relationships/Bundle.properties | 4 +- .../relationships/Bundle.properties-MERGED | 8 +- .../relationships/ContactsViewer.form | 17 ++-- .../relationships/ContactsViewer.java | 78 ++++++++++++------- .../relationships/MessagesViewer.form | 12 +-- .../relationships/MessagesViewer.java | 77 +++++++++++------- .../relationships/SummaryViewer.java | 2 +- .../timeline/ui/Bundle.properties-MERGED | 6 +- 10 files changed, 126 insertions(+), 82 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/communications/AccountDeviceInstanceNode.java b/Core/src/org/sleuthkit/autopsy/communications/AccountDeviceInstanceNode.java index 0a57c3728f..b7359a9088 100644 --- a/Core/src/org/sleuthkit/autopsy/communications/AccountDeviceInstanceNode.java +++ b/Core/src/org/sleuthkit/autopsy/communications/AccountDeviceInstanceNode.java @@ -72,7 +72,7 @@ final class AccountDeviceInstanceNode extends AbstractNode { } @Override - @NbBundle.Messages(value = {"AccountNode.device=Device", "AccountNode.accountName=Account", "AccountNode.accountType=Type", "AccountNode.messageCount=Msgs"}) + @NbBundle.Messages(value = {"AccountNode.device=Device", "AccountNode.accountName=Account", "AccountNode.accountType=Type", "AccountNode.messageCount=Messages"}) protected Sheet createSheet() { Sheet sheet = super.createSheet(); Sheet.Set properties = sheet.get(Sheet.PROPERTIES); diff --git a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED index 1ad8b5d9c5..a0e989ee6a 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED @@ -1,7 +1,7 @@ AccountNode.accountName=Account AccountNode.accountType=Type AccountNode.device=Device -AccountNode.messageCount=Msgs +AccountNode.messageCount=Messages applyText=Apply CTL_OpenCVTAction=Communications CVTTopComponent.name=\ Communications Visualization diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties index 6ef03951af..4970a5958e 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties @@ -3,8 +3,6 @@ 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 @@ -13,3 +11,5 @@ SummaryViewer.emailDataLabel.text=emails SummaryViewer.attachmentsDataLabel.text=attachments SummaryViewer.messagesLabel.text=Messages: SummaryViewer.callLogsLabel.text=Call Logs: +SummaryViewer.caseReferencesPanel.border.title=Other Occurrences +SummaryViewer.fileReferencesPanel.border.title=File References in Current Case diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED index 6082d83375..b31598dbc6 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/Bundle.properties-MERGED @@ -9,6 +9,7 @@ ContactNode_URL=URL ContactsViewer_columnHeader_Email=Email ContactsViewer_columnHeader_Name=Name ContactsViewer_columnHeader_Phone=Phone +ContactsViewer_noContacts_message= ContactsViewer_tabTitle=Contacts MediaViewer_Name=Media MessageNode_Node_Property_Attms=Attachments @@ -22,13 +23,12 @@ MessageViewer_columnHeader_Date=Date MessageViewer_columnHeader_From=From MessageViewer_columnHeader_Subject=Subject MessageViewer_columnHeader_To=To +MessageViewer_no_messages= 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 @@ -37,8 +37,10 @@ SummaryViewer.emailDataLabel.text=emails SummaryViewer.attachmentsDataLabel.text=attachments SummaryViewer.messagesLabel.text=Messages: SummaryViewer.callLogsLabel.text=Call Logs: +SummaryViewer.caseReferencesPanel.border.title=Other Occurrences +SummaryViewer.fileReferencesPanel.border.title=File References in Current Case SummaryViewer_CaseRefNameColumn_Title=Case Name -SummaryViewer_CentralRepository_Message= +SummaryViewer_CentralRepository_Message= SummaryViewer_Creation_Date_Title=Creation Date SummaryViewer_FileRefNameColumn_Title=Path SummaryViewer_TabTitle=Summary diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsViewer.form b/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsViewer.form index 82fb67dad9..83cb8057d0 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsViewer.form +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsViewer.form @@ -16,27 +16,24 @@ - - + + - - - + + + - - - - - + + diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsViewer.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsViewer.java index 68c48d8166..8cd00a8c18 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsViewer.java +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsViewer.java @@ -23,7 +23,6 @@ import java.awt.KeyboardFocusManager; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import javax.swing.JPanel; -import javax.swing.ListSelectionModel; import static javax.swing.SwingUtilities.isDescendingFrom; import org.netbeans.swing.outline.DefaultOutlineModel; import org.netbeans.swing.outline.Outline; @@ -32,6 +31,8 @@ import static org.openide.explorer.ExplorerUtils.createLookup; import org.openide.nodes.AbstractNode; import org.openide.nodes.Children; import org.openide.nodes.Node; +import org.openide.nodes.NodeAdapter; +import org.openide.nodes.NodeMemberEvent; import org.openide.util.Lookup; import org.openide.util.NbBundle; import org.openide.util.lookup.ServiceProvider; @@ -45,9 +46,9 @@ import org.sleuthkit.datamodel.BlackboardAttribute; * */ @ServiceProvider(service = RelationshipsViewer.class) -public final class ContactsViewer extends JPanel implements RelationshipsViewer, ExplorerManager.Provider, Lookup.Provider { +public final class ContactsViewer extends JPanel implements RelationshipsViewer{ - private final ExplorerManager tableEM; +// private final ExplorerManager tableEM; private final Outline outline; private final ModifiableProxyLookup proxyLookup; private final PropertyChangeListener focusPropertyListener; @@ -57,14 +58,17 @@ public final class ContactsViewer extends JPanel implements RelationshipsViewer, "ContactsViewer_tabTitle=Contacts", "ContactsViewer_columnHeader_Name=Name", "ContactsViewer_columnHeader_Phone=Phone", - "ContactsViewer_columnHeader_Email=Email",}) + "ContactsViewer_columnHeader_Email=Email", + "ContactsViewer_noContacts_message=" + }) /** * Visualization for contact nodes. */ public ContactsViewer() { - tableEM = new ExplorerManager(); - proxyLookup = new ModifiableProxyLookup(createLookup(tableEM, getActionMap())); + initComponents(); + + proxyLookup = new ModifiableProxyLookup(createLookup(outlineViewPanel.getExplorerManager(), getActionMap())); nodeFactory = new ContactsChildNodeFactory(null); // See org.sleuthkit.autopsy.timeline.TimeLineTopComponent for a detailed @@ -81,30 +85,44 @@ public final class ContactsViewer extends JPanel implements RelationshipsViewer, proxyLookup.setNewLookups(createLookup(contactPane.getExplorerManager(), getActionMap())); } else if (isDescendingFrom(newFocusOwner, ContactsViewer.this)) { //... or if it is within the Results table. - proxyLookup.setNewLookups(createLookup(tableEM, getActionMap())); + proxyLookup.setNewLookups(createLookup(outlineViewPanel.getExplorerManager(), getActionMap())); } } }; - initComponents(); - - outline = outlineView.getOutline(); - outlineView.setPropertyColumns( + outline = outlineViewPanel.getOutlineView().getOutline(); + outlineViewPanel.getOutlineView().setPropertyColumns( "TSK_EMAIL", BlackboardAttribute.ATTRIBUTE_TYPE.TSK_EMAIL.getDisplayName(), "TSK_PHONE_NUMBER", BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PHONE_NUMBER.getDisplayName() ); outline.setRootVisible(false); ((DefaultOutlineModel) outline.getOutlineModel()).setNodesColumnLabel(Bundle.ContactsViewer_columnHeader_Name()); + + outlineViewPanel.hideOutlineView(""); - tableEM.addPropertyChangeListener((PropertyChangeEvent evt) -> { + outlineViewPanel.getExplorerManager().addPropertyChangeListener((PropertyChangeEvent evt) -> { if (evt.getPropertyName().equals(ExplorerManager.PROP_SELECTED_NODES)) { - final Node[] nodes = tableEM.getSelectedNodes(); + final Node[] nodes = outlineViewPanel.getExplorerManager().getSelectedNodes(); contactPane.setNode(nodes); } }); - tableEM.setRootContext(new TableFilterNode(new DataResultFilterNode(new AbstractNode(Children.create(nodeFactory, true)), getExplorerManager()), true)); + outlineViewPanel.getExplorerManager().setRootContext(new TableFilterNode(new DataResultFilterNode(new AbstractNode(Children.create(nodeFactory, true)), outlineViewPanel.getExplorerManager()), true)); + + // When a new set of nodes are added to the OutlineView the childrenAdded + // seems to be fired before the childrenRemoved. + outlineViewPanel.getExplorerManager().getRootContext().addNodeListener(new NodeAdapter(){ + @Override + public void childrenAdded(NodeMemberEvent nme) { + updateOutlineViewPanel(); + } + + @Override + public void childrenRemoved(NodeMemberEvent nme) { + updateOutlineViewPanel(); + } + }); } @Override @@ -124,12 +142,7 @@ public final class ContactsViewer extends JPanel implements RelationshipsViewer, nodeFactory.refresh(info); } - - @Override - public ExplorerManager getExplorerManager() { - return tableEM; - } - + @Override public Lookup getLookup() { return proxyLookup; @@ -140,14 +153,23 @@ public final class ContactsViewer extends JPanel implements RelationshipsViewer, super.addNotify(); //add listener that maintains correct selection in the Global Actions Context KeyboardFocusManager.getCurrentKeyboardFocusManager() - .addPropertyChangeListener("focusOwner", focusPropertyListener); + .addPropertyChangeListener("focusOwner", focusPropertyListener); //NON-NLS } @Override public void removeNotify() { super.removeNotify(); KeyboardFocusManager.getCurrentKeyboardFocusManager() - .removePropertyChangeListener("focusOwner", focusPropertyListener); + .removePropertyChangeListener("focusOwner", focusPropertyListener); //NON-NLS + } + + private void updateOutlineViewPanel() { + int nodeCount = outlineViewPanel.getExplorerManager().getRootContext().getChildren().getNodesCount(); + if(nodeCount == 0) { + outlineViewPanel.hideOutlineView(Bundle.ContactsViewer_noContacts_message()); + } else { + outlineViewPanel.showOutlineView(); + } } /** @@ -159,28 +181,28 @@ public final class ContactsViewer extends JPanel implements RelationshipsViewer, // //GEN-BEGIN:initComponents private void initComponents() { - outlineView = new org.openide.explorer.view.OutlineView(); contactPane = new org.sleuthkit.autopsy.communications.relationships.ContactDetailsPane(); + outlineViewPanel = new org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel(); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(outlineView, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(contactPane, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(outlineViewPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() - .addComponent(outlineView, javax.swing.GroupLayout.DEFAULT_SIZE, 350, Short.MAX_VALUE) - .addGap(1, 1, 1) - .addComponent(contactPane, javax.swing.GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE)) + .addComponent(outlineViewPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(contactPane, javax.swing.GroupLayout.DEFAULT_SIZE, 332, Short.MAX_VALUE)) ); }// //GEN-END:initComponents // Variables declaration - do not modify//GEN-BEGIN:variables private org.sleuthkit.autopsy.communications.relationships.ContactDetailsPane contactPane; - private org.openide.explorer.view.OutlineView outlineView; + private org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel outlineViewPanel; // End of variables declaration//GEN-END:variables } diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesViewer.form b/Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesViewer.form index 76cf240254..34126bbf8c 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesViewer.form +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesViewer.form @@ -16,27 +16,27 @@ - - + + - + - + - - + + diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesViewer.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesViewer.java index fa7bbab6bb..6dfd20ec95 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesViewer.java +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesViewer.java @@ -23,7 +23,6 @@ import java.awt.KeyboardFocusManager; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import javax.swing.JPanel; -import javax.swing.ListSelectionModel; import static javax.swing.SwingUtilities.isDescendingFrom; import org.netbeans.swing.outline.DefaultOutlineModel; import org.netbeans.swing.outline.Outline; @@ -32,6 +31,8 @@ import static org.openide.explorer.ExplorerUtils.createLookup; import org.openide.nodes.AbstractNode; import org.openide.nodes.Children; import org.openide.nodes.Node; +import org.openide.nodes.NodeAdapter; +import org.openide.nodes.NodeMemberEvent; import org.openide.util.Lookup; import org.openide.util.NbBundle.Messages; import org.openide.util.lookup.ServiceProvider; @@ -43,9 +44,8 @@ import org.sleuthkit.autopsy.directorytree.DataResultFilterNode; * Visualation for the messages of the currently selected accounts. */ @ServiceProvider(service = RelationshipsViewer.class) -public final class MessagesViewer extends JPanel implements RelationshipsViewer, ExplorerManager.Provider, Lookup.Provider { +public final class MessagesViewer extends JPanel implements RelationshipsViewer { - private final ExplorerManager tableEM; private final Outline outline; private final ModifiableProxyLookup proxyLookup; private final PropertyChangeListener focusPropertyListener; @@ -57,15 +57,17 @@ public final class MessagesViewer extends JPanel implements RelationshipsViewer, "MessageViewer_columnHeader_To=To", "MessageViewer_columnHeader_Date=Date", "MessageViewer_columnHeader_Subject=Subject", - "MessageViewer_columnHeader_Attms=Attachments" + "MessageViewer_columnHeader_Attms=Attachments", + "MessageViewer_no_messages=" }) /** * Visualation for the messages of the currently selected accounts. */ public MessagesViewer() { - tableEM = new ExplorerManager(); - proxyLookup = new ModifiableProxyLookup(createLookup(tableEM, getActionMap())); + initComponents(); + + proxyLookup = new ModifiableProxyLookup(createLookup(outlineViewPanel.getExplorerManager(), getActionMap())); nodeFactory = new MessagesChildNodeFactory(null); // See org.sleuthkit.autopsy.timeline.TimeLineTopComponent for a detailed @@ -82,29 +84,26 @@ public final class MessagesViewer extends JPanel implements RelationshipsViewer, proxyLookup.setNewLookups(createLookup(((MessageDataContent) contentViewer).getExplorerManager(), getActionMap())); } else if (isDescendingFrom(newFocusOwner, MessagesViewer.this)) { //... or if it is within the Results table. - proxyLookup.setNewLookups(createLookup(tableEM, getActionMap())); + proxyLookup.setNewLookups(createLookup(outlineViewPanel.getExplorerManager(), getActionMap())); } } }; - initComponents(); - - outline = outlineView.getOutline(); - outlineView.setPropertyColumns( + outline = outlineViewPanel.getOutlineView().getOutline(); + outlineViewPanel.getOutlineView().setPropertyColumns( "From", Bundle.MessageViewer_columnHeader_From(), "To", Bundle.MessageViewer_columnHeader_To(), "Date", Bundle.MessageViewer_columnHeader_Date(), "Subject", Bundle.MessageViewer_columnHeader_Subject(), - "Attms", Bundle.MessageViewer_columnHeader_Attms(), - "Type", "Type" + "Attms", Bundle.MessageViewer_columnHeader_Attms() ); outline.setRootVisible(false); ((DefaultOutlineModel) outline.getOutlineModel()).setNodesColumnLabel("Type"); - tableEM.addPropertyChangeListener((PropertyChangeEvent evt) -> { + outlineViewPanel.getExplorerManager().addPropertyChangeListener((PropertyChangeEvent evt) -> { if (evt.getPropertyName().equals(ExplorerManager.PROP_SELECTED_NODES)) { - final Node[] nodes = tableEM.getSelectedNodes(); + final Node[] nodes = outlineViewPanel.getExplorerManager().getSelectedNodes(); if (nodes != null && nodes.length == 1) { contentViewer.setNode(nodes[0]); @@ -115,7 +114,27 @@ public final class MessagesViewer extends JPanel implements RelationshipsViewer, } }); - tableEM.setRootContext(new TableFilterNode(new DataResultFilterNode(new AbstractNode(Children.create(nodeFactory, true)), getExplorerManager()), true)); + outlineViewPanel.getExplorerManager().setRootContext( + new TableFilterNode( + new DataResultFilterNode( + new AbstractNode( + Children.create(nodeFactory, true)), + outlineViewPanel.getExplorerManager()), + true)); + + // When a new set of nodes are added to the OutlineView the childrenAdded + // seems to be fired before the childrenRemoved. + outlineViewPanel.getExplorerManager().getRootContext().addNodeListener(new NodeAdapter() { + @Override + public void childrenAdded(NodeMemberEvent nme) { + updateOutlineViewPanel(); + } + + @Override + public void childrenRemoved(NodeMemberEvent nme) { + updateOutlineViewPanel(); + } + }); } @Override @@ -133,11 +152,6 @@ public final class MessagesViewer extends JPanel implements RelationshipsViewer, nodeFactory.refresh(info); } - @Override - public ExplorerManager getExplorerManager() { - return tableEM; - } - @Override public Lookup getLookup() { return proxyLookup; @@ -157,6 +171,15 @@ public final class MessagesViewer extends JPanel implements RelationshipsViewer, KeyboardFocusManager.getCurrentKeyboardFocusManager() .removePropertyChangeListener("focusOwner", focusPropertyListener); } + + private void updateOutlineViewPanel() { + int nodeCount = outlineViewPanel.getExplorerManager().getRootContext().getChildren().getNodesCount(); + if(nodeCount == 0) { + outlineViewPanel.hideOutlineView(Bundle.MessageViewer_no_messages()); + } else { + outlineViewPanel.showOutlineView(); + } + } /** * This method is called from within the constructor to initialize the form. @@ -167,28 +190,28 @@ public final class MessagesViewer extends JPanel implements RelationshipsViewer, // //GEN-BEGIN:initComponents private void initComponents() { - outlineView = new org.openide.explorer.view.OutlineView(); contentViewer = new MessageDataContent(); + outlineViewPanel = new org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel(); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(outlineView, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(contentViewer, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(contentViewer, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(outlineViewPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() - .addComponent(outlineView, javax.swing.GroupLayout.DEFAULT_SIZE, 300, Short.MAX_VALUE) + .addComponent(outlineViewPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(contentViewer, javax.swing.GroupLayout.DEFAULT_SIZE, 500, Short.MAX_VALUE)) + .addComponent(contentViewer, javax.swing.GroupLayout.DEFAULT_SIZE, 390, Short.MAX_VALUE)) ); }// //GEN-END:initComponents // Variables declaration - do not modify//GEN-BEGIN:variables private org.sleuthkit.autopsy.contentviewers.MessageContentViewer contentViewer; - private org.openide.explorer.view.OutlineView outlineView; + private org.sleuthkit.autopsy.communications.relationships.OutlineViewPanel outlineViewPanel; // End of variables declaration//GEN-END:variables } diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java index 5641fad521..d31e7c902f 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/SummaryViewer.java @@ -45,7 +45,7 @@ public class SummaryViewer extends javax.swing.JPanel implements RelationshipsVi "SummaryViewer_TabTitle=Summary", "SummaryViewer_FileRefNameColumn_Title=Path", "SummaryViewer_CaseRefNameColumn_Title=Case Name", - "SummaryViewer_CentralRepository_Message=", + "SummaryViewer_CentralRepository_Message=", "SummaryViewer_Creation_Date_Title=Creation Date" }) diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/timeline/ui/Bundle.properties-MERGED index ed3e6724d8..3255e82f2b 100755 --- a/Core/src/org/sleuthkit/autopsy/timeline/ui/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/Bundle.properties-MERGED @@ -1,4 +1,4 @@ -/*= +/* * Autopsy Forensic Browser * * Copyright 2013-15 Basis Technology Corp. @@ -14,8 +14,8 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and -*=limitations under the License. -*/= + * limitations under the License. + */ AbstractTimelineChart.defaultTooltip.text=Drag the mouse to select a time interval to zoom into.\nRight-click for more actions. HistoryToolBar.historyLabel.text=History