diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties-MERGED index d3573080ff..dada8efef8 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties-MERGED @@ -47,6 +47,7 @@ DefaultTableArtifactContentViewer.attrsTableHeader.value=Value GeneralPurposeArtifactViewer.dates.created=Created GeneralPurposeArtifactViewer.dates.end=End GeneralPurposeArtifactViewer.dates.start=Start +GeneralPurposeArtifactViewer.dates.time=Time GeneralPurposeArtifactViewer.details.attrHeader=Details GeneralPurposeArtifactViewer.details.bookmarkHeader=Bookmark Details GeneralPurposeArtifactViewer.details.cachedHeader=Cached File @@ -59,6 +60,7 @@ GeneralPurposeArtifactViewer.details.historyHeader=Visit Details GeneralPurposeArtifactViewer.details.otherHeader=Other GeneralPurposeArtifactViewer.details.searchHeader=Web Search GeneralPurposeArtifactViewer.details.sourceHeader=Source +GeneralPurposeArtifactViewer.term.label=Term GeneralPurposeArtifactViewer.unknown.text=Unknown GeneralPurposeArtifactViewer_menuitem_copy=Copy MessageAccountPanel.account.justification=Account found in Message artifact diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/GeneralPurposeArtifactViewer.java b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/GeneralPurposeArtifactViewer.java index a6a8522553..c9f4108859 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/GeneralPurposeArtifactViewer.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/GeneralPurposeArtifactViewer.java @@ -266,13 +266,11 @@ public class GeneralPurposeArtifactViewer extends AbstractArtifactDetailsPanel i } else { addNameValueRow(bba.getAttributeType().getDisplayName(), TimeUtilities.epochToTime(bba.getValueLong(), ContentUtils.getTimeZone(artifact))); } - + } else if (artifact.getArtifactTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_SEARCH_QUERY.getTypeID() && bba.getAttributeType().getTypeID() == BlackboardAttribute.ATTRIBUTE_TYPE.TSK_TEXT.getTypeID()) { + addNameValueRow(Bundle.GeneralPurposeArtifactViewer_term_label(), bba.getDisplayString()); } else { - if (artifact.getArtifactTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_SEARCH_QUERY.getTypeID() && bba.getAttributeType().getTypeID() == BlackboardAttribute.ATTRIBUTE_TYPE.TSK_TEXT.getTypeID()) { - addNameValueRow(Bundle.GeneralPurposeArtifactViewer_term_label(), bba.getDisplayString()); - } else { - addNameValueRow(bba.getAttributeType().getDisplayName(), bba.getDisplayString()); - } + addNameValueRow(bba.getAttributeType().getDisplayName(), bba.getDisplayString()); + } } }