3116: A more generic way to get account display name for all availabe account types.

This commit is contained in:
U-BASIS\zhaohui 2017-10-25 15:00:05 -04:00
parent 98f01f5921
commit af6fb2fcee

View File

@ -176,8 +176,11 @@ class TableReportGenerator {
* compund name by appending a ":" and the account type. * compund name by appending a ":" and the account type.
*/ */
String accountDisplayname = accountType; String accountDisplayname = accountType;
if (accountType != null && accountType.equals(Account.Type.CREDIT_CARD.name())) { for (Account.Type acct : Account.Type.values()) {
accountDisplayname = Account.Type.CREDIT_CARD.getDisplayName(); if (acct.equals(Account.Type.valueOf(accountType))) {
accountDisplayname = acct.getDisplayName();
break;
}
} }
final String compundDataTypeName = BlackboardArtifact.ARTIFACT_TYPE.TSK_ACCOUNT.getDisplayName() + ": " + accountDisplayname; final String compundDataTypeName = BlackboardArtifact.ARTIFACT_TYPE.TSK_ACCOUNT.getDisplayName() + ": " + accountDisplayname;
writeTableForDataType(new ArrayList<>(groupedArtifacts.get(accountType)), type, compundDataTypeName, comment); writeTableForDataType(new ArrayList<>(groupedArtifacts.get(accountType)), type, compundDataTypeName, comment);