diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/AbstractContentNode.java b/DataModel/src/org/sleuthkit/autopsy/datamodel/AbstractContentNode.java index 6246f3402a..47f723b406 100644 --- a/DataModel/src/org/sleuthkit/autopsy/datamodel/AbstractContentNode.java +++ b/DataModel/src/org/sleuthkit/autopsy/datamodel/AbstractContentNode.java @@ -66,15 +66,6 @@ abstract class AbstractContentNode extends AbstractNode imple return super.getName(); } - /** - * Gets the ID of this node. - * - * @return ID the ID of this node - */ - public long getID() { - return content.getId(); - } - /** * Gets the row values for this node. The main purpose of this method is to * get the 'x' number of the row values for this node to set the width of each @@ -84,6 +75,7 @@ abstract class AbstractContentNode extends AbstractNode imple * @return rowValues the row values for this node. * @throws SQLException */ + @Override abstract public Object[][] getRowValues(int rows) throws SQLException; /** @@ -103,6 +95,7 @@ abstract class AbstractContentNode extends AbstractNode imple * * @return content the content of this node (can be image, volume, directory, or file) */ + @Override public Content getContent() { return content; } @@ -116,6 +109,7 @@ abstract class AbstractContentNode extends AbstractNode imple * * @return the path of this node */ + @Override public String[] getDisplayPath() { return content.accept(getDisplayPath).toArray(new String[]{}); } @@ -129,6 +123,7 @@ abstract class AbstractContentNode extends AbstractNode imple * * @return the path of this node */ + @Override public String[] getSystemPath() { return content.accept(getSystemPath).toArray(new String[]{}); } diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/ContentFilterNode.java b/DataModel/src/org/sleuthkit/autopsy/datamodel/ContentFilterNode.java index c3e757827c..28d8646259 100644 --- a/DataModel/src/org/sleuthkit/autopsy/datamodel/ContentFilterNode.java +++ b/DataModel/src/org/sleuthkit/autopsy/datamodel/ContentFilterNode.java @@ -23,7 +23,6 @@ import org.openide.nodes.FilterNode; import org.openide.nodes.Node; import org.openide.util.Lookup; import org.sleuthkit.datamodel.Content; -import org.sleuthkit.datamodel.TskException; public class ContentFilterNode extends FilterNode implements ContentNode { @@ -38,11 +37,6 @@ public class ContentFilterNode extends FilterNode implements ContentNode { public ContentFilterNode(ContentNode original, Children children, Lookup lookup) { super((Node) original, children, lookup); } - - @Override - public long getID() { - return ((ContentNode) super.getOriginal()).getID(); - } @Override public Object[][] getRowValues(int rows) throws SQLException { diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/ContentNode.java b/DataModel/src/org/sleuthkit/autopsy/datamodel/ContentNode.java index ef27ec768e..ddac749e84 100644 --- a/DataModel/src/org/sleuthkit/autopsy/datamodel/ContentNode.java +++ b/DataModel/src/org/sleuthkit/autopsy/datamodel/ContentNode.java @@ -20,7 +20,6 @@ package org.sleuthkit.autopsy.datamodel; import java.sql.SQLException; import org.sleuthkit.datamodel.Content; -import org.sleuthkit.datamodel.TskException; /** * Interface class that all Data nodes inherit from. @@ -28,22 +27,6 @@ import org.sleuthkit.datamodel.TskException; */ public interface ContentNode { - /** - * Returns the programmatic name for this node. This is NOT the name to - * display to users, or the plain name of the Content object - use - * Node.getDisplayName() for that. - * - * @return name the programmatic name for this node - */ - public String getName(); - - /** - * Gets the ID of this node. - * - * @return ID the ID of this node - */ - public long getID(); - /** * Gets the row values for this node. The main purpose of this method is to * get the 'x' number of the row values for this node to set the width of each diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java b/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java index 707ed449dc..b602d53c7d 100644 --- a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java +++ b/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java @@ -39,7 +39,6 @@ import org.openide.nodes.Node; import org.openide.nodes.Sheet; import org.sleuthkit.autopsy.datamodel.ContentNodeVisitor; import org.sleuthkit.datamodel.Content; -import org.sleuthkit.datamodel.TskException; /** * This class wraps nodes as they are passed to the DataResult viewers. It @@ -190,11 +189,6 @@ public class DataResultFilterNode extends FilterNode implements ContentNode { return propertySets; } - @Override - public long getID() { - return ((ContentNode) currentNode).getID(); - } - @Override public Object[][] getRowValues(int rows) throws SQLException { return ((ContentNode) currentNode).getRowValues(rows); diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/DataResultFilterNode.java b/FileSearch/src/org/sleuthkit/autopsy/filesearch/DataResultFilterNode.java index 21f2dc59f9..f2d82431e2 100644 --- a/FileSearch/src/org/sleuthkit/autopsy/filesearch/DataResultFilterNode.java +++ b/FileSearch/src/org/sleuthkit/autopsy/filesearch/DataResultFilterNode.java @@ -29,9 +29,7 @@ import javax.swing.Action; import org.openide.nodes.FilterNode; import org.openide.nodes.Node; import org.sleuthkit.datamodel.Content; -import org.sleuthkit.datamodel.TskException; import org.sleuthkit.autopsy.directorytree.ChangeViewAction; -import org.sleuthkit.autopsy.directorytree.ExtractAction; /** * This class wraps nodes as they are passed to the DataResult viewers. It @@ -96,11 +94,6 @@ public class DataResultFilterNode extends FilterNode implements ContentNode { return null; } - @Override - public long getID() { - return ((ContentNode) currentNode).getID(); - } - @Override public Object[][] getRowValues(int rows) throws SQLException { return ((ContentNode) currentNode).getRowValues(rows); diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/SearchNode.java b/FileSearch/src/org/sleuthkit/autopsy/filesearch/SearchNode.java index d1e5016b50..b028299ddb 100644 --- a/FileSearch/src/org/sleuthkit/autopsy/filesearch/SearchNode.java +++ b/FileSearch/src/org/sleuthkit/autopsy/filesearch/SearchNode.java @@ -47,11 +47,6 @@ class SearchNode extends AbstractNode implements ContentNode { return "Search Result"; } - @Override - public long getID() { - return -1; // change this later when needed - } - @Override public Object[][] getRowValues(int rows) throws SQLException { int totalNodes = children.getNodesCount();