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

Merge branch '5369-DedupingCodeChanges' of https://github.com/wschaeferB/autopsy into 5372-VideoThumbnailViewer-List

Browse Source
This commit is contained in:
William Schaefer 2019-08-20 16:38:44 -04:00
commit ad27caa9ff
5 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Core/src/org/sleuthkit/autopsy/filequery/DiscoveryEvents.java
View File

@ -75,7 +75,7 @@ final class DiscoveryEvents {
*/
static final class SearchCompleteEvent {
private final LinkedHashMap<String, Integer> groupMap;
private final Map<String, Integer> groupMap;
private final List<FileSearchFiltering.FileFilter> searchFilters;
private final FileSearch.AttributeType groupingAttribute;
private final FileGroup.GroupSortingAlgorithm groupSort;
@ -92,7 +92,7 @@ final class DiscoveryEvents {
* @param groupSort The sorting algorithm used for groups.
* @param fileSortMethod The sorting method used for files.
*/
SearchCompleteEvent(LinkedHashMap<String, Integer> groupMap, List<FileSearchFiltering.FileFilter> searchfilters,
SearchCompleteEvent(Map<String, Integer> groupMap, List<FileSearchFiltering.FileFilter> searchfilters,
FileSearch.AttributeType groupingAttribute, FileGroup.GroupSortingAlgorithm groupSort,
FileSorter.SortingMethod fileSortMethod) {
this.groupMap = groupMap;
@ -200,13 +200,19 @@ final class DiscoveryEvents {
}
}
/**
* Event to signal that there were no results for the search.
*/
static final class NoResultsEvent {
NoResultsEvent(){
/**
* Construct a new NoResultsEvent.
*/
NoResultsEvent() {
//no arg conustructor
}
}
/**
* Event to signal that a group has been selected.
*/

2
Core/src/org/sleuthkit/autopsy/filequery/FileSearchData.java
View File

@ -23,7 +23,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.datamodel.utils.FileTypeUtils;
import org.sleuthkit.autopsy.coreutils.FileTypeUtils;
/**
* Utility enums for FileSearch

6
Core/src/org/sleuthkit/autopsy/filequery/PageWorker.java
View File

@ -88,10 +88,4 @@ final class PageWorker extends SwingWorker<Void, Void> {
}
return null;
}
@Override
protected void done() {
}
}

12
Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.form
View File

@ -173,6 +173,10 @@
<Dimension value="[33, 23]"/>
</Property>
</Properties>
<AuxValues>
<AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
</AuxValues>
</Component>
<Component class="javax.swing.JLabel" name="gotoPageLabel">
<Properties>
@ -189,6 +193,10 @@
<Dimension value="[70, 23]"/>
</Property>
</Properties>
<AuxValues>
<AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
</AuxValues>
</Component>
<Component class="javax.swing.JTextField" name="gotoPageField">
<Properties>
@ -213,6 +221,10 @@
<Dimension value="[60, 23]"/>
</Property>
</Properties>
<AuxValues>
<AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
</AuxValues>
</Component>
</SubComponents>
</Container>

9
Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.java
View File

@ -210,10 +210,10 @@ public class ResultsPanel extends javax.swing.JPanel {
currentPageLabel = new javax.swing.JLabel();
nextPageButton = new javax.swing.JButton();
pageSizeSpinner = new javax.swing.JSpinner();
pageControlsLabel = new javax.swing.JLabel();
gotoPageLabel = new javax.swing.JLabel();
javax.swing.JLabel pageControlsLabel = new javax.swing.JLabel();
javax.swing.JLabel gotoPageLabel = new javax.swing.JLabel();
gotoPageField = new javax.swing.JTextField();
pageSizeLabel = new javax.swing.JLabel();
javax.swing.JLabel pageSizeLabel = new javax.swing.JLabel();
resultsViewerPanel = new javax.swing.JPanel();
pagingPanel.setBorder(javax.swing.BorderFactory.createEtchedBorder());
@ -407,10 +407,7 @@ public class ResultsPanel extends javax.swing.JPanel {
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JLabel currentPageLabel;
private javax.swing.JTextField gotoPageField;
private javax.swing.JLabel gotoPageLabel;
private javax.swing.JButton nextPageButton;
private javax.swing.JLabel pageControlsLabel;
private javax.swing.JLabel pageSizeLabel;
private javax.swing.JSpinner pageSizeSpinner;
private javax.swing.JPanel pagingPanel;
private javax.swing.JButton previousPageButton;