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

Merge branch 'master' of https://github.com/sleuthkit/autopsy

Browse Source
This commit is contained in:
adam-m 2012-12-28 10:47:18 -05:00
commit f5345b3d9c
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java
View File

@ -67,6 +67,7 @@ public class ReportBodyFile implements GeneralReportModule {
* @param progressPanel panel to update the report's progress * @param progressPanel panel to update the report's progress
*/ */
@Override @Override
@SuppressWarnings("deprecation")
public void generateReport(String path, ReportProgressPanel progressPanel) { public void generateReport(String path, ReportProgressPanel progressPanel) {
// Start the progress bar and setup the report // Start the progress bar and setup the report
progressPanel.setIndeterminate(false); progressPanel.setIndeterminate(false);

2
Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
View File

@ -410,6 +410,7 @@ public class ReportGenerator {
* Write the keyword hits to the provided TableReportModules. * Write the keyword hits to the provided TableReportModules.
* @param tableModules modules to report on * @param tableModules modules to report on
*/ */
@SuppressWarnings("deprecation")
private void writeKeywordHits(List<TableReportModule> tableModules) { private void writeKeywordHits(List<TableReportModule> tableModules) {
ResultSet listsRs = null; ResultSet listsRs = null;
try { try {
@ -546,6 +547,7 @@ public class ReportGenerator {
* Write the hashset hits to the provided TableReportModules. * Write the hashset hits to the provided TableReportModules.
* @param tableModules modules to report on * @param tableModules modules to report on
*/ */
@SuppressWarnings("deprecation")
private void writeHashsetHits(List<TableReportModule> tableModules) { private void writeHashsetHits(List<TableReportModule> tableModules) {
ResultSet listsRs = null; ResultSet listsRs = null;
try { try {

24
Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
View File

@ -97,6 +97,7 @@ public final class ReportWizardAction extends CallableSystemAction implements P
* and start all necessary reports. * and start all necessary reports.
*/ */
@Override @Override
@SuppressWarnings("unchecked")
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
// Create the wizard // Create the wizard
WizardDescriptor wiz = new WizardDescriptor(new ReportWizardIterator()); WizardDescriptor wiz = new WizardDescriptor(new ReportWizardIterator());
@ -106,15 +107,26 @@ public final class ReportWizardAction extends CallableSystemAction implements P
// When the user presses the finish button // When the user presses the finish button
if (DialogDisplayer.getDefault().notify(wiz) == WizardDescriptor.FINISH_OPTION) { if (DialogDisplayer.getDefault().notify(wiz) == WizardDescriptor.FINISH_OPTION) {
// Get the wizard information // Get the wizard information
Map<TableReportModule, Boolean> tableModuleStates = (Map<TableReportModule, Boolean>) wiz.getProperty("tableModuleStates"); Object wizProp1 = wiz.getProperty("tableModuleStates");
Map<GeneralReportModule, Boolean> generalModuleStates = (Map<GeneralReportModule, Boolean>) wiz.getProperty("generalModuleStates"); Object wizProp2 = wiz.getProperty("generalModuleStates");
Object wizProp3 = wiz.getProperty("isTagsSelected");
Object wizProp4 = wiz.getProperty("tagStates");
Object wizProp5 = wiz.getProperty("artifactStates");
// Initialize varibales
Map<TableReportModule, Boolean> tableModuleStates = (Map<TableReportModule, Boolean>) wizProp1;
Map<GeneralReportModule, Boolean> generalModuleStates = (Map<GeneralReportModule, Boolean>) wizProp2;
Boolean isTagsSelected = (Boolean) wizProp3;
Map<String, Boolean> tagStates = (Map<String, Boolean>) wizProp4;
Map<ARTIFACT_TYPE, Boolean> artifactStates = (Map<ARTIFACT_TYPE, Boolean>) wizProp5;
// Create the generator and generate reports // Create the generator and generate reports
ReportGenerator generator = new ReportGenerator(tableModuleStates, generalModuleStates); ReportGenerator generator = new ReportGenerator(tableModuleStates, generalModuleStates);
if (wiz.getProperty("isTagsSelected") != null) { if (isTagsSelected != null) {
if ((Boolean) wiz.getProperty("isTagsSelected")) { if (isTagsSelected) {
generator.generateTableTagReport((Map<String, Boolean>) wiz.getProperty("tagStates")); generator.generateTableTagReport(tagStates);
} else { } else {
generator.generateTableArtifactReport((Map<ARTIFACT_TYPE, Boolean>) wiz.getProperty("artifactStates")); generator.generateTableArtifactReport(artifactStates);
} }
} }
generator.generateGeneralReports(); generator.generateGeneralReports();