From db17730091ee3146c16a212e8aa858250e7fca70 Mon Sep 17 00:00:00 2001
From: millmanorama <millmanorama@gmail.com>
Date: Thu, 8 Sep 2016 15:19:52 +0200
Subject: [PATCH] add status column and credit card icon to credit card account
 reporting

---
 .../sleuthkit/autopsy/report/ReportHTML.java  |   3 +++
 .../autopsy/report/TableReportGenerator.java  |  24 +++++++++++++++++-
 .../autopsy/report/images/credit-card.png     | Bin 0 -> 536 bytes
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 Core/src/org/sleuthkit/autopsy/report/images/credit-card.png

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
index 54fa7b6b7e..6bd503cd4c 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
@@ -254,6 +254,9 @@ class ReportHTML implements TableReportModule {
                 case TSK_REMOTE_DRIVE:
                     in = getClass().getResourceAsStream("/org/sleuthkit/autopsy/report/images/drive_network.png"); //NON-NLS
                     break;
+                case TSK_CREDIT_CARD_ACCOUNT:
+                    in = getClass().getResourceAsStream("/org/sleuthkit/autopsy/report/images/credit-card.png"); //NON-NLS
+                    break;
                 default:
                     logger.log(Level.WARNING, "useDataTypeIcon: unhandled artifact type = " + dataType); //NON-NLS
                     in = getClass().getResourceAsStream("/org/sleuthkit/autopsy/report/images/star.png"); //NON-NLS
diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
index 5dd88f680a..a7ad4b1415 100755
--- a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2013 Basis Technology Corp.
+ * Copyright 2013-16 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -1449,6 +1449,8 @@ class TableReportGenerator {
 
             columns.add(new AttributeColumn(NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.remotePath"),
                     new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_REMOTE_PATH)));
+        } else if (artifactTypeId == BlackboardArtifact.ARTIFACT_TYPE.TSK_CREDIT_CARD_ACCOUNT.getTypeID()) {
+            columns.add(new StatusColumn());
         } else {
             // This is the case that it is a custom type. The reason an else is 
             // necessary is to make sure that the source file column is added
@@ -1562,6 +1564,26 @@ class TableReportGenerator {
         Set<BlackboardAttribute.Type> removeTypeFromSet(Set<BlackboardAttribute.Type> types);
     }
 
+    private class StatusColumn implements Column {
+
+        @NbBundle.Messages("TableReportGenerator.StatusColumn.Header=Review Status")
+        @Override
+        public String getColumnHeader() {
+            return Bundle.TableReportGenerator_StatusColumn_Header();
+        }
+
+        @Override
+        public String getCellData(ArtifactData artData) {
+            return artData.getArtifact().getReviewStatus().getDisplayName();
+        }
+
+        @Override
+        public Set<BlackboardAttribute.Type> removeTypeFromSet(Set<BlackboardAttribute.Type> types) {
+            // This column doesn't have a type, so nothing to remove
+            return types;
+        }
+
+    }
     private class AttributeColumn implements Column {
 
         private final String columnHeader;
diff --git a/Core/src/org/sleuthkit/autopsy/report/images/credit-card.png b/Core/src/org/sleuthkit/autopsy/report/images/credit-card.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8d6624d769f62b8064111348a77f33f8dfbec43
GIT binary patch
literal 536
zcmV+z0_XjSP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzx=BPqRCwCNQ$1@NK@ferx98JYid6`c
zCIJ=BN11fSU{d%8xN>P5QYc-1MhL{N;xsM|AwM7lLDIN%<;ozE6b6F}n?P(y_qDgX
zli8CH$OIL3;f1-Kxw$uQ=Ix#!BHU$3+;J(jd$G;?)-A9C)*dK!HrHP~SfSF@B=;lv
zp#s5`B|;_GWaayJ0h<sbw6QMV`*scmqRfMn#EifSBXCHtPQo}Y<}d~Jvdu@LMy4zz
zoXaQ7W418#7K~%hET_QM5{zM|)R}@c`84zY!EeMd$BJ`dWjlY{K#}E=j5d>*XE5Jf
zrE$K1RnWy`=2>ljGB05=$E`b*r9~|wP(EZ4i+s+j?FE}P^YaElauATeJQ7ELERgn<
zBAv(nsNOCC-AmwU!!khQaggG7B5^oq;t7M7->)G$ImEM%8(<DJ9(~4_v|r-_MZ+_H
z=vnyF=v{egg*1&3MT)y|mEywzA#1-v^Q?=cwF<Y$tz?6`g3)!@LO*Q9b5m_E1QpQF
ze40AM?|vZQ+)u$;@ps>UU27CcUEuZC4#;&X6tS|-jrN<qDcN#((V3JPw9oI0d;c5%
a2`~WLh}sZ}_3q&S0000<MNUMnLSTZ@^7LT<

literal 0
HcmV?d00001