Merge branch '3961-common-files-refinements' of https://github.com/briangsweeney/autopsy into 3961-common-files-refinements

This commit is contained in:
Andrew Ziehl 2018-06-27 10:29:21 -07:00
commit 8b541458fc
4 changed files with 9 additions and 7 deletions

View File

@ -7,7 +7,7 @@ CommonFilesPanel.selectedFileCategoriesButton.text=Match on the following file c
CommonFilesPanel.selectedFileCategoriesButton.toolTipText=Select from the options below...
CommonFilesPanel.pictureVideoCheckbox.text=Pictures and Videos
CommonFilesPanel.documentsCheckbox.text=Documents
CommonFilesPanel.commonFilesSearchLabel.text=<html>Find duplicate files in the current case.</html>
CommonFilesPanel.commonFilesSearchLabel.text=<html>Find files in multiple data sources in the current case.</html>
CommonFilesPanel.allFileCategoriesRadioButton.toolTipText=No filtering applied to results...
CommonFilesPanel.allFileCategoriesRadioButton.text=Match on all file types
CommonFilesPanel.text=Indicate which data sources to consider while searching for duplicates:

View File

@ -42,12 +42,12 @@ public class CommonFilesSearchResultsViewerTable extends DataResultViewerTable {
static {
Map<String, Integer> map = new HashMap<>();
map.put(Bundle.CommonFilesSearchResultsViewerTable_filesColLbl(), 235);
map.put(Bundle.CommonFilesSearchResultsViewerTable_instancesColLbl(), 235);
map.put(Bundle.CommonFilesSearchResultsViewerTable_filesColLbl(), 260);
map.put(Bundle.CommonFilesSearchResultsViewerTable_instancesColLbl(), 65);
map.put(Bundle.CommonFilesSearchResultsViewerTable_pathColLbl(), 300);
map.put(Bundle.CommonFilesSearchResultsViewerTable_dataSourceColLbl(), 200);
map.put(Bundle.CommonFilesSearchResultsViewerTable_hashsetHitsColLbl(), 100);
map.put(Bundle.CommonFilesSearchResultsViewerTable_mimeTypeColLbl(), 150);
map.put(Bundle.CommonFilesSearchResultsViewerTable_mimeTypeColLbl(), 130);
map.put(Bundle.CommonFilesSearchResultsViewerTable_tagsColLbl1(), 300);
COLUMN_WIDTHS = Collections.unmodifiableMap(map);
@ -58,7 +58,7 @@ public class CommonFilesSearchResultsViewerTable extends DataResultViewerTable {
"CommonFilesSearchResultsViewerTable.instancesColLbl=Instances",
"CommonFilesSearchResultsViewerTable.pathColLbl=Parent Path",
"CommonFilesSearchResultsViewerTable.hashsetHitsColLbl=Hash Set Hits",
"CommonFilesSearchResultsViewerTable.dataSourceColLbl=Data Source",
"CommonFilesSearchResultsViewerTable.dataSourceColLbl=Data Source(s)",
"CommonFilesSearchResultsViewerTable.mimeTypeColLbl=MIME Type",
"CommonFilesSearchResultsViewerTable.tagsColLbl1=Tags"
})
@ -71,8 +71,8 @@ public class CommonFilesSearchResultsViewerTable extends DataResultViewerTable {
TableColumn column = columnsEnumerator.nextElement();
final Object headerValue = column.getHeaderValue();
final Integer get = COLUMN_WIDTHS.get(headerValue);
final String headerValue = column.getHeaderValue().toString();
final Integer get = COLUMN_WIDTHS.get((String)headerValue);
column.setPreferredWidth(get);
}

View File

@ -58,6 +58,7 @@ final public class InstanceCountNode extends DisplayableItemNode {
this.metadataList = md5Metadata;
this.setDisplayName(String.format(Bundle.InstanceCountNode_displayName(), Integer.toString(instanceCount), md5Metadata.size()));
this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/fileset-icon-16.png"); //NON-NLS
}
/**

View File

@ -66,6 +66,7 @@ public class Md5Node extends DisplayableItemNode {
this.md5Hash = data.getMd5();
this.setDisplayName(String.format(Bundle.Md5Node_Md5Node_format(), this.md5Hash));
this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/fileset-icon-16.png"); //NON-NLS
}
/**