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

Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3624-tree-table-view

Browse Source 
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
This commit is contained in:
Brian Sweeney
2018-04-09 09:42:05 -06:00
parent 9792111cb7
commit a01585d7c4
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetaData.java
View File

@@ -60,5 +60,4 @@ public class CommonFilesMetaData {
public String getDataSources() {
return dataSources;
}
}

11
Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetaDataBuilder.java
View File

@@ -80,10 +80,12 @@ abstract class CommonFilesMetaDataBuilder {
return metaDataModels;
}
/**
* Should build a SQL WHERE clause to be passed to SleuthkitCase.findAllFilesWhere(sql)
* which will select the desired common files ordered by MD5.
* Should build a SQL WHERE clause to be passed to
* SleuthkitCase.findAllFilesWhere(sql) which will select the desired common
* files ordered by MD5.
*
* @return sql string where clause
*/
protected abstract String buildSqlWhereClause();
@@ -107,7 +109,6 @@ abstract class CommonFilesMetaDataBuilder {
addDataSource(dataSources, file, dataSourceIdToNameMap);
md5ToDataSourcesStringMap.put(currentMd5, dataSources);
}
}
}
@@ -118,4 +119,4 @@ abstract class CommonFilesMetaDataBuilder {
List<AbstractFile> files = sleuthkitCase.findAllFilesWhere(whereClause);
return files;
}
}
}

1
Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
View File

@@ -197,6 +197,7 @@ public final class CommonFilesPanel extends javax.swing.JPanel {
}
@Override
@SuppressWarnings({"BoxedValueEquality", "NumberEquality"})
protected List<CommonFilesMetaData> doInBackground() throws TskCoreException, NoCurrentCaseException, SQLException {
Long dataSourceId = determineDataSourceId();

2
Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesSearchAction.java
View File

@@ -30,7 +30,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
final class CommonFilesSearchAction extends CallableSystemAction {
private static final Logger LOGGER = Logger.getLogger(CommonFilesPanel.class.getName());
private static CommonFilesSearchAction instance = null;
private static final long serialVersionUID = 1L;

19
Core/src/org/sleuthkit/autopsy/datamodel/CommonFileParentNode.java
View File

@@ -44,12 +44,12 @@ public class CommonFileParentNode extends DisplayableItemNode {
public CommonFileParentNode(CommonFilesMetaData metaData) {
super(Children.create(
new CommonFilesChildFactory(metaData.getChildren(),
metaData.getDataSourceIdToNameMap()), true),
metaData.getDataSourceIdToNameMap()), true),
Lookups.singleton(metaData.getMd5()));
this.commonFileCount = metaData.getChildren().size();
this.dataSources = metaData.getDataSources();
this.md5Hash = metaData.getMd5();
this.setDisplayName(md5Hash);
}
@@ -60,8 +60,8 @@ public class CommonFileParentNode extends DisplayableItemNode {
String getDataSources() {
return this.dataSources;
}
public String getMd5(){
public String getMd5() {
return this.md5Hash;
}
@@ -73,7 +73,7 @@ public class CommonFileParentNode extends DisplayableItemNode {
sheetSet = Sheet.createPropertiesSet();
sheet.put(sheetSet);
}
Map<String, Object> map = new LinkedHashMap<>();
fillPropertyMap(map, this);
@@ -113,7 +113,6 @@ public class CommonFileParentNode extends DisplayableItemNode {
public String getItemType() {
return getClass().getName();
}
/**
* Child generator for FileNodes of CommonFileParentNodes
@@ -121,15 +120,15 @@ public class CommonFileParentNode extends DisplayableItemNode {
static class CommonFilesChildFactory extends ChildFactory<AbstractFile> {
private final List<AbstractFile> descendants;
private final Map<Long, String> dataSourceMap;
private final Map<Long, String> dataSourceMap;
CommonFilesChildFactory(List<AbstractFile> descendants, Map<Long, String> dataSourceMap){
CommonFilesChildFactory(List<AbstractFile> descendants, Map<Long, String> dataSourceMap) {
this.descendants = descendants;
this.dataSourceMap = dataSourceMap;
}
@Override
protected Node createNodeForKey(AbstractFile file){
protected Node createNodeForKey(AbstractFile file) {
final String dataSource = this.dataSourceMap.get(file.getDataSourceObjectId());
@@ -141,8 +140,8 @@ public class CommonFileParentNode extends DisplayableItemNode {
list.addAll(this.descendants);
return true;
}
}
@NbBundle.Messages({
"CommonFileParentPropertyType.fileColLbl=File",
"CommonFileParentPropertyType.instanceColLbl=Instance Count",