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

Merge pull request #6579 from gdicristofaro/7172-oldRefFix

Browse Source 
7172 old image reference fix
This commit is contained in:
Richard Cordovano 2020-12-28 17:19:24 -05:00 committed by GitHub
commit 522e890c32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/ContainerPanel.java
View File

@ -173,7 +173,7 @@ class ContainerPanel extends BaseDataSourceSummaryPanel {
try { try {
acquisitionDetailsTextArea.setText(selectedDataSource.getAcquisitionDetails()); acquisitionDetailsTextArea.setText(selectedDataSource.getAcquisitionDetails());
} catch (TskCoreException ex) { } catch (TskCoreException ex) {
logger.log(Level.WARNING, "Unable to get aquisition details for selected data source", ex); logger.log(Level.WARNING, "Unable to get acquisition details for selected data source", ex);
} }
if (selectedDataSource instanceof Image) { if (selectedDataSource instanceof Image) {

23
Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryTabbedPane.java
View File

@ -20,10 +20,13 @@ package org.sleuthkit.autopsy.datasourcesummary.ui;
import java.awt.CardLayout; import java.awt.CardLayout;
import java.awt.Component; import java.awt.Component;
import java.beans.PropertyChangeListener;
import java.util.Arrays; import java.util.Arrays;
import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;
import org.openide.util.NbBundle.Messages; import org.openide.util.NbBundle.Messages;
import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.casemodule.IngestJobInfoPanel; import org.sleuthkit.autopsy.casemodule.IngestJobInfoPanel;
import org.sleuthkit.datamodel.DataSource; import org.sleuthkit.datamodel.DataSource;
@ -141,12 +144,22 @@ public class DataSourceSummaryTabbedPane extends javax.swing.JPanel {
private DataSource dataSource = null; private DataSource dataSource = null;
private CardLayout cardLayout; private CardLayout cardLayout;
/**
* On case close, clear the currently held data source summary node.
*/
private final PropertyChangeListener caseEventsListener = (evt) -> {
if (evt.getPropertyName().equals(Case.Events.CURRENT_CASE.toString()) && evt.getNewValue() == null) {
setDataSource(null);
}
};
/** /**
* Creates new form TabPane * Creates new form TabPane
*/ */
public DataSourceSummaryTabbedPane() { public DataSourceSummaryTabbedPane() {
initComponents(); initComponents();
postInit(); postInit();
Case.addEventTypeSubscriber(EnumSet.of(Case.Events.CURRENT_CASE), caseEventsListener);
} }
/** /**
@ -199,12 +212,14 @@ public class DataSourceSummaryTabbedPane extends javax.swing.JPanel {
*/ */
public void setDataSource(DataSource dataSource) { public void setDataSource(DataSource dataSource) {
this.dataSource = dataSource; this.dataSource = dataSource;
if (this.dataSource == null) {
cardLayout.show(this, NO_DATASOURCE_PANE);
} else {
for (DataSourceTab tab : tabs) { for (DataSourceTab tab : tabs) {
tab.getOnDataSource().accept(dataSource); tab.getOnDataSource().accept(dataSource);
} }
if (this.dataSource == null) {
cardLayout.show(this, NO_DATASOURCE_PANE);
} else {
cardLayout.show(this, TABBED_PANE); cardLayout.show(this, TABBED_PANE);
} }
} }
@ -216,6 +231,8 @@ public class DataSourceSummaryTabbedPane extends javax.swing.JPanel {
for (DataSourceTab tab : tabs) { for (DataSourceTab tab : tabs) {
tab.getOnClose().run(); tab.getOnClose().run();
} }
Case.removeEventTypeSubscriber(EnumSet.of(Case.Events.CURRENT_CASE), caseEventsListener);
} }
/** /**