From 75ff182a16595229d4788d826db9a2d0f09d6ad6 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Tue, 9 May 2017 14:13:34 -0400 Subject: [PATCH 1/2] Fix MissingResourceException in Experimental NBM --- .../experimental/autoingest/AutoIngestCasePanel.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestCasePanel.java b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestCasePanel.java index 9c44f701cd..03484f678e 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestCasePanel.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestCasePanel.java @@ -40,11 +40,11 @@ import javax.swing.event.ListSelectionEvent; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableColumn; import org.openide.util.NbBundle; -import org.openide.windows.WindowManager; import org.sleuthkit.autopsy.casemodule.CaseActionCancelledException; import org.sleuthkit.autopsy.casemodule.CaseMetadata; import org.sleuthkit.autopsy.casemodule.StartupWindowProvider; import org.sleuthkit.autopsy.coreutils.Logger; +import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil; /** * A panel that allows a user to open cases created by auto ingest. @@ -281,6 +281,9 @@ public final class AutoIngestCasePanel extends JPanel { * * @param caseMetadataFilePath The path to the case metadata file. */ + @NbBundle.Messages({ + "# {0} - exception message", "AutoIngestCasePanel.openCaseException.couldNotOpenCase=Error opening case: {0}", + }) private void openCase(Path caseMetadataFilePath) { setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); new SwingWorker() { @@ -300,11 +303,7 @@ public final class AutoIngestCasePanel extends JPanel { } catch (InterruptedException | ExecutionException ex) { if (null != ex.getCause() && !(ex.getCause() instanceof CaseActionCancelledException)) { logger.log(Level.SEVERE, String.format("Error opening case with metadata file path %s", caseMetadataFilePath), ex); //NON-NLS - JOptionPane.showMessageDialog( - WindowManager.getDefault().getMainWindow(), - ex.getCause().getMessage(), //get the message of the wrapped exception - NbBundle.getMessage(this.getClass(), "CaseOpenAction.msgDlg.cantOpenCase.title"), //NON-NLS - JOptionPane.ERROR_MESSAGE); + MessageNotifyUtil.Message.error(ex.getCause().getLocalizedMessage()); } StartupWindowProvider.getInstance().open(); } finally { From 915dad6498c8c852d2d3b1dd0b22999d05dca1e1 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Tue, 9 May 2017 14:15:08 -0400 Subject: [PATCH 2/2] Fix MissingResourceException in Experimental NBM --- .../autopsy/experimental/autoingest/AutoIngestCasePanel.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestCasePanel.java b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestCasePanel.java index 03484f678e..ea98faea18 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestCasePanel.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestCasePanel.java @@ -39,7 +39,6 @@ import javax.swing.SwingWorker; import javax.swing.event.ListSelectionEvent; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableColumn; -import org.openide.util.NbBundle; import org.sleuthkit.autopsy.casemodule.CaseActionCancelledException; import org.sleuthkit.autopsy.casemodule.CaseMetadata; import org.sleuthkit.autopsy.casemodule.StartupWindowProvider; @@ -281,9 +280,6 @@ public final class AutoIngestCasePanel extends JPanel { * * @param caseMetadataFilePath The path to the case metadata file. */ - @NbBundle.Messages({ - "# {0} - exception message", "AutoIngestCasePanel.openCaseException.couldNotOpenCase=Error opening case: {0}", - }) private void openCase(Path caseMetadataFilePath) { setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); new SwingWorker() {