From bcaf0ce57f84b6d4c0ad1f0d957654bd87cea674 Mon Sep 17 00:00:00 2001 From: Joe Ho Date: Wed, 26 Jun 2019 14:36:20 -0400 Subject: [PATCH] Fix message format and status label --- .../logicalimager/configuration/Bundle.properties-MERGED | 2 +- .../logicalimager/configuration/ConfigVisualPanel3.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/Bundle.properties-MERGED index 40890b33de..7e094dc552 100644 --- a/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/Bundle.properties-MERGED @@ -50,7 +50,7 @@ ConfigVisualPanel3.description.text=Press Save to write the imaging tool and con ConfigVisualPanel3.failedToSaveConfigMsg=Failed to save configuration file: {0} ConfigVisualPanel3.failedToSaveExeMsg=Failed to save tsk_logical_imager.exe file # {0} - reason -ConfigVisualPanel3.reason=\nReason: +ConfigVisualPanel3.reason=\nReason: {0} ConfigVisualPanel3.saveConfigurationFile=Save imager CreateLogicalImagerAction.title=Create Logical Imager CTL_CreateLogicalImagerAction=Create Logical Imager diff --git a/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/ConfigVisualPanel3.java b/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/ConfigVisualPanel3.java index f9d61edeff..81039d6660 100644 --- a/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/ConfigVisualPanel3.java +++ b/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/ConfigVisualPanel3.java @@ -91,7 +91,7 @@ class ConfigVisualPanel3 extends javax.swing.JPanel { "# {0} - configFilename", "ConfigVisualPanel3.failedToSaveConfigMsg=Failed to save configuration file: {0}", "# {0} - reason", - "ConfigVisualPanel3.reason=\nReason: ", + "ConfigVisualPanel3.reason=\nReason: {0}", "ConfigVisualPanel3.failedToSaveExeMsg=Failed to save tsk_logical_imager.exe file",}) void saveConfigFile() { boolean saveSuccess = true; @@ -111,8 +111,8 @@ class ConfigVisualPanel3 extends javax.swing.JPanel { configStatusLabel.setText(Bundle.ConfigVisualPanel3_copyStatus_saved()); } catch (IOException ex) { saveSuccess = false; - executableStatusLabel.setText(Bundle.ConfigVisualPanel3_copyStatus_error()); - executableStatusLabel.setForeground(Color.RED); + configStatusLabel.setText(Bundle.ConfigVisualPanel3_copyStatus_error()); + configStatusLabel.setForeground(Color.RED); JOptionPane.showMessageDialog(this, Bundle.ConfigVisualPanel3_failedToSaveConfigMsg(configFilename) + Bundle.ConfigVisualPanel3_reason(ex.getMessage())); } catch (JsonIOException jioe) {