From 2c06144ca9c7028a7eb5cd6381f977a1d48880a6 Mon Sep 17 00:00:00 2001
From: "U-BASIS\\smori" <smori@win-olive-3256.basistech.net>
Date: Wed, 17 Aug 2016 09:52:47 -0400
Subject: [PATCH 01/10] changed date on DeleteBlackboardArtifactTagAction

---
 .../autopsy/actions/DeleteBlackboardArtifactTagAction.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/actions/DeleteBlackboardArtifactTagAction.java b/Core/src/org/sleuthkit/autopsy/actions/DeleteBlackboardArtifactTagAction.java
index ae3c8c52e5..66697cb89e 100755
--- a/Core/src/org/sleuthkit/autopsy/actions/DeleteBlackboardArtifactTagAction.java
+++ b/Core/src/org/sleuthkit/autopsy/actions/DeleteBlackboardArtifactTagAction.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  * 
- * Copyright 2013-2015 Basis Technology Corp.
+ * Copyright 2013-2016 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");

From 72012c58882461f36eecc7b1a2e8096aff29d6c3 Mon Sep 17 00:00:00 2001
From: Sophie Mori <smori@basistech.com>
Date: Wed, 17 Aug 2016 14:23:51 -0400
Subject: [PATCH 02/10] Updated use of PropertyChangeListener in
 KeywordSearchGlobalLanguageSettingsPanel,
 KeywordSearchGlobalSearchSettingsPanel, ImageFilePanel, LocalFilesPanel

---
 .../autopsy/casemodule/ImageFilePanel.java    | 31 +++----------------
 .../autopsy/casemodule/LocalFilesPanel.java   | 23 +-------------
 ...wordSearchGlobalLanguageSettingsPanel.java | 18 ++---------
 ...eywordSearchGlobalSearchSettingsPanel.java | 26 +++++-----------
 4 files changed, 15 insertions(+), 83 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java
index babd324370..044559e0f8 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java
@@ -18,8 +18,6 @@
  */
 package org.sleuthkit.autopsy.casemodule;
 
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
 import java.io.File;
 import java.util.Calendar;
 import java.util.List;
@@ -47,7 +45,6 @@ public class ImageFilePanel extends JPanel implements DocumentListener {
 
     private final String PROP_LASTIMAGE_PATH = "LBL_LastImage_PATH"; //NON-NLS
     private static final Logger logger = Logger.getLogger(ImageFilePanel.class.getName());
-    private PropertyChangeSupport pcs = null;
     private JFileChooser fc = new JFileChooser();
 
     // Externally supplied name is used to store settings 
@@ -80,7 +77,6 @@ public class ImageFilePanel extends JPanel implements DocumentListener {
         }
 
         this.contextName = context;
-        pcs = new PropertyChangeSupport(this);
 
         createTimeZoneList();
     }
@@ -207,7 +203,7 @@ public class ImageFilePanel extends JPanel implements DocumentListener {
         }
 
         try {
-            pcs.firePropertyChange(DataSourceProcessor.DSP_PANEL_EVENT.FOCUS_NEXT.toString(), false, true);
+            firePropertyChange(DataSourceProcessor.DSP_PANEL_EVENT.FOCUS_NEXT.toString(), false, true);
         } catch (Exception e) {
             logger.log(Level.SEVERE, "ImageFilePanel listener threw exception", e); //NON-NLS
             MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "ImageFilePanel.moduleErr"),
@@ -357,7 +353,7 @@ public class ImageFilePanel extends JPanel implements DocumentListener {
     public void insertUpdate(DocumentEvent e) {
 
         try {
-            pcs.firePropertyChange(DataSourceProcessor.DSP_PANEL_EVENT.UPDATE_UI.toString(), false, true);
+            firePropertyChange(DataSourceProcessor.DSP_PANEL_EVENT.UPDATE_UI.toString(), false, true);
         } catch (Exception ee) {
             logger.log(Level.SEVERE, "ImageFilePanel listener threw exception", ee); //NON-NLS
             MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "ImageFilePanel.moduleErr"),
@@ -369,7 +365,7 @@ public class ImageFilePanel extends JPanel implements DocumentListener {
     @Override
     public void removeUpdate(DocumentEvent e) {
         try {
-            pcs.firePropertyChange(DataSourceProcessor.DSP_PANEL_EVENT.UPDATE_UI.toString(), false, true);
+            firePropertyChange(DataSourceProcessor.DSP_PANEL_EVENT.UPDATE_UI.toString(), false, true);
         } catch (Exception ee) {
             logger.log(Level.SEVERE, "ImageFilePanel listener threw exception", ee); //NON-NLS
             MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "ImageFilePanel.moduleErr"),
@@ -382,7 +378,7 @@ public class ImageFilePanel extends JPanel implements DocumentListener {
     public void changedUpdate(DocumentEvent e) {
 
         try {
-            pcs.firePropertyChange(DataSourceProcessor.DSP_PANEL_EVENT.UPDATE_UI.toString(), false, true);
+            firePropertyChange(DataSourceProcessor.DSP_PANEL_EVENT.UPDATE_UI.toString(), false, true);
         } catch (Exception ee) {
             logger.log(Level.SEVERE, "ImageFilePanel listener threw exception", ee); //NON-NLS
             MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "ImageFilePanel.moduleErr"),
@@ -397,23 +393,4 @@ public class ImageFilePanel extends JPanel implements DocumentListener {
     public void select() {
         pathTextField.requestFocusInWindow();
     }
-
-    @Override
-    public synchronized void addPropertyChangeListener(PropertyChangeListener pcl) {
-        super.addPropertyChangeListener(pcl);
-
-        if (pcs == null) {
-            pcs = new PropertyChangeSupport(this);
-        }
-
-        pcs.addPropertyChangeListener(pcl);
-    }
-
-    @Override
-    public void removePropertyChangeListener(PropertyChangeListener pcl) {
-        super.removePropertyChangeListener(pcl);
-
-        pcs.removePropertyChangeListener(pcl);
-    }
-
 }
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java
index 99ba5ec231..c04aaa5bbf 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java
@@ -19,8 +19,6 @@
 package org.sleuthkit.autopsy.casemodule;
 
 import java.awt.Dialog;
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
 import java.io.File;
 import java.util.Arrays;
 import java.util.List;
@@ -46,7 +44,6 @@ import org.sleuthkit.autopsy.coreutils.PathValidator;
  */
 class LocalFilesPanel extends JPanel {
 
-    private PropertyChangeSupport pcs = null;
     private Set<File> currentFiles = new TreeSet<File>(); //keep currents in a set to disallow duplicates per add
     private boolean enableNext = false;
     private static LocalFilesPanel instance;
@@ -148,24 +145,6 @@ class LocalFilesPanel extends JPanel {
         this.displayNameLabel.setText(NbBundle.getMessage(this.getClass(), "LocalFilesPanel.displayNameLabel.text"));
     }
 
-    @Override
-    public synchronized void addPropertyChangeListener(PropertyChangeListener pcl) {
-        super.addPropertyChangeListener(pcl);
-
-        if (pcs == null) {
-            pcs = new PropertyChangeSupport(this);
-        }
-
-        pcs.addPropertyChangeListener(pcl);
-    }
-
-    @Override
-    public void removePropertyChangeListener(PropertyChangeListener pcl) {
-        super.removePropertyChangeListener(pcl);
-
-        pcs.removePropertyChangeListener(pcl);
-    }
-
     public String getFileSetName() {
         return this.displayName;
     }
@@ -312,7 +291,7 @@ class LocalFilesPanel extends JPanel {
         }
 
         try {
-            pcs.firePropertyChange(DataSourceProcessor.DSP_PANEL_EVENT.UPDATE_UI.toString(), false, true);
+            firePropertyChange(DataSourceProcessor.DSP_PANEL_EVENT.UPDATE_UI.toString(), false, true);
         } catch (Exception e) {
             logger.log(Level.SEVERE, "LocalFilesPanel listener threw exception", e); //NON-NLS
             MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "LocalFilesPanel.moduleErr"),
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalLanguageSettingsPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalLanguageSettingsPanel.java
index 03e72a8ddb..4deb056a77 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalLanguageSettingsPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalLanguageSettingsPanel.java
@@ -22,7 +22,6 @@ import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -42,7 +41,6 @@ class KeywordSearchGlobalLanguageSettingsPanel extends javax.swing.JPanel implem
     private final Map<String, StringExtract.StringExtractUnicodeTable.SCRIPT> scripts = new HashMap<>();
     private ActionListener updateLanguagesAction;
     private List<SCRIPT> toUpdate;
-    private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
 
     KeywordSearchGlobalLanguageSettingsPanel() {
         initComponents();
@@ -69,16 +67,6 @@ class KeywordSearchGlobalLanguageSettingsPanel extends javax.swing.JPanel implem
         reloadScriptsCheckBoxes();
     }
 
-    @Override
-    public void addPropertyChangeListener(PropertyChangeListener l) {
-        pcs.addPropertyChangeListener(l);
-    }
-
-    @Override
-    public void removePropertyChangeListener(PropertyChangeListener l) {
-        pcs.removePropertyChangeListener(l);
-    }
-
     private void activateScriptsCheckboxes(boolean activate) {
         final int components = checkPanel.getComponentCount();
         for (int i = 0; i < components; ++i) {
@@ -104,7 +92,7 @@ class KeywordSearchGlobalLanguageSettingsPanel extends javax.swing.JPanel implem
             ch.addActionListener(new ActionListener() {
                 @Override
                 public void actionPerformed(ActionEvent e) {
-                    pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+                    firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
                 }
             });
             ch.addActionListener(updateLanguagesAction);
@@ -247,7 +235,7 @@ class KeywordSearchGlobalLanguageSettingsPanel extends javax.swing.JPanel implem
         boolean selected = this.enableUTF8Checkbox.isSelected();
 
         activateScriptsCheckboxes(selected || this.enableUTF16Checkbox.isSelected());
-        pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+        firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
 
     }//GEN-LAST:event_enableUTF8CheckboxActionPerformed
 
@@ -256,7 +244,7 @@ class KeywordSearchGlobalLanguageSettingsPanel extends javax.swing.JPanel implem
         boolean selected = this.enableUTF16Checkbox.isSelected();
 
         activateScriptsCheckboxes(selected || this.enableUTF8Checkbox.isSelected());
-        pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+        firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
     }//GEN-LAST:event_enableUTF16CheckboxActionPerformed
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSearchSettingsPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSearchSettingsPanel.java
index fc0caa164f..9a7fe7817c 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSearchSettingsPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSearchSettingsPanel.java
@@ -20,7 +20,6 @@ package org.sleuthkit.autopsy.keywordsearch;
 
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
 import java.util.logging.Level;
 import org.netbeans.spi.options.OptionsPanelController;
 import org.sleuthkit.autopsy.corecomponents.OptionsPanel;
@@ -34,7 +33,6 @@ import org.sleuthkit.autopsy.keywordsearch.KeywordSearchIngestModule.UpdateFrequ
 class KeywordSearchGlobalSearchSettingsPanel extends javax.swing.JPanel implements OptionsPanel {
 
     private final Logger logger = Logger.getLogger(KeywordSearchGlobalSearchSettingsPanel.class.getName());
-    private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
 
     /**
      * Creates new form KeywordSearchConfigurationPanel2
@@ -76,16 +74,6 @@ class KeywordSearchGlobalSearchSettingsPanel extends javax.swing.JPanel implemen
         }
     }
 
-    @Override
-    public void addPropertyChangeListener(PropertyChangeListener l) {
-        pcs.addPropertyChangeListener(l);
-    }
-
-    @Override
-    public void removePropertyChangeListener(PropertyChangeListener l) {
-        pcs.removePropertyChangeListener(l);
-    }
-
     /**
      * This method is called from within the constructor to initialize the form.
      * WARNING: Do NOT modify this code. The content of this method is always
@@ -262,31 +250,31 @@ class KeywordSearchGlobalSearchSettingsPanel extends javax.swing.JPanel implemen
     }// </editor-fold>//GEN-END:initComponents
 
     private void timeRadioButton5ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_timeRadioButton5ActionPerformed
-        pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+        firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
     }//GEN-LAST:event_timeRadioButton5ActionPerformed
 
     private void skipNSRLCheckBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_skipNSRLCheckBoxActionPerformed
-        pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+        firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
     }//GEN-LAST:event_skipNSRLCheckBoxActionPerformed
 
     private void showSnippetsCBActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_showSnippetsCBActionPerformed
-        pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+        firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
     }//GEN-LAST:event_showSnippetsCBActionPerformed
 
     private void timeRadioButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_timeRadioButton1ActionPerformed
-        pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+        firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
     }//GEN-LAST:event_timeRadioButton1ActionPerformed
 
     private void timeRadioButton2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_timeRadioButton2ActionPerformed
-        pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+        firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
     }//GEN-LAST:event_timeRadioButton2ActionPerformed
 
     private void timeRadioButton3ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_timeRadioButton3ActionPerformed
-        pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+        firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
     }//GEN-LAST:event_timeRadioButton3ActionPerformed
 
     private void timeRadioButton4ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_timeRadioButton4ActionPerformed
-        pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+        firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
     }//GEN-LAST:event_timeRadioButton4ActionPerformed
 
     // Variables declaration - do not modify//GEN-BEGIN:variables

From 5c9145733e45e20c2636e1b1b11ab412b8ea04de Mon Sep 17 00:00:00 2001
From: wishdasher <smori@basistech.com>
Date: Wed, 17 Aug 2016 17:21:50 -0400
Subject: [PATCH 03/10] Updated use of PropertyChangeListener in
 InterestingItemDefsPanel, KeywordSearchGlobalLanguageSettingsPanel,
 AddFileTypePanel

---
 .../modules/filetypeid/AddFileTypePanel.java  | 17 ++-----------
 .../InterestingItemDefsPanel.java             | 25 +++++--------------
 ...wordSearchGlobalLanguageSettingsPanel.java |  1 -
 3 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/AddFileTypePanel.java b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/AddFileTypePanel.java
index bc44e8884f..cedd760146 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/AddFileTypePanel.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/AddFileTypePanel.java
@@ -18,8 +18,6 @@
  */
 package org.sleuthkit.autopsy.modules.filetypeid;
 
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
 import java.util.ArrayList;
 import java.util.List;
 import javax.swing.DefaultListModel;
@@ -41,7 +39,6 @@ class AddFileTypePanel extends javax.swing.JPanel {
 
     private AddFileTypeSignatureDialog addSigDialog;
     private DefaultListModel<FileType.Signature> signaturesListModel;
-    private PropertyChangeSupport pcs = new PropertyChangeSupport(this);
 
     /**
      * Creates a panel for a new file type.
@@ -148,16 +145,6 @@ class AddFileTypePanel extends javax.swing.JPanel {
     boolean hasSignature() {
         return !this.signaturesListModel.isEmpty();
     }
-    
-    @Override
-    public void addPropertyChangeListener(PropertyChangeListener l) {
-        pcs.addPropertyChangeListener(l);
-    }
-
-    @Override
-    public void removePropertyChangeListener(PropertyChangeListener l) {
-        pcs.removePropertyChangeListener(l);
-    }
 
     /**
      * This method is called from within the constructor to initialize the form.
@@ -279,7 +266,7 @@ class AddFileTypePanel extends javax.swing.JPanel {
             if (!this.signaturesListModel.isEmpty()) {
                 signatureList.setSelectedIndex(0);
             }
-            pcs.firePropertyChange(SIG_LIST_CHANGED.toString(), null, null);
+            firePropertyChange(SIG_LIST_CHANGED.toString(), null, null);
         }
     }//GEN-LAST:event_deleteSigButtonActionPerformed
 
@@ -289,7 +276,7 @@ class AddFileTypePanel extends javax.swing.JPanel {
             if (addSigDialog.getResult() == AddFileTypeSignatureDialog.BUTTON_PRESSED.OK) {
                 signaturesListModel.addElement(this.addSigDialog.getSignature());
             }
-            pcs.firePropertyChange(SIG_LIST_CHANGED.toString(), null, null);
+            firePropertyChange(SIG_LIST_CHANGED.toString(), null, null);
         }
     }//GEN-LAST:event_addSigButtonActionPerformed
 
diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemDefsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemDefsPanel.java
index 3669612f16..df527b887d 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemDefsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemDefsPanel.java
@@ -19,8 +19,6 @@
 package org.sleuthkit.autopsy.modules.interestingitems;
 
 import java.awt.EventQueue;
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -74,7 +72,6 @@ final class InterestingItemDefsPanel extends IngestModuleGlobalSettingsPanel imp
     // definitions manager. Note that it is a tree map to aid in displaying
     // files sets in sorted order by name.
     private TreeMap<String, FilesSet> filesSets;
-    private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
 
     /**
      * Constructs an interesting item definitions panel.
@@ -123,16 +120,6 @@ final class InterestingItemDefsPanel extends IngestModuleGlobalSettingsPanel imp
         this.equalitySignComboBox.setSelectedIndex(2);
     }
     
-    @Override
-    public void addPropertyChangeListener(PropertyChangeListener l) {
-        pcs.addPropertyChangeListener(l);
-    }
-
-    @Override
-    public void removePropertyChangeListener(PropertyChangeListener l) {
-        pcs.removePropertyChangeListener(l);
-    }
-
     /**
      * @inheritDoc
      */
@@ -928,7 +915,7 @@ final class InterestingItemDefsPanel extends IngestModuleGlobalSettingsPanel imp
 
     private void newSetButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_newSetButtonActionPerformed
         this.doFileSetsDialog(null);
-        pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+        firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
     }//GEN-LAST:event_newSetButtonActionPerformed
 
     private void deleteRuleButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deleteRuleButtonActionPerformed
@@ -946,7 +933,7 @@ final class InterestingItemDefsPanel extends IngestModuleGlobalSettingsPanel imp
         } else {
             this.resetRuleComponents();
         }
-        pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+        firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
     }//GEN-LAST:event_deleteRuleButtonActionPerformed
 
     private void deleteSetButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deleteSetButtonActionPerformed
@@ -961,7 +948,7 @@ final class InterestingItemDefsPanel extends IngestModuleGlobalSettingsPanel imp
         } else {
             this.resetComponents();
         }
-        pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+        firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
     }//GEN-LAST:event_deleteSetButtonActionPerformed
 
     private void ignoreKnownFilesCheckboxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_ignoreKnownFilesCheckboxActionPerformed
@@ -970,17 +957,17 @@ final class InterestingItemDefsPanel extends IngestModuleGlobalSettingsPanel imp
 
     private void editSetButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_editSetButtonActionPerformed
         this.doFileSetsDialog(this.setsList.getSelectedValue());
-        pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+        firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
     }//GEN-LAST:event_editSetButtonActionPerformed
 
     private void editRuleButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_editRuleButtonActionPerformed
         this.doFilesSetRuleDialog(this.rulesList.getSelectedValue());
-        pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+        firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
     }//GEN-LAST:event_editRuleButtonActionPerformed
 
     private void newRuleButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_newRuleButtonActionPerformed
         this.doFilesSetRuleDialog(null);
-        pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+        firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
     }//GEN-LAST:event_newRuleButtonActionPerformed
 
     private void fileNameTextFieldActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_fileNameTextFieldActionPerformed
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalLanguageSettingsPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalLanguageSettingsPanel.java
index 4deb056a77..2a590e6862 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalLanguageSettingsPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalLanguageSettingsPanel.java
@@ -21,7 +21,6 @@ package org.sleuthkit.autopsy.keywordsearch;
 import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

From 9cd31870176fef0adbacdeeed6e4fe56207c23fc Mon Sep 17 00:00:00 2001
From: wishdasher <smori@basistech.com>
Date: Thu, 18 Aug 2016 10:16:36 -0400
Subject: [PATCH 04/10] Updated use of PropertyChangeSupport in
 FileExtMismatchSettingsPanel, FileTypeIdGlobalSettingsPanel,
 HashLookupSettingsPanel

---
 .../FileExtMismatchSettingsPanel.java         | 21 ++++--------------
 .../FileTypeIdGlobalSettingsPanel.java        | 18 +++------------
 .../hashdatabase/HashLookupSettingsPanel.java | 22 +++++--------------
 3 files changed, 12 insertions(+), 49 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java
index ca4921837d..a524b44afd 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java
@@ -19,8 +19,6 @@
 package org.sleuthkit.autopsy.modules.fileextmismatch;
 
 import java.awt.Color;
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -57,7 +55,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
     private String selectedExt = "";
     ListSelectionModel lsm = null;
     private FileTypeDetector fileTypeDetector;
-    private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
 
     public FileExtMismatchSettingsPanel() {
         mimeTableModel = new MimeTableModel();
@@ -136,16 +133,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
         addExtButton.setEnabled(false);
     }
 
-    @Override
-    public void addPropertyChangeListener(PropertyChangeListener l) {
-        pcs.addPropertyChangeListener(l);
-    }
-
-    @Override
-    public void removePropertyChangeListener(PropertyChangeListener l) {
-        pcs.removePropertyChangeListener(l);
-    }
-
     private void clearErrLabels() {
         mimeErrLabel.setText(" ");
         extErrorLabel.setText(" ");
@@ -394,7 +381,7 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
         updateExtList();
         extTableModel.resync();
         this.userExtTextField.setText("");
-        pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+        firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
     }//GEN-LAST:event_addExtButtonActionPerformed
 
     private void addTypeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addTypeButtonActionPerformed
@@ -442,7 +429,7 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
         mimeTableModel.resync();
         userTypeTextField.setText("");
         this.clearErrLabels();
-        pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+        firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
     }//GEN-LAST:event_addTypeButtonActionPerformed
 
     private void userExtTextFieldFocusGained(java.awt.event.FocusEvent evt) {//GEN-FIRST:event_userExtTextFieldFocusGained
@@ -467,7 +454,7 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
         // Refresh table
         updateMimeList();
         mimeTableModel.resync();
-        pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+        firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
     }//GEN-LAST:event_removeTypeButtonActionPerformed
 
     private void removeExtButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_removeExtButtonActionPerformed
@@ -495,7 +482,7 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
         // Refresh tables        
         updateExtList();
         extTableModel.resync();
-        pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+        firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
     }//GEN-LAST:event_removeExtButtonActionPerformed
 
     private void updateMimeList() {
diff --git a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdGlobalSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdGlobalSettingsPanel.java
index a4b4ff49d3..69ee7d32d1 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdGlobalSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdGlobalSettingsPanel.java
@@ -21,7 +21,6 @@ package org.sleuthkit.autopsy.modules.filetypeid;
 import java.awt.EventQueue;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
@@ -74,7 +73,6 @@ final class FileTypeIdGlobalSettingsPanel extends IngestModuleGlobalSettingsPane
     // modules obtained and shared a per data source ingest job snapshot of the
     // file type definitions.
     IngestJobEventPropertyChangeListener ingestJobEventsListener;
-    private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
 
     /**
      * Creates a panel to allow a user to make custom file type definitions.
@@ -100,16 +98,6 @@ final class FileTypeIdGlobalSettingsPanel extends IngestModuleGlobalSettingsPane
         populateTypeDetailsComponents();
     }
 
-    @Override
-    public void addPropertyChangeListener(PropertyChangeListener l) {
-        pcs.addPropertyChangeListener(l);
-    }
-
-    @Override
-    public void removePropertyChangeListener(PropertyChangeListener l) {
-        pcs.removePropertyChangeListener(l);
-    }
-
     /**
      * Sets the list model for the list of file types.
      */
@@ -501,7 +489,7 @@ final class FileTypeIdGlobalSettingsPanel extends IngestModuleGlobalSettingsPane
         if (result == AddFileTypeDialog.BUTTON_PRESSED.OK) {
             fileTypes.add(dialog.getFileType());
             updateFileTypesListModel();
-            pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+            firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
         }
 
     }//GEN-LAST:event_newTypeButtonActionPerformed
@@ -513,7 +501,7 @@ final class FileTypeIdGlobalSettingsPanel extends IngestModuleGlobalSettingsPane
         if (!typesListModel.isEmpty()) {
             typesList.setSelectedIndex(0);
         }
-        pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+        firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
     }//GEN-LAST:event_deleteTypeButtonActionPerformed
 
     private void editTypeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_editTypeButtonActionPerformed
@@ -524,7 +512,7 @@ final class FileTypeIdGlobalSettingsPanel extends IngestModuleGlobalSettingsPane
             this.fileTypes.remove(selected);
             this.fileTypes.add(selected, dialog.getFileType());
             updateFileTypesListModel();
-            pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+            firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
         }
     }//GEN-LAST:event_editTypeButtonActionPerformed
 
diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java
index 8f20eeb6cc..04efe6a86d 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java
@@ -22,7 +22,6 @@ import java.awt.*;
 import java.awt.event.KeyEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
@@ -62,7 +61,6 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
             .getMessage(HashLookupSettingsPanel.class, "HashDbConfigPanel.errorGettingIndexStatusText");
     private final HashDbManager hashSetManager = HashDbManager.getInstance();
     private final HashSetTableModel hashSetTableModel = new HashSetTableModel();
-    private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
 
     public HashLookupSettingsPanel() {
         initComponents();
@@ -104,16 +102,6 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
         });
     }
 
-    @Override
-    public void addPropertyChangeListener(PropertyChangeListener l) {
-        pcs.addPropertyChangeListener(l);
-    }
-
-    @Override
-    public void removePropertyChangeListener(PropertyChangeListener l) {
-        pcs.removePropertyChangeListener(l);
-    }
-
     private void updateComponents() {
         HashDb db = ((HashSetTable) hashSetTable).getSelection();
         if (db != null) {
@@ -844,7 +832,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
                     JOptionPane.showMessageDialog(null, Bundle.HashLookupSettingsPanel_removeDatabaseFailure_message(hashDb.getHashSetName()));
                 }
                 hashSetTableModel.refreshModel();
-                pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+                firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
             }
         }
     }//GEN-LAST:event_deleteDatabaseButtonActionPerformed
@@ -859,7 +847,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
                     JOptionPane.showMessageDialog(null, Bundle.HashLookupSettingsPanel_removeDatabaseFailure_message(hashDb.getHashSetName()));
                 }
                 hashSetTableModel.refreshModel();
-                pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+                firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
             }
         }
     }//GEN-LAST:event_hashSetTableKeyPressed
@@ -868,7 +856,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
         HashDb hashDb = ((HashSetTable) hashSetTable).getSelection();
         if (hashDb != null) {
             hashDb.setSendIngestMessages(sendIngestMessagesCheckBox.isSelected());
-            pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+            firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
         }
     }//GEN-LAST:event_sendIngestMessagesCheckBoxActionPerformed
 
@@ -877,7 +865,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
         if (null != hashDb) {
             hashSetTableModel.refreshModel();
             ((HashSetTable) hashSetTable).selectRowByName(hashDb.getHashSetName());
-            pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+            firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
         }
     }//GEN-LAST:event_importDatabaseButtonActionPerformed
 
@@ -886,7 +874,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
         if (null != hashDb) {
             hashSetTableModel.refreshModel();
             ((HashSetTable) hashSetTable).selectRowByName(hashDb.getHashSetName());
-            pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
+            firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
         }
     }//GEN-LAST:event_createDatabaseButtonActionPerformed
 

From 06efd34f8c142adef557eeb319c72b4ddb09bb93 Mon Sep 17 00:00:00 2001
From: millmanorama <millmanorama@gmail.com>
Date: Mon, 22 Aug 2016 14:02:52 +0200
Subject: [PATCH 05/10] updating version check in build.xml and updating to
 ControlsFX 8.40.11 to allow building against java 8u101/2

---
 CoreLibs/ivy.xml                      | 2 +-
 CoreLibs/nbproject/project.properties | 6 +++---
 CoreLibs/nbproject/project.xml        | 4 ++--
 build.xml                             | 1 +
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml
index 70bbe38e46..7c3f27396c 100644
--- a/CoreLibs/ivy.xml
+++ b/CoreLibs/ivy.xml
@@ -36,7 +36,7 @@
         <dependency conf="autopsy_core->*" org="org.imgscalr" name="imgscalr-lib" rev="4.2" />
         
         <!-- timeline and image analyzer -->
-        <dependency conf="autopsy_core->*" org="org.controlsfx" name="controlsfx" rev="8.40.10" />
+        <dependency conf="autopsy_core->*" org="org.controlsfx" name="controlsfx" rev="8.40.11" />
 
         <!-- timeline  -->
         <dependency conf="autopsy_core->*" org="joda-time" name="joda-time" rev="2.4" />
diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties
index 7b1b68be8a..da6ee3ad6d 100644
--- a/CoreLibs/nbproject/project.properties
+++ b/CoreLibs/nbproject/project.properties
@@ -16,7 +16,7 @@ file.reference.commons-logging-1.1.2-javadoc.jar=release/modules/ext/commons-log
 file.reference.commons-logging-1.1.2-sources.jar=release/modules/ext/commons-logging-1.1.2-sources.jar
 file.reference.commons-logging-1.1.2.jar=release/modules/ext/commons-logging-1.1.2.jar
 file.reference.compiler-0.9.1.jar=release/modules/ext/compiler-0.9.1.jar
-file.reference.controlsfx-8.40.10.jar=release/modules/ext/controlsfx-8.40.10.jar
+file.reference.controlsfx-8.40.11.jar=release/modules/ext/controlsfx-8.40.11.jar
 file.reference.dom4j-1.6.1.jar=release/modules/ext/dom4j-1.6.1.jar
 file.reference.geronimo-jms_1.1_spec-1.0.jar=release/modules/ext/geronimo-jms_1.1_spec-1.0.jar
 file.reference.gson-1.4.jar=release/modules/ext/gson-1.4.jar
@@ -72,14 +72,14 @@ file.reference.xmlbeans-2.3.0.jar=release/modules/ext/xmlbeans-2.3.0.jar
 javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
 javadoc.reference.compiler-0.9.1.jar=release/modules/ext/compiler-0.9.1-javadoc.jar
-javadoc.reference.controlsfx-8.40.10.jar=release/modules/ext/controlsfx-8.40.10-javadoc.jar
+javadoc.reference.controlsfx-8.40.11.jar=release/modules/ext/controlsfx-8.40.11-javadoc.jar
 javadoc.reference.guava-18.0.jar=release/modules/ext/guava-18.0-javadoc.jar
 javadoc.reference.jfxtras-common-8.0-r4.jar=release/modules/ext/jfxtras-common-8.0-r4-javadoc.jar
 javadoc.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-8.0-r4-javadoc.jar
 javadoc.reference.jfxtras-fxml-8.0-r4.jar=release/modules/ext/jfxtras-fxml-8.0-r4-javadoc.jar
 nbm.needs.restart=true
 source.reference.compiler-0.9.1.jar=release/modules/ext/compiler-0.9.1-sources.jar
-source.reference.controlsfx-8.40.10.jar=release/modules/ext/controlsfx-8.40.10-sources.jar
+source.reference.controlsfx-8.40.11.jar=release/modules/ext/controlsfx-8.40.11-sources.jar
 source.reference.guava-18.0.jar=release/modules/ext/guava-18.0-sources.jar
 source.reference.jfxtras-common-8.0-r4.jar=release/modules/ext/jfxtras-common-8.0-r4-sources.jar
 source.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-8.0-r4-sources.jar
diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml
index 22b2a8cfe4..2b6af06837 100644
--- a/CoreLibs/nbproject/project.xml
+++ b/CoreLibs/nbproject/project.xml
@@ -919,8 +919,8 @@
                 <binary-origin>release/modules/ext/gstreamer-java-1.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/controlsfx-8.40.10.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/controlsfx-8.40.10.jar</binary-origin>
+                <runtime-relative-path>ext/controlsfx-8.40.11.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/controlsfx-8.40.11.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/dom4j-1.6.1.jar</runtime-relative-path>
diff --git a/build.xml b/build.xml
index c898e32189..3fcfb0ebab 100755
--- a/build.xml
+++ b/build.xml
@@ -15,6 +15,7 @@
         <or>
             <matches string="${java.version}" pattern="1\.8\.0_6[6-9]"/>
             <matches string="${java.version}" pattern="1\.8\.0_[7-9][0-9]"/>
+         <matches string="${java.version}" pattern="1\.8\.0_[1-9][0-9][0-9]"/>
             <matches string="${java.version}" pattern="1\.8\.[1-9]_[0-9][0-9]"/>
             <equals arg1="${ant.java.version}" arg2="1.9"/>
         </or>

From 12957130cfa3a6af593e155d3a054efb48fde3ee Mon Sep 17 00:00:00 2001
From: Ann Priestman <apriestman@basistech.com>
Date: Wed, 24 Aug 2016 13:46:20 -0400
Subject: [PATCH 06/10] Updating the user docs for ActiveMQ and PostgreSQL
 installation.

---
 docs/doxygen-user/installActiveMQ.dox | 4 ++--
 docs/doxygen-user/installPostgres.dox | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/doxygen-user/installActiveMQ.dox b/docs/doxygen-user/installActiveMQ.dox
index 117a264dfd..0e431b1e0c 100755
--- a/docs/doxygen-user/installActiveMQ.dox
+++ b/docs/doxygen-user/installActiveMQ.dox
@@ -5,7 +5,7 @@ To install ActiveMQ, perform the following steps:
 
 You will need:
 - 64-bit version of the Java Runtime Environment (JRE) from http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html. 
-- Download ActiveMQ-5.13.3 from: http://activemq.apache.org/activemq-5133-release.html
+- Download ActiveMQ from: http://activemq.apache.org/download.html . Autopsy has been tested with ActiveMQ version 5.13.3.
 
 
 \section install_activemq_install Installation
@@ -20,7 +20,7 @@ If you need the JRE, install it with the default settings.
 
 \subsection install_activemq_install_mq ActiveMQ Installation
 
-1. Extract the contents of the ActiveMQ archive folder to a location of your choice, bearing in mind that the files should be in a location that the running process will have write permissions to the folder. A typical folder choice is <i>C:\\Program Files\\apache-activemq-5.13.3</i>. Typically, it will ask for administrator permission to move the folder. Allow it if required. 
+1. Extract the contents of the ActiveMQ archive folder to a location of your choice, bearing in mind that the files should be in a location that the running process will have write permissions to the folder. A typical folder choice would be similar to <i>C:\\Program Files\\apache-activemq-5.13.3</i>. Typically, it will ask for administrator permission to move the folder. Allow it if required. 
 
 2. Edit the <i>conf\\activemq.xml</i> in the extracted folder to add <i>"&amp;wireFormat.maxInactivityDuration=0"</i> to the URI for the _transportConnector_ named _openwire_. Add the text highlighted in yellow below:
 <br><br>
diff --git a/docs/doxygen-user/installPostgres.dox b/docs/doxygen-user/installPostgres.dox
index e013de31ad..07650aee24 100755
--- a/docs/doxygen-user/installPostgres.dox
+++ b/docs/doxygen-user/installPostgres.dox
@@ -1,9 +1,9 @@
 /*! \page install_postgresql Install and Configure PostgreSQL
 To install PostgreSQL, perform the following steps:
 
-1.	Download a 64-bit PostgreSQL version 9.5.3 installer from  http://www.enterprisedb.com/products-services-training/pgdownload#windows  Choose the one that says _Win X86-64_.
+1.	Download a 64-bit PostgreSQL installer from  http://www.enterprisedb.com/products-services-training/pgdownload#windows  Choose the one that says _Win X86-64_. Autopsy has been tested with PostgreSQL version 9.5.
 
-2.	Run _postgresql-9.5.3-1-windows-x64.exe_
+2.	Run the installer. The name will be similar to _postgresql-9.5.3-1-windows-x64.exe_.
 
 3.	You may accept defaults for all items except for the password as you work through the wizard. Do not lose the password you enter in. This is the PostgreSQL administrator login password.
 

From 67eeb2294f073e08dcf44a370f17dea94bd3f244 Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Thu, 25 Aug 2016 23:16:59 -0400
Subject: [PATCH 07/10] Resolve IngestJob/DataSourceIngestJob cancellation
 deadlock

---
 .../sleuthkit/autopsy/ingest/IngestJob.java   | 62 +++++++++----------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java
index 14c0f12430..d82f73fb76 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java
@@ -1,15 +1,15 @@
 /*
  * Autopsy Forensic Browser
- * 
- * Copyright 2014-2015 Basis Technology Corp.
+ *
+ * Copyright 2011-2016 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -50,25 +50,23 @@ public final class IngestJob {
         OUT_OF_DISK_SPACE(NbBundle.getMessage(IngestJob.class, "IngestJob.cancelReason.outOfDiskSpace.text")),
         SERVICES_DOWN(NbBundle.getMessage(IngestJob.class, "IngestJob.cancelReason.servicesDown.text")),
         CASE_CLOSED(NbBundle.getMessage(IngestJob.class, "IngestJob.cancelReason.caseClosed.text"));
-        
+
         private final String displayName;
-        
+
         private CancellationReason(String displayName) {
             this.displayName = displayName;
         }
-        
+
         public String getDisplayName() {
             return displayName;
         }
     }
 
-    private static final AtomicLong nextId = new AtomicLong(0L);
+    private final static AtomicLong nextId = new AtomicLong(0L);
     private final long id;
     private final Map<Long, DataSourceIngestJob> dataSourceJobs;
-    private final AtomicInteger incompleteJobsCount;
-    private boolean started;
-    private boolean cancelled;
-    private CancellationReason cancellationReason;
+    private final AtomicInteger incompleteJobsCount;    
+    private volatile CancellationReason cancellationReason;
 
     /**
      * Constructs an ingest job that runs a collection of data sources through a
@@ -127,14 +125,7 @@ public final class IngestJob {
      *
      * @return A collection of ingest module start up errors, empty on success.
      */
-    synchronized List<IngestModuleError> start() {
-        List<IngestModuleError> errors = new ArrayList<>();
-        if (started) {
-            errors.add(new IngestModuleError("IngestJob", new IllegalStateException("Job already started"))); //NON-NLS
-            return errors;
-        }
-        started = true;
-
+    List<IngestModuleError> start() {
         /*
          * Try to start each data source ingest job. Note that there is a not
          * unwarranted assumption here that if there is going to be a module
@@ -143,6 +134,7 @@ public final class IngestJob {
          * TODO (RC): Consider separating module start up from pipeline startup
          * so that no processing is done if this assumption is false.
          */
+        List<IngestModuleError> errors = new ArrayList<>();
         for (DataSourceIngestJob dataSourceJob : this.dataSourceJobs.values()) {
             errors.addAll(dataSourceJob.start());
             if (errors.isEmpty() == false) {
@@ -205,7 +197,7 @@ public final class IngestJob {
      * @deprecated Use cancel(CancellationReason reason) instead
      */
     @Deprecated
-    synchronized public void cancel() {
+    public void cancel() {
         cancel(CancellationReason.USER_CANCELLED);
     }
 
@@ -217,12 +209,11 @@ public final class IngestJob {
      *
      * @param reason The reason for cancellation.
      */
-    synchronized public void cancel(CancellationReason reason) {
+    public void cancel(CancellationReason reason) {
+        this.cancellationReason = reason;
         this.dataSourceJobs.values().stream().forEach((job) -> {
             job.cancel(reason);
         });
-        this.cancelled = true;
-        this.cancellationReason = reason;
     }
 
     /**
@@ -230,7 +221,7 @@ public final class IngestJob {
      *
      * @return The cancellation reason, may be not cancelled.
      */
-    synchronized public CancellationReason getCancellationReason() {
+    public CancellationReason getCancellationReason() {
         return this.cancellationReason;
     }
 
@@ -240,8 +231,8 @@ public final class IngestJob {
      *
      * @return True or false.
      */
-    synchronized public boolean isCancelled() {
-        return this.cancelled;
+    public boolean isCancelled() {
+        return (CancellationReason.NOT_CANCELLED != this.cancellationReason);
     }
 
     /**
@@ -311,7 +302,7 @@ public final class IngestJob {
              *
              * @return The cancellation reason, may be not cancelled.
              */
-            synchronized public CancellationReason getCancellationReason() {
+            public CancellationReason getCancellationReason() {
                 return snapshot.getCancellationReason();
             }
 
@@ -353,7 +344,7 @@ public final class IngestJob {
                     fileIngestStartTime = childFileIngestStartTime;
                 }
             }
-            this.jobCancelled = cancelled;
+            this.jobCancelled = isCancelled();
             this.jobCancellationReason = cancellationReason;
         }
 
@@ -401,7 +392,7 @@ public final class IngestJob {
          *
          * @return The cancellation reason, may be not cancelled.
          */
-        synchronized public CancellationReason getCancellationReason() {
+        public CancellationReason getCancellationReason() {
             return this.jobCancellationReason;
         }
 
@@ -495,5 +486,14 @@ public final class IngestJob {
         }
 
     }
+    
+    enum CancelledState {
+        NOT_CANCELLED,
+        CANCELLED_BY_USER,
+        CANCELLED_FOR_INGEST_MODULES_STARTUP_ERRORS,
+        CANCELLED_FOR_OUT_OF_DISK_SPACE,
+        CANCELLED_FOR_SERVICES_DOWN,
+        CANCELLED_FOR_CASE_CLOSED;        
+    }
 
 }

From 7410a3af8f1142d4daf3dccea99db58c2f978ab1 Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Thu, 25 Aug 2016 23:23:30 -0400
Subject: [PATCH 08/10] Remove unused IngestJob

---
 Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java
index d82f73fb76..827d11a069 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java
@@ -486,14 +486,5 @@ public final class IngestJob {
         }
 
     }
-    
-    enum CancelledState {
-        NOT_CANCELLED,
-        CANCELLED_BY_USER,
-        CANCELLED_FOR_INGEST_MODULES_STARTUP_ERRORS,
-        CANCELLED_FOR_OUT_OF_DISK_SPACE,
-        CANCELLED_FOR_SERVICES_DOWN,
-        CANCELLED_FOR_CASE_CLOSED;        
-    }
 
 }

From e17226bcbf8caab8aed944ed9c9f40ff130f4093 Mon Sep 17 00:00:00 2001
From: Ann Priestman <apriestman@basistech.com>
Date: Fri, 26 Aug 2016 09:34:36 -0400
Subject: [PATCH 09/10] Updated activeMQ version

---
 docs/doxygen-user/installActiveMQ.dox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/doxygen-user/installActiveMQ.dox b/docs/doxygen-user/installActiveMQ.dox
index 0e431b1e0c..fec69c00de 100755
--- a/docs/doxygen-user/installActiveMQ.dox
+++ b/docs/doxygen-user/installActiveMQ.dox
@@ -5,7 +5,7 @@ To install ActiveMQ, perform the following steps:
 
 You will need:
 - 64-bit version of the Java Runtime Environment (JRE) from http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html. 
-- Download ActiveMQ from: http://activemq.apache.org/download.html . Autopsy has been tested with ActiveMQ version 5.13.3.
+- Download ActiveMQ from: http://activemq.apache.org/download.html . Autopsy has been tested with ActiveMQ version 5.14.0.
 
 
 \section install_activemq_install Installation

From faa8220fe271559d3024474afcad59aece7a5fc0 Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Fri, 26 Aug 2016 10:13:59 -0400
Subject: [PATCH 10/10] Add null checks to DSP cancel methods

---
 .../org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java    | 4 +++-
 .../sleuthkit/autopsy/casemodule/LocalDiskDSProcessor.java    | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java b/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java
index fa9f92188c..5f68f07c21 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java
@@ -190,7 +190,9 @@ public class ImageDSProcessor implements DataSourceProcessor {
      */
     @Override
     public void cancel() {
-        addImageTask.cancelTask();
+        if (null != addImageTask) {
+            addImageTask.cancelTask();
+        }
     }
 
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskDSProcessor.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskDSProcessor.java
index 977c7ef6b0..02590894f2 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskDSProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskDSProcessor.java
@@ -169,7 +169,9 @@ public class LocalDiskDSProcessor implements DataSourceProcessor {
      */
     @Override
     public void cancel() {
-        addDiskTask.cancelTask();
+        if (null != addDiskTask) {
+            addDiskTask.cancelTask();
+        }
     }
 
     /**