mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-14 17:06:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into encodedFiles

Browse Source
This commit is contained in:
Ann Priestman 2016-09-07 08:03:43 -04:00
commit b25b84a0e4
19 changed files with 75 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/org/sleuthkit/autopsy/actions/DeleteBlackboardArtifactTagAction.java
View File

@ -1,7 +1,7 @@
/* /*
* Autopsy Forensic Browser * Autopsy Forensic Browser
* *
* Copyright 2013-2015 Basis Technology Corp. * Copyright 2013-2016 Basis Technology Corp.
* Contact: carrier <at> sleuthkit <dot> org * Contact: carrier <at> sleuthkit <dot> org
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");

4
Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java
View File

@ -190,7 +190,9 @@ public class ImageDSProcessor implements DataSourceProcessor {
*/ */
@Override @Override
public void cancel() { public void cancel() {
addImageTask.cancelTask(); if (null != addImageTask) {
addImageTask.cancelTask();
}
} }
/** /**

31
Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java
View File

@ -18,8 +18,6 @@
*/ */
package org.sleuthkit.autopsy.casemodule; package org.sleuthkit.autopsy.casemodule;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.io.File; import java.io.File;
import java.util.Calendar; import java.util.Calendar;
import java.util.List; 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 final String PROP_LASTIMAGE_PATH = "LBL_LastImage_PATH"; //NON-NLS
private static final Logger logger = Logger.getLogger(ImageFilePanel.class.getName()); private static final Logger logger = Logger.getLogger(ImageFilePanel.class.getName());
private PropertyChangeSupport pcs = null;
private JFileChooser fc = new JFileChooser(); private JFileChooser fc = new JFileChooser();
// Externally supplied name is used to store settings // Externally supplied name is used to store settings
@ -80,7 +77,6 @@ public class ImageFilePanel extends JPanel implements DocumentListener {
} }
this.contextName = context; this.contextName = context;
pcs = new PropertyChangeSupport(this);
createTimeZoneList(); createTimeZoneList();
} }
@ -207,7 +203,7 @@ public class ImageFilePanel extends JPanel implements DocumentListener {
} }
try { 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) { } catch (Exception e) {
logger.log(Level.SEVERE, "ImageFilePanel listener threw exception", e); //NON-NLS logger.log(Level.SEVERE, "ImageFilePanel listener threw exception", e); //NON-NLS
MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "ImageFilePanel.moduleErr"), 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) { public void insertUpdate(DocumentEvent e) {
try { 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) { } catch (Exception ee) {
logger.log(Level.SEVERE, "ImageFilePanel listener threw exception", ee); //NON-NLS logger.log(Level.SEVERE, "ImageFilePanel listener threw exception", ee); //NON-NLS
MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "ImageFilePanel.moduleErr"), MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "ImageFilePanel.moduleErr"),
@ -369,7 +365,7 @@ public class ImageFilePanel extends JPanel implements DocumentListener {
@Override @Override
public void removeUpdate(DocumentEvent e) { public void removeUpdate(DocumentEvent e) {
try { 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) { } catch (Exception ee) {
logger.log(Level.SEVERE, "ImageFilePanel listener threw exception", ee); //NON-NLS logger.log(Level.SEVERE, "ImageFilePanel listener threw exception", ee); //NON-NLS
MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "ImageFilePanel.moduleErr"), 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) { public void changedUpdate(DocumentEvent e) {
try { 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) { } catch (Exception ee) {
logger.log(Level.SEVERE, "ImageFilePanel listener threw exception", ee); //NON-NLS logger.log(Level.SEVERE, "ImageFilePanel listener threw exception", ee); //NON-NLS
MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "ImageFilePanel.moduleErr"), MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "ImageFilePanel.moduleErr"),
@ -397,23 +393,4 @@ public class ImageFilePanel extends JPanel implements DocumentListener {
public void select() { public void select() {
pathTextField.requestFocusInWindow(); 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);
}
} }

4
Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskDSProcessor.java
View File

@ -169,7 +169,9 @@ public class LocalDiskDSProcessor implements DataSourceProcessor {
*/ */
@Override @Override
public void cancel() { public void cancel() {
addDiskTask.cancelTask(); if (null != addDiskTask) {
addDiskTask.cancelTask();
}
} }
/** /**

23
Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java
View File

@ -19,8 +19,6 @@
package org.sleuthkit.autopsy.casemodule; package org.sleuthkit.autopsy.casemodule;
import java.awt.Dialog; import java.awt.Dialog;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.io.File; import java.io.File;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@ -46,7 +44,6 @@ import org.sleuthkit.autopsy.coreutils.PathValidator;
*/ */
class LocalFilesPanel extends JPanel { 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 Set<File> currentFiles = new TreeSet<File>(); //keep currents in a set to disallow duplicates per add
private boolean enableNext = false; private boolean enableNext = false;
private static LocalFilesPanel instance; private static LocalFilesPanel instance;
@ -148,24 +145,6 @@ class LocalFilesPanel extends JPanel {
this.displayNameLabel.setText(NbBundle.getMessage(this.getClass(), "LocalFilesPanel.displayNameLabel.text")); 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() { public String getFileSetName() {
return this.displayName; return this.displayName;
} }
@ -312,7 +291,7 @@ class LocalFilesPanel extends JPanel {
} }
try { 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) { } catch (Exception e) {
logger.log(Level.SEVERE, "LocalFilesPanel listener threw exception", e); //NON-NLS logger.log(Level.SEVERE, "LocalFilesPanel listener threw exception", e); //NON-NLS
MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "LocalFilesPanel.moduleErr"), MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "LocalFilesPanel.moduleErr"),

53
Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java
View File

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

21
Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java
View File

@ -19,8 +19,6 @@
package org.sleuthkit.autopsy.modules.fileextmismatch; package org.sleuthkit.autopsy.modules.fileextmismatch;
import java.awt.Color; import java.awt.Color;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
@ -57,7 +55,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
private String selectedExt = ""; private String selectedExt = "";
ListSelectionModel lsm = null; ListSelectionModel lsm = null;
private FileTypeDetector fileTypeDetector; private FileTypeDetector fileTypeDetector;
private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
public FileExtMismatchSettingsPanel() { public FileExtMismatchSettingsPanel() {
mimeTableModel = new MimeTableModel(); mimeTableModel = new MimeTableModel();
@ -136,16 +133,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
addExtButton.setEnabled(false); addExtButton.setEnabled(false);
} }
@Override
public void addPropertyChangeListener(PropertyChangeListener l) {
pcs.addPropertyChangeListener(l);
}
@Override
public void removePropertyChangeListener(PropertyChangeListener l) {
pcs.removePropertyChangeListener(l);
}
private void clearErrLabels() { private void clearErrLabels() {
mimeErrLabel.setText(" "); mimeErrLabel.setText(" ");
extErrorLabel.setText(" "); extErrorLabel.setText(" ");
@ -394,7 +381,7 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
updateExtList(); updateExtList();
extTableModel.resync(); extTableModel.resync();
this.userExtTextField.setText(""); this.userExtTextField.setText("");
pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
}//GEN-LAST:event_addExtButtonActionPerformed }//GEN-LAST:event_addExtButtonActionPerformed
private void addTypeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addTypeButtonActionPerformed private void addTypeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addTypeButtonActionPerformed
@ -442,7 +429,7 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
mimeTableModel.resync(); mimeTableModel.resync();
userTypeTextField.setText(""); userTypeTextField.setText("");
this.clearErrLabels(); this.clearErrLabels();
pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
}//GEN-LAST:event_addTypeButtonActionPerformed }//GEN-LAST:event_addTypeButtonActionPerformed
private void userExtTextFieldFocusGained(java.awt.event.FocusEvent evt) {//GEN-FIRST:event_userExtTextFieldFocusGained private void userExtTextFieldFocusGained(java.awt.event.FocusEvent evt) {//GEN-FIRST:event_userExtTextFieldFocusGained
@ -467,7 +454,7 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
// Refresh table // Refresh table
updateMimeList(); updateMimeList();
mimeTableModel.resync(); mimeTableModel.resync();
pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
}//GEN-LAST:event_removeTypeButtonActionPerformed }//GEN-LAST:event_removeTypeButtonActionPerformed
private void removeExtButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_removeExtButtonActionPerformed private void removeExtButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_removeExtButtonActionPerformed
@ -495,7 +482,7 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
// Refresh tables // Refresh tables
updateExtList(); updateExtList();
extTableModel.resync(); extTableModel.resync();
pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
}//GEN-LAST:event_removeExtButtonActionPerformed }//GEN-LAST:event_removeExtButtonActionPerformed
private void updateMimeList() { private void updateMimeList() {

17
Core/src/org/sleuthkit/autopsy/modules/filetypeid/AddFileTypePanel.java
View File

@ -18,8 +18,6 @@
*/ */
package org.sleuthkit.autopsy.modules.filetypeid; package org.sleuthkit.autopsy.modules.filetypeid;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.swing.DefaultListModel; import javax.swing.DefaultListModel;
@ -41,7 +39,6 @@ class AddFileTypePanel extends javax.swing.JPanel {
private AddFileTypeSignatureDialog addSigDialog; private AddFileTypeSignatureDialog addSigDialog;
private DefaultListModel<FileType.Signature> signaturesListModel; private DefaultListModel<FileType.Signature> signaturesListModel;
private PropertyChangeSupport pcs = new PropertyChangeSupport(this);
/** /**
* Creates a panel for a new file type. * Creates a panel for a new file type.
@ -148,16 +145,6 @@ class AddFileTypePanel extends javax.swing.JPanel {
boolean hasSignature() { boolean hasSignature() {
return !this.signaturesListModel.isEmpty(); 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. * 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()) { if (!this.signaturesListModel.isEmpty()) {
signatureList.setSelectedIndex(0); signatureList.setSelectedIndex(0);
} }
pcs.firePropertyChange(SIG_LIST_CHANGED.toString(), null, null); firePropertyChange(SIG_LIST_CHANGED.toString(), null, null);
} }
}//GEN-LAST:event_deleteSigButtonActionPerformed }//GEN-LAST:event_deleteSigButtonActionPerformed
@ -289,7 +276,7 @@ class AddFileTypePanel extends javax.swing.JPanel {
if (addSigDialog.getResult() == AddFileTypeSignatureDialog.BUTTON_PRESSED.OK) { if (addSigDialog.getResult() == AddFileTypeSignatureDialog.BUTTON_PRESSED.OK) {
signaturesListModel.addElement(this.addSigDialog.getSignature()); signaturesListModel.addElement(this.addSigDialog.getSignature());
} }
pcs.firePropertyChange(SIG_LIST_CHANGED.toString(), null, null); firePropertyChange(SIG_LIST_CHANGED.toString(), null, null);
} }
}//GEN-LAST:event_addSigButtonActionPerformed }//GEN-LAST:event_addSigButtonActionPerformed

18
Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdGlobalSettingsPanel.java
View File

@ -21,7 +21,6 @@ package org.sleuthkit.autopsy.modules.filetypeid;
import java.awt.EventQueue; import java.awt.EventQueue;
import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener; import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.logging.Level; 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 // modules obtained and shared a per data source ingest job snapshot of the
// file type definitions. // file type definitions.
IngestJobEventPropertyChangeListener ingestJobEventsListener; IngestJobEventPropertyChangeListener ingestJobEventsListener;
private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
/** /**
* Creates a panel to allow a user to make custom file type definitions. * Creates a panel to allow a user to make custom file type definitions.
@ -100,16 +98,6 @@ final class FileTypeIdGlobalSettingsPanel extends IngestModuleGlobalSettingsPane
populateTypeDetailsComponents(); 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. * 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) { if (result == AddFileTypeDialog.BUTTON_PRESSED.OK) {
fileTypes.add(dialog.getFileType()); fileTypes.add(dialog.getFileType());
updateFileTypesListModel(); updateFileTypesListModel();
pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
} }
}//GEN-LAST:event_newTypeButtonActionPerformed }//GEN-LAST:event_newTypeButtonActionPerformed
@ -513,7 +501,7 @@ final class FileTypeIdGlobalSettingsPanel extends IngestModuleGlobalSettingsPane
if (!typesListModel.isEmpty()) { if (!typesListModel.isEmpty()) {
typesList.setSelectedIndex(0); typesList.setSelectedIndex(0);
} }
pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
}//GEN-LAST:event_deleteTypeButtonActionPerformed }//GEN-LAST:event_deleteTypeButtonActionPerformed
private void editTypeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_editTypeButtonActionPerformed 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.remove(selected);
this.fileTypes.add(selected, dialog.getFileType()); this.fileTypes.add(selected, dialog.getFileType());
updateFileTypesListModel(); updateFileTypesListModel();
pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
} }
}//GEN-LAST:event_editTypeButtonActionPerformed }//GEN-LAST:event_editTypeButtonActionPerformed

22
Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java
View File

@ -22,7 +22,6 @@ import java.awt.*;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener; import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -62,7 +61,6 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
.getMessage(HashLookupSettingsPanel.class, "HashDbConfigPanel.errorGettingIndexStatusText"); .getMessage(HashLookupSettingsPanel.class, "HashDbConfigPanel.errorGettingIndexStatusText");
private final HashDbManager hashSetManager = HashDbManager.getInstance(); private final HashDbManager hashSetManager = HashDbManager.getInstance();
private final HashSetTableModel hashSetTableModel = new HashSetTableModel(); private final HashSetTableModel hashSetTableModel = new HashSetTableModel();
private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
public HashLookupSettingsPanel() { public HashLookupSettingsPanel() {
initComponents(); 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() { private void updateComponents() {
HashDb db = ((HashSetTable) hashSetTable).getSelection(); HashDb db = ((HashSetTable) hashSetTable).getSelection();
if (db != null) { if (db != null) {
@ -844,7 +832,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
JOptionPane.showMessageDialog(null, Bundle.HashLookupSettingsPanel_removeDatabaseFailure_message(hashDb.getHashSetName())); JOptionPane.showMessageDialog(null, Bundle.HashLookupSettingsPanel_removeDatabaseFailure_message(hashDb.getHashSetName()));
} }
hashSetTableModel.refreshModel(); hashSetTableModel.refreshModel();
pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
} }
} }
}//GEN-LAST:event_deleteDatabaseButtonActionPerformed }//GEN-LAST:event_deleteDatabaseButtonActionPerformed
@ -859,7 +847,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
JOptionPane.showMessageDialog(null, Bundle.HashLookupSettingsPanel_removeDatabaseFailure_message(hashDb.getHashSetName())); JOptionPane.showMessageDialog(null, Bundle.HashLookupSettingsPanel_removeDatabaseFailure_message(hashDb.getHashSetName()));
} }
hashSetTableModel.refreshModel(); hashSetTableModel.refreshModel();
pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
} }
} }
}//GEN-LAST:event_hashSetTableKeyPressed }//GEN-LAST:event_hashSetTableKeyPressed
@ -868,7 +856,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
HashDb hashDb = ((HashSetTable) hashSetTable).getSelection(); HashDb hashDb = ((HashSetTable) hashSetTable).getSelection();
if (hashDb != null) { if (hashDb != null) {
hashDb.setSendIngestMessages(sendIngestMessagesCheckBox.isSelected()); hashDb.setSendIngestMessages(sendIngestMessagesCheckBox.isSelected());
pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
} }
}//GEN-LAST:event_sendIngestMessagesCheckBoxActionPerformed }//GEN-LAST:event_sendIngestMessagesCheckBoxActionPerformed
@ -877,7 +865,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
if (null != hashDb) { if (null != hashDb) {
hashSetTableModel.refreshModel(); hashSetTableModel.refreshModel();
((HashSetTable) hashSetTable).selectRowByName(hashDb.getHashSetName()); ((HashSetTable) hashSetTable).selectRowByName(hashDb.getHashSetName());
pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
} }
}//GEN-LAST:event_importDatabaseButtonActionPerformed }//GEN-LAST:event_importDatabaseButtonActionPerformed
@ -886,7 +874,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
if (null != hashDb) { if (null != hashDb) {
hashSetTableModel.refreshModel(); hashSetTableModel.refreshModel();
((HashSetTable) hashSetTable).selectRowByName(hashDb.getHashSetName()); ((HashSetTable) hashSetTable).selectRowByName(hashDb.getHashSetName());
pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
} }
}//GEN-LAST:event_createDatabaseButtonActionPerformed }//GEN-LAST:event_createDatabaseButtonActionPerformed

25
Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemDefsPanel.java
View File

@ -19,8 +19,6 @@
package org.sleuthkit.autopsy.modules.interestingitems; package org.sleuthkit.autopsy.modules.interestingitems;
import java.awt.EventQueue; import java.awt.EventQueue;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; 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 // definitions manager. Note that it is a tree map to aid in displaying
// files sets in sorted order by name. // files sets in sorted order by name.
private TreeMap<String, FilesSet> filesSets; private TreeMap<String, FilesSet> filesSets;
private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
/** /**
* Constructs an interesting item definitions panel. * Constructs an interesting item definitions panel.
@ -123,16 +120,6 @@ final class InterestingItemDefsPanel extends IngestModuleGlobalSettingsPanel imp
this.equalitySignComboBox.setSelectedIndex(2); this.equalitySignComboBox.setSelectedIndex(2);
} }
@Override
public void addPropertyChangeListener(PropertyChangeListener l) {
pcs.addPropertyChangeListener(l);
}
@Override
public void removePropertyChangeListener(PropertyChangeListener l) {
pcs.removePropertyChangeListener(l);
}
/** /**
* @inheritDoc * @inheritDoc
*/ */
@ -928,7 +915,7 @@ final class InterestingItemDefsPanel extends IngestModuleGlobalSettingsPanel imp
private void newSetButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_newSetButtonActionPerformed private void newSetButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_newSetButtonActionPerformed
this.doFileSetsDialog(null); this.doFileSetsDialog(null);
pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
}//GEN-LAST:event_newSetButtonActionPerformed }//GEN-LAST:event_newSetButtonActionPerformed
private void deleteRuleButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deleteRuleButtonActionPerformed private void deleteRuleButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deleteRuleButtonActionPerformed
@ -946,7 +933,7 @@ final class InterestingItemDefsPanel extends IngestModuleGlobalSettingsPanel imp
} else { } else {
this.resetRuleComponents(); this.resetRuleComponents();
} }
pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
}//GEN-LAST:event_deleteRuleButtonActionPerformed }//GEN-LAST:event_deleteRuleButtonActionPerformed
private void deleteSetButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deleteSetButtonActionPerformed private void deleteSetButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deleteSetButtonActionPerformed
@ -961,7 +948,7 @@ final class InterestingItemDefsPanel extends IngestModuleGlobalSettingsPanel imp
} else { } else {
this.resetComponents(); this.resetComponents();
} }
pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
}//GEN-LAST:event_deleteSetButtonActionPerformed }//GEN-LAST:event_deleteSetButtonActionPerformed
private void ignoreKnownFilesCheckboxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_ignoreKnownFilesCheckboxActionPerformed 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 private void editSetButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_editSetButtonActionPerformed
this.doFileSetsDialog(this.setsList.getSelectedValue()); this.doFileSetsDialog(this.setsList.getSelectedValue());
pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
}//GEN-LAST:event_editSetButtonActionPerformed }//GEN-LAST:event_editSetButtonActionPerformed
private void editRuleButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_editRuleButtonActionPerformed private void editRuleButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_editRuleButtonActionPerformed
this.doFilesSetRuleDialog(this.rulesList.getSelectedValue()); this.doFilesSetRuleDialog(this.rulesList.getSelectedValue());
pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
}//GEN-LAST:event_editRuleButtonActionPerformed }//GEN-LAST:event_editRuleButtonActionPerformed
private void newRuleButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_newRuleButtonActionPerformed private void newRuleButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_newRuleButtonActionPerformed
this.doFilesSetRuleDialog(null); this.doFilesSetRuleDialog(null);
pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
}//GEN-LAST:event_newRuleButtonActionPerformed }//GEN-LAST:event_newRuleButtonActionPerformed
private void fileNameTextFieldActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_fileNameTextFieldActionPerformed private void fileNameTextFieldActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_fileNameTextFieldActionPerformed

2
CoreLibs/ivy.xml
View File

@ -36,7 +36,7 @@
<dependency conf="autopsy_core->*" org="org.imgscalr" name="imgscalr-lib" rev="4.2" /> <dependency conf="autopsy_core->*" org="org.imgscalr" name="imgscalr-lib" rev="4.2" />
<!-- timeline and image analyzer --> <!-- 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 --> <!-- timeline -->
<dependency conf="autopsy_core->*" org="joda-time" name="joda-time" rev="2.4" /> <dependency conf="autopsy_core->*" org="joda-time" name="joda-time" rev="2.4" />

6
CoreLibs/nbproject/project.properties
View File

@ -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-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.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.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.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.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 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.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial javac.compilerargs=-Xlint -Xlint:-serial
javadoc.reference.compiler-0.9.1.jar=release/modules/ext/compiler-0.9.1-javadoc.jar 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.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-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-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 javadoc.reference.jfxtras-fxml-8.0-r4.jar=release/modules/ext/jfxtras-fxml-8.0-r4-javadoc.jar
nbm.needs.restart=true nbm.needs.restart=true
source.reference.compiler-0.9.1.jar=release/modules/ext/compiler-0.9.1-sources.jar 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.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-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 source.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-8.0-r4-sources.jar

4
CoreLibs/nbproject/project.xml
View File

@ -919,8 +919,8 @@
<binary-origin>release/modules/ext/gstreamer-java-1.5.jar</binary-origin> <binary-origin>release/modules/ext/gstreamer-java-1.5.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/controlsfx-8.40.10.jar</runtime-relative-path> <runtime-relative-path>ext/controlsfx-8.40.11.jar</runtime-relative-path>
<binary-origin>release/modules/ext/controlsfx-8.40.10.jar</binary-origin> <binary-origin>release/modules/ext/controlsfx-8.40.11.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/dom4j-1.6.1.jar</runtime-relative-path> <runtime-relative-path>ext/dom4j-1.6.1.jar</runtime-relative-path>

19
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalLanguageSettingsPanel.java
View File

@ -21,8 +21,6 @@ package org.sleuthkit.autopsy.keywordsearch;
import java.awt.GridLayout; import java.awt.GridLayout;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -42,7 +40,6 @@ class KeywordSearchGlobalLanguageSettingsPanel extends javax.swing.JPanel implem
private final Map<String, StringExtract.StringExtractUnicodeTable.SCRIPT> scripts = new HashMap<>(); private final Map<String, StringExtract.StringExtractUnicodeTable.SCRIPT> scripts = new HashMap<>();
private ActionListener updateLanguagesAction; private ActionListener updateLanguagesAction;
private List<SCRIPT> toUpdate; private List<SCRIPT> toUpdate;
private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
KeywordSearchGlobalLanguageSettingsPanel() { KeywordSearchGlobalLanguageSettingsPanel() {
initComponents(); initComponents();
@ -69,16 +66,6 @@ class KeywordSearchGlobalLanguageSettingsPanel extends javax.swing.JPanel implem
reloadScriptsCheckBoxes(); reloadScriptsCheckBoxes();
} }
@Override
public void addPropertyChangeListener(PropertyChangeListener l) {
pcs.addPropertyChangeListener(l);
}
@Override
public void removePropertyChangeListener(PropertyChangeListener l) {
pcs.removePropertyChangeListener(l);
}
private void activateScriptsCheckboxes(boolean activate) { private void activateScriptsCheckboxes(boolean activate) {
final int components = checkPanel.getComponentCount(); final int components = checkPanel.getComponentCount();
for (int i = 0; i < components; ++i) { for (int i = 0; i < components; ++i) {
@ -104,7 +91,7 @@ class KeywordSearchGlobalLanguageSettingsPanel extends javax.swing.JPanel implem
ch.addActionListener(new ActionListener() { ch.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
} }
}); });
ch.addActionListener(updateLanguagesAction); ch.addActionListener(updateLanguagesAction);
@ -247,7 +234,7 @@ class KeywordSearchGlobalLanguageSettingsPanel extends javax.swing.JPanel implem
boolean selected = this.enableUTF8Checkbox.isSelected(); boolean selected = this.enableUTF8Checkbox.isSelected();
activateScriptsCheckboxes(selected || this.enableUTF16Checkbox.isSelected()); activateScriptsCheckboxes(selected || this.enableUTF16Checkbox.isSelected());
pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
}//GEN-LAST:event_enableUTF8CheckboxActionPerformed }//GEN-LAST:event_enableUTF8CheckboxActionPerformed
@ -256,7 +243,7 @@ class KeywordSearchGlobalLanguageSettingsPanel extends javax.swing.JPanel implem
boolean selected = this.enableUTF16Checkbox.isSelected(); boolean selected = this.enableUTF16Checkbox.isSelected();
activateScriptsCheckboxes(selected || this.enableUTF8Checkbox.isSelected()); activateScriptsCheckboxes(selected || this.enableUTF8Checkbox.isSelected());
pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
}//GEN-LAST:event_enableUTF16CheckboxActionPerformed }//GEN-LAST:event_enableUTF16CheckboxActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables

26
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSearchSettingsPanel.java
View File

@ -20,7 +20,6 @@ package org.sleuthkit.autopsy.keywordsearch;
import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener; import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.util.logging.Level; import java.util.logging.Level;
import org.netbeans.spi.options.OptionsPanelController; import org.netbeans.spi.options.OptionsPanelController;
import org.sleuthkit.autopsy.corecomponents.OptionsPanel; 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 { class KeywordSearchGlobalSearchSettingsPanel extends javax.swing.JPanel implements OptionsPanel {
private final Logger logger = Logger.getLogger(KeywordSearchGlobalSearchSettingsPanel.class.getName()); private final Logger logger = Logger.getLogger(KeywordSearchGlobalSearchSettingsPanel.class.getName());
private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
/** /**
* Creates new form KeywordSearchConfigurationPanel2 * 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. * 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 * 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 }// </editor-fold>//GEN-END:initComponents
private void timeRadioButton5ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_timeRadioButton5ActionPerformed 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 }//GEN-LAST:event_timeRadioButton5ActionPerformed
private void skipNSRLCheckBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_skipNSRLCheckBoxActionPerformed 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 }//GEN-LAST:event_skipNSRLCheckBoxActionPerformed
private void showSnippetsCBActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_showSnippetsCBActionPerformed 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 }//GEN-LAST:event_showSnippetsCBActionPerformed
private void timeRadioButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_timeRadioButton1ActionPerformed 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 }//GEN-LAST:event_timeRadioButton1ActionPerformed
private void timeRadioButton2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_timeRadioButton2ActionPerformed 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 }//GEN-LAST:event_timeRadioButton2ActionPerformed
private void timeRadioButton3ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_timeRadioButton3ActionPerformed 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 }//GEN-LAST:event_timeRadioButton3ActionPerformed
private void timeRadioButton4ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_timeRadioButton4ActionPerformed 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 }//GEN-LAST:event_timeRadioButton4ActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables

1
build.xml
View File

@ -15,6 +15,7 @@
<or> <or>
<matches string="${java.version}" pattern="1\.8\.0_6[6-9]"/> <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_[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]"/> <matches string="${java.version}" pattern="1\.8\.[1-9]_[0-9][0-9]"/>
<equals arg1="${ant.java.version}" arg2="1.9"/> <equals arg1="${ant.java.version}" arg2="1.9"/>
</or> </or>

4
docs/doxygen-user/installActiveMQ.dox
View File

@ -5,7 +5,7 @@ To install ActiveMQ, perform the following steps:
You will need: 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. - 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.14.0.
\section install_activemq_install Installation \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 \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: 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> <br><br>

4
docs/doxygen-user/installPostgres.dox
View File

@ -1,9 +1,9 @@
/*! \page install_postgresql Install and Configure PostgreSQL /*! \page install_postgresql Install and Configure PostgreSQL
To install PostgreSQL, perform the following steps: 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. 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.