mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-09 06:39:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

more merge conflicts

Browse Source
This commit is contained in:
Brian Sweeney 2018-07-23 16:15:09 -06:00
parent d8b4fc878e
commit a65e43d112
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/InterCaseUtils.java
View File

@ -50,14 +50,13 @@ import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationAttributeInstance; import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationAttributeInstance;
import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationCase; import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationCase;
import org.sleuthkit.autopsy.centralrepository.datamodel.EamDb; import org.sleuthkit.autopsy.centralrepository.datamodel.EamDb;
import org.sleuthkit.autopsy.commonfilesearch.AbstractCommonAttributeInstanceNode; import org.sleuthkit.autopsy.commonfilesearch.AbstractCommonAttributeInstance;
import org.sleuthkit.autopsy.commonfilesearch.CaseDBCommonAttributeInstanceNode;
import org.sleuthkit.autopsy.commonfilesearch.CentralRepoCommonAttributeInstance;
import org.sleuthkit.autopsy.commonfilesearch.CentralRepoCommonAttributeInstanceNode;
import org.sleuthkit.autopsy.commonfilesearch.CommonAttributeSearchResults; import org.sleuthkit.autopsy.commonfilesearch.CommonAttributeSearchResults;
import org.sleuthkit.autopsy.commonfilesearch.DataSourceLoader; import org.sleuthkit.autopsy.commonfilesearch.DataSourceLoader;
import org.sleuthkit.autopsy.commonfilesearch.CaseDBCommonAttributeInstance;
import org.sleuthkit.autopsy.commonfilesearch.CommonAttributeValue; import org.sleuthkit.autopsy.commonfilesearch.CommonAttributeValue;
import org.sleuthkit.autopsy.commonfilesearch.InterCaseCommonAttributeInstanceNode;
import org.sleuthkit.autopsy.commonfilesearch.InterCaseCommonAttributeSearchResults;
import org.sleuthkit.autopsy.commonfilesearch.IntraCaseCommonAttributeInstanceNode;
import org.sleuthkit.autopsy.datamodel.DisplayableItemNode; import org.sleuthkit.autopsy.datamodel.DisplayableItemNode;
import org.sleuthkit.datamodel.AbstractFile; import org.sleuthkit.datamodel.AbstractFile;
@ -299,19 +298,19 @@ class InterCaseUtils {
int tally = 0; int tally = 0;
for(Map.Entry<Integer, List<CommonAttributeValue>> entry : searchDomain.getValues().entrySet()){ for(Map.Entry<Integer, List<CommonAttributeValue>> entry : searchDomain.getMetadata().entrySet()){
for(CommonAttributeValue values : entry.getValue()){ for(CommonAttributeValue value : entry.getValue()){
for(AbstractCommonAttributeInstanceNode commonAttribute : values.getMetadata()){ for(AbstractCommonAttributeInstance commonAttribute : value.getInstances()){
if(commonAttribute instanceof InterCaseCommonAttributeSearchResults){ if(commonAttribute instanceof CentralRepoCommonAttributeInstance){
InterCaseCommonAttributeSearchResults results = (InterCaseCommonAttributeSearchResults) commonAttribute; CentralRepoCommonAttributeInstance results = (CentralRepoCommonAttributeInstance) commonAttribute;
for (DisplayableItemNode din : results.generateNodes()){ for (DisplayableItemNode din : results.generateNodes()){
if(din instanceof InterCaseCommonAttributeInstanceNode){ if(din instanceof CentralRepoCommonAttributeInstanceNode){
InterCaseCommonAttributeInstanceNode node = (InterCaseCommonAttributeInstanceNode) din; CentralRepoCommonAttributeInstanceNode node = (CentralRepoCommonAttributeInstanceNode) din;
CorrelationAttributeInstance instance = node.getCorrelationAttributeInstance(); CorrelationAttributeInstance instance = node.getCorrelationAttributeInstance();
final String fullPath = instance.getFilePath(); final String fullPath = instance.getFilePath();
@ -332,9 +331,9 @@ class InterCaseUtils {
} }
} }
if(din instanceof IntraCaseCommonAttributeInstanceNode){ if(din instanceof CaseDBCommonAttributeInstanceNode){
IntraCaseCommonAttributeInstanceNode node = (IntraCaseCommonAttributeInstanceNode) din; CaseDBCommonAttributeInstanceNode node = (CaseDBCommonAttributeInstanceNode) din;
AbstractFile file = node.getContent(); AbstractFile file = node.getContent();
final String testFileName = file.getName(); final String testFileName = file.getName();

2
Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IntraCaseUtils.java
View File

@ -205,7 +205,7 @@ class IntraCaseUtils {
static Map<Long, String> mapFileInstancesToDataSources(CommonAttributeSearchResults metadata) { static Map<Long, String> mapFileInstancesToDataSources(CommonAttributeSearchResults metadata) {
Map<Long, String> instanceIdToDataSource = new HashMap<>(); Map<Long, String> instanceIdToDataSource = new HashMap<>();
for (Map.Entry<Integer, List<CommonAttributeValue>> entry : metadata.getValues().entrySet()) { for (Map.Entry<Integer, List<CommonAttributeValue>> entry : metadata.getMetadata().entrySet()) {
for (CommonAttributeValue md : entry.getValue()) { for (CommonAttributeValue md : entry.getValue()) {
for (AbstractCommonAttributeInstance fim : md.getInstances()) { for (AbstractCommonAttributeInstance fim : md.getInstances()) {
instanceIdToDataSource.put(fim.getAbstractFileObjectId(), fim.getDataSource()); instanceIdToDataSource.put(fim.getAbstractFileObjectId(), fim.getDataSource());