From 07094de3552ec8b90b75415a7d603a210dfdc4cb Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Fri, 12 Nov 2021 09:11:16 -0500 Subject: [PATCH] fix in data fetcher --- .../autopsy/corecomponents/DataResultPanel.java | 3 +-- .../autopsy/mainui/datamodel/DataArtifactDAO.java | 10 ++++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java index e47dadde1f..a0fb40b3d7 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java @@ -1152,8 +1152,7 @@ public class DataResultPanel extends javax.swing.JPanel implements DataResult, C */ void displayDataArtifact(DataArtifactSearchParam dataArtifactParams) { try { - DataArtifactDAO dataArtDAO = MainDAO.getInstance().getDataArtifactsDAO(); - this.searchResultManager = new SearchManager(dataArtDAO.new DataArtifactFetcher(dataArtifactParams), getPageSize()); + this.searchResultManager = new SearchManager(new DataArtifactFetcher(dataArtifactParams), getPageSize()); SearchResultsDTO results = searchResultManager.getResults(); displaySearchResults(results, true); } catch (ExecutionException ex) { diff --git a/Core/src/org/sleuthkit/autopsy/mainui/datamodel/DataArtifactDAO.java b/Core/src/org/sleuthkit/autopsy/mainui/datamodel/DataArtifactDAO.java index 899e434a78..e374c0e929 100644 --- a/Core/src/org/sleuthkit/autopsy/mainui/datamodel/DataArtifactDAO.java +++ b/Core/src/org/sleuthkit/autopsy/mainui/datamodel/DataArtifactDAO.java @@ -220,8 +220,9 @@ public class DataArtifactDAO extends BlackboardArtifactDAO { /* * Handles fetching and paging of data artifacts. */ - public class DataArtifactFetcher extends DAOFetcher { - + public static class DataArtifactFetcher extends DAOFetcher { + private final DataArtifactDAO dao; + /** * Main constructor. * @@ -229,16 +230,17 @@ public class DataArtifactDAO extends BlackboardArtifactDAO { */ public DataArtifactFetcher(DataArtifactSearchParam params) { super(params); + this.dao = MainDAO.getInstance().getDataArtifactsDAO(); } @Override public SearchResultsDTO getSearchResults(int pageSize, int pageIdx, boolean hardRefresh) throws ExecutionException { - return MainDAO.getInstance().getDataArtifactsDAO().getDataArtifactsForTable(this.getParameters(), pageIdx * pageSize, (long) pageSize, hardRefresh); + return dao.getDataArtifactsForTable(this.getParameters(), pageIdx * pageSize, (long) pageSize, hardRefresh); } @Override public boolean isRefreshRequired(DAOEvent evt) { - return DataArtifactDAO.this.isDataArtifactInvalidating(this.getParameters(), evt); + return dao.isDataArtifactInvalidating(this.getParameters(), evt); } } }