Merge branch '3201-ManageTagsOptionsPanel' of https://github.com/wschaeferB/autopsy into 3202-TagsMessagingOnStatusChange

This commit is contained in:
William Schaefer 2017-11-20 11:41:17 -05:00
commit 752ad4cd62

View File

@ -215,6 +215,7 @@ final class TagNameDefinition implements Comparable<TagNameDefinition> {
// if the Tags.Properties file is up to date parse it
tagNames.addAll(readCurrentTagPropertiesFile(tagNameTuples, standardTags));
}
}
//create standard tags which should always exist which were not already created for whatever reason, such as upgrade
for (String standardTagName : standardTags) {
if (STANDARD_NOTABLE_TAG_DISPLAY_NAMES.contains(standardTagName)) {
@ -223,7 +224,6 @@ final class TagNameDefinition implements Comparable<TagNameDefinition> {
tagNames.add(new TagNameDefinition(standardTagName, "", TagName.HTML_COLOR.NONE, TskData.FileKnown.UNKNOWN));
}
}
}
return tagNames;
}