convert filters package to NBundle.Messages annotation

This commit is contained in:
jmillman 2015-07-24 12:06:57 -04:00
parent a95eb009ae
commit e4b095681b
7 changed files with 33 additions and 31 deletions

View File

@ -377,7 +377,6 @@ public class TimeLineController {
} }
} }
@SuppressWarnings("deprecation")
private long getCaseLastArtifactID(final SleuthkitCase sleuthkitCase) { private long getCaseLastArtifactID(final SleuthkitCase sleuthkitCase) {
long caseLastArtfId = -1; long caseLastArtfId = -1;
String query = "select Max(artifact_id) as max_id from blackboard_artifacts"; // NON-NLS String query = "select Max(artifact_id) as max_id from blackboard_artifacts"; // NON-NLS

View File

@ -1,4 +0,0 @@
hideKnownFilter.displayName.text=Hide Known Files
IntersectionFilter.displayName.text=Intersection{0}
TextFilter.displayName.text=Text Filter
TypeFilter.displayName.text=Event Type Filter

View File

@ -20,6 +20,7 @@ package org.sleuthkit.autopsy.timeline.filters;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javafx.beans.binding.Bindings; import javafx.beans.binding.Bindings;
import org.openide.util.NbBundle;
/** /**
* union of {@link DataSourceFilter}s * union of {@link DataSourceFilter}s
@ -44,8 +45,9 @@ public class DataSourcesFilter extends UnionFilter<DataSourceFilter> {
} }
@Override @Override
@NbBundle.Messages("DataSourcesFilter.displayName.text=Data Source")
public String getDisplayName() { public String getDisplayName() {
return "Data Source"; return Bundle.DataSourcesFilter_displayName_text();
} }
@Override @Override
@ -53,7 +55,10 @@ public class DataSourcesFilter extends UnionFilter<DataSourceFilter> {
//move this logic into SaveSnapshot //move this logic into SaveSnapshot
String string = getDisplayName() + getStringCheckBox(); String string = getDisplayName() + getStringCheckBox();
if (getSubFilters().isEmpty() == false) { if (getSubFilters().isEmpty() == false) {
string = string + " : " + getSubFilters().stream().filter(Filter::isSelected).map(Filter::getHTMLReportString).collect(Collectors.joining("</li><li>", "<ul><li>", "</li></ul>")); // NON-NLS string = string + " : " + getSubFilters().stream()
.filter(Filter::isSelected)
.map(Filter::getHTMLReportString)
.collect(Collectors.joining("</li><li>", "<ul><li>", "</li></ul>")); // NON-NLS
} }
return string; return string;
} }

View File

@ -26,8 +26,9 @@ import org.openide.util.NbBundle;
public class HideKnownFilter extends AbstractFilter { public class HideKnownFilter extends AbstractFilter {
@Override @Override
@NbBundle.Messages("hideKnownFilter.displayName.text=Hide Known Files")
public String getDisplayName() { public String getDisplayName() {
return NbBundle.getMessage(this.getClass(), "hideKnownFilter.displayName.text"); return Bundle.hideKnownFilter_displayName_text();
} }
public HideKnownFilter() { public HideKnownFilter() {

View File

@ -47,12 +47,13 @@ public class IntersectionFilter<S extends Filter> extends CompoundFilter<S> {
} }
@Override @Override
@NbBundle.Messages({"# {0} - sub filter displaynames",
"IntersectionFilter.displayName.text=Intersection{0}"})
public String getDisplayName() { public String getDisplayName() {
return NbBundle.getMessage(this.getClass(), String collect = getSubFilters().stream()
"IntersectionFilter.displayName.text",
getSubFilters().stream()
.map(Filter::getDisplayName) .map(Filter::getDisplayName)
.collect(Collectors.joining(",", "[", "]"))); .collect(Collectors.joining(",", "[", "]"));
return Bundle.IntersectionFilter_displayName_text(collect);
} }
@Override @Override

View File

@ -41,8 +41,9 @@ public class TextFilter extends AbstractFilter {
} }
@Override @Override
@NbBundle.Messages("TextFilter.displayName.text=Text Filter")
public String getDisplayName() { public String getDisplayName() {
return NbBundle.getMessage(this.getClass(), "TextFilter.displayName.text"); return Bundle.TextFilter_displayName_text();
} }
synchronized public String getText() { synchronized public String getText() {

View File

@ -64,12 +64,11 @@ public class TypeFilter extends UnionFilter<TypeFilter> {
} }
@Override @Override
@NbBundle.Messages("TypeFilter.displayName.text=Event Type Filter")
public String getDisplayName() { public String getDisplayName() {
if (eventType == RootEventType.getInstance()) { return (eventType == RootEventType.getInstance())
return NbBundle.getMessage(this.getClass(), "TypeFilter.displayName.text"); ? Bundle.TypeFilter_displayName_text()
} else { : eventType.getDisplayName();
return eventType.getDisplayName();
}
} }
/** @return a color to use in GUI components representing this filter */ /** @return a color to use in GUI components representing this filter */