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

Merge branch 'develop' of github.com:sleuthkit/autopsy into archive_dsp_3136

Browse Source
This commit is contained in:
Eugene Livis 2017-10-23 14:16:39 -04:00
commit e51e4e2656
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalListSettingsPanel.java
View File

@ -138,12 +138,14 @@ final class GlobalListSettingsPanel extends javax.swing.JPanel implements Option
@Override @Override
public void addPropertyChangeListener(PropertyChangeListener l) { public void addPropertyChangeListener(PropertyChangeListener l) {
super.addPropertyChangeListener(l);
listsManagementPanel.addPropertyChangeListener(l); listsManagementPanel.addPropertyChangeListener(l);
editListPanel.addPropertyChangeListener(l); editListPanel.addPropertyChangeListener(l);
} }
@Override @Override
public void removePropertyChangeListener(PropertyChangeListener l) { public void removePropertyChangeListener(PropertyChangeListener l) {
super.removePropertyChangeListener(l);
listsManagementPanel.removePropertyChangeListener(l); listsManagementPanel.removePropertyChangeListener(l);
editListPanel.removePropertyChangeListener(l); editListPanel.removePropertyChangeListener(l);
} }

7
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.java
View File

@ -1,7 +1,7 @@
/* /*
* Autopsy Forensic Browser * Autopsy Forensic Browser
* *
* Copyright 2011-2016 Basis Technology Corp. * Copyright 2011-2017 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");
@ -28,11 +28,12 @@ import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSettingsPanel;
*/ */
final class KeywordSearchGlobalSettingsPanel extends IngestModuleGlobalSettingsPanel implements OptionsPanel { final class KeywordSearchGlobalSettingsPanel extends IngestModuleGlobalSettingsPanel implements OptionsPanel {
private static final long serialVersionUID = 1L;
private GlobalListSettingsPanel listsPanel; private GlobalListSettingsPanel listsPanel;
private KeywordSearchGlobalLanguageSettingsPanel languagesPanel; private KeywordSearchGlobalLanguageSettingsPanel languagesPanel;
private KeywordSearchGlobalSearchSettingsPanel generalPanel; private KeywordSearchGlobalSearchSettingsPanel generalPanel;
public KeywordSearchGlobalSettingsPanel() { KeywordSearchGlobalSettingsPanel() {
initComponents(); initComponents();
customizeComponents(); customizeComponents();
} }
@ -53,6 +54,7 @@ final class KeywordSearchGlobalSettingsPanel extends IngestModuleGlobalSettingsP
@Override @Override
public void addPropertyChangeListener(PropertyChangeListener l) { public void addPropertyChangeListener(PropertyChangeListener l) {
super.addPropertyChangeListener(l);
listsPanel.addPropertyChangeListener(l); listsPanel.addPropertyChangeListener(l);
languagesPanel.addPropertyChangeListener(l); languagesPanel.addPropertyChangeListener(l);
generalPanel.addPropertyChangeListener(l); generalPanel.addPropertyChangeListener(l);
@ -60,6 +62,7 @@ final class KeywordSearchGlobalSettingsPanel extends IngestModuleGlobalSettingsP
@Override @Override
public void removePropertyChangeListener(PropertyChangeListener l) { public void removePropertyChangeListener(PropertyChangeListener l) {
super.removePropertyChangeListener(l);
listsPanel.removePropertyChangeListener(l); listsPanel.removePropertyChangeListener(l);
languagesPanel.removePropertyChangeListener(l); languagesPanel.removePropertyChangeListener(l);
generalPanel.removePropertyChangeListener(l); generalPanel.removePropertyChangeListener(l);