diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java b/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java index 7ef1b872db..cb87b1fa53 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java @@ -226,7 +226,7 @@ public class EmailExtracted implements AutopsyVisitableItem { * for the event to have a null oldValue. */ ModuleDataEvent eventData = (ModuleDataEvent) evt.getOldValue(); - if (null != eventData && eventData.getArtifactTypeId() == BlackboardArtifact.ARTIFACT_TYPE.TSK_EMAIL_MSG.getTypeID()) { + if (null != eventData && eventData.getBlackboardArtifactType().getTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_EMAIL_MSG.getTypeID()) { emailResults.update(); } } catch (IllegalStateException notUsed) { diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java index dc50e6a024..bdc98adb43 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java @@ -167,7 +167,7 @@ public class ExtractedContent implements AutopsyVisitableItem { if (null != event) { boolean passed = true; for(BlackboardArtifact.ARTIFACT_TYPE type: doNotShow) { - if(type.getTypeID() == event.getArtifactTypeId()) { + if(type.getTypeID() == event.getBlackboardArtifactType().getTypeID()) { passed = false; } } @@ -225,9 +225,9 @@ public class ExtractedContent implements AutopsyVisitableItem { if (skCase != null) { try { List inUse = new ArrayList<>(); - List types = skCase.getArtifactTypesInUse(); - for (Integer i: types) { - inUse.add(BlackboardArtifact.ARTIFACT_TYPE.fromID(i)); + List types = skCase.getArtifactTypesInUse(); + for (BlackboardArtifact.Type type: types) { + inUse.add(BlackboardArtifact.ARTIFACT_TYPE.fromID(type.getTypeID())); } inUse.removeAll(doNotShow); Collections.sort(inUse, @@ -424,7 +424,7 @@ public class ExtractedContent implements AutopsyVisitableItem { * for the event to have a null oldValue. */ final ModuleDataEvent event = (ModuleDataEvent) evt.getOldValue(); - if (null != event && event.getArtifactTypeId() == type.getTypeID()) { + if (null != event && event.getBlackboardArtifactType().getTypeID() == type.getTypeID()) { refresh(true); } } catch (IllegalStateException notUsed) { diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java b/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java index 4d4da97efc..60855fe8a0 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java @@ -204,7 +204,7 @@ public class HashsetHits implements AutopsyVisitableItem { * oldValue if the event is a remote event. */ ModuleDataEvent eventData = (ModuleDataEvent) evt.getOldValue(); - if (null != eventData && eventData.getArtifactTypeId() == ARTIFACT_TYPE.TSK_HASHSET_HIT.getTypeID()) { + if (null != eventData && eventData.getBlackboardArtifactType().getTypeID() == ARTIFACT_TYPE.TSK_HASHSET_HIT.getTypeID()) { hashsetResults.update(); } } catch (IllegalStateException notUsed) { diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/InterestingHits.java b/Core/src/org/sleuthkit/autopsy/datamodel/InterestingHits.java index 3aaa09bf83..e69dfd75b5 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/InterestingHits.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/InterestingHits.java @@ -195,8 +195,8 @@ public class InterestingHits implements AutopsyVisitableItem { * for the event to have a null oldValue. */ ModuleDataEvent eventData = (ModuleDataEvent) evt.getOldValue(); - if (null != eventData && (eventData.getArtifactTypeId() == BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getTypeID() - || eventData.getArtifactTypeId() == BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID())) { + if (null != eventData && (eventData.getBlackboardArtifactType().getTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getTypeID() + || eventData.getBlackboardArtifactType().getTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT.getTypeID())) { interestingResults.update(); } } catch (IllegalStateException notUsed) { diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java b/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java index 251b784ffb..77be04dd6d 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java @@ -268,7 +268,7 @@ public class KeywordHits implements AutopsyVisitableItem { * for the event to have a null oldValue. */ ModuleDataEvent eventData = (ModuleDataEvent) evt.getOldValue(); - if (null != eventData && eventData.getArtifactTypeId() == BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWORD_HIT.getTypeID()) { + if (null != eventData && eventData.getBlackboardArtifactType().getTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWORD_HIT.getTypeID()) { keywordResults.update(); } } catch (IllegalStateException notUsed) { diff --git a/Core/src/org/sleuthkit/autopsy/ingest/ModuleDataEvent.java b/Core/src/org/sleuthkit/autopsy/ingest/ModuleDataEvent.java index d71c049b6e..652c6d8645 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/ModuleDataEvent.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/ModuleDataEvent.java @@ -49,39 +49,39 @@ import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE; public class ModuleDataEvent extends ChangeEvent { private String moduleName; - private ARTIFACT_TYPE artifactType; - private int artifactTypeId; + private BlackboardArtifact.Type blackboardArtifactType; private Collection artifacts; /** * @param moduleName Module name * @param artifactType Type of artifact that was posted to blackboard */ + @Deprecated public ModuleDataEvent(String moduleName, ARTIFACT_TYPE artifactType) { super(artifactType); - this.artifactTypeId = artifactType.getTypeID(); + this.blackboardArtifactType = new BlackboardArtifact.Type(artifactType.getTypeID(), artifactType.getLabel(), artifactType.getDisplayName()); this.moduleName = moduleName; - this.artifactType = artifactType; } /** - * @param moduleName Module name - * @param artifactTypeId ID of the type of artifact posted to the blackboard + * @param moduleName Module Name + * @param blackboardArtifactType Type of the blackboard artifact posted to + * the blackboard */ - public ModuleDataEvent(String moduleName, int artifactTypeId) { - super(ARTIFACT_TYPE.fromID(artifactTypeId)); - this.artifactTypeId = artifactTypeId; + public ModuleDataEvent(String moduleName, BlackboardArtifact.Type blackboardArtifactType) { + super(blackboardArtifactType); + this.blackboardArtifactType = blackboardArtifactType; this.moduleName = moduleName; } /** * @param moduleName Module name - * @param artifactTypeId ID of the type of artifact posted to the blackboard + * @param blackboardArtifactType Type of artifact posted to the blackboard * @param artifacts List of specific artifact ID values that were added to * blackboard */ - public ModuleDataEvent(String moduleName, int artifactTypeId, Collection artifacts) { - this(moduleName, artifactTypeId); + public ModuleDataEvent(String moduleName, BlackboardArtifact.Type blackboardArtifactType, Collection artifacts) { + this(moduleName, blackboardArtifactType); this.artifacts = artifacts; } @@ -91,17 +91,20 @@ public class ModuleDataEvent extends ChangeEvent { * @param artifacts List of specific artifact values that were added to * blackboard */ + @Deprecated public ModuleDataEvent(String moduleName, ARTIFACT_TYPE artifactType, Collection artifacts) { this(moduleName, artifactType); this.artifacts = artifacts; } - + /** - * Gets the Artifact Type ID of this event - * @return The artifact ID + * Gets the blackboard artifact type of the new artifacts associated with + * the event + * + * @return The blackboard artifact type */ - public int getArtifactTypeId() { - return this.artifactTypeId; + public BlackboardArtifact.Type getBlackboardArtifactType() { + return this.blackboardArtifactType; } /** @@ -112,16 +115,6 @@ public class ModuleDataEvent extends ChangeEvent { public Collection getArtifacts() { return artifacts; } - - /** - * get artifact type of the new artifacts associated with the event - * If it is a user defined artifact, it will return null - * @return the artifact type - */ - public ARTIFACT_TYPE getArtifactType() { - return artifactType; - } - /** * get module name that created the artifacts and fired the event * diff --git a/Core/src/org/sleuthkit/autopsy/ingest/events/BlackboardPostEvent.java b/Core/src/org/sleuthkit/autopsy/ingest/events/BlackboardPostEvent.java index 527eb61fb9..a63b3893e9 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/events/BlackboardPostEvent.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/events/BlackboardPostEvent.java @@ -61,7 +61,7 @@ public final class BlackboardPostEvent extends AutopsyEvent implements Serializa */ super( IngestManager.IngestModuleEvent.DATA_ADDED.toString(), - new SerializableEventData(eventData.getModuleName(), eventData.getArtifactTypeId(), eventData.getArtifacts() != null + new SerializableEventData(eventData.getModuleName(), eventData.getBlackboardArtifactType() , eventData.getArtifacts() != null ? eventData.getArtifacts() .stream() .map(BlackboardArtifact::getArtifactID) @@ -112,10 +112,10 @@ public final class BlackboardPostEvent extends AutopsyEvent implements Serializa private static final long serialVersionUID = 1L; private final String moduleName; - private int artifactTypeId; + private BlackboardArtifact.Type artifactTypeId; private Collection artifactIds; - private SerializableEventData(String moduleName, int artifactTypeId, Collection artifactIds) { + private SerializableEventData(String moduleName, BlackboardArtifact.Type artifactTypeId, Collection artifactIds) { this.moduleName = moduleName; this.artifactTypeId = artifactTypeId; this.artifactIds = new ArrayList<>(artifactIds);