From ffd447541f29a29f273d7bea191d091f57906465 Mon Sep 17 00:00:00 2001 From: Devin148 Date: Fri, 28 Dec 2012 09:24:49 -0500 Subject: [PATCH] Suppress safe compile warnings --- .../autopsy/report/ReportBodyFile.java | 1 + .../autopsy/report/ReportGenerator.java | 2 ++ .../autopsy/report/ReportWizardAction.java | 24 ++++++++++++++----- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java b/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java index e813574054..f731db3f29 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java @@ -67,6 +67,7 @@ public class ReportBodyFile implements GeneralReportModule { * @param progressPanel panel to update the report's progress */ @Override + @SuppressWarnings("deprecation") public void generateReport(String path, ReportProgressPanel progressPanel) { // Start the progress bar and setup the report progressPanel.setIndeterminate(false); diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java index 44dbbe5734..56c3c7d228 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java @@ -410,6 +410,7 @@ public class ReportGenerator { * Write the keyword hits to the provided TableReportModules. * @param tableModules modules to report on */ + @SuppressWarnings("deprecation") private void writeKeywordHits(List tableModules) { ResultSet listsRs = null; try { @@ -546,6 +547,7 @@ public class ReportGenerator { * Write the hashset hits to the provided TableReportModules. * @param tableModules modules to report on */ + @SuppressWarnings("deprecation") private void writeHashsetHits(List tableModules) { ResultSet listsRs = null; try { diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java index 7beb5c1948..0fa0a8bb0e 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java @@ -97,6 +97,7 @@ public final class ReportWizardAction extends CallableSystemAction implements P * and start all necessary reports. */ @Override + @SuppressWarnings("unchecked") public void actionPerformed(ActionEvent e) { // Create the wizard 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 if (DialogDisplayer.getDefault().notify(wiz) == WizardDescriptor.FINISH_OPTION) { // Get the wizard information - Map tableModuleStates = (Map) wiz.getProperty("tableModuleStates"); - Map generalModuleStates = (Map) wiz.getProperty("generalModuleStates"); + Object wizProp1 = wiz.getProperty("tableModuleStates"); + Object wizProp2 = wiz.getProperty("generalModuleStates"); + Object wizProp3 = wiz.getProperty("isTagsSelected"); + Object wizProp4 = wiz.getProperty("tagStates"); + Object wizProp5 = wiz.getProperty("artifactStates"); + + // Initialize varibales + Map tableModuleStates = (Map) wizProp1; + Map generalModuleStates = (Map) wizProp2; + Boolean isTagsSelected = (Boolean) wizProp3; + Map tagStates = (Map) wizProp4; + Map artifactStates = (Map) wizProp5; + // Create the generator and generate reports ReportGenerator generator = new ReportGenerator(tableModuleStates, generalModuleStates); - if (wiz.getProperty("isTagsSelected") != null) { - if ((Boolean) wiz.getProperty("isTagsSelected")) { - generator.generateTableTagReport((Map) wiz.getProperty("tagStates")); + if (isTagsSelected != null) { + if (isTagsSelected) { + generator.generateTableTagReport(tagStates); } else { - generator.generateTableArtifactReport((Map) wiz.getProperty("artifactStates")); + generator.generateTableArtifactReport(artifactStates); } } generator.generateGeneralReports();