Dont use Bundle for logger messages.

This commit is contained in:
Joe Ho 2019-05-16 17:49:35 -04:00
parent 430c05436d
commit 996683333d

View File

@ -68,7 +68,6 @@ 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"
}) })
@ -83,7 +82,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 = Bundle.AddLogicalImageTask_failedToCopyDirectory(src.toString(), dest.toString()); String msg = String.format("Failed to copy directory {0} to {1}", src.toString(), dest.toString());
logger.log(Level.SEVERE, msg); 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);
@ -120,9 +119,6 @@ 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.
@ -131,7 +127,7 @@ 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 = Bundle.AddLogicalImageTask_failedToAddReport(reportPath.toString(), ex.getMessage()); String msg = String.format("Failed to add report {0}. Reason= {1}", reportPath.toString(), ex.getMessage());
logger.log(Level.SEVERE, msg); logger.log(Level.SEVERE, msg);
return msg; return msg;
} }