codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-03 14:30:01 +00:00
Code Issues Releases Wiki Activity

merge problems - wip

Browse Source
This commit is contained in:
Brian Sweeney
2018-06-21 17:15:14 -06:00
parent 998234ea4b
commit c2eea78f65
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Core/src/org/sleuthkit/autopsy/datamodel/Md5Node.java
View File

@@ -185,13 +185,13 @@ public class Md5Node extends DisplayableItemNode {
}
@Override
protected Node createNodeForKey(FileInstanceMetadata file) {
protected Node createNodeForKey(SleuthkitCaseFileInstanceMetadata file) {
try {
Case currentCase = Case.getCurrentCaseThrows();
SleuthkitCase tskDb = currentCase.getSleuthkitCase();
AbstractFile abstractFile = tskDb.findAllFilesWhere(String.format("obj_id in (%s)", file.getObjectId())).get(0);
return new FileInstanceNode(abstractFile, file.getDataSourceName());
return new SleuthkitCaseFileInstanceNode(abstractFile, file.getDataSourceName());
} 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);
}

2
Core/src/org/sleuthkit/autopsy/datamodel/SleuthkitCaseFileInstanceNode.java
View File

@@ -46,7 +46,7 @@ public class SleuthkitCaseFileInstanceNode extends FileNode {
* @param fsContent
* @param dataSource
*/
public FileInstanceNode(AbstractFile fsContent, String dataSource) {
public SleuthkitCaseFileInstanceNode(AbstractFile fsContent, String caseName, String dataSource) {
super(fsContent);
this.content = fsContent;
this.caseName = caseName;

4
Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java
View File

@@ -51,7 +51,6 @@ import org.sleuthkit.autopsy.datamodel.DataModelActionsFactory;
import org.sleuthkit.autopsy.datamodel.DirectoryNode;
import org.sleuthkit.autopsy.datamodel.DisplayableItemNode;
import org.sleuthkit.autopsy.datamodel.DisplayableItemNodeVisitor;
import org.sleuthkit.autopsy.datamodel.FileInstanceNode;
import org.sleuthkit.autopsy.datamodel.FileNode;
import org.sleuthkit.autopsy.datamodel.FileTypeExtensions;
import org.sleuthkit.autopsy.datamodel.FileTypes.FileTypesNode;
@@ -63,6 +62,7 @@ import org.sleuthkit.autopsy.datamodel.Md5Node;
import org.sleuthkit.autopsy.datamodel.NodeSelectionInfo;
import org.sleuthkit.autopsy.datamodel.Reports;
import org.sleuthkit.autopsy.datamodel.SlackFileNode;
import org.sleuthkit.autopsy.datamodel.SleuthkitCaseFileInstanceNode;
import org.sleuthkit.autopsy.datamodel.VirtualDirectoryNode;
import static org.sleuthkit.autopsy.directorytree.Bundle.*;
import org.sleuthkit.autopsy.modules.embeddedfileextractor.ExtractArchiveWithPasswordAction;
@@ -540,7 +540,7 @@ public class DataResultFilterNode extends FilterNode {
}
@Override
public AbstractAction visit(FileInstanceNode fin){
public AbstractAction visit(SleuthkitCaseFileInstanceNode fin){
return null;
}