diff --git a/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java b/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java index a1d8c218a8656ad86d496b3887db607fc857860f..9c5ae438ed0e33fc3a09a8a1f476fb0151e48ada 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java +++ b/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java @@ -23,7 +23,6 @@ import java.sql.SQLException; import java.text.MessageFormat; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -711,7 +710,7 @@ public BlackboardArtifact newArtifact(int artifactTypeID) throws TskCoreExceptio public AnalysisResultAdded newAnalysisResult(BlackboardArtifact.Type artifactType, Score score, String conclusion, String configuration, String justification, Collection<BlackboardAttribute> attributesList) throws TskCoreException { CaseDbTransaction trans = sleuthkitCase.beginTransaction(); try { - AnalysisResultAdded resultAdded = sleuthkitCase.getBlackboard().newAnalysisResult(artifactType, this.getObjectID(), this.getDataSource().getId(), score, conclusion, configuration, justification, attributesList, trans); + AnalysisResultAdded resultAdded = sleuthkitCase.getBlackboard().newAnalysisResult(artifactType, this.getId(), this.getDataSource().getId(), score, conclusion, configuration, justification, attributesList, trans); trans.commit(); return resultAdded; @@ -725,7 +724,7 @@ public AnalysisResultAdded newAnalysisResult(BlackboardArtifact.Type artifactTyp public AnalysisResultAdded newAnalysisResult(BlackboardArtifact.Type artifactType, Score score, String conclusion, String configuration, String justification, Collection<BlackboardAttribute> attributesList, long dataSourceId) throws TskCoreException { CaseDbTransaction trans = sleuthkitCase.beginTransaction(); try { - AnalysisResultAdded resultAdded = sleuthkitCase.getBlackboard().newAnalysisResult(artifactType, this.getObjectID(), dataSourceId, score, conclusion, configuration, justification, attributesList, trans); + AnalysisResultAdded resultAdded = sleuthkitCase.getBlackboard().newAnalysisResult(artifactType, this.getId(), dataSourceId, score, conclusion, configuration, justification, attributesList, trans); trans.commit(); return resultAdded; @@ -1288,6 +1287,11 @@ public static final class Type implements Serializable { */ public static final Type TSK_WEB_CATEGORIZATION = new BlackboardArtifact.Type(68, "TSK_WEB_CATEGORIZATION", bundle.getString("BlackboardArtifact.tskWebCategorization.text"), Category.ANALYSIS_RESULT); + /** + * Indicates that the file or artifacts was previously seen in another Autopsy case. + */ + public static final Type TSK_PREVIOUSLY_SEEN = new BlackboardArtifact.Type(69, "TSK_PREVIOUSLY_SEEN", bundle.getString("BlackboardArtifact.tskPreviouslySeen.text"), Category.ANALYSIS_RESULT); + // NOTE: When adding a new standard BlackboardArtifact.Type, add the instance and then add to the STANDARD_TYPES map. /** * All standard artifact types with ids mapped to the type. @@ -1353,7 +1357,8 @@ public static final class Type implements Serializable { TSK_USER_DEVICE_EVENT, TSK_YARA_HIT, TSK_GPS_AREA, - TSK_WEB_CATEGORIZATION + TSK_WEB_CATEGORIZATION, + TSK_PREVIOUSLY_SEEN ).collect(Collectors.toMap(type -> type.getTypeID(), type -> type))); private final String typeName; @@ -1849,7 +1854,12 @@ public enum ARTIFACT_TYPE implements SleuthkitVisitableItem { TSK_GPS_AREA(67, "TSK_GPS_AREA", bundle.getString("BlackboardArtifact.tskGPSArea.text"), Category.DATA_ARTIFACT), TSK_WEB_CATEGORIZATION(68, "TSK_WEB_CATEGORIZATION", - bundle.getString("BlackboardArtifact.tskWebCategorization.text"), Category.ANALYSIS_RESULT),; + bundle.getString("BlackboardArtifact.tskWebCategorization.text"), Category.ANALYSIS_RESULT), + /** + * Indicates that the file or artifacts was previously seen in another Autopsy case. + */ + TSK_PREVIOUSLY_SEEN(69, "TSK_PREVIOUSLY_SEEN", + bundle.getString("BlackboardArtifact.tskPreviouslySeen.text"), Category.ANALYSIS_RESULT),; /* * To developers: For each new artifact, ensure that: - The enum value diff --git a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties index 6a52a5d8b40a1cd2aa94183251e69c4f62ae45f7..de5eec20fecdf3a0690a2cee09ad7827a658e6ce 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties +++ b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties @@ -64,6 +64,7 @@ BlackboardArtifact.tskUserDeviceEvent.text=User Device Events BlackboardArtifact.shortDescriptionDate.text=at {0} BlackboardArtifact.tskAssociatedObject.text=Associated Object BlackboardArtifact.tskWebCategorization.text=Web Categories +BlackboardArtifact.tskPreviouslySeen.text=Previously Seen BlackboardArtifact.tskYaraHit.text=YARA Hit BlackboardArtifact.tskGPSArea.text=GPS Area BlackboardAttribute.tskAccountType.text=Account Type diff --git a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED index 6a52a5d8b40a1cd2aa94183251e69c4f62ae45f7..de5eec20fecdf3a0690a2cee09ad7827a658e6ce 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED +++ b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED @@ -64,6 +64,7 @@ BlackboardArtifact.tskUserDeviceEvent.text=User Device Events BlackboardArtifact.shortDescriptionDate.text=at {0} BlackboardArtifact.tskAssociatedObject.text=Associated Object BlackboardArtifact.tskWebCategorization.text=Web Categories +BlackboardArtifact.tskPreviouslySeen.text=Previously Seen BlackboardArtifact.tskYaraHit.text=YARA Hit BlackboardArtifact.tskGPSArea.text=GPS Area BlackboardAttribute.tskAccountType.text=Account Type