Merge pull request #6562 from APriestman/7135_ingestJobUpdate

7135 Handle case close events correctly
This commit is contained in:
Richard Cordovano 2020-12-22 11:08:35 -05:00 committed by GitHub
commit eb2b9a8e4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -89,8 +89,15 @@ public final class IngestJobInfoPanel extends javax.swing.JPanel {
return; return;
} }
if (CURRENT_CASE == Case.Events.valueOf(evt.getPropertyName())) { // Check whether we have a case open or case close event.
refresh(); if ((CURRENT_CASE == Case.Events.valueOf(evt.getPropertyName()))) {
if (evt.getNewValue() != null) {
// Case open
refresh();
} else {
// Case close
reset();
}
} }
}); });
} }
@ -124,7 +131,7 @@ public final class IngestJobInfoPanel extends javax.swing.JPanel {
*/ */
private void refresh() { private void refresh() {
try { try {
if (Case.isCaseOpen()) { if (Case.isCaseOpen()) { // Note - this will generally return true when handling a case close event
SleuthkitCase skCase = Case.getCurrentCaseThrows().getSleuthkitCase(); SleuthkitCase skCase = Case.getCurrentCaseThrows().getSleuthkitCase();
this.ingestJobs = skCase.getIngestJobs(); this.ingestJobs = skCase.getIngestJobs();
setDataSource(selectedDataSource); setDataSource(selectedDataSource);
@ -139,6 +146,14 @@ public final class IngestJobInfoPanel extends javax.swing.JPanel {
} }
} }
/**
* Reset the panel.
*/
private void reset() {
this.ingestJobs = new ArrayList<>();
setDataSource(null);
}
@Messages({"IngestJobInfoPanel.IngestJobTableModel.StartTime.header=Start Time", @Messages({"IngestJobInfoPanel.IngestJobTableModel.StartTime.header=Start Time",
"IngestJobInfoPanel.IngestJobTableModel.EndTime.header=End Time", "IngestJobInfoPanel.IngestJobTableModel.EndTime.header=End Time",
"IngestJobInfoPanel.IngestJobTableModel.IngestStatus.header=Ingest Status"}) "IngestJobInfoPanel.IngestJobTableModel.IngestStatus.header=Ingest Status"})