Merge branch '5673-RemoveExcessFilters' of https://github.com/wschaeferB/autopsy into 5723-ShortenPathGroups

This commit is contained in:
William Schaefer 2019-11-14 13:31:39 -05:00
commit eba9e795ec

View File

@ -463,7 +463,7 @@ final class FileSearchPanel extends javax.swing.JPanel implements ActionListener
objectsFilterSettings(true, enabled, !resetSelected && objectsCheckbox.isSelected(), null); objectsFilterSettings(true, enabled, !resetSelected && objectsCheckbox.isSelected(), null);
hashSetFilterSettings(true, enabled, !resetSelected && hashSetCheckbox.isSelected(), null); hashSetFilterSettings(true, enabled, !resetSelected && hashSetCheckbox.isSelected(), null);
interestingItemsFilterSettings(true, enabled, !resetSelected && interestingItemsCheckbox.isSelected(), null); interestingItemsFilterSettings(true, enabled, !resetSelected && interestingItemsCheckbox.isSelected(), null);
parentFilterSettings(true, false, false, null); parentFilterSettings(true, true, false, null);
scoreFilterSettings(false, false, false, null); scoreFilterSettings(false, false, false, null);
tagsFilterSettings(false, false, false, null); tagsFilterSettings(false, false, false, null);
keywordFilterSettings(false, false, false, null); keywordFilterSettings(false, false, false, null);
@ -495,7 +495,7 @@ final class FileSearchPanel extends javax.swing.JPanel implements ActionListener
objectsFilterSettings(true, enabled, !resetSelected && objectsCheckbox.isSelected(), null); objectsFilterSettings(true, enabled, !resetSelected && objectsCheckbox.isSelected(), null);
hashSetFilterSettings(true, enabled, !resetSelected && hashSetCheckbox.isSelected(), null); hashSetFilterSettings(true, enabled, !resetSelected && hashSetCheckbox.isSelected(), null);
interestingItemsFilterSettings(true, enabled, !resetSelected && interestingItemsCheckbox.isSelected(), null); interestingItemsFilterSettings(true, enabled, !resetSelected && interestingItemsCheckbox.isSelected(), null);
parentFilterSettings(true, false, false, null); parentFilterSettings(true, true, false, null);
scoreFilterSettings(false, false, false, null); scoreFilterSettings(false, false, false, null);
tagsFilterSettings(false, false, false, null); tagsFilterSettings(false, false, false, null);
keywordFilterSettings(false, false, false, null); keywordFilterSettings(false, false, false, null);