mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-17 18:17:43 +00:00
Merge branch 'develop' of github.com:sleuthkit/autopsy into archive_dsp_3136
This commit is contained in:
commit
e51e4e2656
@ -138,12 +138,14 @@ final class GlobalListSettingsPanel extends javax.swing.JPanel implements Option
|
||||
|
||||
@Override
|
||||
public void addPropertyChangeListener(PropertyChangeListener l) {
|
||||
super.addPropertyChangeListener(l);
|
||||
listsManagementPanel.addPropertyChangeListener(l);
|
||||
editListPanel.addPropertyChangeListener(l);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removePropertyChangeListener(PropertyChangeListener l) {
|
||||
super.removePropertyChangeListener(l);
|
||||
listsManagementPanel.removePropertyChangeListener(l);
|
||||
editListPanel.removePropertyChangeListener(l);
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* Autopsy Forensic Browser
|
||||
*
|
||||
* Copyright 2011-2016 Basis Technology Corp.
|
||||
* Copyright 2011-2017 Basis Technology Corp.
|
||||
* Contact: carrier <at> sleuthkit <dot> org
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@ -28,11 +28,12 @@ import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSettingsPanel;
|
||||
*/
|
||||
final class KeywordSearchGlobalSettingsPanel extends IngestModuleGlobalSettingsPanel implements OptionsPanel {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
private GlobalListSettingsPanel listsPanel;
|
||||
private KeywordSearchGlobalLanguageSettingsPanel languagesPanel;
|
||||
private KeywordSearchGlobalSearchSettingsPanel generalPanel;
|
||||
|
||||
public KeywordSearchGlobalSettingsPanel() {
|
||||
KeywordSearchGlobalSettingsPanel() {
|
||||
initComponents();
|
||||
customizeComponents();
|
||||
}
|
||||
@ -53,6 +54,7 @@ final class KeywordSearchGlobalSettingsPanel extends IngestModuleGlobalSettingsP
|
||||
|
||||
@Override
|
||||
public void addPropertyChangeListener(PropertyChangeListener l) {
|
||||
super.addPropertyChangeListener(l);
|
||||
listsPanel.addPropertyChangeListener(l);
|
||||
languagesPanel.addPropertyChangeListener(l);
|
||||
generalPanel.addPropertyChangeListener(l);
|
||||
@ -60,6 +62,7 @@ final class KeywordSearchGlobalSettingsPanel extends IngestModuleGlobalSettingsP
|
||||
|
||||
@Override
|
||||
public void removePropertyChangeListener(PropertyChangeListener l) {
|
||||
super.removePropertyChangeListener(l);
|
||||
listsPanel.removePropertyChangeListener(l);
|
||||
languagesPanel.removePropertyChangeListener(l);
|
||||
generalPanel.removePropertyChangeListener(l);
|
||||
|
Loading…
x
Reference in New Issue
Block a user