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

Merge branch '5370-AddFileSearchCaching' of https://github.com/wschaeferB/autopsy into 5369-DedupingCodeChanges

Browse Source
This commit is contained in:
William Schaefer 2019-08-14 11:28:48 -04:00
commit 41f49bc170
3 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,7 +205,8 @@ class FileSearchData {
} }
/** /**
* Enum representing the file type. We don't simply use * Enum representing the file type.
* We don't simply use
* FileTypeUtils.FileTypeCategory because: - Some file types categories * FileTypeUtils.FileTypeCategory because: - Some file types categories
* overlap - It is convenient to have the "OTHER" option for files that * overlap - It is convenient to have the "OTHER" option for files that
* don't match the given types * don't match the given types

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

@ -101,15 +101,6 @@
</Property> </Property>
<Property name="enabled" type="boolean" value="false"/> <Property name="enabled" type="boolean" value="false"/>
<Property name="focusable" type="boolean" value="false"/> <Property name="focusable" type="boolean" value="false"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[23, 23]"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[23, 23]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[23, 23]"/>
</Property>
<Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/org/sleuthkit/autopsy/corecomponents/btn_step_back_hover.png"/> <Image iconType="3" name="/org/sleuthkit/autopsy/corecomponents/btn_step_back_hover.png"/>
</Property> </Property>
@ -147,15 +138,6 @@
</Property> </Property>
<Property name="enabled" type="boolean" value="false"/> <Property name="enabled" type="boolean" value="false"/>
<Property name="focusable" type="boolean" value="false"/> <Property name="focusable" type="boolean" value="false"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[23, 23]"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[23, 23]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[23, 23]"/>
</Property>
<Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/org/sleuthkit/autopsy/corecomponents/btn_step_forward_hover.png"/> <Image iconType="3" name="/org/sleuthkit/autopsy/corecomponents/btn_step_forward_hover.png"/>
</Property> </Property>

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

@ -158,7 +158,9 @@ public class ResultsPanel extends javax.swing.JPanel {
private void updateControls() { private void updateControls() {
previousPageSize = (int) pageSizeSpinner.getValue(); previousPageSize = (int) pageSizeSpinner.getValue();
int pageSize = (int) pageSizeSpinner.getValue(); int pageSize = (int) pageSizeSpinner.getValue();
currentPageLabel.setText(Bundle.ResultsPanel_currentPage_displayValue(currentPage + 1, (groupSize / pageSize) + 1)); //handle edge case where group size is 0 and we want the empty results to be labeled paged 1 of 1 not page 1 of 0
double maxPageDouble = groupSize == 0 ? 1 : Math.ceil((double) groupSize / pageSize);
currentPageLabel.setText(Bundle.ResultsPanel_currentPage_displayValue(currentPage + 1, maxPageDouble));
previousPageButton.setEnabled(currentPage != 0); previousPageButton.setEnabled(currentPage != 0);
nextPageButton.setEnabled(groupSize > ((currentPage + 1) * pageSize)); nextPageButton.setEnabled(groupSize > ((currentPage + 1) * pageSize));
gotoPageField.setEnabled(groupSize > pageSize); gotoPageField.setEnabled(groupSize > pageSize);
@ -358,9 +360,9 @@ public class ResultsPanel extends javax.swing.JPanel {
return; return;
} }
int pageSize = (int) pageSizeSpinner.getValue(); int pageSize = (int) pageSizeSpinner.getValue();
if ((newPage - 1) < 0 || groupSize < ((newPage - 1) * pageSize)) { if ((newPage - 1) < 0 || groupSize <= ((newPage - 1) * pageSize)) {
JOptionPane.showMessageDialog(this, JOptionPane.showMessageDialog(this,
Bundle.ResultsPanel_invalidPageNumber_message(newPage, ((groupSize / pageSize) + 1)), Bundle.ResultsPanel_invalidPageNumber_message(newPage, Math.ceil((double) groupSize / pageSize)),
Bundle.ResultsPanel_invalidPageNumber_title(), Bundle.ResultsPanel_invalidPageNumber_title(),
JOptionPane.WARNING_MESSAGE); JOptionPane.WARNING_MESSAGE);
return; return;