Merge pull request #7325 from gdicristofaro/8074-adhocIssues

8074 improve context menu for ad hoc search
sleuthkit · Oct 1, 2021 · ac29528 · ac29528
2 parents c49f039 + 22ca11b
commit ac29528
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AdHocSearchFilterNode.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AdHocSearchFilterNode.java
@@ -52,15 +52,15 @@
 
 /**
  * FilterNode containing properties and actions for keyword search.
- * 
+ *
  * Wraps the generic KeyValue node and customizes the property sheet and lookup
  */
 class AdHocSearchFilterNode extends FilterNode {
 
     /**
      * Instantiate a KeywordSearchFilterNode.
-     * 
-     * @param original         The original source node.
+     *
+     * @param original The original source node.
      */
     AdHocSearchFilterNode(Node original) {
         super(original, null, new ProxyLookup(original.getLookup()));
@@ -160,10 +160,20 @@ public List<Action> visit(VirtualDirectory dir) {
 
         private List<Action> getFileActions() {
             List<Action> actionsList = new ArrayList<>();
+
+            boolean hasAbstractFile = getOriginal().getLookup().lookup(AbstractFile.class) != null;
+
             actionsList.add(new NewWindowViewAction(NbBundle.getMessage(this.getClass(), "KeywordSearchFilterNode.getFileActions.viewInNewWinActionLbl"), AdHocSearchFilterNode.this));
-            actionsList.add(new ExternalViewerAction(NbBundle.getMessage(this.getClass(), "KeywordSearchFilterNode.getFileActions.openExternViewActLbl"), getOriginal()));
+
+            if (hasAbstractFile) {
+                actionsList.add(new ExternalViewerAction(NbBundle.getMessage(this.getClass(), "KeywordSearchFilterNode.getFileActions.openExternViewActLbl"), getOriginal()));
+            }
+
             actionsList.add(null);
-            actionsList.add(ExtractAction.getInstance());
+            if (hasAbstractFile) {
+                actionsList.add(ExtractAction.getInstance());
+            }
+
             actionsList.add(ExportCSVAction.getInstance());
             actionsList.add(null); // creates a menu separator
             actionsList.add(AddContentTagAction.getInstance());