From e28f078f69c2041e243532d1ccc54fdd64abe846 Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Wed, 10 Nov 2021 15:44:59 -0500
Subject: [PATCH] Moved SelectionResponder to fix build errors
---
.../SelectionResponder.java | 2 +-
.../datamodel/AbstractContentNode.java | 2 +-
.../autopsy/datamodel/Artifacts.java | 2 +-
.../autopsy/datamodel/HashsetHits.java | 2 +-
.../sleuthkit/autopsy/datamodel/HostNode.java | 2 +-
.../autopsy/datamodel/KeywordHits.java | 2 +-
.../org/sleuthkit/autopsy/datamodel/Tags.java | 2 +-
.../DirectoryTreeTopComponent.java | 2 +-
.../autopsy/mainui/nodes/TreeNode.java | 1 +
.../imagegallery/FileIDSelectionModel.java | 38 +++++++++----------
10 files changed, 28 insertions(+), 27 deletions(-)
rename Core/src/org/sleuthkit/autopsy/{mainui/nodes => corecomponents}/SelectionResponder.java (95%)
diff --git a/Core/src/org/sleuthkit/autopsy/mainui/nodes/SelectionResponder.java b/Core/src/org/sleuthkit/autopsy/corecomponents/SelectionResponder.java
similarity index 95%
rename from Core/src/org/sleuthkit/autopsy/mainui/nodes/SelectionResponder.java
rename to Core/src/org/sleuthkit/autopsy/corecomponents/SelectionResponder.java
index b7370485d6..91fbb1248d 100755
--- a/Core/src/org/sleuthkit/autopsy/mainui/nodes/SelectionResponder.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/SelectionResponder.java
@@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.sleuthkit.autopsy.mainui.nodes;
+package org.sleuthkit.autopsy.corecomponents;
import org.sleuthkit.autopsy.corecomponents.DataResultTopComponent;
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractContentNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractContentNode.java
index 00f80a04fa..1f581b8d6b 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractContentNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractContentNode.java
@@ -40,7 +40,7 @@
import org.sleuthkit.autopsy.corecomponents.DataResultViewerTable;
import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.mainui.datamodel.FileSystemContentSearchParam;
-import org.sleuthkit.autopsy.mainui.nodes.SelectionResponder;
+import org.sleuthkit.autopsy.corecomponents.SelectionResponder;
import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE;
import org.sleuthkit.datamodel.Content;
import org.sleuthkit.datamodel.Score;
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/Artifacts.java b/Core/src/org/sleuthkit/autopsy/datamodel/Artifacts.java
index 220b3aae76..3d578bc54d 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/Artifacts.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/Artifacts.java
@@ -54,7 +54,7 @@
import org.python.google.common.collect.Sets;
import org.sleuthkit.autopsy.corecomponents.DataResultTopComponent;
import org.sleuthkit.autopsy.mainui.datamodel.AnalysisResultSearchParam;
-import org.sleuthkit.autopsy.mainui.nodes.SelectionResponder;
+import org.sleuthkit.autopsy.corecomponents.SelectionResponder;
import org.sleuthkit.datamodel.Blackboard;
import static org.sleuthkit.datamodel.BlackboardArtifact.Type.TSK_ACCOUNT;
import static org.sleuthkit.datamodel.BlackboardArtifact.Type.TSK_DATA_SOURCE_USAGE;
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java b/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java
index 743cab10d6..89d21f4324 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java
@@ -54,7 +54,7 @@
import org.sleuthkit.datamodel.TskCoreException;
import org.sleuthkit.autopsy.datamodel.Artifacts.UpdatableCountTypeNode;
import org.sleuthkit.autopsy.mainui.datamodel.HashHitSearchParam;
-import org.sleuthkit.autopsy.mainui.nodes.SelectionResponder;
+import org.sleuthkit.autopsy.corecomponents.SelectionResponder;
/**
* Hash set hits node support. Inner classes have all of the nodes in the tree.
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/HostNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/HostNode.java
index a42c9114b1..f043463268 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/HostNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/HostNode.java
@@ -46,7 +46,7 @@
import org.sleuthkit.autopsy.datamodel.hosts.MergeHostMenuAction;
import org.sleuthkit.autopsy.datamodel.hosts.RemoveParentPersonAction;
import org.sleuthkit.autopsy.mainui.datamodel.FileSystemHostSearchParam;
-import org.sleuthkit.autopsy.mainui.nodes.SelectionResponder;
+import org.sleuthkit.autopsy.corecomponents.SelectionResponder;
import org.sleuthkit.datamodel.DataSource;
import org.sleuthkit.datamodel.Host;
import org.sleuthkit.datamodel.Person;
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java b/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java
index ef4f1bd299..1464d07070 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java
@@ -60,7 +60,7 @@
import static org.sleuthkit.datamodel.BlackboardArtifact.Type.TSK_KEYWORD_HIT;
import org.sleuthkit.autopsy.datamodel.Artifacts.UpdatableCountTypeNode;
import org.sleuthkit.autopsy.mainui.datamodel.KeywordHitSearchParam;
-import org.sleuthkit.autopsy.mainui.nodes.SelectionResponder;
+import org.sleuthkit.autopsy.corecomponents.SelectionResponder;
import org.sleuthkit.datamodel.AnalysisResult;
/**
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/Tags.java b/Core/src/org/sleuthkit/autopsy/datamodel/Tags.java
index 4291d118fb..56f160c9f0 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/Tags.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/Tags.java
@@ -45,7 +45,7 @@
import org.sleuthkit.autopsy.mainui.datamodel.TagsSearchParams;
import static org.sleuthkit.autopsy.mainui.datamodel.TagsSearchParams.TagType.FILE;
import static org.sleuthkit.autopsy.mainui.datamodel.TagsSearchParams.TagType.RESULT;
-import org.sleuthkit.autopsy.mainui.nodes.SelectionResponder;
+import org.sleuthkit.autopsy.corecomponents.SelectionResponder;
import org.sleuthkit.autopsy.tags.TagUtils;
import org.sleuthkit.datamodel.BlackboardArtifactTag;
import org.sleuthkit.datamodel.ContentTag;
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
index 2504e7c049..c0a64b7f2b 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
@@ -89,7 +89,7 @@
import org.sleuthkit.autopsy.datamodel.ViewsNode;
import org.sleuthkit.autopsy.datamodel.accounts.Accounts;
import org.sleuthkit.autopsy.datamodel.accounts.BINRange;
-import org.sleuthkit.autopsy.mainui.nodes.SelectionResponder;
+import org.sleuthkit.autopsy.corecomponents.SelectionResponder;
import org.sleuthkit.datamodel.Account;
import org.sleuthkit.datamodel.BlackboardArtifact;
import org.sleuthkit.datamodel.BlackboardArtifact.Category;
diff --git a/Core/src/org/sleuthkit/autopsy/mainui/nodes/TreeNode.java b/Core/src/org/sleuthkit/autopsy/mainui/nodes/TreeNode.java
index 7229825d89..847069d12e 100644
--- a/Core/src/org/sleuthkit/autopsy/mainui/nodes/TreeNode.java
+++ b/Core/src/org/sleuthkit/autopsy/mainui/nodes/TreeNode.java
@@ -18,6 +18,7 @@
*/
package org.sleuthkit.autopsy.mainui.nodes;
+import org.sleuthkit.autopsy.corecomponents.SelectionResponder;
import java.text.MessageFormat;
import java.util.logging.Level;
import org.openide.nodes.AbstractNode;
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/FileIDSelectionModel.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/FileIDSelectionModel.java
index d960308f65..4c79409654 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/FileIDSelectionModel.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/FileIDSelectionModel.java
@@ -66,25 +66,25 @@ public FileIDSelectionModel(ImageGalleryController controller) {
selected.addListener((Observable observable) -> {
Set<Long> fileIDs = ImmutableSet.copyOf(selected);
SwingUtilities.invokeLater(() -> {
- ArrayList<FileNode> fileNodes = new ArrayList<>();
- for (Long id : fileIDs) {
- try {
- fileNodes.add(new FileNode(controller.getCaseDatabase().getAbstractFileById(id)));
- } catch (TskCoreException ex) {
- LOGGER.log(Level.SEVERE, "Failed to get abstract file by its ID", ex); //NON-NLS
- }
- }
- FileNode[] fileNodeArray = fileNodes.stream().toArray(FileNode[]::new);
- Children.Array children = new Children.Array();
- children.add(fileNodeArray);
-
- ImageGalleryTopComponent etc = ImageGalleryTopComponent.getTopComponent();
- etc.getExplorerManager().setRootContext(new AbstractNode(children));
- try {
- etc.getExplorerManager().setSelectedNodes(fileNodeArray);
- } catch (PropertyVetoException ex) {
- LOGGER.log(Level.SEVERE, "Explorer manager selection was vetoed.", ex); //NON-NLS
- }
+// ArrayList<FileNode> fileNodes = new ArrayList<>();
+// for (Long id : fileIDs) {
+// try {
+// fileNodes.add(new FileNode(controller.getCaseDatabase().getAbstractFileById(id)));
+// } catch (TskCoreException ex) {
+// LOGGER.log(Level.SEVERE, "Failed to get abstract file by its ID", ex); //NON-NLS
+// }
+// }
+// FileNode[] fileNodeArray = fileNodes.stream().toArray(FileNode[]::new);
+// Children.Array children = new Children.Array();
+// children.add(fileNodeArray);
+//
+// ImageGalleryTopComponent etc = ImageGalleryTopComponent.getTopComponent();
+// etc.getExplorerManager().setRootContext(new AbstractNode(children));
+// try {
+// etc.getExplorerManager().setSelectedNodes(fileNodeArray);
+// } catch (PropertyVetoException ex) {
+// LOGGER.log(Level.SEVERE, "Explorer manager selection was vetoed.", ex); //NON-NLS
+// }
});
});
}
--
GitLab