From 362ab0ebaea04d20cccbb8d202b83472ce063cdd Mon Sep 17 00:00:00 2001 From: Eamonn Saunders Date: Tue, 9 Jun 2015 14:58:53 -0400 Subject: [PATCH] Modified PhotoRec module message to indicate that it was the saving (and not the carving) of unallocated space that failed. --- .../autopsy/modules/photoreccarver/Bundle.properties | 4 ++-- .../photoreccarver/PhotoRecCarverFileIngestModule.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/Bundle.properties b/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/Bundle.properties index 442bc51366..00a3779a24 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/Bundle.properties @@ -12,5 +12,5 @@ cannotRunExecutable.message=Unable to execute unallocated carver cannotCreateOutputDir.message=Unable to create output directory: {0} PhotoRecIngestModule.processTerminated=PhotoRec Carver ingest module was terminated due to exceeding max allowable run time when scanning PhotoRecIngestModule.moduleError=PhotoRec Carver Module Error -PhotoRecIngestModule.UnableToCarve=Unable to carve with PhotoRec -PhotoRecIngestModule.NotEnoughDiskSpace=Not enough disk space to carve files. Carving will be skipped. \ No newline at end of file +PhotoRecIngestModule.UnableToCarve=Unable to carve file: {0} +PhotoRecIngestModule.NotEnoughDiskSpace=Not enough disk space to save unallocated file. Carving will be skipped. \ No newline at end of file diff --git a/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/PhotoRecCarverFileIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/PhotoRecCarverFileIngestModule.java index 25df83b5dc..af12a905ee 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/PhotoRecCarverFileIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/PhotoRecCarverFileIngestModule.java @@ -148,10 +148,10 @@ final class PhotoRecCarverFileIngestModule implements FileIngestModule { // In this case, expect enough space and move on. long freeDiskSpace = IngestServices.getInstance().getFreeDiskSpace(); if ((freeDiskSpace != -1) && ((file.getSize() * 1.2) > freeDiskSpace)) { - logger.log(Level.SEVERE, "PhotoRec error processing {0} with {1} Not enough space on primary disk to carve unallocated space.", // NON-NLS + logger.log(Level.SEVERE, "PhotoRec error processing {0} with {1} Not enough space on primary disk to save unallocated space.", // NON-NLS new Object[]{file.getName(), PhotoRecCarverIngestModuleFactory.getModuleName()}); // NON-NLS - MessageNotifyUtil.Notify.error(NbBundle.getMessage(PhotoRecCarverFileIngestModule.class, "PhotoRecIngestModule.UnableToCarve"), - NbBundle.getMessage(PhotoRecCarverFileIngestModule.class, "PhotoRecIngestModule.NotEnoughDiskSpace")); + MessageNotifyUtil.Notify.error(NbBundle.getMessage(this.getClass(), "PhotoRecIngestModule.UnableToCarve", file.getName()), + NbBundle.getMessage(this.getClass(), "PhotoRecIngestModule.NotEnoughDiskSpace")); return IngestModule.ProcessResult.ERROR; }