From f3fbba91faffb99c3e972cb67424f78e69089448 Mon Sep 17 00:00:00 2001 From: sidheshenator <sidheshenator@gmail.com> Date: Tue, 25 Aug 2015 15:01:54 -0400 Subject: [PATCH] TSK_FACE_DETECTED B Artifact added --- .../java/src/org/sleuthkit/datamodel/BlackboardArtifact.java | 4 +++- bindings/java/src/org/sleuthkit/datamodel/Bundle.properties | 1 + framework/tsk/framework/services/TskBlackboard.cpp | 1 + framework/tsk/framework/services/TskBlackboard.h | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java b/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java index 37e06f095..263a47384 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java +++ b/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java @@ -124,7 +124,9 @@ public enum ARTIFACT_TYPE implements SleuthkitVisitableItem { TSK_GPS_ROUTE(36, "TSK_GPS_ROUTE", //NON-NLS bundle.getString("BlackboardArtifact.tskGpsRoute.text")), // Route based on GPS coordinates TSK_REMOTE_DRIVE(37, "TSK_REMOTE_DRIVE", //NON-NLS - bundle.getString("BlackboardArtifact.tskRemoteDrive.text")); + bundle.getString("BlackboardArtifact.tskRemoteDrive.text")), + TSK_FACE_DETECTED(38, "TSK_FACE_DETECTED", //NON-NLS + bundle.getString("BlackboardArtifact.tskFaceDetected.text")); /* SEE ABOVE -- KEEP C++ CODE IN SYNC */ private final String label; diff --git a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties index 0384b7fc0..5c6dbe56b 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties +++ b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties @@ -34,6 +34,7 @@ BlackboardArtifact.tskEncryptionDetected.text=Encryption Detected BlackboardArtifact.tskExtMismatchDetected.text=Extension Mismatch Detected BlackboardArtifact.tskInterestingArtifactHit.text=Interesting Results BlackboardArtifact.tskRemoteDrive.text=Remote Drive +BlackboardArtifact.tskFaceDetected.text=Face Detected BlackboardAttribute.tskUrl.text=URL BlackboardAttribute.tskDatetime.text=Date/Time BlackboardAttribute.tskName.text=Name diff --git a/framework/tsk/framework/services/TskBlackboard.cpp b/framework/tsk/framework/services/TskBlackboard.cpp index c5fe51f46..4f13162e0 100755 --- a/framework/tsk/framework/services/TskBlackboard.cpp +++ b/framework/tsk/framework/services/TskBlackboard.cpp @@ -49,6 +49,7 @@ map<int, TskArtifactNames> initializeArtifactTypeMap(){ retval.insert(pair<int, TskArtifactNames>(TSK_INTERESTING_ARTIFACT_HIT, TskArtifactNames("TSK_INTERESTING_ARTIFACT_HIT", "Interesting Results"))); retval.insert(pair<int, TskArtifactNames>(TSK_GPS_ROUTE, TskArtifactNames("TSK_GPS_ROUTE", "GPS Route"))); retval.insert(pair<int, TskArtifactNames>(TSK_REMOTE_DRIVE, TskArtifactNames("TSK_REMOTE_DRIVE", "Remote Drive"))); + retval.insert(pair<int, TskArtifactNames>(TSK_FACE_DETECTED, TskArtifactNames("TSK_FACE_DETECTED", "Face Detected"))); return retval; } diff --git a/framework/tsk/framework/services/TskBlackboard.h b/framework/tsk/framework/services/TskBlackboard.h index 4e1848bd7..1f45fec78 100755 --- a/framework/tsk/framework/services/TskBlackboard.h +++ b/framework/tsk/framework/services/TskBlackboard.h @@ -86,6 +86,7 @@ enum TSK_ARTIFACT_TYPE { TSK_INTERESTING_ARTIFACT_HIT = 35, ///< Any artifact interesting enough that it should be called out in the UI. TSK_GPS_ROUTE = 36, ///< Route based on GPS coordinates TSK_REMOTE_DRIVE = 37, ///< Network drive + TSK_FACE_DETECTED = 38, ///< Face detected /* SEE ABOVE: * - KEEP JAVA CODE IN SYNC -- GitLab