mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-12 16:06:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Joe Ho 2019-05-16 19:29:36 -04:00
parent 996683333d
commit 1df0a4f60c
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Core/src/org/sleuthkit/autopsy/casemodule/AddLogicalImageTask.java
View File

@ -68,6 +68,7 @@ public class AddLogicalImageTask extends AddImageTask {
@Messages({ @Messages({
"# {0} - src", "# {1} - dest", "AddLogicalImageTask.copyingImageFromTo=Copying image from {0} to {1}", "# {0} - src", "# {1} - dest", "AddLogicalImageTask.copyingImageFromTo=Copying image from {0} to {1}",
"AddLogicalImageTask.doneCopying=Done copying", "AddLogicalImageTask.doneCopying=Done copying",
"# {0} - src", "# {1} - dest", "AddLogicalImageTask.failedToCopyDirectory=Failed to copy directory {0} to {1}",
"# {0} - file", "AddLogicalImageTask.addingToReport=Adding {0} to report", "# {0} - file", "AddLogicalImageTask.addingToReport=Adding {0} to report",
"# {0} - file", "AddLogicalImageTask.doneAddingToReport=Done adding {0} to report" "# {0} - file", "AddLogicalImageTask.doneAddingToReport=Done adding {0} to report"
}) })
@ -82,8 +83,7 @@ public class AddLogicalImageTask extends AddImageTask {
progressMonitor.setProgressText(Bundle.AddLogicalImageTask_doneCopying()); progressMonitor.setProgressText(Bundle.AddLogicalImageTask_doneCopying());
} catch (IOException ex) { } catch (IOException ex) {
// Copy directory failed // Copy directory failed
String msg = String.format("Failed to copy directory {0} to {1}", src.toString(), dest.toString()); String msg = Bundle.AddLogicalImageTask_failedToCopyDirectory(src.toString(), dest.toString());
logger.log(Level.SEVERE, msg);
errorList.add(msg); errorList.add(msg);
callback.done(DataSourceProcessorCallback.DataSourceProcessorResult.CRITICAL_ERRORS, errorList, emptyDataSources); callback.done(DataSourceProcessorCallback.DataSourceProcessorResult.CRITICAL_ERRORS, errorList, emptyDataSources);
return; return;
@ -119,6 +119,9 @@ public class AddLogicalImageTask extends AddImageTask {
* @returns null if success, or exception message if failure * @returns null if success, or exception message if failure
* *
*/ */
@Messages({
"# {0} - file", "# {1} - exception message", "AddLogicalImageTask.failedToAddReport=Failed to add report {0}. Reason= {1}"
})
private String addReport(Path reportPath, String reportName) { private String addReport(Path reportPath, String reportName) {
if (!reportPath.toFile().exists()) { if (!reportPath.toFile().exists()) {
return null; // if the reportPath doesn't exist, just ignore it. return null; // if the reportPath doesn't exist, just ignore it.
@ -127,8 +130,8 @@ public class AddLogicalImageTask extends AddImageTask {
Case.getCurrentCase().addReport(reportPath.toString(), "LogicalImager", reportName); //NON-NLS Case.getCurrentCase().addReport(reportPath.toString(), "LogicalImager", reportName); //NON-NLS
return null; return null;
} catch (TskCoreException ex) { } catch (TskCoreException ex) {
String msg = String.format("Failed to add report {0}. Reason= {1}", reportPath.toString(), ex.getMessage()); String msg = Bundle.AddLogicalImageTask_failedToAddReport(reportPath.toString(), ex.getMessage());
logger.log(Level.SEVERE, msg); logger.log(Level.SEVERE, String.format("Failed to add report {0}. Reason= {1}", reportPath.toString(), ex.getMessage()));
return msg; return msg;
} }
} }

2
Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties-MERGED
View File

@ -186,7 +186,7 @@ LogicalImagerDSProcessor.dataSourceType=Autopsy Imager
# {0} - directory # {0} - directory
LogicalImagerDSProcessor.directoryAlreadyExists=Directory {0} already exists LogicalImagerDSProcessor.directoryAlreadyExists=Directory {0} already exists
# {0} - directory # {0} - directory
LogicalImagerDSProcessor.failToCreateDirectory=Fail to create directory {0} LogicalImagerDSProcessor.failToCreateDirectory=Failed to create directory {0}
# {0} - imageDirPath # {0} - imageDirPath
LogicalImagerDSProcessor.imageDirPathNotFound={0} not found.\nUSB drive has been ejected. LogicalImagerDSProcessor.imageDirPathNotFound={0} not found.\nUSB drive has been ejected.
LogicalImagerPanel.imageTable.columnModel.title0=Hostname LogicalImagerPanel.imageTable.columnModel.title0=Hostname