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

6457-discovery ui polish

Browse Source
This commit is contained in:
William Schaefer 2020-06-09 15:13:06 -04:00
parent d6835a198d
commit a59a60f1d3
6 changed files with 127 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,18 +57,24 @@ FileSearch.InterestingItemGroupKey.noSets=None
FileSearch.KeywordListGroupKey.noKeywords=None FileSearch.KeywordListGroupKey.noKeywords=None
FileSearch.NoGroupingGroupKey.allFiles=All Files FileSearch.NoGroupingGroupKey.allFiles=All Files
FileSearch.ObjectDetectedGroupKey.noSets=None FileSearch.ObjectDetectedGroupKey.noSets=None
FileSearchData.FileSize.LARGE_IMAGE.displayName=Large: 1-50MB FileSearchData.FileSize.100kbto1mb=: 100KB-1MB
FileSearchData.FileSize.LARGE_VIDEO.displayName=Large: 1-5GB FileSearchData.FileSize.100mbto1gb=: 100MB-1GB
FileSearchData.FileSize.MEDIUM_IMAGE.displayName=Medium: 100KB-1MB FileSearchData.FileSize.10PlusGb=: 10GB+
FileSearchData.FileSize.MEDIUM_VIDEO.displayName=Medium: 100MB-1GB FileSearchData.FileSize.16kbto100kb=: 16-100KB
FileSearchData.FileSize.SMALL_IMAGE.displayName=Small: 16-100KB FileSearchData.FileSize.1gbto5gb=: 1-5GB
FileSearchData.FileSize.SMALL_VIDEO.displayName=Small: 500KB-100MB FileSearchData.FileSize.1mbto50mb=: 1-50MB
FileSearchData.FileSize.XLARGE_IMAGE.displayName=XLarge: 50-200MB FileSearchData.FileSize.200PlusMb=: 200MB+
FileSearchData.FileSize.XLARGE_VIDEO.displayName=XLarge: 5-10GB FileSearchData.FileSize.500kbto100mb=: 500KB-100MB
FileSearchData.FileSize.XSMALL_IMAGE.displayName=XSmall: 0-16KB FileSearchData.FileSize.50mbto200mb=: 50-200MB
FileSearchData.FileSize.XSMALL_VIDEO.displayName=XSmall: 0-500KB FileSearchData.FileSize.5gbto10gb=: 5-10GB
FileSearchData.FileSize.XXLARGE_IMAGE.displayName=XXLarge: 200MB+ FileSearchData.FileSize.LARGE.displayName=Large
FileSearchData.FileSize.XXLARGE_VIDEO.displayName=XXLarge: 10GB+ FileSearchData.FileSize.MEDIUM.displayName=Medium
FileSearchData.FileSize.SMALL.displayName=Small
FileSearchData.FileSize.upTo16kb=: 0-16KB
FileSearchData.FileSize.upTo500kb=: 0-500KB
FileSearchData.FileSize.XLARGE.displayName=XLarge
FileSearchData.FileSize.XSMALL.displayName=XSmall
FileSearchData.FileSize.XXLARGE.displayName=XXLarge
FileSearchData.FileType.Audio.displayName=Audio FileSearchData.FileType.Audio.displayName=Audio
FileSearchData.FileType.Documents.displayName=Documents FileSearchData.FileType.Documents.displayName=Documents
FileSearchData.FileType.Executables.displayName=Executables FileSearchData.FileType.Executables.displayName=Executables
@ -106,25 +112,25 @@ FileSearchFiltering.concatenateSetNamesForDisplay.comma=,
# {1} - Data source ID # {1} - Data source ID
FileSearchFiltering.DataSourceFilter.datasource={0}({1}) FileSearchFiltering.DataSourceFilter.datasource={0}({1})
# {0} - filters # {0} - filters
FileSearchFiltering.DataSourceFilter.desc=Files in data source(s): {0} FileSearchFiltering.DataSourceFilter.desc=In data source(s): {0}
FileSearchFiltering.DataSourceFilter.or=\ or FileSearchFiltering.DataSourceFilter.or=\ or
# {0} - filters # {0} - filters
FileSearchFiltering.FileTypeFilter.desc=Files with type: {0} FileSearchFiltering.FileTypeFilter.desc=Files with type: {0}
FileSearchFiltering.FileTypeFilter.or=\ or FileSearchFiltering.FileTypeFilter.or=\ or
# {0} - filters # {0} - filters
FileSearchFiltering.FrequencyFilter.desc=Files with frequency: {0} FileSearchFiltering.FrequencyFilter.desc=With frequency: {0}
FileSearchFiltering.FrequencyFilter.or=\ or FileSearchFiltering.FrequencyFilter.or=\ or
# {0} - filters # {0} - filters
FileSearchFiltering.HashSetFilter.desc=Files with hash set hits in set(s): {0} FileSearchFiltering.HashSetFilter.desc=With hash set hits in set(s): {0}
# {0} - filters # {0} - filters
FileSearchFiltering.InterestingItemSetFilter.desc=Files with interesting item hits in set(s): {0} FileSearchFiltering.InterestingItemSetFilter.desc=With interesting item hits in set(s): {0}
# {0} - filters # {0} - filters
FileSearchFiltering.KeywordListFilter.desc=Files with keywords in list(s): {0} FileSearchFiltering.KeywordListFilter.desc=With keywords in list(s): {0}
FileSearchFiltering.KnownFilter.desc=Files which are not known FileSearchFiltering.KnownFilter.desc=Which are not known
# {0} - filters # {0} - filters
FileSearchFiltering.ObjectDetectionFilter.desc=Files with objects detected in set(s): {0} FileSearchFiltering.ObjectDetectionFilter.desc=With objects detected in set(s): {0}
# {0} - filters # {0} - filters
FileSearchFiltering.ParentFilter.desc=Files with paths matching: {0} FileSearchFiltering.ParentFilter.desc=With paths matching: {0}
FileSearchFiltering.ParentFilter.exact=(exact match) FileSearchFiltering.ParentFilter.exact=(exact match)
FileSearchFiltering.ParentFilter.or=\ or FileSearchFiltering.ParentFilter.or=\ or
FileSearchFiltering.ParentFilter.substring=(substring) FileSearchFiltering.ParentFilter.substring=(substring)
@ -132,19 +138,16 @@ FileSearchFiltering.ParentSearchTerm.excludeString=\ (exclude)
FileSearchFiltering.ParentSearchTerm.fullString=\ (exact) FileSearchFiltering.ParentSearchTerm.fullString=\ (exact)
FileSearchFiltering.ParentSearchTerm.includeString=\ (include) FileSearchFiltering.ParentSearchTerm.includeString=\ (include)
FileSearchFiltering.ParentSearchTerm.subString=\ (substring) FileSearchFiltering.ParentSearchTerm.subString=\ (substring)
FileSearchFiltering.PreviouslyNotableFilter.desc=Files that were previously marked as notable FileSearchFiltering.PreviouslyNotableFilter.desc=That were previously marked as notable
# {0} - filters # {0} - filters
FileSearchFiltering.ScoreFilter.desc=Files with score(s) of : {0} FileSearchFiltering.ScoreFilter.desc=With score(s) of : {0}
# {0} - filters # {0} - filters
FileSearchFiltering.SizeFilter.desc=Files with size in range(s): {0} FileSearchFiltering.SizeFilter.desc=With size(s): {0}
FileSearchFiltering.SizeFilter.or=\ or FileSearchFiltering.SizeFilter.or=, or
# {0} - Minimum bytes
# {1} - Maximum bytes
FileSearchFiltering.SizeFilter.range=({0} to {1})
# {0} - tag names # {0} - tag names
FileSearchFiltering.TagsFilter.desc=Files that have been tagged {0} FileSearchFiltering.TagsFilter.desc=That have been tagged {0}
FileSearchFiltering.TagsFilter.or=\ or FileSearchFiltering.TagsFilter.or=\ or
FileSearchFiltering.UserCreatedFilter.desc=Files that contain EXIF data FileSearchFiltering.UserCreatedFilter.desc=That contain EXIF data
FileSearchPanel.sortingPanel.border.title=Grouping FileSearchPanel.sortingPanel.border.title=Grouping
FileSearchPanel.addButton.text=Add FileSearchPanel.addButton.text=Add
FileSearchPanel.substringRadioButton.text=Substring FileSearchPanel.substringRadioButton.text=Substring

20
Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.form
View File

@ -43,23 +43,25 @@
<Layout> <Layout>
<DimensionLayout dim="0"> <DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0"> <Group type="102" alignment="0" attributes="0">
<EmptySpace pref="196" max="32767" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Component id="filler1" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="step1Label" min="-2" pref="243" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0"> <Group type="102" attributes="0">
<EmptySpace min="10" pref="10" max="-2" attributes="0"/>
<Component id="imagesButton" min="-2" pref="110" max="-2" attributes="0"/> <Component id="imagesButton" min="-2" pref="110" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="videosButton" min="-2" pref="110" max="-2" attributes="0"/> <Component id="videosButton" min="-2" pref="110" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="documentsButton" min="-2" max="-2" attributes="0"/> <Component id="documentsButton" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="370" max="32767" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<Component id="step1Label" min="-2" pref="243" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="filler1" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="391" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
<EmptySpace pref="196" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>

18
Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java
View File

@ -275,19 +275,21 @@ final class DiscoveryDialog extends javax.swing.JDialog {
toolBarPanelLayout.setHorizontalGroup( toolBarPanelLayout.setHorizontalGroup(
toolBarPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) toolBarPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(toolBarPanelLayout.createSequentialGroup() .addGroup(toolBarPanelLayout.createSequentialGroup()
.addContainerGap(196, Short.MAX_VALUE) .addContainerGap()
.addGroup(toolBarPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addGroup(toolBarPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.LEADING, toolBarPanelLayout.createSequentialGroup()
.addComponent(filler1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(step1Label, javax.swing.GroupLayout.PREFERRED_SIZE, 243, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(toolBarPanelLayout.createSequentialGroup() .addGroup(toolBarPanelLayout.createSequentialGroup()
.addGap(10, 10, 10)
.addComponent(imagesButton, javax.swing.GroupLayout.PREFERRED_SIZE, 110, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(imagesButton, javax.swing.GroupLayout.PREFERRED_SIZE, 110, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(videosButton, javax.swing.GroupLayout.PREFERRED_SIZE, 110, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(videosButton, javax.swing.GroupLayout.PREFERRED_SIZE, 110, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(documentsButton))) .addComponent(documentsButton)
.addContainerGap(196, Short.MAX_VALUE)) .addContainerGap(370, Short.MAX_VALUE))
.addGroup(toolBarPanelLayout.createSequentialGroup()
.addComponent(step1Label, javax.swing.GroupLayout.PREFERRED_SIZE, 243, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(filler1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap(391, Short.MAX_VALUE))))
); );
toolBarPanelLayout.setVerticalGroup( toolBarPanelLayout.setVerticalGroup(
toolBarPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) toolBarPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)

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

@ -24,6 +24,9 @@ import java.awt.Graphics;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.swing.JSplitPane; import javax.swing.JSplitPane;
import javax.swing.border.Border;
import javax.swing.plaf.basic.BasicSplitPaneDivider;
import javax.swing.plaf.basic.BasicSplitPaneUI;
import org.openide.util.NbBundle; import org.openide.util.NbBundle;
import org.openide.util.NbBundle.Messages; import org.openide.util.NbBundle.Messages;
import org.openide.windows.Mode; import org.openide.windows.Mode;
@ -67,6 +70,22 @@ public final class DiscoveryTopComponent extends TopComponent {
mainSplitPane.setLeftComponent(groupListPanel); mainSplitPane.setLeftComponent(groupListPanel);
rightSplitPane.setTopComponent(resultsPanel); rightSplitPane.setTopComponent(resultsPanel);
rightSplitPane.setBottomComponent(detailsPanel); rightSplitPane.setBottomComponent(detailsPanel);
//set color of divider
rightSplitPane.setUI(new BasicSplitPaneUI() {
@Override
public BasicSplitPaneDivider createDefaultDivider() {
return new BasicSplitPaneDivider(this) {
private static final long serialVersionUID = 1L;
@Override
public void paint(Graphics g) {
g.setColor(Color.YELLOW);
g.fillRect(0, 0, getSize().width, getSize().height);
super.paint(g);
}
};
}
});
} }
/** /**

68
Core/src/org/sleuthkit/autopsy/discovery/FileSearchData.java
View File

@ -126,39 +126,46 @@ final class FileSearchData {
* Enum representing the file size * Enum representing the file size
*/ */
@NbBundle.Messages({ @NbBundle.Messages({
"FileSearchData.FileSize.XXLARGE_IMAGE.displayName=XXLarge: 200MB+", "FileSearchData.FileSize.XXLARGE.displayName=XXLarge",
"FileSearchData.FileSize.XLARGE_IMAGE.displayName=XLarge: 50-200MB", "FileSearchData.FileSize.XLARGE.displayName=XLarge",
"FileSearchData.FileSize.LARGE_IMAGE.displayName=Large: 1-50MB", "FileSearchData.FileSize.LARGE.displayName=Large",
"FileSearchData.FileSize.MEDIUM_IMAGE.displayName=Medium: 100KB-1MB", "FileSearchData.FileSize.MEDIUM.displayName=Medium",
"FileSearchData.FileSize.SMALL_IMAGE.displayName=Small: 16-100KB", "FileSearchData.FileSize.SMALL.displayName=Small",
"FileSearchData.FileSize.XSMALL_IMAGE.displayName=XSmall: 0-16KB", "FileSearchData.FileSize.XSMALL.displayName=XSmall",
"FileSearchData.FileSize.XXLARGE_VIDEO.displayName=XXLarge: 10GB+", "FileSearchData.FileSize.10PlusGb=: 10GB+",
"FileSearchData.FileSize.XLARGE_VIDEO.displayName=XLarge: 5-10GB", "FileSearchData.FileSize.5gbto10gb=: 5-10GB",
"FileSearchData.FileSize.LARGE_VIDEO.displayName=Large: 1-5GB", "FileSearchData.FileSize.1gbto5gb=: 1-5GB",
"FileSearchData.FileSize.MEDIUM_VIDEO.displayName=Medium: 100MB-1GB", "FileSearchData.FileSize.100mbto1gb=: 100MB-1GB",
"FileSearchData.FileSize.SMALL_VIDEO.displayName=Small: 500KB-100MB", "FileSearchData.FileSize.200PlusMb=: 200MB+",
"FileSearchData.FileSize.XSMALL_VIDEO.displayName=XSmall: 0-500KB",}) "FileSearchData.FileSize.50mbto200mb=: 50-200MB",
"FileSearchData.FileSize.500kbto100mb=: 500KB-100MB",
"FileSearchData.FileSize.1mbto50mb=: 1-50MB",
"FileSearchData.FileSize.100kbto1mb=: 100KB-1MB",
"FileSearchData.FileSize.16kbto100kb=: 16-100KB",
"FileSearchData.FileSize.upTo500kb=: 0-500KB",
"FileSearchData.FileSize.upTo16kb=: 0-16KB",})
enum FileSize { enum FileSize {
XXLARGE_VIDEO(0, 10000 * BYTES_PER_MB, -1, Bundle.FileSearchData_FileSize_XXLARGE_VIDEO_displayName()), XXLARGE_VIDEO(0, 10000 * BYTES_PER_MB, -1, Bundle.FileSearchData_FileSize_XXLARGE_displayName(), Bundle.FileSearchData_FileSize_10PlusGb()),
XLARGE_VIDEO(1, 5000 * BYTES_PER_MB, 10000 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_XLARGE_VIDEO_displayName()), XLARGE_VIDEO(1, 5000 * BYTES_PER_MB, 10000 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_XLARGE_displayName(), Bundle.FileSearchData_FileSize_5gbto10gb()),
LARGE_VIDEO(2, 1000 * BYTES_PER_MB, 5000 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_LARGE_VIDEO_displayName()), LARGE_VIDEO(2, 1000 * BYTES_PER_MB, 5000 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_LARGE_displayName(), Bundle.FileSearchData_FileSize_1gbto5gb()),
MEDIUM_VIDEO(3, 100 * BYTES_PER_MB, 1000 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_MEDIUM_VIDEO_displayName()), MEDIUM_VIDEO(3, 100 * BYTES_PER_MB, 1000 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_MEDIUM_displayName(), Bundle.FileSearchData_FileSize_100mbto1gb()),
SMALL_VIDEO(4, 500000, 100 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_SMALL_VIDEO_displayName()), SMALL_VIDEO(4, 500000, 100 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_SMALL_displayName(), Bundle.FileSearchData_FileSize_500kbto100mb()),
XSMALL_VIDEO(5, 0, 500000, Bundle.FileSearchData_FileSize_XSMALL_VIDEO_displayName()), XSMALL_VIDEO(5, 0, 500000, Bundle.FileSearchData_FileSize_XSMALL_displayName(), Bundle.FileSearchData_FileSize_upTo500kb()),
XXLARGE_IMAGE(6, 200 * BYTES_PER_MB, -1, Bundle.FileSearchData_FileSize_XXLARGE_IMAGE_displayName()), XXLARGE_IMAGE(6, 200 * BYTES_PER_MB, -1, Bundle.FileSearchData_FileSize_XXLARGE_displayName(), Bundle.FileSearchData_FileSize_200PlusMb()),
XLARGE_IMAGE(7, 50 * BYTES_PER_MB, 200 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_XLARGE_IMAGE_displayName()), XLARGE_IMAGE(7, 50 * BYTES_PER_MB, 200 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_XLARGE_displayName(), Bundle.FileSearchData_FileSize_50mbto200mb()),
LARGE_IMAGE(8, 1 * BYTES_PER_MB, 50 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_LARGE_IMAGE_displayName()), LARGE_IMAGE(8, 1 * BYTES_PER_MB, 50 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_LARGE_displayName(), Bundle.FileSearchData_FileSize_1mbto50mb()),
MEDIUM_IMAGE(9, 100000, 1 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_MEDIUM_IMAGE_displayName()), MEDIUM_IMAGE(9, 100000, 1 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_MEDIUM_displayName(), Bundle.FileSearchData_FileSize_100kbto1mb()),
SMALL_IMAGE(10, 16000, 100000, Bundle.FileSearchData_FileSize_SMALL_IMAGE_displayName()), SMALL_IMAGE(10, 16000, 100000, Bundle.FileSearchData_FileSize_SMALL_displayName(), Bundle.FileSearchData_FileSize_16kbto100kb()),
XSMALL_IMAGE(11, 0, 16000, Bundle.FileSearchData_FileSize_XSMALL_IMAGE_displayName()); XSMALL_IMAGE(11, 0, 16000, Bundle.FileSearchData_FileSize_XSMALL_displayName(), Bundle.FileSearchData_FileSize_upTo16kb());
private final int ranking; // Must be unique for each value private final int ranking; // Must be unique for each value
private final long minBytes; // Note that the size must be strictly greater than this to match private final long minBytes; // Note that the size must be strictly greater than this to match
private final long maxBytes; private final long maxBytes;
private final String displayName; private final String sizeGroup;
private final String displaySize;
final static long NO_MAXIMUM = -1; final static long NO_MAXIMUM = -1;
FileSize(int ranking, long minB, long maxB, String displayName) { FileSize(int ranking, long minB, long maxB, String displayName, String displaySize) {
this.ranking = ranking; this.ranking = ranking;
this.minBytes = minB; this.minBytes = minB;
if (maxB >= 0) { if (maxB >= 0) {
@ -166,7 +173,8 @@ final class FileSearchData {
} else { } else {
this.maxBytes = NO_MAXIMUM; this.maxBytes = NO_MAXIMUM;
} }
this.displayName = displayName; this.sizeGroup = displayName;
this.displaySize = displaySize;
} }
/** /**
@ -246,7 +254,11 @@ final class FileSearchData {
@Override @Override
public String toString() { public String toString() {
return displayName; return sizeGroup + displaySize;
}
String getSizeGroup(){
return sizeGroup;
} }
/** /**

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

@ -207,11 +207,8 @@ class FileSearchFiltering {
@NbBundle.Messages({ @NbBundle.Messages({
"# {0} - filters", "# {0} - filters",
"FileSearchFiltering.SizeFilter.desc=Files with size in range(s): {0}", "FileSearchFiltering.SizeFilter.desc=With size(s): {0}",
"FileSearchFiltering.SizeFilter.or= or ", "FileSearchFiltering.SizeFilter.or=, or "})
"# {0} - Minimum bytes",
"# {1} - Maximum bytes",
"FileSearchFiltering.SizeFilter.range=({0} to {1})",})
@Override @Override
String getDesc() { String getDesc() {
String desc = ""; // NON-NLS String desc = ""; // NON-NLS
@ -219,7 +216,7 @@ class FileSearchFiltering {
if (!desc.isEmpty()) { if (!desc.isEmpty()) {
desc += Bundle.FileSearchFiltering_SizeFilter_or(); desc += Bundle.FileSearchFiltering_SizeFilter_or();
} }
desc += Bundle.FileSearchFiltering_SizeFilter_range(size.getMinBytes(), size.getMaxBytes()); desc += size.getSizeGroup();
} }
desc = Bundle.FileSearchFiltering_SizeFilter_desc(desc); desc = Bundle.FileSearchFiltering_SizeFilter_desc(desc);
return desc; return desc;
@ -364,7 +361,7 @@ class FileSearchFiltering {
@NbBundle.Messages({ @NbBundle.Messages({
"# {0} - filters", "# {0} - filters",
"FileSearchFiltering.ParentFilter.desc=Files with paths matching: {0}", "FileSearchFiltering.ParentFilter.desc=With paths matching: {0}",
"FileSearchFiltering.ParentFilter.or= or ", "FileSearchFiltering.ParentFilter.or= or ",
"FileSearchFiltering.ParentFilter.exact=(exact match)", "FileSearchFiltering.ParentFilter.exact=(exact match)",
"FileSearchFiltering.ParentFilter.substring=(substring)",}) "FileSearchFiltering.ParentFilter.substring=(substring)",})
@ -417,7 +414,7 @@ class FileSearchFiltering {
@NbBundle.Messages({ @NbBundle.Messages({
"# {0} - filters", "# {0} - filters",
"FileSearchFiltering.DataSourceFilter.desc=Files in data source(s): {0}", "FileSearchFiltering.DataSourceFilter.desc=In data source(s): {0}",
"FileSearchFiltering.DataSourceFilter.or= or ", "FileSearchFiltering.DataSourceFilter.or= or ",
"# {0} - Data source name", "# {0} - Data source name",
"# {1} - Data source ID", "# {1} - Data source ID",
@ -466,7 +463,7 @@ class FileSearchFiltering {
@NbBundle.Messages({ @NbBundle.Messages({
"# {0} - filters", "# {0} - filters",
"FileSearchFiltering.KeywordListFilter.desc=Files with keywords in list(s): {0}",}) "FileSearchFiltering.KeywordListFilter.desc=With keywords in list(s): {0}",})
@Override @Override
String getDesc() { String getDesc() {
return Bundle.FileSearchFiltering_KeywordListFilter_desc(concatenateSetNamesForDisplay(listNames)); return Bundle.FileSearchFiltering_KeywordListFilter_desc(concatenateSetNamesForDisplay(listNames));
@ -586,7 +583,7 @@ class FileSearchFiltering {
@NbBundle.Messages({ @NbBundle.Messages({
"# {0} - filters", "# {0} - filters",
"FileSearchFiltering.FrequencyFilter.desc=Files with frequency: {0}", "FileSearchFiltering.FrequencyFilter.desc=With frequency: {0}",
"FileSearchFiltering.FrequencyFilter.or= or ",}) "FileSearchFiltering.FrequencyFilter.or= or ",})
@Override @Override
String getDesc() { String getDesc() {
@ -632,7 +629,7 @@ class FileSearchFiltering {
@NbBundle.Messages({ @NbBundle.Messages({
"# {0} - filters", "# {0} - filters",
"FileSearchFiltering.HashSetFilter.desc=Files with hash set hits in set(s): {0}",}) "FileSearchFiltering.HashSetFilter.desc=With hash set hits in set(s): {0}",})
@Override @Override
String getDesc() { String getDesc() {
return Bundle.FileSearchFiltering_HashSetFilter_desc(concatenateSetNamesForDisplay(setNames)); return Bundle.FileSearchFiltering_HashSetFilter_desc(concatenateSetNamesForDisplay(setNames));
@ -670,7 +667,7 @@ class FileSearchFiltering {
@NbBundle.Messages({ @NbBundle.Messages({
"# {0} - filters", "# {0} - filters",
"FileSearchFiltering.InterestingItemSetFilter.desc=Files with interesting item hits in set(s): {0}",}) "FileSearchFiltering.InterestingItemSetFilter.desc=With interesting item hits in set(s): {0}",})
@Override @Override
String getDesc() { String getDesc() {
return Bundle.FileSearchFiltering_InterestingItemSetFilter_desc(concatenateSetNamesForDisplay(setNames)); return Bundle.FileSearchFiltering_InterestingItemSetFilter_desc(concatenateSetNamesForDisplay(setNames));
@ -708,7 +705,7 @@ class FileSearchFiltering {
@NbBundle.Messages({ @NbBundle.Messages({
"# {0} - filters", "# {0} - filters",
"FileSearchFiltering.ObjectDetectionFilter.desc=Files with objects detected in set(s): {0}",}) "FileSearchFiltering.ObjectDetectionFilter.desc=With objects detected in set(s): {0}",})
@Override @Override
String getDesc() { String getDesc() {
return Bundle.FileSearchFiltering_ObjectDetectionFilter_desc(concatenateSetNamesForDisplay(typeNames)); return Bundle.FileSearchFiltering_ObjectDetectionFilter_desc(concatenateSetNamesForDisplay(typeNames));
@ -784,7 +781,7 @@ class FileSearchFiltering {
@NbBundle.Messages({ @NbBundle.Messages({
"# {0} - filters", "# {0} - filters",
"FileSearchFiltering.ScoreFilter.desc=Files with score(s) of : {0}",}) "FileSearchFiltering.ScoreFilter.desc=With score(s) of : {0}",})
@Override @Override
String getDesc() { String getDesc() {
return Bundle.FileSearchFiltering_ScoreFilter_desc( return Bundle.FileSearchFiltering_ScoreFilter_desc(
@ -826,7 +823,7 @@ class FileSearchFiltering {
@NbBundle.Messages({ @NbBundle.Messages({
"# {0} - tag names", "# {0} - tag names",
"FileSearchFiltering.TagsFilter.desc=Files that have been tagged {0}", "FileSearchFiltering.TagsFilter.desc=That have been tagged {0}",
"FileSearchFiltering.TagsFilter.or= or ",}) "FileSearchFiltering.TagsFilter.or= or ",})
@Override @Override
String getDesc() { String getDesc() {
@ -862,7 +859,7 @@ class FileSearchFiltering {
} }
@NbBundle.Messages({ @NbBundle.Messages({
"FileSearchFiltering.UserCreatedFilter.desc=Files that contain EXIF data",}) "FileSearchFiltering.UserCreatedFilter.desc=That contain EXIF data",})
@Override @Override
String getDesc() { String getDesc() {
return Bundle.FileSearchFiltering_UserCreatedFilter_desc(); return Bundle.FileSearchFiltering_UserCreatedFilter_desc();
@ -931,7 +928,7 @@ class FileSearchFiltering {
} }
@NbBundle.Messages({ @NbBundle.Messages({
"FileSearchFiltering.PreviouslyNotableFilter.desc=Files that were previously marked as notable",}) "FileSearchFiltering.PreviouslyNotableFilter.desc=That were previously marked as notable",})
@Override @Override
String getDesc() { String getDesc() {
return Bundle.FileSearchFiltering_PreviouslyNotableFilter_desc(); return Bundle.FileSearchFiltering_PreviouslyNotableFilter_desc();
@ -949,7 +946,7 @@ class FileSearchFiltering {
} }
@NbBundle.Messages({ @NbBundle.Messages({
"FileSearchFiltering.KnownFilter.desc=Files which are not known"}) "FileSearchFiltering.KnownFilter.desc=Which are not known"})
@Override @Override
String getDesc() { String getDesc() {
return Bundle.FileSearchFiltering_KnownFilter_desc(); return Bundle.FileSearchFiltering_KnownFilter_desc();