Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3623-common-files-optimize

# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetaData.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesSearchNode.java
This commit is contained in:
Brian Sweeney 2018-03-16 05:49:32 -06:00
parent 7beb8c78d6
commit c4be23b841
2 changed files with 0 additions and 45 deletions

View File

@ -106,48 +106,6 @@ public class CommonFilesMetaData {
return data; return data;
} }
/**
* @return the dedupedFiles
*/
public List<AbstractFile> getDedupedFiles() {
return Collections.unmodifiableList(dedupedFiles);
}
/**
* @param dedupedFiles the dedupedFiles to set
*/
public void setDedupedFiles(List<AbstractFile> dedupedFiles) {
this.dedupedFiles = dedupedFiles;
}
/**
* @return the instanceCountMap
*/
public java.util.Map<String, Integer> getInstanceCountMap() {
return Collections.unmodifiableMap(instanceCountMap);
}
/**
* @param instanceCountMap the instanceCountMap to set
*/
public void setInstanceCountMap(java.util.Map<String, Integer> instanceCountMap) {
this.instanceCountMap = instanceCountMap;
}
/**
* @return the dataSourceMap
*/
public java.util.Map<String, String> getDataSourceMap() {
return Collections.unmodifiableMap(dataSourceMap);
}
/**
* @param dataSourceMap the dataSourceMap to set
*/
public void setDataSourceMap(java.util.Map<String, String> dataSourceMap) {
this.dataSourceMap = dataSourceMap;
}
private static void addDataSource(Set<String> dataSources, AbstractFile file) { private static void addDataSource(Set<String> dataSources, AbstractFile file) {
try { try {
dataSources.add(file.getDataSource().getName()); dataSources.add(file.getDataSource().getName());

View File

@ -32,9 +32,6 @@ final class CommonFilesSearchNode extends AbstractNode {
CommonFilesSearchNode(CommonFilesMetaData metaData) { CommonFilesSearchNode(CommonFilesMetaData metaData) {
super(Children.create(new CommonFilesChildren(metaData), true), Lookups.singleton(metaData)); super(Children.create(new CommonFilesChildren(metaData), true), Lookups.singleton(metaData));
} }
CommonFilesSearchNode(CommonFilesMetaData metaData) {
super(Children.create(new CommonFilesChildren(metaData), true), Lookups.singleton(metaData));
}
@NbBundle.Messages({ @NbBundle.Messages({
"CommonFilesNode.getName.text=Common Files"}) "CommonFilesNode.getName.text=Common Files"})