Merge branch 'keyword-search-prototype' of github.com:sleuthkit/autopsy into keyword-search-prototype

This commit is contained in:
Brian Carrier 2012-01-01 22:41:32 -05:00
commit 8a1fe57572

View File

@ -24,7 +24,6 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import org.sleuthkit.autopsy.datamodel.VolumeNode; import org.sleuthkit.autopsy.datamodel.VolumeNode;
import org.sleuthkit.autopsy.datamodel.FileNode;
import org.sleuthkit.autopsy.datamodel.DirectoryNode; import org.sleuthkit.autopsy.datamodel.DirectoryNode;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -34,6 +33,8 @@ import org.openide.explorer.ExplorerManager;
import org.openide.nodes.FilterNode; import org.openide.nodes.FilterNode;
import org.openide.nodes.Node; import org.openide.nodes.Node;
import org.openide.nodes.Sheet; import org.openide.nodes.Sheet;
import org.sleuthkit.autopsy.datamodel.AbstractFsContentNode.FsContentPropertyType;
import org.sleuthkit.autopsy.keywordsearch.IndexContentFilesAction;
import org.sleuthkit.datamodel.Content; import org.sleuthkit.datamodel.Content;
import org.sleuthkit.datamodel.ContentVisitor; import org.sleuthkit.datamodel.ContentVisitor;
import org.sleuthkit.datamodel.Directory; import org.sleuthkit.datamodel.Directory;
@ -41,6 +42,7 @@ import org.sleuthkit.datamodel.File;
import org.sleuthkit.datamodel.Image; import org.sleuthkit.datamodel.Image;
import org.sleuthkit.datamodel.Volume; import org.sleuthkit.datamodel.Volume;
/** /**
* This class wraps nodes as they are passed to the DataResult viewers. It * This class wraps nodes as they are passed to the DataResult viewers. It
* defines the actions that the node should have. * defines the actions that the node should have.
@ -52,11 +54,12 @@ public class DataResultFilterNode extends FilterNode{
/** the constructor */ /** the constructor */
public DataResultFilterNode(Node arg, ExplorerManager em) { public DataResultFilterNode(Node node, ExplorerManager em) {
super(arg, new DataResultFilterChildren(arg, em)); super(node, new DataResultFilterChildren(node, em));
this.sourceEm = em; this.sourceEm = em;
getActionsCV = new GetActionsContentVisitor(); getActionsCV = new GetActionsContentVisitor();
} }
/** /**
* Right click action for the nodes that we want to pass to the directory * Right click action for the nodes that we want to pass to the directory
@ -74,6 +77,8 @@ public class DataResultFilterNode extends FilterNode{
Content nodeContent = this.getOriginal().getLookup().lookup(Content.class); Content nodeContent = this.getOriginal().getLookup().lookup(Content.class);
actions.addAll(nodeContent.accept(getActionsCV)); actions.addAll(nodeContent.accept(getActionsCV));
//actions.add(new IndexContentFilesAction(nodeContent, "Index"));
return actions.toArray(new Action[actions.size()]); return actions.toArray(new Action[actions.size()]);
} }
@ -191,7 +196,7 @@ public class DataResultFilterNode extends FilterNode{
newPs.setShortDescription(ps.getShortDescription()); newPs.setShortDescription(ps.getShortDescription());
newPs.put(ps.getProperties()); newPs.put(ps.getProperties());
newPs.remove(FileNode.PROPERTY_LOCATION); newPs.remove(FsContentPropertyType.LOCATION.toString() );
propertySets[i] = newPs; propertySets[i] = newPs;
} }
} }