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

5673 merge conflict resolution from 5674

Browse Source
This commit is contained in:
William Schaefer 2019-11-06 18:19:01 -05:00
commit 0438411b3d
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,8 +235,8 @@ class FileSearchFiltering {
static class ParentSearchTerm {
private final String searchStr;
private final boolean isFullPath;
private final boolean isIncluded;
private final boolean fullPath;
private final boolean included;
/**
* Create the ParentSearchTerm object
@ -249,8 +249,8 @@ class FileSearchFiltering {
*/
ParentSearchTerm(String searchStr, boolean isFullPath, boolean isIncluded) {
this.searchStr = searchStr;
this.isFullPath = isFullPath;
this.isIncluded = isIncluded;
this.fullPath = isFullPath;
this.included = isIncluded;
}
/**
@ -297,17 +297,17 @@ class FileSearchFiltering {
}
/**
* @return the isFullPath
* @return the fullPath
*/
boolean isFullPath() {
return isFullPath;
return fullPath;
}
/**
* @return the isIncluded
* @return the included
*/
boolean isIncluded() {
return isIncluded;
return included;
}
/**

4
Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.form
View File

@ -7,6 +7,10 @@
<Component class="javax.swing.ButtonGroup" name="orderGroupsByButtonGroup">
</Component>
<Component class="javax.swing.ButtonGroup" name="parentIncludeButtonGroup">
<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.ButtonGroup" name="typeButtonGroup">
</Component>

4
Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.java
View File

@ -727,11 +727,10 @@ final class FileSearchPanel extends javax.swing.JPanel implements ActionListener
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
java.awt.GridBagConstraints gridBagConstraints;
parentPathButtonGroup = new javax.swing.ButtonGroup();
orderGroupsByButtonGroup = new javax.swing.ButtonGroup();
parentIncludeButtonGroup = new javax.swing.ButtonGroup();
typeButtonGroup = new javax.swing.ButtonGroup();
javax.swing.ButtonGroup parentIncludeButtonGroup = new javax.swing.ButtonGroup();
filtersScrollPane = new javax.swing.JScrollPane();
filtersPanel = new javax.swing.JPanel();
sizeCheckbox = new javax.swing.JCheckBox();
@ -1581,7 +1580,6 @@ final class FileSearchPanel extends javax.swing.JPanel implements ActionListener
private javax.swing.ButtonGroup orderGroupsByButtonGroup;
private javax.swing.JLabel orderGroupsByLabel;
private javax.swing.JCheckBox parentCheckbox;
private javax.swing.ButtonGroup parentIncludeButtonGroup;
private javax.swing.JLabel parentLabel;
private javax.swing.JList<ParentSearchTerm> parentList;
private javax.swing.ButtonGroup parentPathButtonGroup;