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

2355 Should prevent over-writing of filters list with older list

Browse Source
This commit is contained in:
William Schaefer 2017-03-06 15:44:24 -05:00
parent 3323a69f2f
commit 7f18e67d22
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Core/src/org/sleuthkit/autopsy/ingest/IngestOptionsPanel.java
View File

@ -47,6 +47,7 @@ public class IngestOptionsPanel extends IngestModuleGlobalSettingsPanel implemen
private final static int INDEX_OF_SETTINGS_PANEL = 2; private final static int INDEX_OF_SETTINGS_PANEL = 2;
private ProfileSettingsPanel profilePanel; private ProfileSettingsPanel profilePanel;
private final static int INDEX_OF_PROFILE_PANEL = 1; private final static int INDEX_OF_PROFILE_PANEL = 1;
private boolean fitlerPanelPreviouslySelected = true;
/** /**
* This panel implements a property change listener that listens to ingest * This panel implements a property change listener that listens to ingest
* job events so it can disable the buttons on the panel if ingest is * job events so it can disable the buttons on the panel if ingest is
@ -78,15 +79,17 @@ public class IngestOptionsPanel extends IngestModuleGlobalSettingsPanel implemen
@Override @Override
public void stateChanged(ChangeEvent e) { public void stateChanged(ChangeEvent e) {
if (e.getSource() instanceof JTabbedPane) { if (e.getSource() instanceof JTabbedPane) {
//because we can have two filterPanels open at the same time //because we can have two filterPanels open at the same time
//we need to save the settings when we change tabs otherwise //we need to save the settings when we change tabs from the filterTab
//they could be overwritten with out of date //otherwise they could be overwritten with out of date
if (tabbedPane.getSelectedIndex() == INDEX_OF_FILTER_PANEL) { if (tabbedPane.getSelectedIndex() == INDEX_OF_FILTER_PANEL) {
filterPanel.load(); filterPanel.load();
} fitlerPanelPreviouslySelected = true;
else { } else if (fitlerPanelPreviouslySelected) {
filterPanel.saveSettings(); filterPanel.saveSettings();
} fitlerPanelPreviouslySelected = false;
}
} }
} }
}); });
@ -160,7 +163,11 @@ public class IngestOptionsPanel extends IngestModuleGlobalSettingsPanel implemen
*/ */
@Override @Override
public void saveSettings() { public void saveSettings() {
filterPanel.store(); //Because we can create filters in two seperate windows here we need
//to be careful not to save an out of date list over the current list
if (fitlerPanelPreviouslySelected) {
filterPanel.store();
}
settingsPanel.store(); settingsPanel.store();
} }