From c3394d9ee7125513cdeba01deae4c4b83a97b54d Mon Sep 17 00:00:00 2001 From: Brian Sweeney Date: Mon, 18 Jun 2018 10:49:27 -0600 Subject: [PATCH] cleanup --- .../commonfilesearch/CommonFilesNode.java | 7 +++---- .../commonfilesearch/CommonFilesPanel.java | 2 +- .../MultiLayerTableFilterNode.java | 4 ++-- .../SingleLayerTableFilterNode.java | 20 +++++++------------ .../corecomponents/TableFilterChildren.java | 1 - .../corecomponents/TableFilterNode.java | 3 +++ .../autopsy/datamodel/InstanceCountNode.java | 14 ++++++------- .../sleuthkit/autopsy/datamodel/Md5Node.java | 5 +---- 8 files changed, 24 insertions(+), 32 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesNode.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesNode.java index 0a07c706c9..aa6d310219 100644 --- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesNode.java +++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesNode.java @@ -24,7 +24,6 @@ import org.openide.nodes.ChildFactory; import org.openide.nodes.Children; import org.openide.nodes.Node; import org.openide.util.NbBundle; -import org.openide.util.lookup.Lookups; import org.sleuthkit.autopsy.datamodel.DisplayableItemNode; import org.sleuthkit.autopsy.datamodel.DisplayableItemNodeVisitor; @@ -63,7 +62,7 @@ final public class CommonFilesNode extends DisplayableItemNode { static class InstanceCountNodeFactory extends ChildFactory{ - private CommonFilesMetadata metadata; + private final CommonFilesMetadata metadata; InstanceCountNodeFactory(CommonFilesMetadata metadata){ this.metadata = metadata; @@ -77,8 +76,8 @@ final public class CommonFilesNode extends DisplayableItemNode { @Override protected Node createNodeForKey(Integer instanceCount){ - List metadata= this.metadata.getMetadataForMd5(instanceCount); - return new InstanceCountNode(instanceCount, metadata); + List md5Metadata = this.metadata.getMetadataForMd5(instanceCount); + return new InstanceCountNode(instanceCount, md5Metadata); } } } diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java index a96d5b407c..8c0a3bd4cd 100644 --- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java +++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java @@ -35,7 +35,6 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer; import org.sleuthkit.autopsy.corecomponents.DataResultTopComponent; import org.sleuthkit.autopsy.corecomponents.DataResultViewerTable; import org.sleuthkit.autopsy.corecomponents.MultiLayerTableFilterNode; -import org.sleuthkit.autopsy.corecomponents.SingleLayerTableFilterNode; import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil; import org.sleuthkit.autopsy.directorytree.DataResultFilterNode; @@ -243,6 +242,7 @@ public final class CommonFilesPanel extends javax.swing.JPanel { CommonFilesNode commonFilesNode = new CommonFilesNode(metadata); + //TODO this could be enumerating the children!!! DataResultFilterNode dataResultFilterNode = new DataResultFilterNode(commonFilesNode, ExplorerManager.find(CommonFilesPanel.this)); MultiLayerTableFilterNode tableFilterWithDescendantsNode = new MultiLayerTableFilterNode(dataResultFilterNode); diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/MultiLayerTableFilterNode.java b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiLayerTableFilterNode.java index 176a448379..2c26b2c345 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/MultiLayerTableFilterNode.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiLayerTableFilterNode.java @@ -34,8 +34,8 @@ import org.sleuthkit.autopsy.directorytree.DataResultFilterNode; public class MultiLayerTableFilterNode extends FilterNode implements TableFilterNode { private final boolean createChildren; - private boolean forceUseWrappedDisplayName = false; - private String columnOrderKey = "NONE"; + private final boolean forceUseWrappedDisplayName; + private static final String columnOrderKey = "NONE"; /** * Constructs a filter node that generates children using diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/SingleLayerTableFilterNode.java b/Core/src/org/sleuthkit/autopsy/corecomponents/SingleLayerTableFilterNode.java index 207053dc5e..cb27bf89d7 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/SingleLayerTableFilterNode.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/SingleLayerTableFilterNode.java @@ -33,7 +33,7 @@ import org.sleuthkit.autopsy.directorytree.DataResultFilterNode; public class SingleLayerTableFilterNode extends FilterNode implements TableFilterNode { private final boolean createChildren; - private boolean forceUseWrappedDisplayName = false; + private final boolean forceUseWrappedDisplayName; private String columnOrderKey = "NONE"; /** @@ -48,20 +48,9 @@ public class SingleLayerTableFilterNode extends FilterNode implements TableFilte */ public SingleLayerTableFilterNode(Node node, boolean createChildren) { super(node, TableFilterChildren.createInstance(node, createChildren), Lookups.proxy(node)); + this.forceUseWrappedDisplayName = false; this.createChildren = createChildren; } -// /** -// * To be used in TableFilterChildrenWithDescendants. -// * -// * @param node node to wrap -// * @param createChildren node has children? -// * @param forceUseWrappedDisplayName allow use of custom getDisplayName() . -// */ -// SingleLayerTableFilterNode(Node node, boolean createChildren, boolean forceUseWrappedDisplayName) { -// super(node, TableFilterChildren.createInstance(node, createChildren), Lookups.proxy(node)); -// this.createChildren = createChildren; -// this.forceUseWrappedDisplayName = forceUseWrappedDisplayName; -// } /** * Constructs a filter node that creates at most one layer of child nodes @@ -77,6 +66,7 @@ public class SingleLayerTableFilterNode extends FilterNode implements TableFilte */ public SingleLayerTableFilterNode(Node node, boolean createChildren, String columnOrderKey) { super(node, TableFilterChildren.createInstance(node, createChildren)); + this.forceUseWrappedDisplayName = false; this.createChildren = createChildren; this.columnOrderKey = columnOrderKey; } @@ -98,6 +88,7 @@ public class SingleLayerTableFilterNode extends FilterNode implements TableFilte } } + @Override public String getParentDisplayName() { return super.getDisplayName(); } @@ -108,6 +99,7 @@ public class SingleLayerTableFilterNode extends FilterNode implements TableFilte * * @param selectedChildNodeInfo The child node selection information. */ + @Override public void setChildNodeSelectionInfo(NodeSelectionInfo selectedChildNodeInfo) { /* * Currently, child selection is only supported for nodes selected in @@ -125,6 +117,7 @@ public class SingleLayerTableFilterNode extends FilterNode implements TableFilte * @return The child node selection information, or null if no child should * be selected. */ + @Override public NodeSelectionInfo getChildNodeSelectionInfo() { /* * Currently, child selection is only supported for nodes selected in @@ -144,6 +137,7 @@ public class SingleLayerTableFilterNode extends FilterNode implements TableFilte * DataResultViewerTable. The key should represent what kinds of items the * table is showing. */ + @Override public String getColumnOrderKey() { return columnOrderKey; } diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterChildren.java b/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterChildren.java index 41c63cb57e..cc42efebb7 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterChildren.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterChildren.java @@ -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/TableFilterNode.java b/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterNode.java index 0f925c3f77..0a798f971c 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterNode.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterNode.java @@ -25,6 +25,9 @@ import org.sleuthkit.autopsy.datamodel.NodeSelectionInfo; * Specifies behavior of nodes which are displayed in the DataResultTopComponent. */ public interface TableFilterNode { + + //TODO DisplayableItemNode + //TODO would be nice if this could be cast to Node - probably not totally critical... /** * Gets information about which child node of this node, if any, should be diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/InstanceCountNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/InstanceCountNode.java index eec29a4608..cc7f23eda7 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/InstanceCountNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/InstanceCountNode.java @@ -19,6 +19,7 @@ */ package org.sleuthkit.autopsy.datamodel; +import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; @@ -29,7 +30,6 @@ import org.openide.nodes.Children; import org.openide.nodes.Node; import org.openide.nodes.Sheet; import org.openide.util.NbBundle; -import org.openide.util.lookup.Lookups; import org.sleuthkit.autopsy.commonfilesearch.Md5Metadata; /** @@ -54,7 +54,7 @@ final public class InstanceCountNode extends DisplayableItemNode { } List getMetadata() { - return this.metadataList; + return Collections.unmodifiableList(this.metadataList); } @Override @@ -101,7 +101,7 @@ final public class InstanceCountNode extends DisplayableItemNode { * @param node The item to get properties for. */ static private void fillPropertyMap(Map map, InstanceCountNode node) { - map.put(InstanceCountNodePropertyType.Match.toString(), node.instanceCount); + map.put(InstanceCountNodePropertyType.Match.toString(), node.getInstanceCount()); } @NbBundle.Messages({ @@ -133,7 +133,7 @@ final public class InstanceCountNode extends DisplayableItemNode { * List of models, each of which is a parent node matching a single md5, * containing children FileNodes. */ - private Map metadata; + private final Map metadata; Md5NodeFactory(List metadata) { this.metadata = new HashMap<>(); @@ -147,8 +147,8 @@ final public class InstanceCountNode extends DisplayableItemNode { @Override protected Node createNodeForKey(String md5) { - Md5Metadata metadata = this.metadata.get(md5); - return new Md5Node(metadata); + Md5Metadata md5Metadata = this.metadata.get(md5); + return new Md5Node(md5Metadata); } @Override @@ -157,4 +157,4 @@ final public class InstanceCountNode extends DisplayableItemNode { return true; } } -} +} \ No newline at end of file diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/Md5Node.java b/Core/src/org/sleuthkit/autopsy/datamodel/Md5Node.java index f87da517eb..22f1dd5964 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/Md5Node.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/Md5Node.java @@ -28,7 +28,6 @@ import org.openide.nodes.Children; import org.openide.nodes.Node; import org.openide.nodes.Sheet; import org.openide.util.NbBundle; -import org.openide.util.lookup.Lookups; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException; import org.sleuthkit.autopsy.commonfilesearch.FileInstanceMetadata; @@ -143,9 +142,7 @@ public class Md5Node extends DisplayableItemNode { AbstractFile abstractFile = tskDb.findAllFilesWhere(String.format("obj_id in (%s)", file.getObjectId())).get(0); return new FileInstanceNode(abstractFile, file.getDataSourceName()); - } catch (NoCurrentCaseException ex) { - LOGGER.log(Level.SEVERE, String.format("Unable to create node for file with obj_id: %s.", new Object[]{file.getObjectId()}), ex); - } catch (TskCoreException ex) { + } catch (NoCurrentCaseException | TskCoreException ex) { LOGGER.log(Level.SEVERE, String.format("Unable to create node for file with obj_id: %s.", new Object[]{file.getObjectId()}), ex); } return null;