From 82ed9b8c56ef3b5c1661b08e60f1c0bd80c897cc Mon Sep 17 00:00:00 2001 From: Kelly Kelly Date: Thu, 16 May 2019 15:24:44 -0400 Subject: [PATCH 1/9] 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 From 8b6c4b5dfc62198d3b5b69812ae9ff95acc26af7 Mon Sep 17 00:00:00 2001 From: Kelly Kelly Date: Thu, 23 May 2019 07:55:08 -0400 Subject: [PATCH 2/9] Added invokeLater calls to solve window hang and changed initalization code to make sure the card with no account selected it displayed --- .../communications/relationships/ContactsViewer.java | 2 ++ .../communications/relationships/MessagesViewer.java | 11 +++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsViewer.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsViewer.java index 8cd00a8c18..2591f6940c 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsViewer.java +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsViewer.java @@ -67,6 +67,8 @@ public final class ContactsViewer extends JPanel implements RelationshipsViewer{ */ public ContactsViewer() { initComponents(); + + outlineViewPanel.hideOutlineView(Bundle.ContactsViewer_noContacts_message()); proxyLookup = new ModifiableProxyLookup(createLookup(outlineViewPanel.getExplorerManager(), getActionMap())); nodeFactory = new ContactsChildNodeFactory(null); diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesViewer.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesViewer.java index 6dfd20ec95..d59fda48b1 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesViewer.java +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesViewer.java @@ -23,6 +23,7 @@ import java.awt.KeyboardFocusManager; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import javax.swing.JPanel; +import javax.swing.SwingUtilities; import static javax.swing.SwingUtilities.isDescendingFrom; import org.netbeans.swing.outline.DefaultOutlineModel; import org.netbeans.swing.outline.Outline; @@ -67,6 +68,8 @@ public final class MessagesViewer extends JPanel implements RelationshipsViewer public MessagesViewer() { initComponents(); + outlineViewPanel.hideOutlineView(Bundle.MessageViewer_no_messages()); + proxyLookup = new ModifiableProxyLookup(createLookup(outlineViewPanel.getExplorerManager(), getActionMap())); nodeFactory = new MessagesChildNodeFactory(null); @@ -127,12 +130,16 @@ public final class MessagesViewer extends JPanel implements RelationshipsViewer outlineViewPanel.getExplorerManager().getRootContext().addNodeListener(new NodeAdapter() { @Override public void childrenAdded(NodeMemberEvent nme) { - updateOutlineViewPanel(); + SwingUtilities.invokeLater(() -> { + updateOutlineViewPanel(); + }); } @Override public void childrenRemoved(NodeMemberEvent nme) { - updateOutlineViewPanel(); + SwingUtilities.invokeLater(() -> { + updateOutlineViewPanel(); + }); } }); } From f6ebad6944c71b662c36299a5ebe853b394c3d50 Mon Sep 17 00:00:00 2001 From: Kelly Kelly Date: Thu, 23 May 2019 07:59:09 -0400 Subject: [PATCH 3/9] Added the invokeLater to ContactViewer --- .../communications/relationships/ContactsViewer.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsViewer.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsViewer.java index 2591f6940c..13d833f68b 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsViewer.java +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsViewer.java @@ -23,6 +23,7 @@ import java.awt.KeyboardFocusManager; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import javax.swing.JPanel; +import javax.swing.SwingUtilities; import static javax.swing.SwingUtilities.isDescendingFrom; import org.netbeans.swing.outline.DefaultOutlineModel; import org.netbeans.swing.outline.Outline; @@ -117,12 +118,16 @@ public final class ContactsViewer extends JPanel implements RelationshipsViewer{ outlineViewPanel.getExplorerManager().getRootContext().addNodeListener(new NodeAdapter(){ @Override public void childrenAdded(NodeMemberEvent nme) { - updateOutlineViewPanel(); + SwingUtilities.invokeLater(() -> { + updateOutlineViewPanel(); + }); } @Override public void childrenRemoved(NodeMemberEvent nme) { - updateOutlineViewPanel(); + updateOutlineViewPanel(); SwingUtilities.invokeLater(() -> { + updateOutlineViewPanel(); + }); } }); } From 5669681df7fbc39682d415ff309018b314764d24 Mon Sep 17 00:00:00 2001 From: Kelly Kelly Date: Thu, 23 May 2019 12:23:59 -0400 Subject: [PATCH 4/9] Another attempt at fixing the thread issue --- .../relationships/ContactsViewer.java | 8 ++------ .../relationships/MessagesViewer.java | 8 ++------ .../relationships/OutlineViewPanel.java | 15 ++++++++++----- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsViewer.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsViewer.java index 13d833f68b..2fec1406c0 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsViewer.java +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactsViewer.java @@ -118,16 +118,12 @@ public final class ContactsViewer extends JPanel implements RelationshipsViewer{ outlineViewPanel.getExplorerManager().getRootContext().addNodeListener(new NodeAdapter(){ @Override public void childrenAdded(NodeMemberEvent nme) { - SwingUtilities.invokeLater(() -> { - updateOutlineViewPanel(); - }); + updateOutlineViewPanel(); } @Override public void childrenRemoved(NodeMemberEvent nme) { - updateOutlineViewPanel(); SwingUtilities.invokeLater(() -> { - updateOutlineViewPanel(); - }); + updateOutlineViewPanel(); } }); } diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesViewer.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesViewer.java index d59fda48b1..8bda078161 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesViewer.java +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesViewer.java @@ -130,16 +130,12 @@ public final class MessagesViewer extends JPanel implements RelationshipsViewer outlineViewPanel.getExplorerManager().getRootContext().addNodeListener(new NodeAdapter() { @Override public void childrenAdded(NodeMemberEvent nme) { - SwingUtilities.invokeLater(() -> { - updateOutlineViewPanel(); - }); + updateOutlineViewPanel(); } @Override public void childrenRemoved(NodeMemberEvent nme) { - SwingUtilities.invokeLater(() -> { - updateOutlineViewPanel(); - }); + updateOutlineViewPanel(); } }); } diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/OutlineViewPanel.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/OutlineViewPanel.java index c84c7ae0a7..4e04db4f53 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/OutlineViewPanel.java +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/OutlineViewPanel.java @@ -19,6 +19,7 @@ package org.sleuthkit.autopsy.communications.relationships; import java.awt.CardLayout; +import javax.swing.SwingUtilities; import org.openide.explorer.ExplorerManager; import static org.openide.explorer.ExplorerUtils.createLookup; import org.openide.explorer.view.OutlineView; @@ -62,17 +63,21 @@ public class OutlineViewPanel extends javax.swing.JPanel implements ExplorerMana * @param message String message to show on the panel. */ public void hideOutlineView(String message) { - CardLayout layout = (CardLayout)this.getLayout(); - layout.show(this, "messageCard"); //NON-NLS - messageLabel.setText(message); + SwingUtilities.invokeLater(() -> { + CardLayout layout = (CardLayout)this.getLayout(); + layout.show(this, "messageCard"); //NON-NLS + messageLabel.setText(message); + }); } /** * Hides the message panel and shows the OutlineView. */ public void showOutlineView() { - CardLayout layout = (CardLayout)this.getLayout(); - layout.show(this, "outlineCard"); //NON-NLS + SwingUtilities.invokeLater(() -> { + CardLayout layout = (CardLayout)this.getLayout(); + layout.show(this, "outlineCard"); //NON-NLS + }); } /** From 34a2fb13940ae9e8cc8bfcb4282e17c6e1810268 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Thu, 23 May 2019 15:37:45 -0400 Subject: [PATCH 5/9] 5056 adjust comments and messages to reflect limit to other cases --- .../centralrepository/eventlisteners/IngestEventsListener.java | 2 +- .../autopsy/centralrepository/ingestmodule/Bundle.properties | 2 +- .../autopsy/centralrepository/ingestmodule/IngestSettings.java | 2 +- .../centralrepository/ingestmodule/IngestSettingsPanel.form | 2 +- .../centralrepository/ingestmodule/IngestSettingsPanel.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java b/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java index 37f0f595cb..5e600a7cb0 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java @@ -171,7 +171,7 @@ public class IngestEventsListener { } /** - * Configure the listener to flag previously seen devices or not. + * Configure the listener to flag devices previously seen in other cases or not. * * @param value True to flag seen devices; otherwise false. */ diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/Bundle.properties b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/Bundle.properties index 8b12289af0..8ca571695b 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/Bundle.properties @@ -1,4 +1,4 @@ IngestSettingsPanel.ingestSettingsLabel.text=Ingest Settings IngestSettingsPanel.flagTaggedNotableItemsCheckbox.text=Flag items previously tagged as notable -IngestSettingsPanel.flagPreviouslySeenDevicesCheckbox.text=Flag previously seen devices +IngestSettingsPanel.flagPreviouslySeenDevicesCheckbox.text=Flag devices previously seen in other cases IngestSettingsPanel.createCorrelationPropertiesCheckbox.text=Save items to the Central Repository diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettings.java b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettings.java index 454a2c3628..c48f2811a0 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettings.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettings.java @@ -70,7 +70,7 @@ final class IngestSettings implements IngestModuleIngestJobSettings { } /** - * Are previously seen devices to be flagged? + * Are devices previously seen in other cases to be flagged? * * @return True if flagging; otherwise false. */ diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettingsPanel.form index 82383f135f..b7c9224fd1 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettingsPanel.form +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettingsPanel.form @@ -29,7 +29,7 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettingsPanel.java index 6438b399e7..602d47fc83 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettingsPanel.java @@ -88,7 +88,7 @@ final class IngestSettingsPanel extends IngestModuleIngestJobSettingsPanel { .addComponent(flagTaggedNotableItemsCheckbox, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(flagPreviouslySeenDevicesCheckbox, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(createCorrelationPropertiesCheckbox, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))) - .addContainerGap(65, Short.MAX_VALUE)) + .addContainerGap(47, Short.MAX_VALUE)) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) From 6b3b2b5cf58c9c786320be51644bb6824274f4dc Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Thu, 23 May 2019 15:43:20 -0400 Subject: [PATCH 6/9] 5056 initial condition modification to prevent devices seen in current case from being flagged --- .../centralrepository/eventlisteners/IngestEventsListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java b/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java index 5e600a7cb0..4f937e30bf 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java @@ -482,7 +482,7 @@ public class IngestEventsListener { LOGGER.log(Level.INFO, String.format("Unable to flag notable item: %s.", eamArtifact.toString()), ex); } } - if (flagPreviousItemsEnabled + if (flagPreviousItemsEnabled && !eamArtifact.getCorrelationCase().getCaseUUID().equals(Case.getCurrentCase().getName()) && (eamArtifact.getCorrelationType().getId() == CorrelationAttributeInstance.USBID_TYPE_ID || eamArtifact.getCorrelationType().getId() == CorrelationAttributeInstance.ICCID_TYPE_ID || eamArtifact.getCorrelationType().getId() == CorrelationAttributeInstance.IMEI_TYPE_ID From 7b9840867a127a4a55f4761472cffdea9fa8cf87 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Thu, 23 May 2019 16:20:41 -0400 Subject: [PATCH 7/9] 5056 add updated merged bundle file --- .../centralrepository/ingestmodule/Bundle.properties-MERGED | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/Bundle.properties-MERGED index 876bfe7086..2e709858d8 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/Bundle.properties-MERGED @@ -12,5 +12,5 @@ CentralRepoIngestModuleFactory.ingestmodule.desc=Saves properties to the central CentralRepoIngestModuleFactory.ingestmodule.name=Correlation Engine IngestSettingsPanel.ingestSettingsLabel.text=Ingest Settings IngestSettingsPanel.flagTaggedNotableItemsCheckbox.text=Flag items previously tagged as notable -IngestSettingsPanel.flagPreviouslySeenDevicesCheckbox.text=Flag previously seen devices +IngestSettingsPanel.flagPreviouslySeenDevicesCheckbox.text=Flag devices previously seen in other cases IngestSettingsPanel.createCorrelationPropertiesCheckbox.text=Save items to the Central Repository From d0446c604e126495f58f5391f0b8cdb8b75945e5 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Thu, 23 May 2019 16:51:37 -0400 Subject: [PATCH 8/9] 5056 second try at limiting alerts for previously seen items to other cases --- .../eventlisteners/IngestEventsListener.java | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java b/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java index 4f937e30bf..58bf031359 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java @@ -171,7 +171,8 @@ public class IngestEventsListener { } /** - * Configure the listener to flag devices previously seen in other cases or not. + * Configure the listener to flag devices previously seen in other cases or + * not. * * @param value True to flag seen devices; otherwise false. */ @@ -318,7 +319,7 @@ public class IngestEventsListener { LOGGER.log(Level.SEVERE, "Failed to connect to Central Repository database.", ex); return; } - + switch (IngestManager.IngestJobEvent.valueOf(evt.getPropertyName())) { case DATA_SOURCE_ANALYSIS_COMPLETED: { jobProcessingExecutor.submit(new AnalysisCompleteTask(dbManager, evt)); @@ -332,10 +333,10 @@ public class IngestEventsListener { } private final class AnalysisCompleteTask implements Runnable { - + private final EamDb dbManager; private final PropertyChangeEvent event; - + private AnalysisCompleteTask(EamDb db, PropertyChangeEvent evt) { dbManager = db; event = evt; @@ -361,15 +362,15 @@ public class IngestEventsListener { long dataSourceObjectId = -1; try { dataSource = ((DataSourceAnalysisCompletedEvent) event).getDataSource(); - + /* - * We only care about Images for the purpose of - * updating hash values. + * We only care about Images for the purpose of updating hash + * values. */ if (!(dataSource instanceof Image)) { return; } - + dataSourceName = dataSource.getName(); dataSourceObjectId = dataSource.getId(); @@ -397,7 +398,7 @@ public class IngestEventsListener { if (StringUtils.equals(imageMd5Hash, crMd5Hash) == false) { correlationDataSource.setMd5(imageMd5Hash); } - + String imageSha1Hash = image.getSha1(); if (imageSha1Hash == null) { imageSha1Hash = ""; @@ -406,7 +407,7 @@ public class IngestEventsListener { if (StringUtils.equals(imageSha1Hash, crSha1Hash) == false) { correlationDataSource.setSha1(imageSha1Hash); } - + String imageSha256Hash = image.getSha256(); if (imageSha256Hash == null) { imageSha256Hash = ""; @@ -482,16 +483,20 @@ public class IngestEventsListener { LOGGER.log(Level.INFO, String.format("Unable to flag notable item: %s.", eamArtifact.toString()), ex); } } - if (flagPreviousItemsEnabled && !eamArtifact.getCorrelationCase().getCaseUUID().equals(Case.getCurrentCase().getName()) + if (flagPreviousItemsEnabled && (eamArtifact.getCorrelationType().getId() == CorrelationAttributeInstance.USBID_TYPE_ID || eamArtifact.getCorrelationType().getId() == CorrelationAttributeInstance.ICCID_TYPE_ID || eamArtifact.getCorrelationType().getId() == CorrelationAttributeInstance.IMEI_TYPE_ID || eamArtifact.getCorrelationType().getId() == CorrelationAttributeInstance.IMSI_TYPE_ID || eamArtifact.getCorrelationType().getId() == CorrelationAttributeInstance.MAC_TYPE_ID)) { try { - Long countPreviousOccurences = dbManager.getCountArtifactInstancesByTypeValue(eamArtifact.getCorrelationType(), eamArtifact.getCorrelationValue()); - if (countPreviousOccurences > 0) { - postCorrelatedPreviousArtifactToBlackboard(bbArtifact); + //only alert to previous instances when they were in another case + List previousOccurences = dbManager.getArtifactInstancesByTypeValue(eamArtifact.getCorrelationType(), eamArtifact.getCorrelationValue()); + for (CorrelationAttributeInstance instance : previousOccurences) { + if (!instance.getCorrelationCase().getCaseUUID().equals(eamArtifact.getCorrelationCase().getCaseUUID())) { + postCorrelatedPreviousArtifactToBlackboard(bbArtifact); + break; + } } } catch (CorrelationAttributeNormalizationException ex) { LOGGER.log(Level.INFO, String.format("Unable to flag notable item: %s.", eamArtifact.toString()), ex); From f756cc540ecc007dbd2d12254db464ff7b6147b8 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Thu, 23 May 2019 17:48:40 -0400 Subject: [PATCH 9/9] 5056 undo accidental changes to settings panel size --- .../centralrepository/ingestmodule/IngestSettingsPanel.form | 2 +- .../centralrepository/ingestmodule/IngestSettingsPanel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettingsPanel.form index b7c9224fd1..82383f135f 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettingsPanel.form +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettingsPanel.form @@ -29,7 +29,7 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettingsPanel.java index 602d47fc83..6438b399e7 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettingsPanel.java @@ -88,7 +88,7 @@ final class IngestSettingsPanel extends IngestModuleIngestJobSettingsPanel { .addComponent(flagTaggedNotableItemsCheckbox, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(flagPreviouslySeenDevicesCheckbox, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(createCorrelationPropertiesCheckbox, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))) - .addContainerGap(47, Short.MAX_VALUE)) + .addContainerGap(65, Short.MAX_VALUE)) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)