diff --git a/Core/src/org/sleuthkit/autopsy/mainui/nodes/AnalysisResultTypeFactory.java b/Core/src/org/sleuthkit/autopsy/mainui/nodes/AnalysisResultTypeFactory.java index b7b3438b8e..a09eb4c4ff 100644 --- a/Core/src/org/sleuthkit/autopsy/mainui/nodes/AnalysisResultTypeFactory.java +++ b/Core/src/org/sleuthkit/autopsy/mainui/nodes/AnalysisResultTypeFactory.java @@ -507,7 +507,8 @@ public class AnalysisResultTypeFactory extends TreeChildFactory analysisResultType = actionContext.getAnalysisResultType(); - if (analysisResultType.isPresent()) { - Optional configuration = actionContext.getAnalysisResultConfiguration(); - - //dataSourceId.map(d -> Long.toString(d)).orElse(""); - Optional dataSourceId = actionContext.getDataSourceIdForActions(); - - actionGroups.add(new ActionGroup(new DeleteAnalysisResultSetAction(analysisResultType.get(), - configuration.isPresent() ? configuration.get() : "", - dataSourceId.isPresent() ? dataSourceId.get() : null))); - - actionGroups.add(new ActionGroup(new AbstractAction("Delete Analysis Results of Type") { - @Override - public void actionPerformed(ActionEvent e) { - JOptionPane.showMessageDialog(WindowManager.getDefault().getMainWindow(), - MessageFormat.format("Stub Action for deleting analysis result type: {0} with configuration {1} and data source of {2}", - analysisResultType.get().getDisplayName(), - configuration.map(c -> c == null ? "" : c).orElse(""), - dataSourceId.map(d -> Long.toString(d)).orElse("")), - "Deleting...", - JOptionPane.WARNING_MESSAGE); - } - })); - }*/ - List actionList = new ArrayList<>(); for (ActionGroup aGroup : actionGroups) { if (aGroup != null) { diff --git a/Core/src/org/sleuthkit/autopsy/mainui/nodes/actions/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/mainui/nodes/actions/Bundle.properties-MERGED index 32f6200971..54bc7d9f30 100755 --- a/Core/src/org/sleuthkit/autopsy/mainui/nodes/actions/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/mainui/nodes/actions/Bundle.properties-MERGED @@ -24,4 +24,4 @@ ArtifactFactory_getViewSrcContentAction_displayName=View Source {0} in Directory # {0} - contentType ArtifactFactory_getViewSrcContentAction_displayName2=View Source {0} DeleteAnalysisResultAction_label=Delete Analysis Result -DeleteKeywordSetAction_label=Delete Keyword Search Results +DeleteKeywordSetAction_label=Delete Analysis Results diff --git a/Core/src/org/sleuthkit/autopsy/mainui/nodes/actions/DeleteAnalysisResultSetAction.java b/Core/src/org/sleuthkit/autopsy/mainui/nodes/actions/DeleteAnalysisResultSetAction.java index 494fd34e86..f7b1f348f4 100755 --- a/Core/src/org/sleuthkit/autopsy/mainui/nodes/actions/DeleteAnalysisResultSetAction.java +++ b/Core/src/org/sleuthkit/autopsy/mainui/nodes/actions/DeleteAnalysisResultSetAction.java @@ -20,21 +20,12 @@ package org.sleuthkit.autopsy.mainui.nodes.actions; import java.awt.event.ActionEvent; -import java.util.Collection; import java.util.logging.Level; import javax.swing.AbstractAction; import javax.swing.SwingWorker; -import org.openide.explorer.ExplorerManager; -import org.openide.explorer.view.BeanTreeView; -import org.openide.nodes.Children; -import org.openide.nodes.Node; import org.openide.util.NbBundle.Messages; -import org.openide.util.Utilities; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.coreutils.Logger; -import org.sleuthkit.autopsy.directorytree.DirectoryTreeTopComponent; -import org.sleuthkit.autopsy.mainui.datamodel.KeywordSearchTermParams; -import org.sleuthkit.datamodel.AnalysisResult; import org.sleuthkit.datamodel.BlackboardArtifact; import org.sleuthkit.datamodel.TskCoreException; @@ -63,13 +54,6 @@ public class DeleteAnalysisResultSetAction extends AbstractAction { @Override public void actionPerformed(ActionEvent e) { - //ExplorerManager em = DirectoryTreeTopComponent.findInstance().getExplorerManager(); - //Node[] selectedNode = em.getSelectedNodes(); - //Children c = selectedNode[0].getChildren(); - //for (Node next : c.getNodes()) { - //} - - SwingWorker worker = new SwingWorker() { @Override protected Void doInBackground() throws Exception { @@ -87,8 +71,7 @@ public class DeleteAnalysisResultSetAction extends AbstractAction { } }; - worker.execute(); - + worker.execute(); } }