mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-17 10:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

file already exists fix

Browse Source
This commit is contained in:
Greg DiCristofaro 2021-03-15 11:04:17 -04:00
parent 224b55de06
commit dbfbb9cd71
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/org/sleuthkit/autopsy/url/analytics/domaincategorization/Bundle.properties-MERGED
View File

@ -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.

12
Core/src/org/sleuthkit/autopsy/url/analytics/domaincategorization/WebCategoriesOptionsPanel.java
View File

@ -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);
}
}