From f2792347bcc34b5a0bd9ff54cfd00adf43b10e90 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Tue, 25 Jun 2019 14:55:28 -0400 Subject: [PATCH] 5187 remaining pr feedback add note about non-caps sensitive fields --- .../configuration/Bundle.properties | 4 +- .../configuration/Bundle.properties-MERGED | 4 +- .../EditNonFullPathsRulePanel.form | 92 ++++++++++++------- .../EditNonFullPathsRulePanel.java | 71 ++++++++------ .../configuration/NewRulePanel.form | 2 +- .../configuration/NewRulePanel.java | 2 +- 6 files changed, 112 insertions(+), 63 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/Bundle.properties b/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/Bundle.properties index 887871bf2d..e6c8663dfa 100644 --- a/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/Bundle.properties @@ -112,9 +112,11 @@ ConfigVisualPanel3.configLabel.text=Logical Imager config file save status: ConfigVisualPanel3.executableLabel.text=Logical Imager executable save status: ConfigVisualPanel3.executableStatusLabel.text= EditFullPathsRulePanel.jLabel1.text=Description (Optional): -EditNonFullPathsRulePanel.jLabel2.text=Folder name matches are case insentive and occur anywhere in a path. +EditNonFullPathsRulePanel.jLabel2.text=Folder name matches are case insensitive and occur anywhere in a path. EditNonFullPathsRulePanel.descriptionLabel.text=Description (Optional): EditNonFullPathsRulePanel.jLabel1.text=If file is found: EditFullPathsRulePanel.jLabel2.text=If file is found: ConfigVisualPanel2.flagEncryptionProgramsCheckBox.text=Alert if encryption programs are found ConfigVisualPanel2.finalizeImageWriter.text=Continue imaging after searches are performed +EditNonFullPathsRulePanel.fileNamesInfoLabel.text=File names are case insensitive. +EditNonFullPathsRulePanel.extensionsInfoLabel.text=Extensions are case insensitive. diff --git a/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/Bundle.properties-MERGED index 29fadce676..40890b33de 100644 --- a/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/Bundle.properties-MERGED @@ -177,12 +177,14 @@ ConfigVisualPanel3.configLabel.text=Logical Imager config file save status: ConfigVisualPanel3.executableLabel.text=Logical Imager executable save status: ConfigVisualPanel3.executableStatusLabel.text= EditFullPathsRulePanel.jLabel1.text=Description (Optional): -EditNonFullPathsRulePanel.jLabel2.text=Folder name matches are case insentive and occur anywhere in a path. +EditNonFullPathsRulePanel.jLabel2.text=Folder name matches are case insensitive and occur anywhere in a path. EditNonFullPathsRulePanel.descriptionLabel.text=Description (Optional): EditNonFullPathsRulePanel.jLabel1.text=If file is found: EditFullPathsRulePanel.jLabel2.text=If file is found: ConfigVisualPanel2.flagEncryptionProgramsCheckBox.text=Alert if encryption programs are found ConfigVisualPanel2.finalizeImageWriter.text=Continue imaging after searches are performed +EditNonFullPathsRulePanel.fileNamesInfoLabel.text=File names are case insensitive. +EditNonFullPathsRulePanel.extensionsInfoLabel.text=Extensions are case insensitive. NewRuleSetPanel.attributeRule.description=Search for files based on one or more attributes or metadata fields. NewRuleSetPanel.attributeRule.name=Attribute NewRuleSetPanel.fullPathRule.description=Search for files based on full exact match path. diff --git a/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/EditNonFullPathsRulePanel.form b/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/EditNonFullPathsRulePanel.form index 0dd4b475f6..4eca4bcbac 100644 --- a/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/EditNonFullPathsRulePanel.form +++ b/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/EditNonFullPathsRulePanel.form @@ -21,6 +21,19 @@ + + + + + + + + + + + + + @@ -36,25 +49,29 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + + + + + + + @@ -63,19 +80,6 @@ - - - - - - - - - - - - - @@ -101,7 +105,9 @@ - + + + @@ -110,6 +116,8 @@ + + @@ -382,5 +390,25 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/EditNonFullPathsRulePanel.java b/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/EditNonFullPathsRulePanel.java index caa2817751..607a597cab 100644 --- a/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/EditNonFullPathsRulePanel.java +++ b/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/EditNonFullPathsRulePanel.java @@ -333,6 +333,8 @@ final class EditNonFullPathsRulePanel extends javax.swing.JPanel { descriptionLabel = new javax.swing.JLabel(); jLabel2 = new javax.swing.JLabel(); jLabel1 = new javax.swing.JLabel(); + extensionsInfoLabel = new javax.swing.JLabel(); + fileNamesInfoLabel = new javax.swing.JLabel(); org.openide.awt.Mnemonics.setLocalizedText(daysIncludedLabel, org.openide.util.NbBundle.getMessage(EditNonFullPathsRulePanel.class, "EditNonFullPathsRulePanel.daysIncludedLabel.text")); // NOI18N @@ -435,6 +437,12 @@ final class EditNonFullPathsRulePanel extends javax.swing.JPanel { org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(EditNonFullPathsRulePanel.class, "EditNonFullPathsRulePanel.jLabel1.text")); // NOI18N + extensionsInfoLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/info-icon-16.png"))); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(extensionsInfoLabel, org.openide.util.NbBundle.getMessage(EditNonFullPathsRulePanel.class, "EditNonFullPathsRulePanel.extensionsInfoLabel.text")); // NOI18N + + fileNamesInfoLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/info-icon-16.png"))); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(fileNamesInfoLabel, org.openide.util.NbBundle.getMessage(EditNonFullPathsRulePanel.class, "EditNonFullPathsRulePanel.fileNamesInfoLabel.text")); // NOI18N + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( @@ -444,6 +452,16 @@ final class EditNonFullPathsRulePanel extends javax.swing.JPanel { .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jSeparator2) .addComponent(jSeparator1) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(shouldAlertCheckBox) + .addComponent(shouldSaveCheckBox) + .addComponent(fileNamesCheckbox, javax.swing.GroupLayout.PREFERRED_SIZE, 112, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) + .addComponent(modifiedWithinCheckbox, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(maxSizeCheckbox, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGap(0, 0, Short.MAX_VALUE)) .addGroup(layout.createSequentialGroup() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(extensionsCheckbox, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) @@ -459,33 +477,26 @@ final class EditNonFullPathsRulePanel extends javax.swing.JPanel { .addComponent(folderNamesScrollPane) .addComponent(filenamesScrollPane, javax.swing.GroupLayout.Alignment.TRAILING) .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, 522, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(userFolderNote) - .addGroup(layout.createSequentialGroup() - .addComponent(minSizeTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 63, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(minSizeUnitsCombobox, javax.swing.GroupLayout.PREFERRED_SIZE, 110, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(modifiedWithinTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 63, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(maxSizeTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 63, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(maxSizeUnitsCombobox, javax.swing.GroupLayout.PREFERRED_SIZE, 110, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(daysIncludedLabel))))) - .addGap(0, 11, Short.MAX_VALUE)))) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(shouldAlertCheckBox) - .addComponent(shouldSaveCheckBox) - .addComponent(fileNamesCheckbox, javax.swing.GroupLayout.PREFERRED_SIZE, 112, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) - .addComponent(modifiedWithinCheckbox, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(maxSizeCheckbox, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGap(0, 0, Short.MAX_VALUE))) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(fileNamesInfoLabel) + .addComponent(extensionsInfoLabel) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, 522, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(userFolderNote) + .addGroup(layout.createSequentialGroup() + .addComponent(minSizeTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 63, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(minSizeUnitsCombobox, javax.swing.GroupLayout.PREFERRED_SIZE, 110, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(modifiedWithinTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 63, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(maxSizeTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 63, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(maxSizeUnitsCombobox, javax.swing.GroupLayout.PREFERRED_SIZE, 110, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(daysIncludedLabel)))))) + .addGap(0, 11, Short.MAX_VALUE))))) .addContainerGap()) ); @@ -513,12 +524,16 @@ final class EditNonFullPathsRulePanel extends javax.swing.JPanel { .addComponent(extensionsTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(extensionsCheckbox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(extensionsInfoLabel) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(filenamesScrollPane) .addGroup(layout.createSequentialGroup() .addComponent(fileNamesCheckbox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addGap(0, 0, Short.MAX_VALUE))) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(fileNamesInfoLabel) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(folderNamesScrollPane) .addGroup(layout.createSequentialGroup() @@ -636,8 +651,10 @@ final class EditNonFullPathsRulePanel extends javax.swing.JPanel { private javax.swing.JLabel descriptionLabel; private javax.swing.JTextField descriptionTextField; private javax.swing.JCheckBox extensionsCheckbox; + private javax.swing.JLabel extensionsInfoLabel; private javax.swing.JTextField extensionsTextField; private javax.swing.JCheckBox fileNamesCheckbox; + private javax.swing.JLabel fileNamesInfoLabel; private javax.swing.JScrollPane filenamesScrollPane; private javax.swing.JCheckBox folderNamesCheckbox; private javax.swing.JScrollPane folderNamesScrollPane; diff --git a/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/NewRulePanel.form b/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/NewRulePanel.form index f810941382..71b01a4884 100644 --- a/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/NewRulePanel.form +++ b/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/NewRulePanel.form @@ -82,7 +82,7 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/NewRulePanel.java b/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/NewRulePanel.java index 26bbfb936e..3b3da6dc5a 100644 --- a/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/NewRulePanel.java +++ b/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/NewRulePanel.java @@ -102,7 +102,7 @@ class NewRulePanel extends javax.swing.JPanel { ); sharedLayeredPaneLayout.setVerticalGroup( sharedLayeredPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 423, Short.MAX_VALUE) + .addGap(0, 467, Short.MAX_VALUE) ); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);