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

Bug fix in displaying progress dialog panel

Browse Source
This commit is contained in:
Eugene Livis 2019-09-03 15:19:10 -04:00
parent 85280d47cf
commit a28bb4ee26
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -232,7 +232,7 @@ public class ReportGenerator {
* Display the progress panels to the user, and add actions to close the * Display the progress panels to the user, and add actions to close the
* parent dialog. * parent dialog.
*/ */
private void displayProgressPanel() { void displayProgressPanel() {
if (reportGenerationPanel == null) { if (reportGenerationPanel == null) {
return; return;
} }
@ -269,7 +269,6 @@ public class ReportGenerator {
String reportDir = createReportDirectory(generalReportModule); String reportDir = createReportDirectory(generalReportModule);
setupProgressPanel(generalReportModule, reportDir); setupProgressPanel(generalReportModule, reportDir);
generalReportModule.generateReport(reportDir, progressPanel); generalReportModule.generateReport(reportDir, progressPanel);
displayProgressPanel();
} }
} }
@ -289,7 +288,6 @@ public class ReportGenerator {
// finish progress, wrap up // finish progress, wrap up
progressPanel.complete(ReportProgressPanel.ReportStatus.COMPLETE); progressPanel.complete(ReportProgressPanel.ReportStatus.COMPLETE);
errorList = generator.getErrorList(); errorList = generator.getErrorList();
displayProgressPanel();
} }
} }
@ -345,7 +343,6 @@ public class ReportGenerator {
fileReportModule.endTable(); fileReportModule.endTable();
fileReportModule.endReport(); fileReportModule.endReport();
progressPanel.complete(ReportStatus.COMPLETE); progressPanel.complete(ReportStatus.COMPLETE);
displayProgressPanel();
} }
} }
@ -357,7 +354,6 @@ public class ReportGenerator {
String reportDir = createReportDirectory(portableCaseReportModule); String reportDir = createReportDirectory(portableCaseReportModule);
setupProgressPanel(portableCaseReportModule, reportDir); setupProgressPanel(portableCaseReportModule, reportDir);
portableCaseReportModule.generateReport(reportDir, settings, progressPanel); portableCaseReportModule.generateReport(reportDir, settings, progressPanel);
displayProgressPanel();
} }
} }

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

@ -86,12 +86,13 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
if (runReports) { if (runReports) {
// generate reports in a separate thread // generate reports in a separate thread
panel = new ReportGenerationPanel();
ReportGenerator generator = new ReportGenerator(configName, panel); //NON-NLS
ReportWorker worker = new ReportWorker(() -> { ReportWorker worker = new ReportWorker(() -> {
panel = new ReportGenerationPanel();
ReportGenerator generator = new ReportGenerator(configName, panel); //NON-NLS
generator.generateReports(); generator.generateReports();
}); });
worker.execute(); worker.execute();
generator.displayProgressPanel();
} }
} }
} }