From 466fedd871dc1f3a6979003fa7600853848c10c3 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Fri, 22 Jan 2016 14:14:39 -0500 Subject: [PATCH] Add data source id to org.sleuthkit.autopsy.casemodule.AddImageTask --- .../sleuthkit/autopsy/casemodule/AddImageTask.java | 14 ++++++-------- .../autopsy/casemodule/ImageDSProcessor.java | 2 +- .../autopsy/casemodule/LocalDiskDSProcessor.java | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageTask.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageTask.java index 8ce6634303..657a9b5807 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageTask.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageTask.java @@ -1,7 +1,7 @@ /* * Autopsy Forensic Browser * - * Copyright 2013-2014 Basis Technology Corp. + * Copyright 2013-2016 Basis Technology Corp. * Contact: carrier sleuthkit org * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -30,11 +30,9 @@ import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.PlatformUtil; import org.sleuthkit.datamodel.Content; import org.sleuthkit.datamodel.Image; -import org.sleuthkit.datamodel.SleuthkitCase; import org.sleuthkit.datamodel.SleuthkitJNI; import org.sleuthkit.datamodel.TskCoreException; import org.sleuthkit.datamodel.TskDataException; -import org.sleuthkit.datamodel.TskException; /* * A background task that adds the given image to database using the Sleuthkit @@ -72,6 +70,8 @@ class AddImageTask implements Runnable { private final String imagePath; String timeZone; boolean noFatOrphans; + + private final String dataSourceId; /* * A thread that updates the progressMonitor with the name of the directory @@ -113,18 +113,16 @@ class AddImageTask implements Runnable { } } - public AddImageTask(String imgPath, String tz, boolean noOrphans, DataSourceProcessorProgressMonitor aProgressMonitor, DataSourceProcessorCallback cbObj) { - + AddImageTask(String dataSourceId, String imgPath, String tz, boolean noOrphans, DataSourceProcessorProgressMonitor aProgressMonitor, DataSourceProcessorCallback cbObj) { currentCase = Case.getCurrentCase(); - + this.dataSourceId = dataSourceId; this.imagePath = imgPath; this.timeZone = tz; this.noFatOrphans = noOrphans; - this.callbackObj = cbObj; this.progressMonitor = aProgressMonitor; } - + /** * Starts the addImage process, but does not commit the results. * diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java b/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java index a0267d1b9f..577a8725f1 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java @@ -139,7 +139,7 @@ public class ImageDSProcessor implements DataSourceProcessor { ignoreFatOrphanFiles = configPanel.getNoFatOrphans(); configured = true; } - addImageTask = new AddImageTask(imagePath, timeZone, ignoreFatOrphanFiles, monitor, cbObj); + addImageTask = new AddImageTask(dataSourceId, imagePath, timeZone, ignoreFatOrphanFiles, monitor, cbObj); new Thread(addImageTask).start(); } diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskDSProcessor.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskDSProcessor.java index cff54942d2..a7fd994d04 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskDSProcessor.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskDSProcessor.java @@ -122,7 +122,7 @@ public class LocalDiskDSProcessor implements DataSourceProcessor { ignoreFatOrphanFiles = configPanel.getNoFatOrphans(); configured = true; } - addDiskTask = new AddImageTask(drivePath, timeZone, ignoreFatOrphanFiles, progressMonitor, cbObj); + addDiskTask = new AddImageTask(dataSourceId, drivePath, timeZone, ignoreFatOrphanFiles, progressMonitor, cbObj); new Thread(addDiskTask).start(); }