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

This commit is contained in:
William Schaefer 2019-11-06 18:27:39 -05:00
commit bd3bb1b5be
6 changed files with 25 additions and 22 deletions

View File

@ -72,6 +72,10 @@
</SubComponents> </SubComponents>
</Container> </Container>
<Container class="javax.swing.JPanel" name="toolBarPanel"> <Container class="javax.swing.JPanel" name="toolBarPanel">
<AuxValues>
<AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
</AuxValues>
<Constraints> <Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="First"/> <BorderConstraints direction="First"/>

View File

@ -167,7 +167,7 @@ public final class DiscoveryTopComponent extends TopComponent {
javax.swing.JSplitPane mainSplitPane = new javax.swing.JSplitPane(); javax.swing.JSplitPane mainSplitPane = new javax.swing.JSplitPane();
leftSplitPane = new javax.swing.JSplitPane(); leftSplitPane = new javax.swing.JSplitPane();
rightSplitPane = new javax.swing.JSplitPane(); rightSplitPane = new javax.swing.JSplitPane();
toolBarPanel = new javax.swing.JPanel(); javax.swing.JPanel toolBarPanel = new javax.swing.JPanel();
imagesButton = new javax.swing.JButton(); imagesButton = new javax.swing.JButton();
videosButton = new javax.swing.JButton(); videosButton = new javax.swing.JButton();
@ -291,7 +291,6 @@ public final class DiscoveryTopComponent extends TopComponent {
private javax.swing.JButton imagesButton; private javax.swing.JButton imagesButton;
private javax.swing.JSplitPane leftSplitPane; private javax.swing.JSplitPane leftSplitPane;
private javax.swing.JSplitPane rightSplitPane; private javax.swing.JSplitPane rightSplitPane;
private javax.swing.JPanel toolBarPanel;
private javax.swing.JButton videosButton; private javax.swing.JButton videosButton;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables

View File

@ -1050,10 +1050,8 @@ class FileSearch {
EamDb centralRepoDb) throws FileSearchException { EamDb centralRepoDb) throws FileSearchException {
if (centralRepoDb == null) { if (centralRepoDb == null) {
for (ResultFile file : files) { for (ResultFile file : files) {
if (file.getFrequency() == Frequency.UNKNOWN) { if (file.getFrequency() == Frequency.UNKNOWN && file.getFirstInstance().getKnown() == TskData.FileKnown.KNOWN) {
if (file.getFirstInstance().getKnown() == TskData.FileKnown.KNOWN) { file.setFrequency(Frequency.KNOWN);
file.setFrequency(Frequency.KNOWN);
}
} }
} }
} else { } else {

View File

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

View File

@ -3,12 +3,18 @@
<Form version="1.5" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JPanelFormInfo"> <Form version="1.5" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<NonVisualComponents> <NonVisualComponents>
<Component class="javax.swing.ButtonGroup" name="parentPathButtonGroup"> <Component class="javax.swing.ButtonGroup" name="parentPathButtonGroup">
<AuxValues>
<AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
</AuxValues>
</Component> </Component>
<Component class="javax.swing.ButtonGroup" name="orderGroupsByButtonGroup"> <Component class="javax.swing.ButtonGroup" name="orderGroupsByButtonGroup">
</Component> </Component>
<Component class="javax.swing.ButtonGroup" name="parentIncludeButtonGroup"> <Component class="javax.swing.ButtonGroup" name="parentIncludeButtonGroup">
</Component> <AuxValues>
<Component class="javax.swing.ButtonGroup" name="typeButtonGroup"> <AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
</AuxValues>
</Component> </Component>
</NonVisualComponents> </NonVisualComponents>
<Properties> <Properties>

View File

@ -728,10 +728,9 @@ final class FileSearchPanel extends javax.swing.JPanel implements ActionListener
private void initComponents() { private void initComponents() {
java.awt.GridBagConstraints gridBagConstraints; java.awt.GridBagConstraints gridBagConstraints;
parentPathButtonGroup = new javax.swing.ButtonGroup(); javax.swing.ButtonGroup parentPathButtonGroup = new javax.swing.ButtonGroup();
orderGroupsByButtonGroup = new javax.swing.ButtonGroup(); orderGroupsByButtonGroup = new javax.swing.ButtonGroup();
parentIncludeButtonGroup = new javax.swing.ButtonGroup(); javax.swing.ButtonGroup parentIncludeButtonGroup = new javax.swing.ButtonGroup();
typeButtonGroup = new javax.swing.ButtonGroup();
filtersScrollPane = new javax.swing.JScrollPane(); filtersScrollPane = new javax.swing.JScrollPane();
filtersPanel = new javax.swing.JPanel(); filtersPanel = new javax.swing.JPanel();
sizeCheckbox = new javax.swing.JCheckBox(); sizeCheckbox = new javax.swing.JCheckBox();
@ -1581,10 +1580,8 @@ final class FileSearchPanel extends javax.swing.JPanel implements ActionListener
private javax.swing.ButtonGroup orderGroupsByButtonGroup; private javax.swing.ButtonGroup orderGroupsByButtonGroup;
private javax.swing.JLabel orderGroupsByLabel; private javax.swing.JLabel orderGroupsByLabel;
private javax.swing.JCheckBox parentCheckbox; private javax.swing.JCheckBox parentCheckbox;
private javax.swing.ButtonGroup parentIncludeButtonGroup;
private javax.swing.JLabel parentLabel; private javax.swing.JLabel parentLabel;
private javax.swing.JList<ParentSearchTerm> parentList; private javax.swing.JList<ParentSearchTerm> parentList;
private javax.swing.ButtonGroup parentPathButtonGroup;
private javax.swing.JScrollPane parentScrollPane; private javax.swing.JScrollPane parentScrollPane;
private javax.swing.JTextField parentTextField; private javax.swing.JTextField parentTextField;
private javax.swing.JCheckBox scoreCheckbox; private javax.swing.JCheckBox scoreCheckbox;
@ -1599,7 +1596,6 @@ final class FileSearchPanel extends javax.swing.JPanel implements ActionListener
private javax.swing.JCheckBox tagsCheckbox; private javax.swing.JCheckBox tagsCheckbox;
private javax.swing.JList<TagName> tagsList; private javax.swing.JList<TagName> tagsList;
private javax.swing.JScrollPane tagsScrollPane; private javax.swing.JScrollPane tagsScrollPane;
private javax.swing.ButtonGroup typeButtonGroup;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables
} }