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

6457 change display string for filter results based on feedback

Browse Source
This commit is contained in:
William Schaefer
2020-06-24 10:06:58 -04:00
parent 03d445a89e
commit 5df0c457d6
3 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED
View File

@@ -11,7 +11,7 @@ DiscoveryTopComponent.name=\ Discovery
DiscoveryTopComponent.newSearch.text=New Search
DiscoveryTopComponent.searchCancelled.text=Search has been cancelled.
# {0} - search
DiscoveryTopComponent.searchComplete.text=Results for {0}
DiscoveryTopComponent.searchComplete.text=Results with {0}
# {0} - searchType
DiscoveryTopComponent.searchInProgress.text=Performing search for results of type {0}. Please wait.
DiscoveryUiUtility.bytes.text=bytes
@@ -112,27 +112,27 @@ FileSearchFiltering.concatenateSetNamesForDisplay.comma=,
# {1} - Data source ID
FileSearchFiltering.DataSourceFilter.datasource={0}({1})
# {0} - filters
FileSearchFiltering.DataSourceFilter.desc=In data source(s): {0}
FileSearchFiltering.DataSourceFilter.or=\ or
FileSearchFiltering.DataSourceFilter.desc=data source(s): {0}
FileSearchFiltering.DataSourceFilter.or=,
# {0} - filters
FileSearchFiltering.FileTypeFilter.desc=Files with type: {0}
FileSearchFiltering.FileTypeFilter.or=\ or
FileSearchFiltering.FileTypeFilter.desc=type: {0}
FileSearchFiltering.FileTypeFilter.or=,
# {0} - filters
FileSearchFiltering.FrequencyFilter.desc=With frequency: {0}
FileSearchFiltering.FrequencyFilter.or=\ or
FileSearchFiltering.FrequencyFilter.desc=past occurrences: {0}
FileSearchFiltering.FrequencyFilter.or=,
# {0} - filters
FileSearchFiltering.HashSetFilter.desc=With hash set hits in set(s): {0}
# {0} - filters
FileSearchFiltering.InterestingItemSetFilter.desc=With interesting item hits in set(s): {0}
# {0} - filters
FileSearchFiltering.KeywordListFilter.desc=With keywords in list(s): {0}
FileSearchFiltering.KeywordListFilter.desc=keywords in list(s): {0}
FileSearchFiltering.KnownFilter.desc=Which are not known
# {0} - filters
FileSearchFiltering.ObjectDetectionFilter.desc=With objects detected in set(s): {0}
# {0} - filters
FileSearchFiltering.ParentFilter.desc=With paths matching: {0}
FileSearchFiltering.ParentFilter.desc=paths matching: {0}
FileSearchFiltering.ParentFilter.exact=(exact match)
FileSearchFiltering.ParentFilter.or=\ or
FileSearchFiltering.ParentFilter.or=,
FileSearchFiltering.ParentFilter.substring=(substring)
FileSearchFiltering.ParentSearchTerm.excludeString=\ (exclude)
FileSearchFiltering.ParentSearchTerm.fullString=\ (exact)
@@ -142,11 +142,11 @@ FileSearchFiltering.PreviouslyNotableFilter.desc=That were previously marked as
# {0} - filters
FileSearchFiltering.ScoreFilter.desc=With score(s) of : {0}
# {0} - filters
FileSearchFiltering.SizeFilter.desc=With size(s): {0}
FileSearchFiltering.SizeFilter.or=, or
FileSearchFiltering.SizeFilter.desc=size(s): {0}
FileSearchFiltering.SizeFilter.or=,
# {0} - tag names
FileSearchFiltering.TagsFilter.desc=That have been tagged {0}
FileSearchFiltering.TagsFilter.or=\ or
FileSearchFiltering.TagsFilter.or=,
FileSearchFiltering.UserCreatedFilter.desc=That contain EXIF data
FileSearchPanel.sortingPanel.border.title=Grouping
FileSearchPanel.addButton.text=Add

4
Core/src/org/sleuthkit/autopsy/discovery/DiscoveryTopComponent.java
View File

@@ -280,11 +280,11 @@ public final class DiscoveryTopComponent extends TopComponent {
@Subscribe
@Messages({"DiscoveryTopComponent.newSearch.text=New Search",
"# {0} - search",
"DiscoveryTopComponent.searchComplete.text=Results for {0}"})
"DiscoveryTopComponent.searchComplete.text=Results with {0}"})
void handleSearchCompleteEvent(DiscoveryEventUtils.SearchCompleteEvent searchCompleteEvent) {
newSearchButton.setText(Bundle.DiscoveryTopComponent_newSearch_text());
progressMessageTextArea.setForeground(Color.black);
progressMessageTextArea.setText(Bundle.DiscoveryTopComponent_searchComplete_text(searchCompleteEvent.getFilters().stream().map(FileFilter::getDesc).collect(Collectors.joining(", "))));
progressMessageTextArea.setText(Bundle.DiscoveryTopComponent_searchComplete_text(searchCompleteEvent.getFilters().stream().map(FileFilter::getDesc).collect(Collectors.joining("; "))));
progressMessageTextArea.setCaretPosition(0);
}

26
Core/src/org/sleuthkit/autopsy/discovery/FileSearchFiltering.java
View File

@@ -207,8 +207,8 @@ class FileSearchFiltering {
@NbBundle.Messages({
"# {0} - filters",
"FileSearchFiltering.SizeFilter.desc=With size(s): {0}",
"FileSearchFiltering.SizeFilter.or=, or "})
"FileSearchFiltering.SizeFilter.desc=size(s): {0}",
"FileSearchFiltering.SizeFilter.or=, "})
@Override
String getDesc() {
String desc = ""; // NON-NLS
@@ -361,8 +361,8 @@ class FileSearchFiltering {
@NbBundle.Messages({
"# {0} - filters",
"FileSearchFiltering.ParentFilter.desc=With paths matching: {0}",
"FileSearchFiltering.ParentFilter.or= or ",
"FileSearchFiltering.ParentFilter.desc=paths matching: {0}",
"FileSearchFiltering.ParentFilter.or=, ",
"FileSearchFiltering.ParentFilter.exact=(exact match)",
"FileSearchFiltering.ParentFilter.substring=(substring)",})
@Override
@@ -414,8 +414,8 @@ class FileSearchFiltering {
@NbBundle.Messages({
"# {0} - filters",
"FileSearchFiltering.DataSourceFilter.desc=In data source(s): {0}",
"FileSearchFiltering.DataSourceFilter.or= or ",
"FileSearchFiltering.DataSourceFilter.desc=data source(s): {0}",
"FileSearchFiltering.DataSourceFilter.or=, ",
"# {0} - Data source name",
"# {1} - Data source ID",
"FileSearchFiltering.DataSourceFilter.datasource={0}({1})",})
@@ -463,7 +463,7 @@ class FileSearchFiltering {
@NbBundle.Messages({
"# {0} - filters",
"FileSearchFiltering.KeywordListFilter.desc=With keywords in list(s): {0}",})
"FileSearchFiltering.KeywordListFilter.desc=keywords in list(s): {0}",})
@Override
String getDesc() {
return Bundle.FileSearchFiltering_KeywordListFilter_desc(concatenateSetNamesForDisplay(listNames));
@@ -513,8 +513,8 @@ class FileSearchFiltering {
@NbBundle.Messages({
"# {0} - filters",
"FileSearchFiltering.FileTypeFilter.desc=Files with type: {0}",
"FileSearchFiltering.FileTypeFilter.or= or ",})
"FileSearchFiltering.FileTypeFilter.desc=type: {0}",
"FileSearchFiltering.FileTypeFilter.or=, ",})
@Override
String getDesc() {
String desc = "";
@@ -583,8 +583,8 @@ class FileSearchFiltering {
@NbBundle.Messages({
"# {0} - filters",
"FileSearchFiltering.FrequencyFilter.desc=With frequency: {0}",
"FileSearchFiltering.FrequencyFilter.or= or ",})
"FileSearchFiltering.FrequencyFilter.desc=past occurrences: {0}",
"FileSearchFiltering.FrequencyFilter.or=, ",})
@Override
String getDesc() {
String desc = ""; // NON-NLS
@@ -592,7 +592,7 @@ class FileSearchFiltering {
if (!desc.isEmpty()) {
desc += Bundle.FileSearchFiltering_FrequencyFilter_or();
}
desc += freq.name();
desc += freq.toString();
}
return Bundle.FileSearchFiltering_FrequencyFilter_desc(desc);
}
@@ -824,7 +824,7 @@ class FileSearchFiltering {
@NbBundle.Messages({
"# {0} - tag names",
"FileSearchFiltering.TagsFilter.desc=That have been tagged {0}",
"FileSearchFiltering.TagsFilter.or= or ",})
"FileSearchFiltering.TagsFilter.or=, ",})
@Override
String getDesc() {
String desc = ""; // NON-NLS