From 08298e5dcec87bc66626e9939cbcd56841da0ff2 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Mon, 9 Apr 2018 16:14:32 -0400 Subject: [PATCH] 3610 retain selection through refreshes of explorer view for aid 2.0 --- .../autoingest/AutoIngestDashboard.java | 6 ++---- .../autoingest/AutoIngestJobsPanel.java | 14 ++++---------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestDashboard.java b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestDashboard.java index d0923b63ba..c3347adb32 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestDashboard.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestDashboard.java @@ -257,11 +257,9 @@ final class AutoIngestDashboard extends JPanel implements Observer { * @param jobsSnapshot The jobs snapshot. */ private void refreshTables(JobsSnapshot jobsSnapshot) { -// Node[] selectedPending = pendingJobsPanel.getSelectedNodes(); pendingJobsPanel.refresh(jobsSnapshot); -// pendingJobsPanel.setSelectedNodes(selectedPending); -// runningJobsPanel.refresh(jobsSnapshot); -// finishedJobsPanel.refresh(jobsSnapshot); + runningJobsPanel.refresh(jobsSnapshot); + finishedJobsPanel.refresh(jobsSnapshot); } /** diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestJobsPanel.java b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestJobsPanel.java index ba3b379023..ad8a92f97d 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestJobsPanel.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestJobsPanel.java @@ -19,17 +19,13 @@ package org.sleuthkit.autopsy.experimental.autoingest; import java.awt.Dimension; -import java.awt.EventQueue; import java.beans.PropertyVetoException; -import java.util.Enumeration; import javax.swing.ListSelectionModel; import javax.swing.event.ListSelectionListener; -import javax.swing.table.TableColumn; import org.netbeans.swing.outline.DefaultOutlineModel; import org.netbeans.swing.outline.Outline; import org.openide.explorer.ExplorerManager; import org.openide.nodes.Node; -import org.openide.util.Exceptions; import org.sleuthkit.autopsy.datamodel.EmptyNode; import org.sleuthkit.autopsy.experimental.autoingest.AutoIngestNode.AutoIngestJobType; import org.sleuthkit.autopsy.experimental.autoingest.AutoIngestNode.JobNode; @@ -117,16 +113,14 @@ final class AutoIngestJobsPanel extends javax.swing.JPanel implements ExplorerMa void refresh(AutoIngestMonitor.JobsSnapshot jobsSnapshot) { synchronized (this) { - // outline.setRowSelectionAllowed(false); + outline.setRowSelectionAllowed(false); Node[] selectedNodes = explorerManager.getSelectedNodes(); AutoIngestNode autoIngestNode = new AutoIngestNode(jobsSnapshot, type); explorerManager.setRootContext(autoIngestNode); outline.setRowSelectionAllowed(true); - EventQueue.invokeLater(() -> { - setSelectedNodes(selectedNodes); - System.out.println("SUCESS: " + selectedNodes.length); - - }); + if (selectedNodes.length > 0) { + setSelectedNodes(new Node[]{autoIngestNode.getChildren().findChild(selectedNodes[0].getName())}); + } } }