From 2a00a770cc4d5ee467bde741cdc0e903813e7bb8 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Mon, 19 Nov 2018 14:57:01 -0500 Subject: [PATCH] 4381 comment out partially completed adding of artifacts --- .../centralrepository/datamodel/EamArtifactUtil.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamArtifactUtil.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamArtifactUtil.java index 9e7a7e9dbb..b093c098bd 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamArtifactUtil.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamArtifactUtil.java @@ -166,9 +166,11 @@ public class EamArtifactUtil { } else if (correlationType.getId() == CorrelationAttributeInstance.SSID_TYPE_ID && BlackboardArtifact.ARTIFACT_TYPE.TSK_WIFI_NETWORK.getTypeID() == artifactTypeID) { value = bbArtifact.getAttribute(new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SSID)).getValueString(); - } else if (correlationType.getId() == CorrelationAttributeInstance.MAC_TYPE_ID) { - value = "NEED_MAC_ADDRESS"; - } + } +// else if (correlationType.getId() == CorrelationAttributeInstance.MAC_TYPE_ID +// && BlackboardArtifact.ARTIFACT_TYPE.TSK_DEVICE_ATTACHED.getTypeID() == artifactTypeID) { +// value = bbArtifact.getAttribute(new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DEVICE_ID)).getValueString(); +// } //WJS-TODO enable actually making the mac address attrs when tsk_artifacts and attrs added } catch (TskCoreException ex) { logger.log(Level.SEVERE, "Error getting attribute while getting type from BlackboardArtifact.", ex); // NON-NLS return null;