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 sleuthkit org * * Licensed under the Apache License, Version 2.0 (the "License"); 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/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/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(); + } } /** 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 currentFiles = new TreeSet(); //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/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java index 14c0f12430..827d11a069 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 sleuthkit 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 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 start() { - List errors = new ArrayList<>(); - if (started) { - errors.add(new IngestModuleError("IngestJob", new IllegalStateException("Job already started"))); //NON-NLS - return errors; - } - started = true; - + List 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 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; } 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/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 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/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 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 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/CoreLibs/ivy.xml b/CoreLibs/ivy.xml index 70bbe38e46..7c3f27396c 100644 --- a/CoreLibs/ivy.xml +++ b/CoreLibs/ivy.xml @@ -36,7 +36,7 @@ - + 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 @@ release/modules/ext/gstreamer-java-1.5.jar - ext/controlsfx-8.40.10.jar - release/modules/ext/controlsfx-8.40.10.jar + ext/controlsfx-8.40.11.jar + release/modules/ext/controlsfx-8.40.11.jar ext/dom4j-1.6.1.jar diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalLanguageSettingsPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalLanguageSettingsPanel.java index 03e72a8ddb..2a590e6862 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalLanguageSettingsPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalLanguageSettingsPanel.java @@ -21,8 +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.beans.PropertyChangeSupport; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -42,7 +40,6 @@ class KeywordSearchGlobalLanguageSettingsPanel extends javax.swing.JPanel implem private final Map scripts = new HashMap<>(); private ActionListener updateLanguagesAction; private List