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

2969: update the Messages by using classname.messeges format

Browse Source
This commit is contained in:
U-BASIS\zhaohui 2017-10-27 09:49:39 -04:00
parent 9f637c8be4
commit a9caa22141
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Core/src/org/sleuthkit/autopsy/filesearch/DateSearchFilter.java
View File

@ -204,8 +204,8 @@ class DateSearchFilter extends AbstractFileSearchFilter<DateSearchPanel> {
@Override @Override
@Messages ({ @Messages ({
"End.date.before.start.date=The end date should be after the start date.", "DateSearchFilter.endDateBeforeStartDate=The end date should be after the start date.",
"No.checkbox.selected=Non of the date search checkbox is selected." "DateSearchFilter.noCheckboxSelected=Non of the date search checkbox is selected."
}) })
public boolean isValid() { public boolean isValid() {
@ -214,12 +214,12 @@ class DateSearchFilter extends AbstractFileSearchFilter<DateSearchPanel> {
Calendar endDate = getCalendarDate(panel.getDateToTextField().getText()); Calendar endDate = getCalendarDate(panel.getDateToTextField().getText());
if ((startDate != null && startDate.after(endDate)) || (endDate != null && endDate.before(startDate))) { if ((startDate != null && startDate.after(endDate)) || (endDate != null && endDate.before(startDate))) {
setLastError(Bundle.End_date_before_start_date()); setLastError(Bundle.DateSearchFilter_endDateBeforeStartDate());
return false; return false;
} }
if (!panel.isValidSearch()) { if (!panel.isValidSearch()) {
setLastError(Bundle.No_checkbox_selected()); setLastError(Bundle.DateSearchFilter_noCheckboxSelected());
return false; return false;
} }

12
Core/src/org/sleuthkit/autopsy/filesearch/HashSearchFilter.java
View File

@ -62,22 +62,22 @@ class HashSearchFilter extends AbstractFileSearchFilter<HashSearchPanel> {
@Override @Override
@Messages({ @Messages({
"Empty.hash=Hash data is empty.", "HashSearchFilter.emptyHash=Hash data is empty.",
"# {0} - hash data length", "Wrong.length=Input lenght({0}), doesn't match the MD5 length(32).", "# {0} - hash data length", "HashSearchFilter.wrongLength=Input lenght({0}), doesn't match the MD5 length(32).",
"Wrong.character=Input data is an invalid MD5 hex data." "HashSearchFilter.wrongCharacter=Input data is an invalid MD5 hex data."
}) })
public boolean isValid() { public boolean isValid() {
String inputHashData = this.getComponent().getSearchTextField().getText(); String inputHashData = this.getComponent().getSearchTextField().getText();
if (inputHashData.isEmpty()) { if (inputHashData.isEmpty()) {
setLastError(Bundle.Empty_hash()); setLastError(Bundle.HashSearchFilter_emptyHash());
return false; return false;
} }
if (inputHashData.length() != 32) { if (inputHashData.length() != 32) {
setLastError(Bundle.Wrong_length(inputHashData.length())); setLastError(Bundle.HashSearchFilter_wrongLength(inputHashData.length()));
return false; return false;
} }
if (!inputHashData.matches("[0-9a-fA-F]+")) { if (!inputHashData.matches("[0-9a-fA-F]+")) {
setLastError(Bundle.Wrong_character()); setLastError(Bundle.HashSearchFilter_wrongCharacter());
return false; return false;
} }
return true; return true;

8
Core/src/org/sleuthkit/autopsy/filesearch/SizeSearchFilter.java
View File

@ -76,8 +76,8 @@ class SizeSearchFilter extends AbstractFileSearchFilter<SizeSearchPanel> {
@Override @Override
@Messages ({ @Messages ({
"Non.negative.number=Input size data is a negative number.", "SizeSearchFilter.nonNegativeNumber=Input size data is a negative number.",
"Not.a.number=Input size data is not a number." "SizeSearchFilter.notANumber=Input size data is not a number."
}) })
public boolean isValid() { public boolean isValid() {
String input = this.getComponent().getSizeTextField().getText(); String input = this.getComponent().getSizeTextField().getText();
@ -85,11 +85,11 @@ class SizeSearchFilter extends AbstractFileSearchFilter<SizeSearchPanel> {
try { try {
int inputInt = Integer.parseInt(input); int inputInt = Integer.parseInt(input);
if (inputInt < 0) { if (inputInt < 0) {
setLastError(Bundle.Non_negative_number()); setLastError(Bundle.SizeSearchFilter_nonNegativeNumber());
return false; return false;
} }
} catch (NumberFormatException | NullPointerException e) { } catch (NumberFormatException | NullPointerException e) {
setLastError(Bundle.Not_a_number()); setLastError(Bundle.SizeSearchFilter_notANumber());
return false; return false;
} }
return true; return true;