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

use friendly warning message instead of error popup

Browse Source
This commit is contained in:
momo 2015-09-10 12:36:17 -04:00
parent a89183f863
commit 4f45e5c0ff
2 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Core/src/org/sleuthkit/autopsy/report/Bundle.properties
View File

@ -3,7 +3,8 @@ CTL_ReportWizardAction=Run Report
ArtifactSelectionDialog.titleLabel.text=Select which artifacts you would like to report on: ArtifactSelectionDialog.titleLabel.text=Select which artifacts you would like to report on:
ArtifactSelectionDialog.okButton.text=OK ArtifactSelectionDialog.okButton.text=OK
ReportVisualPanel1.reportModulesLabel.text=Report Modules: ReportVisualPanel1.reportModulesLabel.text=Report Modules:
ReportVisualPanel1.initModules.invalidWarning=Encountered an invalid Report Module ReportVisualPanel1.invalidModuleWarning=Encountered an invalid Report Module
ReportVisualPanel1.ReportVisualPanelWillNotDisplayModule=Report Module will not be displayed.
DefaultReportConfigurationPanel.infoLabel.text=This report will be configured on the next screen. DefaultReportConfigurationPanel.infoLabel.text=This report will be configured on the next screen.
ReportVisualPanel2.dataLabel.text=Select which data to report on: ReportVisualPanel2.dataLabel.text=Select which data to report on:
ReportVisualPanel2.deselectAllButton.text=Deselect All ReportVisualPanel2.deselectAllButton.text=Deselect All

51
Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
View File

@ -35,18 +35,17 @@ import javax.swing.ListCellRenderer;
import javax.swing.ListSelectionModel; import javax.swing.ListSelectionModel;
import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener; import javax.swing.event.ListSelectionListener;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
import org.openide.util.Lookup; import org.openide.util.Lookup;
import org.openide.util.NbBundle; import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.actions.OpenPythonModulesFolderAction;
import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.ingest.IngestMessage;
import org.sleuthkit.autopsy.ingest.IngestServices;
import org.sleuthkit.autopsy.python.JythonModuleLoader; import org.sleuthkit.autopsy.python.JythonModuleLoader;
import org.sleuthkit.autopsy.report.ReportHTML;
final class ReportVisualPanel1 extends JPanel implements ListSelectionListener { final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
private static final Logger logger = Logger.getLogger(ReportVisualPanel1.class.getName()); private static final Logger logger = Logger.getLogger(ReportVisualPanel1.class.getName());
private final IngestServices services = IngestServices.getInstance();
private ReportWizardPanel1 wizPanel; private ReportWizardPanel1 wizPanel;
private List<ReportModule> modules = new ArrayList<>(); private List<ReportModule> modules = new ArrayList<>();
private List<GeneralReportModule> generalModules = new ArrayList<>(); private List<GeneralReportModule> generalModules = new ArrayList<>();
@ -68,54 +67,38 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
// Initialize the list of ReportModules // Initialize the list of ReportModules
private void initModules() { private void initModules() {
for (TableReportModule module : Lookup.getDefault().lookupAll(TableReportModule.class)) { for (TableReportModule module : Lookup.getDefault().lookupAll(TableReportModule.class)) {
if(validModule(module)) { if (validModule(module)) {
tableModules.add(module); tableModules.add(module);
modules.add(module); modules.add(module);
} else { } else {
// log postWarningMessage(module);
logger.log(Level.WARNING, "Invalid TableReportModule"); // NON_NLS
DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(
NbBundle.getMessage(ReportVisualPanel1.class, "ReportVisualPanel1.initModules.invalidWarning", module),
NotifyDescriptor.ERROR_MESSAGE));
} }
} }
for (GeneralReportModule module : Lookup.getDefault().lookupAll(GeneralReportModule.class)) { for (GeneralReportModule module : Lookup.getDefault().lookupAll(GeneralReportModule.class)) {
if(validModule(module)) { if (validModule(module)) {
generalModules.add(module); generalModules.add(module);
modules.add(module); modules.add(module);
} else { } else {
// log postWarningMessage(module);
logger.log(Level.WARNING, "Invalid GeneralReportModule"); // NON_NLS
DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(
NbBundle.getMessage(ReportVisualPanel1.class, "ReportVisualPanel1.initModules.invalidWarning", module),
NotifyDescriptor.ERROR_MESSAGE));
} }
} }
for (GeneralReportModule module : JythonModuleLoader.getGeneralReportModules()) { for (GeneralReportModule module : JythonModuleLoader.getGeneralReportModules()) {
if(validModule(module)) { if (validModule(module)) {
generalModules.add(module); generalModules.add(module);
modules.add(module); modules.add(module);
} else { } else {
//log postWarningMessage(module);
logger.log(Level.WARNING, "Invalid GeneralReportModule"); // NON_NLS
DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(
NbBundle.getMessage(ReportVisualPanel1.class, "ReportVisualPanel1.initModules.invalidWarning", module),
NotifyDescriptor.ERROR_MESSAGE));
} }
} }
for (FileReportModule module : Lookup.getDefault().lookupAll(FileReportModule.class)) { for (FileReportModule module : Lookup.getDefault().lookupAll(FileReportModule.class)) {
if(validModule(module)) { if (validModule(module)) {
fileModules.add(module); fileModules.add(module);
modules.add(module); modules.add(module);
} else { } else {
//log postWarningMessage(module);
logger.log(Level.WARNING, "Invalid FileReportModule"); // NON_NLS
DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(
NbBundle.getMessage(ReportVisualPanel1.class, "ReportVisualPanel1.initModules.invalidWarning", module),
NotifyDescriptor.ERROR_MESSAGE));
} }
} }
@ -152,12 +135,22 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
selectedIndex = 0; selectedIndex = 0;
modulesJList.setSelectedIndex(selectedIndex); modulesJList.setSelectedIndex(selectedIndex);
} }
// Make sure that the report module has a valid non-null name. // Make sure that the report module has a valid non-null name.
private boolean validModule(ReportModule module) { private boolean validModule(ReportModule module) {
return module != null && module.getName() != null && !module.getName().isEmpty(); return module != null && module.getName() != null && !module.getName().isEmpty();
} }
private void postWarningMessage(ReportModule module) {
logger.log(Level.WARNING, "Invalid GeneralReportModule"); // NON_NLS
services.postMessage(IngestMessage.createWarningMessage(
(module != null) ? module.getClass().getSimpleName() : "null", // NON_NLS
NbBundle.getMessage(this.getClass(),
"ReportVisualPanel1.invalidModuleWarning"),
NbBundle.getMessage(this.getClass(),
"ReportVisualPanel1.ReportVisualPanelWillNotDisplayModule")));
}
@Override @Override
public String getName() { public String getName() {
return NbBundle.getMessage(this.getClass(), "ReportVisualPanel1.getName.text"); return NbBundle.getMessage(this.getClass(), "ReportVisualPanel1.getName.text");