From 8a5f2b4933cb3fbfe82b4c55e68493fa5821163c Mon Sep 17 00:00:00 2001
From: Oliver Spohngellert <oliver@basistech.net>
Date: Thu, 10 Mar 2016 11:46:09 -0500
Subject: [PATCH] Updated error messages

---
 .../FilesIdentifierIngestJobSettingsPanel.java              | 4 ++--
 .../interestingitems/FilesIdentifierIngestModule.java       | 6 +++++-
 .../modules/interestingitems/InterestingItemDefsPanel.java  | 4 ++--
 .../InterestingItemsIngestModuleFactory.java                | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesIdentifierIngestJobSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesIdentifierIngestJobSettingsPanel.java
index 018824b7ad..261b23a3da 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesIdentifierIngestJobSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesIdentifierIngestJobSettingsPanel.java
@@ -37,8 +37,8 @@ import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel;
  */
 final class FilesIdentifierIngestJobSettingsPanel extends IngestModuleIngestJobSettingsPanel implements Observer {
     @Messages({
-        "FilesIdentifierIngestJobSettingsPanel.updateError=Could not update interesting files sets.",
-        "FilesIdentifierIngestJobSettingsPanel.getError=Could not get interesting files sets."
+        "FilesIdentifierIngestJobSettingsPanel.updateError=Error updating interesting files sets settings file.",
+        "FilesIdentifierIngestJobSettingsPanel.getError=Error getting interesting files sets from settings file."
     })
 
     private final FilesSetsTableModel tableModel;
diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesIdentifierIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesIdentifierIngestModule.java
index f6c49a7586..f0c9bb67fc 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesIdentifierIngestModule.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesIdentifierIngestModule.java
@@ -26,6 +26,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import org.openide.util.Exceptions;
 import org.openide.util.NbBundle;
+import org.openide.util.NbBundle.Messages;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.services.Blackboard;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -45,6 +46,9 @@ import org.sleuthkit.datamodel.TskCoreException;
  * files that match interesting files set definitions.
  */
 final class FilesIdentifierIngestModule implements FileIngestModule {
+    @Messages({
+        "FilesIdentifierIngestModule.getFilesError=Error getting interesting files sets from file."
+    })
 
     private static final Object sharedResourcesLock = new Object();
     private static final Logger logger = Logger.getLogger(FilesIdentifierIngestModule.class.getName());
@@ -85,7 +89,7 @@ final class FilesIdentifierIngestModule implements FileIngestModule {
                         }
                     }
                 } catch (InterestingItemDefsManager.InterestingItemDefsManagerException ex) {
-                    throw new IngestModuleException("Could not start up interesting files module.");
+                    throw new IngestModuleException(Bundle.FilesIdentifierIngestModule_getFilesError());
                 }
                 FilesIdentifierIngestModule.interestingFileSetsByJob.put(context.getJobId(), filesSets);
             }
diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemDefsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemDefsPanel.java
index a65ea8edf8..fbd7a72263 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemDefsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemDefsPanel.java
@@ -55,8 +55,8 @@ final class InterestingItemDefsPanel extends IngestModuleGlobalSettingsPanel imp
         "InterestingItemDefsPanel.kiloBytes=Kilobytes",
         "InterestingItemDefsPanel.megaBytes=Megabytes",
         "InterestingItemDefsPanel.gigaBytes=Gigabytes",
-        "InterestingItemsDefsPanel.loadError=Could not load interesting files sets.",
-        "InterestingItemsDefsPanel.saveError=Could not save interesting files sets."
+        "InterestingItemsDefsPanel.loadError=Error loading interesting files sets from file.",
+        "InterestingItemsDefsPanel.saveError=Error saving interesting files sets to file."
     })
 
     private static final SortedSet<MediaType> mediaTypes = MimeTypes.getDefaultMimeTypes().getMediaTypeRegistry().getTypes();
diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemsIngestModuleFactory.java b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemsIngestModuleFactory.java
index 7b820ed780..1779c8b3c2 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemsIngestModuleFactory.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemsIngestModuleFactory.java
@@ -41,7 +41,7 @@ import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel;
 final public class InterestingItemsIngestModuleFactory extends IngestModuleFactoryAdapter {
 
     @Messages({
-        "InterestingItemsIngestModuleFactory.defaultSettingsError=Could not get default interesting files settings."
+        "InterestingItemsIngestModuleFactory.defaultSettingsError=Error getting default interesting files settings from file."
     })
 
     @Override