Md5Node used to display common files search
- * results in the top right pane. Calls Md5NodeFactory.
+ * results in the top right pane. Calls InstanceCountNodeFactory.
*/
final public class CommonFilesNode extends DisplayableItemNode {
CommonFilesNode(CommonFilesMetadata metadataList) {
- super(Children.create(new Md5NodeFactory(metadataList), true), Lookups.singleton(CommonFilesNode.class));
+ super(Children.create(new InstanceCountNodeFactory(metadataList), true));
}
@NbBundle.Messages({
@@ -60,37 +58,33 @@ final public class CommonFilesNode extends DisplayableItemNode {
public String getItemType() {
return getClass().getName();
}
-
+
/**
- * ChildFactory which builds CommonFileParentNodes from the
- * CommonFilesMetaaData models.
+ * Used to generate InstanceCountNodes.
*/
- static class Md5NodeFactory extends ChildFactoryCommonFilesMetadata
+ * object into DisplayableItemNodes.
+ * @param metadata
*/
- private CommonFilesMetadata metadata;
-
- Md5NodeFactory(CommonFilesMetadata metadata) {
+ InstanceCountNodeFactory(CommonFilesMetadata metadata){
this.metadata = metadata;
}
-
- protected void removeNotify() {
- metadata = null;
- }
-
+
@Override
- protected Node createNodeForKey(String md5){
- Md5Metadata metadata = this.metadata.getMetadataForMd5(md5);
- return new Md5Node(metadata);
- }
-
- @Override
- protected boolean createKeys(ListDataResultViewerTable which overrides the default column header
+ * width calculations. The CommonFilesSearchResultsViewerTable
+ * presents multiple tiers of data which are not always present and it may not
+ * make sense to try to calculate the column widths for such tables by sampling
+ * rows and looking for wide cells. Rather, we just pick some reasonable values.
+ */
+public class CommonFilesSearchResultsViewerTable extends DataResultViewerTable {
+
+ private static final MapMd5Nodes.
+ */
+public class FileInstanceNode extends FileNode {
+
+ private final String dataSource;
+
+ /**
+ * Create a node which can be used in a multilayer tree table and is based
+ * on an AbstractFile.
+ *
+ * @param fsContent
+ * @param dataSource
+ */
+ public FileInstanceNode(AbstractFile fsContent, String dataSource) {
+ super(fsContent);
+ this.dataSource = dataSource;
+
+ this.setDisplayName(fsContent.getName());
+ }
+
+ @Override
+ public boolean isLeafTypeNode(){
+ //Not used atm - could maybe be leveraged for better use in Children objects
+ return true;
+ }
+
+ @Override
+ public Children implementation for a
+ * TableFilterNode. A
+ * TableFilterNode creates at most one layer of child
+ * nodes for the node it wraps. It is designed to be used in the results view
+ * to ensure the individual viewers display only the first layer of child nodes.
*/
class TableFilterChildren extends FilterNode.Children {
/**
* Creates a Children object for a TableFilterNode. A TableFilterNode
- * creates at most one layer of child nodes for the node it wraps. It is
- * designed to be used in the results view to ensure the individual viewers
- * display only the first layer of child nodes.
+ creates at most one layer of child nodes for the node it wraps. It is
+ designed to be used in the results view to ensure the individual viewers
+ display only the first layer of child nodes.
*
- *
- * @param wrappedNode The node wrapped by the TableFilterNode.
+ * @param wrappedNode The node wrapped by the TableFilterNode.
* @param createChildren True if a children (child factory) object should be
- * created for the wrapped node.
+ * created for the wrapped node.
*
- * @return A children (child factory) object for a node wrapped by a
- * TableFilterNode.
+ * @return A children (child factory) object for a node wrapped by a TableFilterNode.
*/
public static Children createInstance(Node wrappedNode, boolean createChildren) {
-
+
if (createChildren) {
return new TableFilterChildren(wrappedNode);
} else {
@@ -54,9 +53,10 @@ class TableFilterChildren extends FilterNode.Children {
}
/**
- * Constructs a children (child factory) implementation for a
- * TableFilterNode. A TableFilterNode creates at most one layer of child
- * nodes for the node it wraps. It is designed to be used for nodes
+ * Constructs a children (child factory) implementation for a
+ * TableFilterNode. A
+ * TableFilterNode creates at most one layer of
+ * child nodes for the node it wraps. It is designed to be used for nodes
* displayed in Autopsy table views.
*
* @param wrappedNode The node wrapped by the TableFilterNode.
@@ -64,10 +64,10 @@ class TableFilterChildren extends FilterNode.Children {
TableFilterChildren(Node wrappedNode) {
super(wrappedNode);
}
-
+
/**
- * Copies a TableFilterNode, with the create children (child factory) flag
- * set to false.
+ * Copies a TableFilterNode, with the create children
+ (child factory) flag set to false.
*
* @param nodeToCopy The TableFilterNode to copy.
*
@@ -90,5 +90,4 @@ class TableFilterChildren extends FilterNode.Children {
protected Node[] createNodes(Node key) {
return new Node[]{this.copyNode(key)};
}
-
}
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterChildrenWithDescendants.java b/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterChildrenWithDescendants.java
index 5a5c865bfc..6f5f32b247 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterChildrenWithDescendants.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterChildrenWithDescendants.java
@@ -27,21 +27,39 @@ import org.openide.nodes.Node;
* of rows (plus/minus buttons for each row with children).
*/
final class TableFilterChildrenWithDescendants extends TableFilterChildren {
-
- private TableFilterChildrenWithDescendants(Node wrappedNode) {
+
+ private final int childLayerDepth;
+
+ /**
+ * Used to create children of the given node, with the specified number of
+ * child generations.
+ *
+ * @param wrappedNode node with children
+ * @param childLayerDepth number of subsequent generations.
+ */
+ private TableFilterChildrenWithDescendants(Node wrappedNode, int childLayerDepth) {
super(wrappedNode);
+ this.childLayerDepth = childLayerDepth;
}
- public static Children createInstance(Node wrappedNode, boolean createChildren){
- if(createChildren){
- return new TableFilterChildrenWithDescendants(wrappedNode);
- } else {
+ /**
+ * Factory method for getting an instance of the Children object based on the
+ * node with children, and the number of subsequent generations.
+ *
+ * @param wrappedNode node that has children
+ * @param childLayerDepth
+ * @return object capable of generating child node
+ */
+ public static Children createInstance(Node wrappedNode, int childLayerDepth){
+ if(childLayerDepth == 0){
return Children.LEAF;
+ } else {
+ return new TableFilterChildrenWithDescendants(wrappedNode, childLayerDepth - 1);
}
}
@Override
protected Node copyNode(Node nodeToCopy){
- return new TableFilterNode(nodeToCopy, true, true);
- }
+ return new TableFilterNode(nodeToCopy, this.childLayerDepth);
+ }
}
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterNode.java b/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterNode.java
index 879f625b6e..eb36cf2e87 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterNode.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterNode.java
@@ -33,7 +33,7 @@ import org.sleuthkit.autopsy.directorytree.DataResultFilterNode;
public class TableFilterNode extends FilterNode {
private final boolean createChildren;
- private boolean forceUseWrappedDisplayName = false;
+ private final boolean forceUseWrappedDisplayName;
private String columnOrderKey = "NONE";
/**
@@ -48,34 +48,8 @@ public class TableFilterNode extends FilterNode {
*/
public TableFilterNode(Node node, boolean createChildren) {
super(node, TableFilterChildren.createInstance(node, createChildren), Lookups.proxy(node));
- this.createChildren = createChildren;
- }
-
- /**
- * Constructs a filter node that generates children using
- * TableFilterChildrenWithDescendants. This enables row to have descendants.
- *
- * Enables use of getDisplayName() for children of this node.
- *
- * @param node The node to wrap
- */
- public TableFilterNode(Node node) {
- super(node, TableFilterChildrenWithDescendants.createInstance(node, true), Lookups.proxy(node));
- this.createChildren = true;
this.forceUseWrappedDisplayName = false;
- }
-
- /**
- * To be used in TableFilterChildrenWithDescendants.
- *
- * @param node node to wrap
- * @param createChildren node has children?
- * @param forceUseWrappedDisplayName allow use of custom getDisplayName() .
- */
- TableFilterNode(Node node, boolean createChildren, boolean forceUseWrappedDisplayName) {
- super(node, TableFilterChildren.createInstance(node, createChildren), Lookups.proxy(node));
this.createChildren = createChildren;
- this.forceUseWrappedDisplayName = forceUseWrappedDisplayName;
}
/**
@@ -92,9 +66,16 @@ public class TableFilterNode extends FilterNode {
*/
public TableFilterNode(Node node, boolean createChildren, String columnOrderKey) {
super(node, TableFilterChildren.createInstance(node, createChildren));
+ this.forceUseWrappedDisplayName = false;
this.createChildren = createChildren;
this.columnOrderKey = columnOrderKey;
}
+
+ public TableFilterNode(Node node, int childLayerDepth){
+ super(node, TableFilterChildrenWithDescendants.createInstance(node, childLayerDepth), Lookups.proxy(node));
+ this.createChildren = true;
+ this.forceUseWrappedDisplayName = true;
+ }
/**
* Gets the display name for the wrapped node, for use in the first column
@@ -113,10 +94,6 @@ public class TableFilterNode extends FilterNode {
}
}
- protected String getParentDisplayName() {
- return super.getDisplayName();
- }
-
/**
* Adds information about which child node of this node, if any, should be
* selected. Can be null.
@@ -159,8 +136,7 @@ public class TableFilterNode extends FilterNode {
* DataResultViewerTable. The key should represent what kinds of items the
* table is showing.
*/
- String getColumnOrderKey() {
+ public String getColumnOrderKey() {
return columnOrderKey;
}
-
}
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java b/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java
index 11e92836ac..e856b25418 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java
@@ -59,10 +59,11 @@ import javax.imageio.stream.ImageInputStream;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.concurrent.BasicThreadFactory;
-import org.opencv.core.Core;
import org.openide.util.NbBundle;
+import org.openide.util.NbBundle.Messages;
import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
+import org.sleuthkit.autopsy.corelibs.OpenCvLoader;
import org.sleuthkit.autopsy.corelibs.ScalrWrapper;
import org.sleuthkit.autopsy.modules.filetypeid.FileTypeDetector;
import org.sleuthkit.autopsy.modules.filetypeid.FileTypeDetector.FileTypeDetectorInitException;
@@ -96,7 +97,7 @@ public class ImageUtils {
private static final List