From d4e9d78976477dc4629477e50fe2a122f55788ba Mon Sep 17 00:00:00 2001
From: William Schaefer <wschaefer@basistech.net>
Date: Mon, 20 Mar 2017 18:06:45 -0400
Subject: [PATCH] 2409 Warning dialog for unnamed filter fixed

---
 .../autopsy/modules/interestingitems/Bundle.properties   | 2 +-
 .../modules/interestingitems/Bundle_ja.properties        | 2 +-
 .../autopsy/modules/interestingitems/FilesSetPanel.java  | 9 +++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties
index e5ae1eb726..cd61236b01 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties
@@ -9,7 +9,7 @@ OptionsCategory_Keywords_FileIngestFilterDefinitions=FileIngestFilterDefinitions
 InterestingItemsIdentifierIngestModule.moduleName=Interesting Files Identifier
 InterestingItemsIdentifierIngestModule.moduleDescription=Identifies interesting items as defined by interesting item rule sets.
 FilesSetPanel.interesting.title=Interesting Files Set
-FilesSetPanel.messages.filesSetsMustBeNamed=Interesting files sets must be named.
+FilesSetPanel.interesting.messages.filesSetsMustBeNamed=Interesting files sets must be named.
 FilesSetPanel.messages.filesSetsReservedName=You have chosen a name reserved by the software, please choose a different name.
 FilesSetPanel.ignoreKnownFilesCheckbox.text=Ignore Known Files
 FilesSetPanel.descriptionPanel.border.title=Description
diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle_ja.properties
index e370bb9dd7..6f6d7f49cf 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle_ja.properties
@@ -2,7 +2,7 @@ FilesIdentifierIngestJobSettingsPanel.border.title=\u30a4\u30f3\u30b8\u30a7\u30b
 FilesSetPanel.descPanel.border.title=\u6982\u8981
 FilesSetPanel.descriptionPanel.border.title=\u6982\u8981
 FilesSetPanel.ignoreKnownFilesCheckbox.text=\u65e2\u77e5\u30d5\u30a1\u30a4\u30eb\u3092\u7121\u8996
-FilesSetPanel.messages.filesSetsMustBeNamed=\u7591\u308f\u3057\u3044\u30d5\u30a1\u30a4\u30eb\u30bb\u30c3\u30c8\u306f\u540d\u524d\u304c\u5fc5\u8981\u3067\u3059\u3002
+FilesSetPanel.interesting.messages.filesSetsMustBeNamed=\u7591\u308f\u3057\u3044\u30d5\u30a1\u30a4\u30eb\u30bb\u30c3\u30c8\u306f\u540d\u524d\u304c\u5fc5\u8981\u3067\u3059\u3002
 FilesSetPanel.interesting.nameLabel.text=\u30bb\u30c3\u30c8\u540d\uff1a
 FilesSetPanel.title=\u7591\u308f\u3057\u3044\u30d5\u30a1\u30a4\u30eb\u30bb\u30c3\u30c8
 FilesSetRulePanel.extensionRadioButton.text=\u62e1\u5f35\u5b50\u306e\u307f
diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesSetPanel.java b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesSetPanel.java
index 4c47601b68..5f401663ab 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesSetPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesSetPanel.java
@@ -29,9 +29,10 @@ import org.sleuthkit.autopsy.modules.interestingitems.FilesSetDefsPanel.PANEL_TY
  */
 public class FilesSetPanel extends javax.swing.JPanel {
 
-    @NbBundle.Messages({"FilesSetPanel.ingest.title=File Ingest Filter", "FilesSetPanel.ingest.createNewFilter=Create/edit file ingest filter(s)..."})
+    @NbBundle.Messages({"FilesSetPanel.ingest.title=File Ingest Filter", "FilesSetPanel.ingest.createNewFilter=Create/edit file ingest filter(s)...", "FilesSetPanel.ingest.messages.filtersMustBeNamed=File ingest filters must be named."})
 
     private static final String CREATE_NEW_FILE_INGEST_FILTER = Bundle.FilesSetPanel_ingest_createNewFilter();
+    private final String mustBeNamedErrorText;
 
     /**
      * @return the CREATE_NEW_FILE_INGEST_FILTER
@@ -47,8 +48,10 @@ public class FilesSetPanel extends javax.swing.JPanel {
         initComponents();
         if (panelType == PANEL_TYPE.FILE_INGEST_FILTERS) {
             ignoreKnownFilesCheckbox.setVisible(false);
+            mustBeNamedErrorText = NbBundle.getMessage(FilesSetPanel.class, "FilesSetPanel.ingest.messages.filtersMustBeNamed");
             org.openide.awt.Mnemonics.setLocalizedText(nameLabel, org.openide.util.NbBundle.getMessage(FilesSetPanel.class, "FilesSetPanel.ingest.nameLabel.text")); // NOI18N
         } else {
+            mustBeNamedErrorText = NbBundle.getMessage(FilesSetPanel.class, "FilesSetPanel.interesting.messages.filesSetsMustBeNamed");
             ignoreUnallocCheckbox.setVisible(false);
         }
     }
@@ -62,8 +65,10 @@ public class FilesSetPanel extends javax.swing.JPanel {
         initComponents();
         if (panelType == PANEL_TYPE.FILE_INGEST_FILTERS) {
             ignoreKnownFilesCheckbox.setVisible(false);
+            mustBeNamedErrorText = NbBundle.getMessage(FilesSetPanel.class, "FilesSetPanel.ingest.messages.filtersMustBeNamed");
         } else {
             ignoreUnallocCheckbox.setVisible(false);
+            mustBeNamedErrorText = NbBundle.getMessage(FilesSetPanel.class, "FilesSetPanel.interesting.messages.filesSetsMustBeNamed");
         }
         this.nameTextField.setText(filesSet.getName());
         this.descTextArea.setText(filesSet.getDescription());
@@ -81,7 +86,7 @@ public class FilesSetPanel extends javax.swing.JPanel {
     boolean isValidDefinition() {
         if (this.nameTextField.getText().isEmpty()) {
             NotifyDescriptor notifyDesc = new NotifyDescriptor.Message(
-                    NbBundle.getMessage(FilesSetPanel.class, "FilesSetPanel.messages.filesSetsMustBeNamed"),
+                    mustBeNamedErrorText,
                     NotifyDescriptor.WARNING_MESSAGE);
             DialogDisplayer.getDefault().notify(notifyDesc);
             return false;