diff --git a/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java b/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java index ac495f143e70d0231fd2bb9d9b351e36c9e55de2..73279ae2cde96388bec4e017976cec61347f6032 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java +++ b/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java @@ -1,7 +1,7 @@ /* * Sleuth Kit Data Model * - * Copyright 2011-2017 Basis Technology Corp. + * Copyright 2011-2019 Basis Technology Corp. * Contact: carrier <at> sleuthkit <dot> org * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -1175,7 +1175,11 @@ public enum ARTIFACT_TYPE implements SleuthkitVisitableItem { */ TSK_VERIFICATION_FAILED(47, "TSK_VERIFICATION_FAILED", //NON-NLS bundle.getString("BlackboardArtifact.tskVerificationFailed.text")), - + /** + * Categorization information for a data source. + */ + TSK_DATA_SOURCE_USAGE(48, "TSK_DATA_SOURCE_USAGE", //NON-NLS + bundle.getString("BlackboardArtifact.tskDataSourceUsage.text")), /** * Indicates auto fill data from a Web form */ diff --git a/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java b/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java index 7bf081cc6e9b0dd0743d2762c7883c1bc84f976b..82d9ccf7f1cf380901f6dd2c452e5988d48953ce 100755 --- a/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java +++ b/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java @@ -1,7 +1,7 @@ /* * Sleuth Kit Data Model * - * Copyright 2011-2018 Basis Technology Corp. + * Copyright 2011-2019 Basis Technology Corp. * Contact: carrier <at> sleuthkit <dot> org * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -46,7 +46,7 @@ public class BlackboardAttribute { private static final char[] HEX_ARRAY = "0123456789ABCDEF".toCharArray(); private static final Logger LOGGER = Logger.getLogger(BlackboardAttribute.class.getName()); - + private static final ResourceBundle bundle = ResourceBundle.getBundle("org.sleuthkit.datamodel.Bundle"); private BlackboardAttribute.Type attributeType; private final int valueInt; @@ -523,16 +523,16 @@ public String getDisplayString() { return Double.toString(getValueDouble()); case BYTE: return bytesToHexString(getValueBytes()); - + case DATETIME: { try { final Content dataSource = getParentArtifact().getDataSource(); - if ((dataSource != null) && (dataSource instanceof Image )) { + if ((dataSource != null) && (dataSource instanceof Image)) { // return the date/time string in the timezone associated with the datasource, - Image image = (Image) dataSource; + Image image = (Image) dataSource; TimeZone tzone = TimeZone.getTimeZone(image.getTimeZone()); return TimeUtilities.epochToTime(getValueLong(), tzone); - } + } } catch (TskException ex) { LOGGER.log(Level.WARNING, "Could not get timezone for image", ex); //NON-NLS // return time string in default timezone @@ -1297,22 +1297,22 @@ public enum ATTRIBUTE_TYPE { TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING), TSK_SSID(125, "TSK_SSID", //NON-NLS bundle.getString("BlackboardAttribute.tskSsid.text"), - TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING), + TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING), TSK_BSSID(126, "TSK_BSSID", //NON-NLS bundle.getString("BlackboardAttribute.tskBssid.text"), - TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING), + TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING), TSK_MAC_ADDRESS(127, "TSK_MAC_ADDRESS", //NON-NLS bundle.getString("BlackboardAttribute.tskMacAddress.text"), - TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING), + TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING), TSK_IMEI(128, "TSK_IMEI", //NON-NLS bundle.getString("BlackboardAttribute.tskImei.text"), - TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING), + TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING), TSK_IMSI(129, "TSK_IMSI", //NON-NLS bundle.getString("BlackboardAttribute.tskImsi.text"), - TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING), + TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING), TSK_ICCID(130, "TSK_ICCID", //NON-NLS bundle.getString("BlackboardAttribute.tskIccid.text"), - TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING); + TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING); private final int typeID; private final String typeName; diff --git a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties index 7b171a3b1a5900253b8dd04b8e559dca80b3de5e..7ad6e31b0b48aad0614f44fc5cacea36d6529380 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties +++ b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties @@ -44,6 +44,7 @@ BlackboardArtifact.tskSimAttached.text=SIM Attached BlackboardArtifact.tskBluetoothAdapter.text=Bluetooth Adapter BlackboardArtifact.tskWIFINetworkAdapter.text=Wireless Network Adapters BlackboardArtifact.tskVerificationFailed.text=Verification Failure +BlackboardArtifact.tskDataSourceUsage.text=Data Source Usage BlackboardArtifact.tskWebFormAutofill.text=Web Form Autofill BlackboardArtifact.tskWebFormAddresses.text=Web Form Addresses BlackboardArtifact.shortDescriptionDate.text=at {0}