diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java index 58e92c2119..0de53fa409 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java @@ -647,7 +647,7 @@ abstract class AbstractSqlEamDb implements EamDb { * * @param correlationCase the current CorrelationCase used for ensuring * uniqueness of DataSource - * @param dataSourceObjectId the data source device ID number + * @param dataSourceObjectId the object id of the data source * * @return The data source * @@ -675,7 +675,7 @@ abstract class AbstractSqlEamDb implements EamDb { * * @param correlationCase the current CorrelationCase used for ensuring * uniqueness of DataSource - * @param dataSourceDeviceId the data source device ID number + * @param dataSourceDeviceId the object id of the data source * * @return The data source * diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationDataSource.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationDataSource.java index f5684966e7..b1d48d07b2 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationDataSource.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationDataSource.java @@ -44,34 +44,36 @@ public class CorrelationDataSource implements Serializable { * Create a CorrelationDataSource object, the object will not have the data * source id for the row in the central repository. * - * @param correlationCase CorrelationCase object data source is associated - * with. Must have been created by EamDB and have a - * valid ID. - * @param deviceId User specified case-specific ID - * @param name Display name of data source + * @param correlationCase CorrelationCase object data source is + * associated with. Must have been created by + * EamDB and have a valid ID. + * @param deviceId User specified case-specific ID + * @param name Display name of data source + * @param dataSourceObjectId The object ID for the datasource */ - public CorrelationDataSource(CorrelationCase correlationCase, String deviceId, String name, long caseDataSourceId) { - this(correlationCase.getID(), -1, deviceId, name, caseDataSourceId); + public CorrelationDataSource(CorrelationCase correlationCase, String deviceId, String name, long dataSourceObjectId) { + this(correlationCase.getID(), -1, deviceId, name, dataSourceObjectId); } /** * Create a CorrelationDataSource object. * - * @param caseId Row ID for Case in DB - * @param dataSourceId Row ID for this data source in DB (or -1) - * @param deviceId User specified ID for device (unique per case) - * @param name User specified name + * @param caseId Row ID for Case in DB + * @param dataSourceId Row ID for this data source in DB (or -1) + * @param deviceId User specified ID for device (unique per case) + * @param name User specified name + * @param dataSourceObjectId The object ID for the datasource */ CorrelationDataSource(int caseId, int dataSourceId, String deviceId, String name, - Long caseDataSourceId) { + Long dataSourceObjectId) { this.caseID = caseId; this.dataSourceID = dataSourceId; this.deviceID = deviceId; this.name = name; - this.dataSourceObjectID = caseDataSourceId; + this.dataSourceObjectID = dataSourceObjectId; } /** @@ -157,7 +159,7 @@ public class CorrelationDataSource implements Serializable { } /** - * Get the id for the data source in the case db + * Get the object id for the data source in the case db * * @return dataSourceObjectID or NULL if not available */