From 764f4cea392c623cf412db7cc6a447bf68a1139c Mon Sep 17 00:00:00 2001 From: adam-m Date: Wed, 27 Jun 2012 16:55:59 -0400 Subject: [PATCH] Show error log for critical add image errors too --- .../autopsy/casemodule/AddImageVisualPanel2.java | 9 +++++++-- .../autopsy/casemodule/AddImageWizardPanel2.java | 11 ++--------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel2.java b/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel2.java index 192f67bbfc..244fcaafaf 100644 --- a/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel2.java +++ b/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel2.java @@ -98,8 +98,13 @@ final class AddImageVisualPanel2 extends JPanel { - void setNonCriticalErrors(final String errors) { - progressLabel.setText("*Image added (non-critical image errors encountered). Click below to view the Add Image Log."); + void setErrors(final String errors, boolean critical) { + if (critical) { + progressLabel.setText("*Failed to add image (critical errors encountered). Click below to view the Add Image Log."); + } + else { + progressLabel.setText("*Image added (non-critical image errors encountered). Click below to view the Add Image Log."); + } errorButton = new JButton(); errorButton.setText("View Log"); infoPanel.add(errorButton); diff --git a/Case/src/org/sleuthkit/autopsy/casemodule/AddImageWizardPanel2.java b/Case/src/org/sleuthkit/autopsy/casemodule/AddImageWizardPanel2.java index 916bb419f0..6c2b2ea6da 100644 --- a/Case/src/org/sleuthkit/autopsy/casemodule/AddImageWizardPanel2.java +++ b/Case/src/org/sleuthkit/autopsy/casemodule/AddImageWizardPanel2.java @@ -318,20 +318,13 @@ class AddImageWizardPanel2 implements WizardDescriptor.Panel { revert(); if (hasCritError) { //core error - StringBuilder errMsgB = new StringBuilder(); - errMsgB.append("*Failed to add image"); - if (errorString != null) { - errMsgB.append(":
").append(errorString); - } - errMsgB.append(""); - getComponent().changeProgressBarTextAndColor(errMsgB.toString(), 0, Color.black); + getComponent().setErrors(errorString, true); } - return; } else if (errorString != null) { //data error (non-critical) logger.log(Level.INFO, "Handling non-critical errors that occured in add image process"); - getComponent().setNonCriticalErrors(errorString); + getComponent().setErrors(errorString, false); } }