From 0451208df814b432dda3fae51a1028b7a41cb209 Mon Sep 17 00:00:00 2001 From: Eugene Livis Date: Mon, 23 Oct 2017 16:28:52 -0400 Subject: [PATCH] Code review comments --- Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java | 2 -- .../autopsy/experimental/autoingest/AddArchiveTask.java | 2 +- .../autoingest/ArchiveExtractorDSProcessor.java | 6 ++++-- .../autopsy/experimental/autoingest/ArchiveFilePanel.java | 2 +- .../autopsy/experimental/autoingest/AutoIngestManager.java | 2 +- .../autopsy/experimental/autoingest/Bundle.properties | 2 -- ...ourceProcessors.java => DataSourceProcessorUtility.java} | 5 ++++- 7 files changed, 11 insertions(+), 10 deletions(-) rename Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/{IdentifyDataSourceProcessors.java => DataSourceProcessorUtility.java} (96%) diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java index 08c619209f..8aeda52597 100755 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java @@ -192,8 +192,6 @@ public final class IngestMonitor { } logMemoryUsage(); - //logDiskSpaceUsage(); // this creates a log entry every minute - if (!enoughDiskSpace()) { /* * Shut down ingest by cancelling all ingest jobs. diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AddArchiveTask.java b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AddArchiveTask.java index 54e8ec40f7..3bc76e61fd 100755 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AddArchiveTask.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AddArchiveTask.java @@ -34,7 +34,7 @@ import org.sleuthkit.datamodel.Content; * A runnable that adds an archive data source as well as data sources * contained in the archive to the case database. */ -public class AddArchiveTask implements Runnable { +class AddArchiveTask implements Runnable { private final Logger logger = Logger.getLogger(AddArchiveTask.class.getName()); private final String deviceId; diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/ArchiveExtractorDSProcessor.java b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/ArchiveExtractorDSProcessor.java index 0103815e1a..a649b0f37a 100755 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/ArchiveExtractorDSProcessor.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/ArchiveExtractorDSProcessor.java @@ -39,9 +39,11 @@ import org.sleuthkit.autopsy.datasourceprocessors.AutoIngestDataSourceProcessor; // @ServiceProvider(service=DataSourceProcessor.class), // @ServiceProvider(service=AutoIngestDataSourceProcessor.class)} //) +@NbBundle.Messages({ + "ArchiveDSP.dsType.text=Archive file"}) public class ArchiveExtractorDSProcessor implements DataSourceProcessor, AutoIngestDataSourceProcessor { - - private final static String DATA_SOURCE_TYPE = NbBundle.getMessage(ArchiveExtractorDSProcessor.class, "ArchiveExtractorDataSourceProcessor.dsType.text"); + + private final static String DATA_SOURCE_TYPE = Bundle.ArchiveDSP_dsType_text(); private final ArchiveFilePanel configPanel; private String deviceId; diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/ArchiveFilePanel.java b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/ArchiveFilePanel.java index e4b261ea3b..e5285d9e75 100755 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/ArchiveFilePanel.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/ArchiveFilePanel.java @@ -42,7 +42,7 @@ import org.sleuthkit.autopsy.coreutils.PathValidator; * "zip", "rar", "arj", "7z", "7zip", "gzip, etc). Allows the user to select a * file. */ -public class ArchiveFilePanel extends JPanel implements DocumentListener { +class ArchiveFilePanel extends JPanel implements DocumentListener { private static final Logger logger = Logger.getLogger(ArchiveFilePanel.class.getName()); private static final String PROP_LAST_ARCHIVE_PATH = "LBL_LastImage_PATH"; //NON-NLS diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestManager.java b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestManager.java index 8d7df1b6c0..2f2f22fb0d 100755 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestManager.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestManager.java @@ -2316,7 +2316,7 @@ public final class AutoIngestManager extends Observable implements PropertyChang Map validDataSourceProcessorsMap; try { // lookup all AutomatedIngestDataSourceProcessors and poll which ones are able to process the current data source - validDataSourceProcessorsMap = IdentifyDataSourceProcessors.getDataSourceProcessor(dataSource.getPath()); + validDataSourceProcessorsMap = DataSourceProcessorUtility.getDataSourceProcessor(dataSource.getPath()); } catch (AutoIngestDataSourceProcessor.AutoIngestDataSourceProcessorException ex) { SYS_LOGGER.log(Level.SEVERE, "Exception while determining best data source processor for {0}", dataSource.getPath()); // rethrow the exception. It will get caught & handled upstream and will result in AIM auto-pause. diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties index ec32087dbf..edac418672 100755 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties @@ -247,8 +247,6 @@ AutoIngestDashboard.prioritizeJobButton.toolTipText=Move the selected job to the AutoIngestDashboard.prioritizeJobButton.text=Prioritize &Job AutoIngestDashboard.prioritizeCaseButton.toolTipText=Move all images associated with a case to top of Pending queue. AutoIngestDashboard.prioritizeCaseButton.text=Prioritize &Case -ArchiveExtractorDataSourceProcessor.dsType.text=Archive file -ArchiveExtractorDataSourceProcessor.process.exception.text=Exception while trying to extract archive ArchiveFilePanel.pathLabel.text=Browse for an archive file: ArchiveFilePanel.browseButton.text=Browse ArchiveFilePanel.pathTextField.text= diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/IdentifyDataSourceProcessors.java b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/DataSourceProcessorUtility.java similarity index 96% rename from Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/IdentifyDataSourceProcessors.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/DataSourceProcessorUtility.java index b566d99aac..6f88d70a28 100755 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/IdentifyDataSourceProcessors.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/DataSourceProcessorUtility.java @@ -29,7 +29,10 @@ import org.sleuthkit.autopsy.datasourceprocessors.AutoIngestDataSourceProcessor. /** * A utility class to find Data Source Processors */ -class IdentifyDataSourceProcessors { +class DataSourceProcessorUtility { + + private DataSourceProcessorUtility() { + } /** * A utility method to find all Data Source Processors (DSP) that are able