From 005259fdedf7a988809be07e027aa2808f8d10fa Mon Sep 17 00:00:00 2001 From: alexjacks92 Date: Thu, 13 Mar 2014 13:07:28 -0400 Subject: [PATCH] Pulled error messages out into Bundle.properties instead of literals. --- .../org/sleuthkit/autopsy/report/Bundle.properties | 2 ++ .../sleuthkit/autopsy/report/ReportGenerator.java | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties index 2ee9cd089e..27b246e3d2 100644 --- a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties @@ -158,6 +158,8 @@ ReportGenerator.artTableColHdr.appPath=App Path ReportGenerator.artTableColHdr.replytoAddress=ReplyTo Address ReportGenerator.artTableColHdr.mailServer=Mail Server ReportGenerator.artTableColHdr.tags=Tags +ReportGenerator.errors.reportErrorTitle=Error generating report +ReportGenerator.errors.reportErrorText=Error generating report: ReportHTML.link.viewFile=View File ReportHTML.addThumbRows.dataType.title=Tagged Images - {0} ReportHTML.addThumbRows.dataType.msg=Tagged Results and Contents that contain images. diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java index 5cc2aafdfe..d1a11c30c0 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java @@ -257,8 +257,8 @@ import org.sleuthkit.datamodel.TskData; get(); } catch (InterruptedException | ExecutionException ex) { MessageNotifyUtil.Notify.show( - "Error generating report", - "Error generating report: " + ex.getLocalizedMessage(), + NbBundle.getMessage(this.getClass(), "ReportGenerator.errors.reportErrorTitle"), + NbBundle.getMessage(this.getClass(), "ReportGenerator.errors.reportErrorText") + ex.getLocalizedMessage(), MessageNotifyUtil.MessageType.ERROR); logger.log(Level.SEVERE, "failed to generate reports", ex); } @@ -359,8 +359,8 @@ import org.sleuthkit.datamodel.TskData; get(); } catch (InterruptedException | ExecutionException ex) { MessageNotifyUtil.Notify.show( - "Error generating report", - "Error generating report: " + ex.getLocalizedMessage(), + NbBundle.getMessage(this.getClass(), "ReportGenerator.errors.reportErrorTitle"), + NbBundle.getMessage(this.getClass(), "ReportGenerator.errors.reportErrorText") + ex.getLocalizedMessage(), MessageNotifyUtil.MessageType.ERROR); logger.log(Level.SEVERE, "failed to generate reports", ex); } @@ -622,8 +622,8 @@ import org.sleuthkit.datamodel.TskData; get(); } catch (InterruptedException | ExecutionException ex) { MessageNotifyUtil.Notify.show( - "Error generating report", - "Error generating report: " + ex.getLocalizedMessage(), + NbBundle.getMessage(this.getClass(), "ReportGenerator.errors.reportErrorTitle"), + NbBundle.getMessage(this.getClass(), "ReportGenerator.errors.reportErrorText") + ex.getLocalizedMessage(), MessageNotifyUtil.MessageType.ERROR); logger.log(Level.SEVERE, "failed to generate reports", ex); }