diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesSet.java b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesSet.java index b19aec6f6b..fb1af74db9 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesSet.java +++ b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesSet.java @@ -150,9 +150,6 @@ final class FilesSet { * @param pathFilter A file path filter, may be null. */ Rule(String ruleName, FileNameFilter fileNameFilter, MetaTypeFilter metaTypeFilter, ParentPathFilter pathFilter) { - if ((ruleName == null) || (ruleName.isEmpty())) { - throw new IllegalArgumentException("Interesting files set rule name cannot be null or empty"); - } if (fileNameFilter == null) { throw new IllegalArgumentException("Interesting files set rule file name filter cannot be null"); } diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesSetRulePanel.java b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesSetRulePanel.java index 74a891ba22..f4cfdde918 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesSetRulePanel.java +++ b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesSetRulePanel.java @@ -135,20 +135,6 @@ final class FilesSetRulePanel extends javax.swing.JPanel { * @return True if the definition is valid, false otherwise. */ boolean isValidRuleDefinition() { - // The rule must have a name. - // If rule name is absent, set it as the Name Pattern since nameTextField cannot be left empty. - if (StringUtils.isBlank(this.ruleNameTextField.getText())) { - String ruleName = this.nameTextField.getText(); - if (StringUtils.isNotBlank(ruleName)) { - this.ruleNameTextField.setText(ruleName); - } else { - NotifyDescriptor notifyDesc = new NotifyDescriptor.Message( - NbBundle.getMessage(FilesSetPanel.class, "FilesSetRulePanel.messages.emptyNameFilter"), - NotifyDescriptor.WARNING_MESSAGE); - DialogDisplayer.getDefault().notify(notifyDesc); - return false; - } - } // The rule must have name filter text. if (this.nameTextField.getText().isEmpty()) { diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemDefsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemDefsPanel.java index a52f87ffd0..046e641058 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemDefsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemDefsPanel.java @@ -306,7 +306,7 @@ final class InterestingItemDefsPanel extends IngestModuleGlobalSettingsPanel imp rules.remove(selectedRule.getName()); } FilesSet.Rule newRule = new FilesSet.Rule(panel.getRuleName(), panel.getFileNameFilter(), panel.getMetaTypeFilter(), panel.getPathFilter()); - rules.put(newRule.getName(), newRule); + rules.put(newRule.toString(), newRule); // Add the new/edited files set definition, replacing any previous // definition with the same name and refreshing the display.