fix usage of read status attribute

This commit is contained in:
millmanorama 2014-11-01 18:22:32 -04:00
parent b682a57ba5
commit 3412410fd2
2 changed files with 3 additions and 3 deletions

View File

@ -169,7 +169,7 @@ public interface ArtifactEventType extends EventType {
@Override @Override
public String apply(BlackboardArtifact artf, Map<BlackboardAttribute.ATTRIBUTE_TYPE, BlackboardAttribute> attrMap) { public String apply(BlackboardArtifact artf, Map<BlackboardAttribute.ATTRIBUTE_TYPE, BlackboardAttribute> attrMap) {
final BlackboardAttribute attr = attrMap.get(attribute); final BlackboardAttribute attr = attrMap.get(attribute);
return (attr != null) ? StringUtils.defaultString(attr.getValueString()) : " "; return (attr != null) ? StringUtils.defaultString(attr.getDisplayString()) : " ";
} }
private final BlackboardAttribute.ATTRIBUTE_TYPE attribute; private final BlackboardAttribute.ATTRIBUTE_TYPE attribute;

View File

@ -142,14 +142,14 @@ public enum MiscTypes implements EventType, ArtifactEventType {
new AttributeExtractor(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DEVICE_ID)); new AttributeExtractor(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DEVICE_ID));
static public String stringValueOf(BlackboardAttribute attr) { static public String stringValueOf(BlackboardAttribute attr) {
return attr != null ? attr.getValueString() : ""; return attr != null ? attr.getDisplayString() : "";
} }
public static String toFrom(BlackboardAttribute dir) { public static String toFrom(BlackboardAttribute dir) {
if (dir == null) { if (dir == null) {
return ""; return "";
} else { } else {
switch (dir.getValueString()) { switch (dir.getDisplayString()) {
case "Incoming": case "Incoming":
return "from"; return "from";
case "Outgoing": case "Outgoing":