From 7ddec67c591bd50442dd425490569b65becbba5f Mon Sep 17 00:00:00 2001 From: adam-m Date: Mon, 5 Mar 2012 16:40:16 -0500 Subject: [PATCH] Add Explorer top component open action dynamically to menu only for selected explorers --- .../autopsy/corecomponentinterfaces/DataExplorer.java | 2 ++ .../autopsy/directorytree/DirectoryTreeTopComponent.java | 7 +++++++ .../autopsy/filesearch/FileSearchTopComponent.java | 5 +++++ .../autopsy/keywordsearch/KeywordSearchDataExplorer.java | 5 +++++ .../autopsy/menuactions/DataExplorerDynamicMenu.java | 5 ++++- 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataExplorer.java b/CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataExplorer.java index 0b0cdffcf1..1d4580c79d 100644 --- a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataExplorer.java +++ b/CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataExplorer.java @@ -35,5 +35,7 @@ public interface DataExplorer extends PropertyChangeListener { * @return the DataExplorer's TopComponent */ public TopComponent getTopComponent(); + + public boolean hasMenuOpenAction(); } diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java b/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java index cfdb568a6b..e6a3ee2da4 100644 --- a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java +++ b/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java @@ -708,6 +708,13 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat return this; } + @Override + public boolean hasMenuOpenAction() { + return false; + } + + + @Override public void viewArtifact(final BlackboardArtifact art) { BlackboardArtifact.ARTIFACT_TYPE type = BlackboardArtifact.ARTIFACT_TYPE.fromID(art.getArtifactTypeID()); diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/FileSearchTopComponent.java b/FileSearch/src/org/sleuthkit/autopsy/filesearch/FileSearchTopComponent.java index 007efecbb5..071b4a68b6 100644 --- a/FileSearch/src/org/sleuthkit/autopsy/filesearch/FileSearchTopComponent.java +++ b/FileSearch/src/org/sleuthkit/autopsy/filesearch/FileSearchTopComponent.java @@ -348,4 +348,9 @@ public final class FileSearchTopComponent extends TopComponent implements DataEx public TopComponent getTopComponent() { return this; } + + @Override + public boolean hasMenuOpenAction() { + return true; + } } \ No newline at end of file diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchDataExplorer.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchDataExplorer.java index 968477b535..0f3d0c89f9 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchDataExplorer.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchDataExplorer.java @@ -109,6 +109,11 @@ public class KeywordSearchDataExplorer implements DataExplorer { public org.openide.windows.TopComponent getTopComponent() { return this.tc; } + + @Override + public boolean hasMenuOpenAction() { + return false; + } @Override public void propertyChange(PropertyChangeEvent evt) { diff --git a/MenuActions/src/org/sleuthkit/autopsy/menuactions/DataExplorerDynamicMenu.java b/MenuActions/src/org/sleuthkit/autopsy/menuactions/DataExplorerDynamicMenu.java index 9321e4a3d0..6566146880 100644 --- a/MenuActions/src/org/sleuthkit/autopsy/menuactions/DataExplorerDynamicMenu.java +++ b/MenuActions/src/org/sleuthkit/autopsy/menuactions/DataExplorerDynamicMenu.java @@ -44,8 +44,11 @@ public class DataExplorerDynamicMenu extends JMenuItem implements DynamicMenuCon int totalItem = dataExplorers.size(); JComponent[] comps = new JComponent[totalItem]; + int i = 0; for(DataExplorer dx : dataExplorers){ + if (! dx.hasMenuOpenAction()) + continue; TopComponent explorerWin = dx.getTopComponent(); JMenuItem item = new JMenuItem(explorerWin.getName()); item.addActionListener(new OpenTopComponentAction(explorerWin)); @@ -58,7 +61,7 @@ public class DataExplorerDynamicMenu extends JMenuItem implements DynamicMenuCon } comps[i++] = item; - } + } return comps; }