From dbfbb9cd716ab79bbf042d7c1ad7e6918cfc4e8f Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Mon, 15 Mar 2021 11:04:17 -0400 Subject: [PATCH] file already exists fix --- .../domaincategorization/Bundle.properties-MERGED | 2 ++ .../WebCategoriesOptionsPanel.java | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/url/analytics/domaincategorization/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/url/analytics/domaincategorization/Bundle.properties-MERGED index 26ba866dbc..78b832f7d5 100644 --- a/Core/src/org/sleuthkit/autopsy/url/analytics/domaincategorization/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/url/analytics/domaincategorization/Bundle.properties-MERGED @@ -9,6 +9,8 @@ AddEditCategoryDialog_onValueUpdate_suffixRepeat=Please provide a unique domain WebCategoriesOptionsPanel_categoryTable_categoryColumnName=Category WebCategoriesOptionsPanel_categoryTable_suffixColumnName=Domain Suffix WebCategoriesOptionsPanel_exportSetButtonActionPerformed_defaultFileName=Custom Categories Export +WebCategoriesOptionsPanel_exportSetButtonActionPerformed_duplicateMessage=A file already exists at the selected path. +WebCategoriesOptionsPanel_exportSetButtonActionPerformed_duplicateTitle=File Already Exists WebCategoriesOptionsPanel_exportSetButtonActionPerformed_errorMessage=There was an error exporting. WebCategoriesOptionsPanel_exportSetButtonActionPerformed_errorTitle=Export Error WebCategoriesOptionsPanel_importSetButtonActionPerformed_errorMessage=There was an error importing this json file. diff --git a/Core/src/org/sleuthkit/autopsy/url/analytics/domaincategorization/WebCategoriesOptionsPanel.java b/Core/src/org/sleuthkit/autopsy/url/analytics/domaincategorization/WebCategoriesOptionsPanel.java index 96b74310c5..04cc00495b 100644 --- a/Core/src/org/sleuthkit/autopsy/url/analytics/domaincategorization/WebCategoriesOptionsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/url/analytics/domaincategorization/WebCategoriesOptionsPanel.java @@ -446,7 +446,7 @@ public class WebCategoriesOptionsPanel extends IngestModuleGlobalSettingsPanel i this, Bundle.WebCategoriesOptionsPanel_importSetButtonActionPerformed_errorMessage(), Bundle.WebCategoriesOptionsPanel_importSetButtonActionPerformed_errorTitle(), - JOptionPane.ERROR); + JOptionPane.ERROR_MESSAGE); logger.log(Level.WARNING, "There was an error on import.", ex); } } @@ -454,6 +454,8 @@ public class WebCategoriesOptionsPanel extends IngestModuleGlobalSettingsPanel i }//GEN-LAST:event_importSetButtonActionPerformed @Messages({ + "WebCategoriesOptionsPanel_exportSetButtonActionPerformed_duplicateMessage=A file already exists at the selected path.", + "WebCategoriesOptionsPanel_exportSetButtonActionPerformed_duplicateTitle=File Already Exists", "WebCategoriesOptionsPanel_exportSetButtonActionPerformed_errorMessage=There was an error exporting.", "WebCategoriesOptionsPanel_exportSetButtonActionPerformed_errorTitle=Export Error", "WebCategoriesOptionsPanel_exportSetButtonActionPerformed_defaultFileName=Custom Categories Export" @@ -467,9 +469,9 @@ public class WebCategoriesOptionsPanel extends IngestModuleGlobalSettingsPanel i if (selectedFile.exists()) { JOptionPane.showMessageDialog( this, - Bundle.WebCategoriesOptionsPanel_importSetButtonActionPerformed_errorMessage(), - Bundle.WebCategoriesOptionsPanel_importSetButtonActionPerformed_errorTitle(), - JOptionPane.ERROR); + Bundle.WebCategoriesOptionsPanel_exportSetButtonActionPerformed_duplicateMessage(), + Bundle.WebCategoriesOptionsPanel_exportSetButtonActionPerformed_duplicateTitle(), + JOptionPane.ERROR_MESSAGE); } try { setWaitingCursor(); @@ -481,7 +483,7 @@ public class WebCategoriesOptionsPanel extends IngestModuleGlobalSettingsPanel i this, Bundle.WebCategoriesOptionsPanel_importSetButtonActionPerformed_errorMessage(), Bundle.WebCategoriesOptionsPanel_importSetButtonActionPerformed_errorTitle(), - JOptionPane.ERROR); + JOptionPane.ERROR_MESSAGE); logger.log(Level.WARNING, "There was an error on export.", ex); } }