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

6305 hook up sorting algorithms correctly

Browse Source
This commit is contained in:
William Schaefer 2020-05-22 13:09:44 -04:00
parent cf89bc536d
commit 620355db2d
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.form
View File

@ -6,9 +6,6 @@
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[1000, 300]"/> <Dimension value="[1000, 300]"/>
</Property> </Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[1200, 600]"/>
</Property>
</Properties> </Properties>
<SyntheticProperties> <SyntheticProperties>
<SyntheticProperty name="formSizePolicy" type="int" value="1"/> <SyntheticProperty name="formSizePolicy" type="int" value="1"/>

7
Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java
View File

@ -401,6 +401,7 @@ final class DiscoveryDialog extends javax.swing.JDialog {
if (tc.isOpened() == false) { if (tc.isOpened() == false) {
tc.open(); tc.open();
} }
tc.resetTopComponent(); tc.resetTopComponent();
List<FileSearchFiltering.FileFilter> filters; List<FileSearchFiltering.FileFilter> filters;
if (videosButton.isSelected()) { if (videosButton.isSelected()) {
@ -413,11 +414,11 @@ final class DiscoveryDialog extends javax.swing.JDialog {
DiscoveryEventUtils.getDiscoveryEventBus().post(new DiscoveryEventUtils.SearchStartedEvent(fileType)); DiscoveryEventUtils.getDiscoveryEventBus().post(new DiscoveryEventUtils.SearchStartedEvent(fileType));
// Get the grouping attribute and group sorting method // Get the grouping attribute and group sorting method
FileSearch.AttributeType groupingAttr = FileSearch.GroupingAttributeType.FILE_SIZE.getAttributeType(); FileSearch.AttributeType groupingAttr = groupByCombobox.getItemAt(groupByCombobox.getSelectedIndex()).getAttributeType();
FileGroup.GroupSortingAlgorithm groupSortAlgorithm = FileGroup.GroupSortingAlgorithm.BY_GROUP_NAME; FileGroup.GroupSortingAlgorithm groupSortAlgorithm = groupSortingComboBox.getItemAt(groupSortingComboBox.getSelectedIndex());
// Get the file sorting method // Get the file sorting method
FileSorter.SortingMethod fileSort = FileSorter.SortingMethod.BY_FILE_NAME; FileSorter.SortingMethod fileSort = (FileSorter.SortingMethod) orderByCombobox.getSelectedItem();
CentralRepository centralRepoDb = null; CentralRepository centralRepoDb = null;
if (CentralRepository.isEnabled()) { if (CentralRepository.isEnabled()) {
try { try {