From 7c2282e832a9bb3e8d2505a568a3a672d0348262 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Tue, 25 Mar 2014 09:47:46 -0400 Subject: [PATCH 1/4] Renamed ingest job settings classes --- .../autopsy/ingest/IngestJobConfigurationPanel.java | 6 +++--- .../sleuthkit/autopsy/ingest/IngestModuleFactory.java | 8 ++++---- .../autopsy/ingest/IngestModuleFactoryAdapter.java | 8 ++++---- ...ettings.java => IngestModuleIngestJobSettings.java} | 8 ++++---- ...el.java => IngestModuleIngestJobSettingsPanel.java} | 7 ++++--- .../sleuthkit/autopsy/ingest/IngestModuleTemplate.java | 10 +++++----- .../autopsy/ingest/NoIngestModuleSettings.java | 2 +- .../autopsy/exifparser/ExifParserModuleFactory.java | 4 ++-- .../FileExtMismatchDetectorModuleFactory.java | 10 +++++----- .../FileExtMismatchDetectorModuleSettings.java | 4 ++-- .../FileExtMismatchModuleSettingsPanel.java | 8 ++++---- .../autopsy/filetypeid/FileTypeIdModuleFactory.java | 10 +++++----- .../autopsy/filetypeid/FileTypeIdModuleSettings.java | 4 ++-- .../filetypeid/FileTypeIdModuleSettingsPanel.java | 8 ++++---- .../autopsy/hashdatabase/HashLookupModuleFactory.java | 10 +++++----- .../autopsy/hashdatabase/HashLookupModuleSettings.java | 4 ++-- .../hashdatabase/HashLookupModuleSettingsPanel.java | 8 ++++---- .../keywordsearch/KeywordSearchIngestSimplePanel.java | 8 ++++---- .../keywordsearch/KeywordSearchModuleFactory.java | 8 ++++---- .../RecentActivityExtracterModuleFactory.java | 4 ++-- .../autopsy/scalpel/ScalpelCarverModuleFactory.java | 4 ++-- .../sevenzip/ArchiveFileExtractorModuleFactory.java | 4 ++-- .../autopsy/ewfverify/EwfVerifierModuleFactory.java | 4 ++-- .../thunderbirdparser/EmailParserModuleFactory.java | 4 ++-- 24 files changed, 78 insertions(+), 77 deletions(-) rename Core/src/org/sleuthkit/autopsy/ingest/{IngestModuleSettings.java => IngestModuleIngestJobSettings.java} (73%) rename Core/src/org/sleuthkit/autopsy/ingest/{IngestModuleSettingsPanel.java => IngestModuleIngestJobSettingsPanel.java} (78%) diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobConfigurationPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobConfigurationPanel.java index 20b9f50e3d..0e0ce8d74d 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobConfigurationPanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobConfigurationPanel.java @@ -58,7 +58,7 @@ class IngestJobConfigurationPanel extends javax.swing.JPanel { for (IngestModuleModel module : modules) { IngestModuleTemplate moduleTemplate = module.getIngestModuleTemplate(); if (module.hasModuleSettingsPanel()) { - IngestModuleSettings settings = module.getModuleSettingsPanel().getSettings(); + IngestModuleIngestJobSettings settings = module.getModuleSettingsPanel().getSettings(); moduleTemplate.setModuleSettings(settings); } moduleTemplates.add(moduleTemplate); @@ -295,7 +295,7 @@ class IngestJobConfigurationPanel extends javax.swing.JPanel { private final IngestModuleTemplate moduleTemplate; private IngestModuleGlobalSetttingsPanel globalSettingsPanel = null; - private IngestModuleSettingsPanel moduleSettingsPanel = null; + private IngestModuleIngestJobSettingsPanel moduleSettingsPanel = null; IngestModuleModel(IngestModuleTemplate moduleTemplate) { this.moduleTemplate = moduleTemplate; @@ -331,7 +331,7 @@ class IngestJobConfigurationPanel extends javax.swing.JPanel { return moduleTemplate.hasModuleSettingsPanel(); } - IngestModuleSettingsPanel getModuleSettingsPanel() { + IngestModuleIngestJobSettingsPanel getModuleSettingsPanel() { return moduleSettingsPanel; } diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactory.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactory.java index 7070309021..e34e4921de 100755 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactory.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactory.java @@ -117,7 +117,7 @@ public interface IngestModuleFactory { * * @return The ingest options. */ - IngestModuleSettings getDefaultModuleSettings(); + IngestModuleIngestJobSettings getDefaultModuleSettings(); /** * Queries the factory to determine if it provides user interface panels to @@ -152,7 +152,7 @@ public interface IngestModuleFactory { * @param ingestOptions Per ingest job options to initialize the panel. * @return A user interface panel. */ - IngestModuleSettingsPanel getModuleSettingsPanel(IngestModuleSettings settings); + IngestModuleIngestJobSettingsPanel getModuleSettingsPanel(IngestModuleIngestJobSettings settings); /** * Queries the factory to determine if it is capable of creating file ingest @@ -182,7 +182,7 @@ public interface IngestModuleFactory { * @param ingestOptions The ingest options for the module instance. * @return A data source ingest module instance. */ - DataSourceIngestModule createDataSourceIngestModule(IngestModuleSettings settings); + DataSourceIngestModule createDataSourceIngestModule(IngestModuleIngestJobSettings settings); /** * Queries the factory to determine if it is capable of creating file ingest @@ -212,5 +212,5 @@ public interface IngestModuleFactory { * @param ingestOptions The ingest options for the module instance. * @return A file ingest module instance. */ - FileIngestModule createFileIngestModule(IngestModuleSettings settings); + FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings settings); } diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactoryAdapter.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactoryAdapter.java index e750e89b45..75a6b79a75 100755 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactoryAdapter.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactoryAdapter.java @@ -44,7 +44,7 @@ public abstract class IngestModuleFactoryAdapter implements IngestModuleFactory } @Override - public IngestModuleSettings getDefaultModuleSettings() { + public IngestModuleIngestJobSettings getDefaultModuleSettings() { return new NoIngestModuleSettings(); } @@ -54,7 +54,7 @@ public abstract class IngestModuleFactoryAdapter implements IngestModuleFactory } @Override - public IngestModuleSettingsPanel getModuleSettingsPanel(IngestModuleSettings ingestOptions) { + public IngestModuleIngestJobSettingsPanel getModuleSettingsPanel(IngestModuleIngestJobSettings ingestOptions) { throw new UnsupportedOperationException(); } @@ -64,7 +64,7 @@ public abstract class IngestModuleFactoryAdapter implements IngestModuleFactory } @Override - public DataSourceIngestModule createDataSourceIngestModule(IngestModuleSettings ingestOptions) { + public DataSourceIngestModule createDataSourceIngestModule(IngestModuleIngestJobSettings ingestOptions) { throw new UnsupportedOperationException(); } @@ -74,7 +74,7 @@ public abstract class IngestModuleFactoryAdapter implements IngestModuleFactory } @Override - public FileIngestModule createFileIngestModule(IngestModuleSettings ingestOptions) { + public FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings ingestOptions) { throw new UnsupportedOperationException(); } } diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleSettings.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleIngestJobSettings.java similarity index 73% rename from Core/src/org/sleuthkit/autopsy/ingest/IngestModuleSettings.java rename to Core/src/org/sleuthkit/autopsy/ingest/IngestModuleIngestJobSettings.java index b55b0341c6..06e0f4b725 100755 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleSettings.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleIngestJobSettings.java @@ -21,9 +21,9 @@ package org.sleuthkit.autopsy.ingest; import java.io.Serializable; /** - * Interface for per ingest job options for ingest modules. Options are - * serializable to support persistence of options between invocations of the - * application. + * Interface for per ingest job settings for ingest modules. The settings are + * serializable to support persistence of settings for different contexts and + * between invocations of the application. */ -public interface IngestModuleSettings extends Serializable { +public interface IngestModuleIngestJobSettings extends Serializable { } diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleIngestJobSettingsPanel.java similarity index 78% rename from Core/src/org/sleuthkit/autopsy/ingest/IngestModuleSettingsPanel.java rename to Core/src/org/sleuthkit/autopsy/ingest/IngestModuleIngestJobSettingsPanel.java index d4fa7b32d9..cb321f35cb 100755 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleIngestJobSettingsPanel.java @@ -21,14 +21,15 @@ package org.sleuthkit.autopsy.ingest; import javax.swing.JPanel; /** - * Abstract base class for ingest module job settings panels. + * Abstract base class for panels that allow users to specify per ingest job + * settings for ingest modules. */ -public abstract class IngestModuleSettingsPanel extends JPanel { +public abstract class IngestModuleIngestJobSettingsPanel extends JPanel { /** * Gets the ingest job settings for an ingest module. * * @return The ingest settings. */ - public abstract IngestModuleSettings getSettings(); + public abstract IngestModuleIngestJobSettings getSettings(); } diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleTemplate.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleTemplate.java index b37c998e07..45c194e320 100755 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleTemplate.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleTemplate.java @@ -25,10 +25,10 @@ package org.sleuthkit.autopsy.ingest; final class IngestModuleTemplate { private final IngestModuleFactory moduleFactory; - private IngestModuleSettings settings = null; + private IngestModuleIngestJobSettings settings = null; private boolean enabled = true; - IngestModuleTemplate(IngestModuleFactory moduleFactory, IngestModuleSettings settings) { + IngestModuleTemplate(IngestModuleFactory moduleFactory, IngestModuleIngestJobSettings settings) { this.moduleFactory = moduleFactory; this.settings = settings; } @@ -41,11 +41,11 @@ final class IngestModuleTemplate { return moduleFactory.getModuleDescription(); } - IngestModuleSettings getModuleSettings() { + IngestModuleIngestJobSettings getModuleSettings() { return settings; } - void setModuleSettings(IngestModuleSettings settings) { + void setModuleSettings(IngestModuleIngestJobSettings settings) { this.settings = settings; } @@ -53,7 +53,7 @@ final class IngestModuleTemplate { return moduleFactory.hasModuleSettingsPanel(); } - IngestModuleSettingsPanel getModuleSettingsPanel() { + IngestModuleIngestJobSettingsPanel getModuleSettingsPanel() { return moduleFactory.getModuleSettingsPanel(settings); } diff --git a/Core/src/org/sleuthkit/autopsy/ingest/NoIngestModuleSettings.java b/Core/src/org/sleuthkit/autopsy/ingest/NoIngestModuleSettings.java index 1fb3b709f1..4294e9d9b1 100755 --- a/Core/src/org/sleuthkit/autopsy/ingest/NoIngestModuleSettings.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/NoIngestModuleSettings.java @@ -22,7 +22,7 @@ package org.sleuthkit.autopsy.ingest; * Implementation of the IngestModuleOptions interface for use by ingest modules * that do not have per ingest job options. */ -public final class NoIngestModuleSettings implements IngestModuleSettings { +public final class NoIngestModuleSettings implements IngestModuleIngestJobSettings { private final String setting = "None"; diff --git a/ExifParser/src/org/sleuthkit/autopsy/exifparser/ExifParserModuleFactory.java b/ExifParser/src/org/sleuthkit/autopsy/exifparser/ExifParserModuleFactory.java index 639ed3bad6..73078e67cb 100755 --- a/ExifParser/src/org/sleuthkit/autopsy/exifparser/ExifParserModuleFactory.java +++ b/ExifParser/src/org/sleuthkit/autopsy/exifparser/ExifParserModuleFactory.java @@ -23,7 +23,7 @@ import org.sleuthkit.autopsy.coreutils.Version; import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter; import org.sleuthkit.autopsy.ingest.FileIngestModule; import org.sleuthkit.autopsy.ingest.IngestModuleFactory; -import org.sleuthkit.autopsy.ingest.IngestModuleSettings; +import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; import org.openide.util.NbBundle; /** @@ -60,7 +60,7 @@ public class ExifParserModuleFactory extends IngestModuleFactoryAdapter { } @Override - public FileIngestModule createFileIngestModule(IngestModuleSettings ingestOptions) { + public FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings ingestOptions) { return new ExifParserFileIngestModule(); } } diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchDetectorModuleFactory.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchDetectorModuleFactory.java index ee9b36684a..e91d8198ea 100755 --- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchDetectorModuleFactory.java +++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchDetectorModuleFactory.java @@ -24,8 +24,8 @@ import org.sleuthkit.autopsy.coreutils.Version; import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter; import org.sleuthkit.autopsy.ingest.FileIngestModule; import org.sleuthkit.autopsy.ingest.IngestModuleFactory; -import org.sleuthkit.autopsy.ingest.IngestModuleSettings; -import org.sleuthkit.autopsy.ingest.IngestModuleSettingsPanel; +import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; +import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel; import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSetttingsPanel; /** @@ -57,7 +57,7 @@ public class FileExtMismatchDetectorModuleFactory extends IngestModuleFactoryAda } @Override - public IngestModuleSettings getDefaultModuleSettings() { + public IngestModuleIngestJobSettings getDefaultModuleSettings() { return new FileExtMismatchDetectorModuleSettings(); } @@ -67,7 +67,7 @@ public class FileExtMismatchDetectorModuleFactory extends IngestModuleFactoryAda } @Override - public IngestModuleSettingsPanel getModuleSettingsPanel(IngestModuleSettings settings) { + public IngestModuleIngestJobSettingsPanel getModuleSettingsPanel(IngestModuleIngestJobSettings settings) { assert settings instanceof FileExtMismatchDetectorModuleSettings; if (!(settings instanceof FileExtMismatchDetectorModuleSettings)) { throw new IllegalArgumentException("Expected settings argument to be instanceof FileExtMismatchDetectorModuleSettings"); @@ -94,7 +94,7 @@ public class FileExtMismatchDetectorModuleFactory extends IngestModuleFactoryAda } @Override - public FileIngestModule createFileIngestModule(IngestModuleSettings settings) { + public FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings settings) { assert settings instanceof FileExtMismatchDetectorModuleSettings; if (!(settings instanceof FileExtMismatchDetectorModuleSettings)) { throw new IllegalArgumentException("Expected settings argument to be instanceof FileExtMismatchDetectorModuleSettings"); diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchDetectorModuleSettings.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchDetectorModuleSettings.java index eda28ab6ff..66d0ba9826 100755 --- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchDetectorModuleSettings.java +++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchDetectorModuleSettings.java @@ -18,12 +18,12 @@ */ package org.sleuthkit.autopsy.fileextmismatch; -import org.sleuthkit.autopsy.ingest.IngestModuleSettings; +import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; /** * Ingest options for the file extension mismatch detector ingest module. */ -final class FileExtMismatchDetectorModuleSettings implements IngestModuleSettings { +final class FileExtMismatchDetectorModuleSettings implements IngestModuleIngestJobSettings { private boolean skipKnownFiles = false; private boolean skipFilesWithNoExtension = true; diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchModuleSettingsPanel.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchModuleSettingsPanel.java index 8bdc1a5f7c..5dc0c5321d 100644 --- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchModuleSettingsPanel.java +++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchModuleSettingsPanel.java @@ -18,14 +18,14 @@ */ package org.sleuthkit.autopsy.fileextmismatch; -import org.sleuthkit.autopsy.ingest.IngestModuleSettings; -import org.sleuthkit.autopsy.ingest.IngestModuleSettingsPanel; +import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; +import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel; /** * UI component used to set ingest job options for file extension mismatch * detector ingest modules. */ -final class FileExtMismatchModuleSettingsPanel extends IngestModuleSettingsPanel { +final class FileExtMismatchModuleSettingsPanel extends IngestModuleIngestJobSettingsPanel { private final FileExtMismatchDetectorModuleSettings settings; @@ -42,7 +42,7 @@ final class FileExtMismatchModuleSettingsPanel extends IngestModuleSettingsPanel } @Override - public IngestModuleSettings getSettings() { + public IngestModuleIngestJobSettings getSettings() { return settings; } diff --git a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdModuleFactory.java b/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdModuleFactory.java index 5b8e27a2b9..5f55378f97 100755 --- a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdModuleFactory.java +++ b/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdModuleFactory.java @@ -24,8 +24,8 @@ import org.sleuthkit.autopsy.coreutils.Version; import org.sleuthkit.autopsy.ingest.FileIngestModule; import org.sleuthkit.autopsy.ingest.IngestModuleFactory; import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter; -import org.sleuthkit.autopsy.ingest.IngestModuleSettings; -import org.sleuthkit.autopsy.ingest.IngestModuleSettingsPanel; +import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; +import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel; /** * An factory that creates file ingest modules that determine the types of @@ -56,7 +56,7 @@ public class FileTypeIdModuleFactory extends IngestModuleFactoryAdapter { } @Override - public IngestModuleSettings getDefaultModuleSettings() { + public IngestModuleIngestJobSettings getDefaultModuleSettings() { return new FileTypeIdModuleSettings(); } @@ -66,7 +66,7 @@ public class FileTypeIdModuleFactory extends IngestModuleFactoryAdapter { } @Override - public IngestModuleSettingsPanel getModuleSettingsPanel(IngestModuleSettings settings) { + public IngestModuleIngestJobSettingsPanel getModuleSettingsPanel(IngestModuleIngestJobSettings settings) { assert settings instanceof FileTypeIdModuleSettings; if (!(settings instanceof FileTypeIdModuleSettings)) { throw new IllegalArgumentException("Expected settings argument to be instanceof FileTypeIdModuleSettings"); @@ -80,7 +80,7 @@ public class FileTypeIdModuleFactory extends IngestModuleFactoryAdapter { } @Override - public FileIngestModule createFileIngestModule(IngestModuleSettings settings) { + public FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings settings) { assert settings instanceof FileTypeIdModuleSettings; if (!(settings instanceof FileTypeIdModuleSettings)) { throw new IllegalArgumentException("Expected settings argument to be instanceof FileTypeIdModuleSettings"); diff --git a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdModuleSettings.java b/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdModuleSettings.java index d5a962c8d4..cd2bc4bc12 100755 --- a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdModuleSettings.java +++ b/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdModuleSettings.java @@ -18,12 +18,12 @@ */ package org.sleuthkit.autopsy.filetypeid; -import org.sleuthkit.autopsy.ingest.IngestModuleSettings; +import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; /** * Ingest job options for the file type identifier ingest module instances. */ -public class FileTypeIdModuleSettings implements IngestModuleSettings { +public class FileTypeIdModuleSettings implements IngestModuleIngestJobSettings { private boolean skipKnownFiles = true; diff --git a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdModuleSettingsPanel.java b/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdModuleSettingsPanel.java index cd4092f07d..442e2b990e 100644 --- a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdModuleSettingsPanel.java +++ b/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdModuleSettingsPanel.java @@ -18,14 +18,14 @@ */ package org.sleuthkit.autopsy.filetypeid; -import org.sleuthkit.autopsy.ingest.IngestModuleSettings; -import org.sleuthkit.autopsy.ingest.IngestModuleSettingsPanel; +import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; +import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel; /** * UI component used to set ingest job options for file type identifier ingest * modules. */ -final class FileTypeIdModuleSettingsPanel extends IngestModuleSettingsPanel { +final class FileTypeIdModuleSettingsPanel extends IngestModuleIngestJobSettingsPanel { private final FileTypeIdModuleSettings settings; @@ -40,7 +40,7 @@ final class FileTypeIdModuleSettingsPanel extends IngestModuleSettingsPanel { } @Override - public IngestModuleSettings getSettings() { + public IngestModuleIngestJobSettings getSettings() { return settings; } diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupModuleFactory.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupModuleFactory.java index 92b7708524..a57ac7677c 100755 --- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupModuleFactory.java +++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupModuleFactory.java @@ -26,8 +26,8 @@ import org.sleuthkit.autopsy.coreutils.Version; import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter; import org.sleuthkit.autopsy.ingest.FileIngestModule; import org.sleuthkit.autopsy.ingest.IngestModuleFactory; -import org.sleuthkit.autopsy.ingest.IngestModuleSettings; -import org.sleuthkit.autopsy.ingest.IngestModuleSettingsPanel; +import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; +import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel; import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSetttingsPanel; /** @@ -58,7 +58,7 @@ public class HashLookupModuleFactory extends IngestModuleFactoryAdapter { } @Override - public IngestModuleSettings getDefaultModuleSettings() { + public IngestModuleIngestJobSettings getDefaultModuleSettings() { HashDbManager hashDbManager = HashDbManager.getInstance(); List enabledHashSets = new ArrayList<>(); List knownFileHashSets = hashDbManager.getKnownFileHashSets(); @@ -82,7 +82,7 @@ public class HashLookupModuleFactory extends IngestModuleFactoryAdapter { } @Override - public IngestModuleSettingsPanel getModuleSettingsPanel(IngestModuleSettings settings) { + public IngestModuleIngestJobSettingsPanel getModuleSettingsPanel(IngestModuleIngestJobSettings settings) { if (moduleSettingsPanel == null) { moduleSettingsPanel = new HashLookupModuleSettingsPanel(); } @@ -108,7 +108,7 @@ public class HashLookupModuleFactory extends IngestModuleFactoryAdapter { } @Override - public FileIngestModule createFileIngestModule(IngestModuleSettings settings) { + public FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings settings) { assert settings instanceof HashLookupModuleSettings; if (!(settings instanceof HashLookupModuleSettings)) { throw new IllegalArgumentException("Expected settings argument to be instanceof HashLookupModuleSettings"); diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupModuleSettings.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupModuleSettings.java index c1671013ea..781d40fee7 100755 --- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupModuleSettings.java +++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupModuleSettings.java @@ -20,12 +20,12 @@ package org.sleuthkit.autopsy.hashdatabase; import java.util.HashSet; import java.util.List; -import org.sleuthkit.autopsy.ingest.IngestModuleSettings; +import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; /** * Settings for a hash lookup file ingest module instance. */ -final class HashLookupModuleSettings implements IngestModuleSettings { +final class HashLookupModuleSettings implements IngestModuleIngestJobSettings { private final HashSet enabledHashSets = new HashSet<>(); private boolean shouldCalculateHashes = true; diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupModuleSettingsPanel.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupModuleSettingsPanel.java index e98fd281b9..a5747a1159 100644 --- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupModuleSettingsPanel.java +++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupModuleSettingsPanel.java @@ -33,14 +33,14 @@ import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.ingest.IngestManager; import org.sleuthkit.datamodel.TskCoreException; import org.sleuthkit.autopsy.hashdatabase.HashDbManager.HashDb; -import org.sleuthkit.autopsy.ingest.IngestModuleSettings; -import org.sleuthkit.autopsy.ingest.IngestModuleSettingsPanel; +import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; +import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel; /** * Instances of this class provide a simplified UI for managing the hash sets * configuration. */ -public class HashLookupModuleSettingsPanel extends IngestModuleSettingsPanel implements PropertyChangeListener { +public class HashLookupModuleSettingsPanel extends IngestModuleIngestJobSettingsPanel implements PropertyChangeListener { private final HashDbManager hashDbManager = HashDbManager.getInstance(); private HashDatabasesTableModel knownTableModel; @@ -88,7 +88,7 @@ public class HashLookupModuleSettingsPanel extends IngestModuleSettingsPanel imp } @Override - public IngestModuleSettings getSettings() { + public IngestModuleIngestJobSettings getSettings() { List enabledHashSets = new ArrayList<>(); List knownFileHashSets = hashDbManager.getKnownFileHashSets(); for (HashDb db : knownFileHashSets) { diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestSimplePanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestSimplePanel.java index 7576e901ef..0daa8f4d73 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestSimplePanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestSimplePanel.java @@ -27,14 +27,14 @@ import javax.swing.ListSelectionModel; import javax.swing.table.AbstractTableModel; import javax.swing.table.TableColumn; import org.sleuthkit.autopsy.coreutils.StringExtract.StringExtractUnicodeTable.SCRIPT; -import org.sleuthkit.autopsy.ingest.IngestModuleSettings; -import org.sleuthkit.autopsy.ingest.IngestModuleSettingsPanel; +import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; +import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel; import org.sleuthkit.autopsy.ingest.NoIngestModuleSettings; /** * Ingest job options panel for the keyword search file ingest module. */ -public class KeywordSearchIngestSimplePanel extends IngestModuleSettingsPanel { +public class KeywordSearchIngestSimplePanel extends IngestModuleIngestJobSettingsPanel { private final static Logger logger = Logger.getLogger(KeywordSearchIngestSimplePanel.class.getName()); public static final String PROP_OPTIONS = "Keyword Search_Options"; @@ -72,7 +72,7 @@ public class KeywordSearchIngestSimplePanel extends IngestModuleSettingsPanel { } @Override - public IngestModuleSettings getSettings() { + public IngestModuleIngestJobSettings getSettings() { return new NoIngestModuleSettings(); } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchModuleFactory.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchModuleFactory.java index e3f446fe9d..a9de366d56 100755 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchModuleFactory.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchModuleFactory.java @@ -25,8 +25,8 @@ import org.sleuthkit.autopsy.coreutils.Version; import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter; import org.sleuthkit.autopsy.ingest.FileIngestModule; import org.sleuthkit.autopsy.ingest.IngestModuleFactory; -import org.sleuthkit.autopsy.ingest.IngestModuleSettings; -import org.sleuthkit.autopsy.ingest.IngestModuleSettingsPanel; +import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; +import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel; import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSetttingsPanel; /** @@ -60,7 +60,7 @@ public class KeywordSearchModuleFactory extends IngestModuleFactoryAdapter { } @Override - public IngestModuleSettingsPanel getModuleSettingsPanel(IngestModuleSettings ingestJobOptions) { + public IngestModuleIngestJobSettingsPanel getModuleSettingsPanel(IngestModuleIngestJobSettings ingestJobOptions) { KeywordSearchIngestSimplePanel ingestOptionsPanel = new KeywordSearchIngestSimplePanel(); ingestOptionsPanel.load(); return ingestOptionsPanel; @@ -84,7 +84,7 @@ public class KeywordSearchModuleFactory extends IngestModuleFactoryAdapter { } @Override - public FileIngestModule createFileIngestModule(IngestModuleSettings ingestJobOptions) { + public FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings ingestJobOptions) { return new KeywordSearchIngestModule(); } } diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RecentActivityExtracterModuleFactory.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RecentActivityExtracterModuleFactory.java index 0d1622e51d..3f5ba29554 100755 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RecentActivityExtracterModuleFactory.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RecentActivityExtracterModuleFactory.java @@ -24,7 +24,7 @@ import org.sleuthkit.autopsy.coreutils.Version; import org.sleuthkit.autopsy.ingest.DataSourceIngestModule; import org.sleuthkit.autopsy.ingest.IngestModuleFactory; import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter; -import org.sleuthkit.autopsy.ingest.IngestModuleSettings; +import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; /** * A factory that creates data source ingest modules that extract recent @@ -58,7 +58,7 @@ public class RecentActivityExtracterModuleFactory extends IngestModuleFactoryAda } @Override - public DataSourceIngestModule createDataSourceIngestModule(IngestModuleSettings ingestJobOptions) { + public DataSourceIngestModule createDataSourceIngestModule(IngestModuleIngestJobSettings ingestJobOptions) { return new RAImageIngestModule(); } } diff --git a/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/ScalpelCarverModuleFactory.java b/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/ScalpelCarverModuleFactory.java index 9c1358895f..9028de1a4f 100755 --- a/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/ScalpelCarverModuleFactory.java +++ b/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/ScalpelCarverModuleFactory.java @@ -24,7 +24,7 @@ package org.sleuthkit.autopsy.scalpel; import org.sleuthkit.autopsy.coreutils.Version; import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter; import org.sleuthkit.autopsy.ingest.FileIngestModule; -import org.sleuthkit.autopsy.ingest.IngestModuleSettings; +import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; import org.openide.util.NbBundle; /** @@ -60,7 +60,7 @@ public class ScalpelCarverModuleFactory extends IngestModuleFactoryAdapter { } @Override - public FileIngestModule createFileIngestModule(IngestModuleSettings ingestOptions) { + public FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings ingestOptions) { return new ScalpelCarverIngestModule(); } } diff --git a/SevenZip/src/org/sleuthkit/autopsy/sevenzip/ArchiveFileExtractorModuleFactory.java b/SevenZip/src/org/sleuthkit/autopsy/sevenzip/ArchiveFileExtractorModuleFactory.java index b98f5d32c3..7bc38efd53 100755 --- a/SevenZip/src/org/sleuthkit/autopsy/sevenzip/ArchiveFileExtractorModuleFactory.java +++ b/SevenZip/src/org/sleuthkit/autopsy/sevenzip/ArchiveFileExtractorModuleFactory.java @@ -24,7 +24,7 @@ import org.sleuthkit.autopsy.coreutils.Version; import org.sleuthkit.autopsy.ingest.FileIngestModule; import org.sleuthkit.autopsy.ingest.IngestModuleFactory; import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter; -import org.sleuthkit.autopsy.ingest.IngestModuleSettings; +import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; /** * A factory for creating archive extractor file ingest modules and the user @@ -59,7 +59,7 @@ public class ArchiveFileExtractorModuleFactory extends IngestModuleFactoryAdapte } @Override - public FileIngestModule createFileIngestModule(IngestModuleSettings ingestOptions) { + public FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings ingestOptions) { return new SevenZipIngestModule(); } } \ No newline at end of file diff --git a/ewfVerify/src/org/sleuthkit/autopsy/ewfverify/EwfVerifierModuleFactory.java b/ewfVerify/src/org/sleuthkit/autopsy/ewfverify/EwfVerifierModuleFactory.java index 6e3d58309e..5aa8508a5b 100755 --- a/ewfVerify/src/org/sleuthkit/autopsy/ewfverify/EwfVerifierModuleFactory.java +++ b/ewfVerify/src/org/sleuthkit/autopsy/ewfverify/EwfVerifierModuleFactory.java @@ -24,7 +24,7 @@ import org.sleuthkit.autopsy.coreutils.Version; import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter; import org.sleuthkit.autopsy.ingest.DataSourceIngestModule; import org.sleuthkit.autopsy.ingest.IngestModuleFactory; -import org.sleuthkit.autopsy.ingest.IngestModuleSettings; +import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; /** * An factory that creates data source ingest modules that verify the integrity @@ -60,7 +60,7 @@ public class EwfVerifierModuleFactory extends IngestModuleFactoryAdapter { } @Override - public DataSourceIngestModule createDataSourceIngestModule(IngestModuleSettings ingestOptions) { + public DataSourceIngestModule createDataSourceIngestModule(IngestModuleIngestJobSettings ingestOptions) { return new EwfVerifyIngestModule(); } } diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/EmailParserModuleFactory.java b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/EmailParserModuleFactory.java index a95dec2fba..4ed2c82817 100755 --- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/EmailParserModuleFactory.java +++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/EmailParserModuleFactory.java @@ -24,7 +24,7 @@ import org.sleuthkit.autopsy.coreutils.Version; import org.sleuthkit.autopsy.ingest.FileIngestModule; import org.sleuthkit.autopsy.ingest.IngestModuleFactory; import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter; -import org.sleuthkit.autopsy.ingest.IngestModuleSettings; +import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; /** * A factory for creating email parser file ingest module instances. @@ -63,7 +63,7 @@ public class EmailParserModuleFactory extends IngestModuleFactoryAdapter { } @Override - public FileIngestModule createFileIngestModule(IngestModuleSettings settings) { + public FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings settings) { return new ThunderbirdMboxFileIngestModule(); } } \ No newline at end of file From c7e16f59a7b33f8947217d0d822bfcb5573dfd0a Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Tue, 25 Mar 2014 10:52:39 -0400 Subject: [PATCH 2/4] Renamed keywword search settings panels --- .../autopsy/keywordsearch/Bundle.properties | 14 ++++----- .../keywordsearch/Bundle_ja.properties | 13 ++++----- .../KeywordSearchConfigurationAction.java | 8 ++--- ... => KeywordSearchGlobalSettingsPanel.form} | 0 ... => KeywordSearchGlobalSettingsPanel.java} | 8 ++--- ...orm => KeywordSearchJobSettingsPanel.form} | 14 ++++----- ...ava => KeywordSearchJobSettingsPanel.java} | 29 +++++++++---------- .../KeywordSearchModuleFactory.java | 4 +-- .../KeywordSearchOptionsPanelController.java | 8 ++--- 9 files changed, 48 insertions(+), 50 deletions(-) rename KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/{KeywordSearchConfigurationPanel.form => KeywordSearchGlobalSettingsPanel.form} (100%) rename KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/{KeywordSearchConfigurationPanel.java => KeywordSearchGlobalSettingsPanel.java} (90%) rename KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/{KeywordSearchIngestSimplePanel.form => KeywordSearchJobSettingsPanel.form} (86%) rename KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/{KeywordSearchIngestSimplePanel.java => KeywordSearchJobSettingsPanel.java} (89%) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties index 406c98509a..839bc956d9 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties @@ -52,10 +52,6 @@ KeywordSearchConfigurationPanel2.skipNSRLCheckBox.text=Do not add files in NSRL KeywordSearchConfigurationPanel2.skipNSRLCheckBox.toolTipText=Requires Hash DB service to had run previously, or be selected for next ingest. KeywordSearchConfigurationPanel2.filesIndexedValue.text=- KeywordSearchConfigurationPanel2.filesIndexedLabel.text=Files in keyword index: -KeywordSearchIngestSimplePanel.languagesLabel.text=Scripts enabled for string extraction from unknown file types: -KeywordSearchIngestSimplePanel.languagesValLabel.text=- -KeywordSearchIngestSimplePanel.languagesLabel.toolTipText=Scripts enabled for string extraction from unknown file types. Changes can be done in Advanced Settings. -KeywordSearchIngestSimplePanel.languagesValLabel.toolTipText= KeywordSearchConfigurationPanel3.languagesLabel.text=Enabled scripts (languages): KeywordSearchConfigurationPanel2.chunksLabel.text=Chunks in keyword index: KeywordSearchConfigurationPanel2.chunksValLabel.text=- @@ -74,9 +70,6 @@ KeywordSearchConfigurationPanel2.timeRadioButton2.toolTipText=10 minutes (faster KeywordSearchConfigurationPanel2.timeRadioButton2.text=10 minutes (slower feedback, faster ingest) KeywordSearchConfigurationPanel2.timeRadioButton3.toolTipText=5 minutes (overall ingest time will be longer) KeywordSearchConfigurationPanel2.timeRadioButton3.text=5 minutes (default) -KeywordSearchIngestSimplePanel.encodingsLabel.text=Encodings: -KeywordSearchIngestSimplePanel.keywordSearchEncodings.text=- -KeywordSearchIngestSimplePanel.titleLabel.text=Select keyword lists to enable during ingest: OpenIDE-Module-Short-Description=Keyword Search ingest module, extracted text viewer and keyword search tools KeywordSearchListsViewerPanel.manageListsButton.toolTipText=Manage keyword lists, their settings and associated keywords. The settings are shared among all cases. KeywordSearchConfigurationPanel2.frequencyLabel.text=Results update frequency during ingest: @@ -264,3 +257,10 @@ Server.close.exception.msg=Cannot close Core Server.close.exception.msg2=Cannot close Core Server.solrServerNoPortException.msg=Indexing server could not bind to port {0}, port is not available, consider change the default {1} port. KeywordSearchConfigurationPanel2.showSnippetsCB.text=Show Keyword Preview in Keyword Search Results (will result in longer search times) +KeywordSearchJobSettingsPanel.keywordSearchEncodings.text=- +KeywordSearchJobSettingsPanel.languagesValLabel.toolTipText= +KeywordSearchJobSettingsPanel.languagesValLabel.text=- +KeywordSearchJobSettingsPanel.encodingsLabel.text=Encodings: +KeywordSearchJobSettingsPanel.titleLabel.text=Select keyword lists to enable during ingest: +KeywordSearchJobSettingsPanel.languagesLabel.toolTipText=Scripts enabled for string extraction from unknown file types. Changes can be done in Advanced Settings. +KeywordSearchJobSettingsPanel.languagesLabel.text=Scripts enabled for string extraction from unknown file types: diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties index 2b520e0e73..2a1367fb8b 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties @@ -44,8 +44,6 @@ KeywordSearchEditListPanel.ingestMessagesCheckbox.toolTipText=\u3053\u306e\u30ea KeywordSearchConfigurationPanel2.skipNSRLCheckBox.text=\u51e6\u7406\u4e2d\u306bNSRL\u306e\u30d5\u30a1\u30a4\u30eb\uff08\u65e2\u77e5\u306e\u30d5\u30a1\u30a4\u30eb\uff09\u3092\u30ad\u30fc\u30ef\u30fc\u30c9\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306b\u8ffd\u52a0\u3057\u306a\u3044 KeywordSearchConfigurationPanel2.skipNSRLCheckBox.toolTipText=Hash DB\u30b5\u30fc\u30d3\u30b9\u3092\u4e8b\u524d\u306b\u5b9f\u884c\u3059\u308b\u304b\u3001\u6b21\u56de\u306e\u51e6\u7406\u306b\u9078\u629e\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 KeywordSearchConfigurationPanel2.filesIndexedLabel.text=\u30ad\u30fc\u30ef\u30fc\u30c9\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5185\u306e\u30d5\u30a1\u30a4\u30eb\uff1a -KeywordSearchIngestSimplePanel.languagesLabel.text=\u4e0d\u660e\u306a\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f\u304b\u3089\u306e\u30b9\u30c8\u30ea\u30f3\u30b0\u62bd\u51fa\u3092\u6709\u52b9\u306b\u3057\u305f\u30b9\u30af\u30ea\u30d7\u30c8\uff1a -KeywordSearchIngestSimplePanel.languagesLabel.toolTipText=\u4e0d\u660e\u306a\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f\u304b\u3089\u306e\u30b9\u30c8\u30ea\u30f3\u30b0\u62bd\u51fa\u3092\u6709\u52b9\u306b\u3057\u305f\u30b9\u30af\u30ea\u30d7\u30c8\u3002\u30a2\u30c9\u30d0\u30f3\u30b9\u8a2d\u5b9a\u304b\u3089\u5909\u66f4\u304c\u53ef\u80fd\u3067\u3059\u3002 KeywordSearchConfigurationPanel3.languagesLabel.text=\u6709\u52b9\u306a\u30b9\u30af\u30ea\u30d7\u30c8\uff08\u8a00\u8a9e\uff09\uff1a KeywordSearchConfigurationPanel2.chunksLabel.text=\u30ad\u30fc\u30ef\u30fc\u30c9\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5185\u306e\u30c1\u30e3\u30f3\u30af\uff1a KeywordSearchConfigurationPanel3.enableUTF8Checkbox.text=UTF8\u30c6\u30ad\u30b9\u30c8\u62bd\u51fa\u306e\u6709\u52b9\u5316 @@ -63,8 +61,6 @@ KeywordSearchConfigurationPanel2.timeRadioButton2.toolTipText=\uff11\uff10\u5206 KeywordSearchConfigurationPanel2.timeRadioButton2.text=\uff11\uff10\u5206\uff08\u3088\u308a\u9045\u3044\u30d5\u30a3\u30fc\u30c9\u30d0\u30c3\u30af\u3001\u3088\u308a\u901f\u3044\u51e6\u7406\u6642\u9593\uff09 KeywordSearchConfigurationPanel2.timeRadioButton3.toolTipText=\uff15\u5206\uff08\u5168\u4f53\u7684\u306a\u51e6\u7406\u6642\u9593\u304c\u9577\u304f\u306a\u308a\u307e\u3059\uff09 KeywordSearchConfigurationPanel2.timeRadioButton3.text=\uff15\u5206\uff08\u30c7\u30d5\u30a9\u30eb\u30c8\uff09 -KeywordSearchIngestSimplePanel.encodingsLabel.text=\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\uff1a -KeywordSearchIngestSimplePanel.titleLabel.text=\u51e6\u7406\u4e2d\u306b\u6709\u52b9\u306a\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8\u3092\u9078\u629e\uff1a OpenIDE-Module-Short-Description=\u30ad\u30fc\u30ef\u30fc\u30c9\u691c\u7d22\u51e6\u7406\u30e2\u30b8\u30e5\u30fc\u30eb\u3001\u62bd\u51fa\u3055\u308c\u305f\u30c6\u30ad\u30b9\u30c8\u30d3\u30e5\u30fc\u30a2\u3001\u30ad\u30fc\u30ef\u30fc\u30c9\u691c\u7d22\u30c4\u30fc\u30eb KeywordSearchListsViewerPanel.manageListsButton.toolTipText=\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8\u3001\u30ea\u30b9\u30c8\u306e\u8a2d\u5b9a\u3068\u95a2\u9023\u3059\u308b\u30ad\u30fc\u30ef\u30fc\u30c9\u306e\u7ba1\u7406\u3002\u3053\u306e\u8a2d\u5b9a\u306f\u5168\u3066\u306e\u30b1\u30fc\u30b9\u306b\u9069\u7528\u3055\u308c\u307e\u3059\u3002 KeywordSearchConfigurationPanel2.frequencyLabel.text=\u51e6\u7406\u4e2d\u306e\u7d50\u679c\u66f4\u65b0\u306e\u983b\u5ea6\uff1a @@ -172,9 +168,7 @@ ExtractedContentPanel.pageOfLabel.text=of ExtractedContentPanel.pageCurLabel.text=- ExtractedContentPanel.pageTotalLabel.text=- KeywordSearchConfigurationPanel2.filesIndexedValue.text=- -KeywordSearchIngestSimplePanel.languagesValLabel.text=- KeywordSearchConfigurationPanel2.chunksValLabel.text=- -KeywordSearchIngestSimplePanel.keywordSearchEncodings.text=- AbstractFileChunk.index.exception.msg=\u30d5\u30a1\u30a4\u30eb\u30b9\u30c8\u30ea\u30f3\u30b0\u30c1\u30e3\u30f3\u30af\u306e\u51e6\u7406\u4e2d\u306b\u554f\u984c\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a {0}, \u30c1\u30e3\u30f3\u30af\: {1} AbstractFileStringContentStream.getSize.exception.msg=\u30b9\u30c8\u30ea\u30f3\u30b0\u5168\u4f53\u304c\u5909\u63db\u3055\u308c\u306a\u3051\u308c\u3070\u3001\u5909\u63db\u3055\u308c\u305f\u30b9\u30c8\u30ea\u30f3\u30b0\u5185\u306e\u30ad\u30e3\u30e9\u30af\u30bf\u30fc\u6570\u306f\u4e0d\u660e\u3067\u3059\u3002 AbstractFileStringContentStream.getSrcInfo.text=\u30d5\u30a1\u30a4\u30eb\uff1a{0} @@ -255,4 +249,9 @@ KeywordSearchIngestModule.doInBackGround.cancelMsg=\uff08\u30ad\u30e3\u30f3\u30b Server.addDoc.exception.msg2=\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u30cf\u30f3\u30c9\u30e9\u30fc\u3092\u4f7f\u7528\u3057\u307e\u3057\u305f\u304c\u3001\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306b\u4e0b\u8a18\u306e\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\uff1a{0} ExtractedContentViewer.getSolrContent.txtBodyItal={0} Keyword.toString.text=Keyword'{'query\={0}, isLiteral\={1}, keywordType\={2}'}' - +KeywordSearchJobSettingsPanel.keywordSearchEncodings.text=- +KeywordSearchJobSettingsPanel.languagesValLabel.text=- +KeywordSearchJobSettingsPanel.encodingsLabel.text=\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\uff1a +KeywordSearchJobSettingsPanel.titleLabel.text=\u51e6\u7406\u4e2d\u306b\u6709\u52b9\u306a\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8\u3092\u9078\u629e\uff1a +KeywordSearchJobSettingsPanel.languagesLabel.toolTipText=\u4e0d\u660e\u306a\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f\u304b\u3089\u306e\u30b9\u30c8\u30ea\u30f3\u30b0\u62bd\u51fa\u3092\u6709\u52b9\u306b\u3057\u305f\u30b9\u30af\u30ea\u30d7\u30c8\u3002\u30a2\u30c9\u30d0\u30f3\u30b9\u8a2d\u5b9a\u304b\u3089\u5909\u66f4\u304c\u53ef\u80fd\u3067\u3059\u3002 +KeywordSearchJobSettingsPanel.languagesLabel.text=\u4e0d\u660e\u306a\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f\u304b\u3089\u306e\u30b9\u30c8\u30ea\u30f3\u30b0\u62bd\u51fa\u3092\u6709\u52b9\u306b\u3057\u305f\u30b9\u30af\u30ea\u30d7\u30c8\uff1a diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationAction.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationAction.java index faa4f9688e..d22a6d4ad6 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationAction.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationAction.java @@ -33,11 +33,11 @@ import org.sleuthkit.autopsy.corecomponents.AdvancedConfigurationDialog; class KeywordSearchConfigurationAction extends CallableSystemAction{ private static final String ACTION_NAME = org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class, "ListBundleConfig"); - private KeywordSearchConfigurationPanel panel; + private KeywordSearchGlobalSettingsPanel panel; @Override public void performAction() { - final KeywordSearchConfigurationPanel panel = getPanel(); + final KeywordSearchGlobalSettingsPanel panel = getPanel(); panel.load(); final AdvancedConfigurationDialog dialog = new AdvancedConfigurationDialog(); dialog.addApplyButtonListener(new ActionListener() { @@ -60,9 +60,9 @@ class KeywordSearchConfigurationAction extends CallableSystemAction{ dialog.display(panel); } - private KeywordSearchConfigurationPanel getPanel() { + private KeywordSearchGlobalSettingsPanel getPanel() { if(panel==null) { - panel = new KeywordSearchConfigurationPanel(); + panel = new KeywordSearchGlobalSettingsPanel(); } return panel; } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.form similarity index 100% rename from KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.form rename to KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.form diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.java similarity index 90% rename from KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.java rename to KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.java index a738a98ebb..59fbf17598 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.java @@ -25,13 +25,13 @@ import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSetttingsPanel; /** * Global options panel for keyword searching. */ -final class KeywordSearchConfigurationPanel extends IngestModuleGlobalSetttingsPanel implements OptionsPanel { +final class KeywordSearchGlobalSettingsPanel extends IngestModuleGlobalSetttingsPanel implements OptionsPanel { private KeywordSearchConfigurationPanel1 listsPanel; private KeywordSearchConfigurationPanel3 languagesPanel; private KeywordSearchConfigurationPanel2 generalPanel; - public KeywordSearchConfigurationPanel() { + public KeywordSearchGlobalSettingsPanel() { initComponents(); customizeComponents(); } @@ -63,11 +63,11 @@ final class KeywordSearchConfigurationPanel extends IngestModuleGlobalSetttingsP this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(tabbedPane, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 675, Short.MAX_VALUE) + .addComponent(tabbedPane, javax.swing.GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(tabbedPane, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 505, Short.MAX_VALUE) + .addComponent(tabbedPane, javax.swing.GroupLayout.DEFAULT_SIZE, 300, Short.MAX_VALUE) ); }// //GEN-END:initComponents diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestSimplePanel.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchJobSettingsPanel.form similarity index 86% rename from KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestSimplePanel.form rename to KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchJobSettingsPanel.form index ff0bc6d7ad..7f9d785173 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestSimplePanel.form +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchJobSettingsPanel.form @@ -105,41 +105,41 @@ - + - + - + - + - + - + - + diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestSimplePanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchJobSettingsPanel.java similarity index 89% rename from KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestSimplePanel.java rename to KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchJobSettingsPanel.java index 0daa8f4d73..3c86ad6725 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestSimplePanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchJobSettingsPanel.java @@ -34,14 +34,13 @@ import org.sleuthkit.autopsy.ingest.NoIngestModuleSettings; /** * Ingest job options panel for the keyword search file ingest module. */ -public class KeywordSearchIngestSimplePanel extends IngestModuleIngestJobSettingsPanel { +public class KeywordSearchJobSettingsPanel extends IngestModuleIngestJobSettingsPanel { - private final static Logger logger = Logger.getLogger(KeywordSearchIngestSimplePanel.class.getName()); - public static final String PROP_OPTIONS = "Keyword Search_Options"; + private final static Logger logger = Logger.getLogger(KeywordSearchJobSettingsPanel.class.getName()); private KeywordTableModel tableModel; private List lists; - KeywordSearchIngestSimplePanel() { + KeywordSearchJobSettingsPanel() { tableModel = new KeywordTableModel(); lists = new ArrayList<>(); reloadLists(); @@ -123,17 +122,17 @@ public class KeywordSearchIngestSimplePanel extends IngestModuleIngestJobSetting listsTable.setShowVerticalLines(false); listsScrollPane.setViewportView(listsTable); - titleLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchIngestSimplePanel.class, "KeywordSearchIngestSimplePanel.titleLabel.text")); // NOI18N + titleLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchJobSettingsPanel.class, "KeywordSearchJobSettingsPanel.titleLabel.text")); // NOI18N - languagesLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchIngestSimplePanel.class, "KeywordSearchIngestSimplePanel.languagesLabel.text")); // NOI18N - languagesLabel.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchIngestSimplePanel.class, "KeywordSearchIngestSimplePanel.languagesLabel.toolTipText")); // NOI18N + languagesLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchJobSettingsPanel.class, "KeywordSearchJobSettingsPanel.languagesLabel.text")); // NOI18N + languagesLabel.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchJobSettingsPanel.class, "KeywordSearchJobSettingsPanel.languagesLabel.toolTipText")); // NOI18N - languagesValLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchIngestSimplePanel.class, "KeywordSearchIngestSimplePanel.languagesValLabel.text")); // NOI18N - languagesValLabel.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchIngestSimplePanel.class, "KeywordSearchIngestSimplePanel.languagesValLabel.toolTipText")); // NOI18N + languagesValLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchJobSettingsPanel.class, "KeywordSearchJobSettingsPanel.languagesValLabel.text")); // NOI18N + languagesValLabel.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchJobSettingsPanel.class, "KeywordSearchJobSettingsPanel.languagesValLabel.toolTipText")); // NOI18N - encodingsLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchIngestSimplePanel.class, "KeywordSearchIngestSimplePanel.encodingsLabel.text")); // NOI18N + encodingsLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchJobSettingsPanel.class, "KeywordSearchJobSettingsPanel.encodingsLabel.text")); // NOI18N - keywordSearchEncodings.setText(org.openide.util.NbBundle.getMessage(KeywordSearchIngestSimplePanel.class, "KeywordSearchIngestSimplePanel.keywordSearchEncodings.text")); // NOI18N + keywordSearchEncodings.setText(org.openide.util.NbBundle.getMessage(KeywordSearchJobSettingsPanel.class, "KeywordSearchJobSettingsPanel.keywordSearchEncodings.text")); // NOI18N javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); @@ -165,7 +164,7 @@ public class KeywordSearchIngestSimplePanel extends IngestModuleIngestJobSetting .addGap(7, 7, 7) .addComponent(titleLabel) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(listsScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 135, Short.MAX_VALUE) + .addComponent(listsScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 62, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(languagesLabel) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) @@ -228,7 +227,7 @@ public class KeywordSearchIngestSimplePanel extends IngestModuleIngestJobSetting @Override public int getRowCount() { - return KeywordSearchIngestSimplePanel.this.lists.size(); + return KeywordSearchJobSettingsPanel.this.lists.size(); } @Override @@ -238,7 +237,7 @@ public class KeywordSearchIngestSimplePanel extends IngestModuleIngestJobSetting @Override public Object getValueAt(int rowIndex, int columnIndex) { - KeywordList list = KeywordSearchIngestSimplePanel.this.lists.get(rowIndex); + KeywordList list = KeywordSearchJobSettingsPanel.this.lists.get(rowIndex); if(columnIndex == 0) { return list.getUseForIngest(); } else { @@ -254,7 +253,7 @@ public class KeywordSearchIngestSimplePanel extends IngestModuleIngestJobSetting @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { - KeywordList list = KeywordSearchIngestSimplePanel.this.lists.get(rowIndex); + KeywordList list = KeywordSearchJobSettingsPanel.this.lists.get(rowIndex); if(columnIndex == 0){ KeywordSearchListsXML loader = KeywordSearchListsXML.getCurrent(); loader.addList(list.getName(), list.getKeywords(), (Boolean) aValue, false); diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchModuleFactory.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchModuleFactory.java index a9de366d56..97a55a27d8 100755 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchModuleFactory.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchModuleFactory.java @@ -61,7 +61,7 @@ public class KeywordSearchModuleFactory extends IngestModuleFactoryAdapter { @Override public IngestModuleIngestJobSettingsPanel getModuleSettingsPanel(IngestModuleIngestJobSettings ingestJobOptions) { - KeywordSearchIngestSimplePanel ingestOptionsPanel = new KeywordSearchIngestSimplePanel(); + KeywordSearchJobSettingsPanel ingestOptionsPanel = new KeywordSearchJobSettingsPanel(); ingestOptionsPanel.load(); return ingestOptionsPanel; } @@ -73,7 +73,7 @@ public class KeywordSearchModuleFactory extends IngestModuleFactoryAdapter { @Override public IngestModuleGlobalSetttingsPanel getGlobalSettingsPanel() { - KeywordSearchConfigurationPanel globalOptionsPanel = new KeywordSearchConfigurationPanel(); + KeywordSearchGlobalSettingsPanel globalOptionsPanel = new KeywordSearchGlobalSettingsPanel(); globalOptionsPanel.load(); return globalOptionsPanel; } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchOptionsPanelController.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchOptionsPanelController.java index 4fbd1c5755..7a5d132174 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchOptionsPanelController.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchOptionsPanelController.java @@ -37,10 +37,10 @@ import org.sleuthkit.autopsy.coreutils.Logger; keywordsCategory = "KeywordSearchOptions") public final class KeywordSearchOptionsPanelController extends OptionsPanelController { - private KeywordSearchConfigurationPanel panel; + private KeywordSearchGlobalSettingsPanel panel; private final PropertyChangeSupport pcs = new PropertyChangeSupport(this); private boolean changed; - private static final Logger logger = Logger.getLogger(KeywordSearchConfigurationPanel.class.getName()); + private static final Logger logger = Logger.getLogger(KeywordSearchGlobalSettingsPanel.class.getName()); @Override public void update() { @@ -89,9 +89,9 @@ public final class KeywordSearchOptionsPanelController extends OptionsPanelContr pcs.removePropertyChangeListener(l); } - private KeywordSearchConfigurationPanel getPanel() { + private KeywordSearchGlobalSettingsPanel getPanel() { if (panel == null) { - panel = new KeywordSearchConfigurationPanel(); + panel = new KeywordSearchGlobalSettingsPanel(); } return panel; } From 63b6da0528dff39fd2ad8e33f7ac5312a9801cf5 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Tue, 25 Mar 2014 13:27:50 -0400 Subject: [PATCH 3/4] Renamed child panels of keyword search global settings panel --- .../autopsy/keywordsearch/Bundle.properties | 44 +++++++++---------- .../keywordsearch/Bundle_ja.properties | 42 +++++++++--------- ...ordSearchGlobalLanguageSettingsPanel.form} | 8 ++-- ...ordSearchGlobalLanguageSettingsPanel.java} | 20 ++++----- ...KeywordSearchGlobalListSettingsPanel.form} | 0 ...KeywordSearchGlobalListSettingsPanel.java} | 8 ++-- ...ywordSearchGlobalSearchSettingsPanel.form} | 36 +++++++-------- ...ywordSearchGlobalSearchSettingsPanel.java} | 42 +++++++++--------- .../KeywordSearchGlobalSettingsPanel.java | 12 ++--- 9 files changed, 106 insertions(+), 106 deletions(-) rename KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/{KeywordSearchConfigurationPanel3.form => KeywordSearchGlobalLanguageSettingsPanel.form} (89%) rename KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/{KeywordSearchConfigurationPanel3.java => KeywordSearchGlobalLanguageSettingsPanel.java} (91%) rename KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/{KeywordSearchConfigurationPanel1.form => KeywordSearchGlobalListSettingsPanel.form} (100%) rename KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/{KeywordSearchConfigurationPanel1.java => KeywordSearchGlobalListSettingsPanel.java} (97%) rename KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/{KeywordSearchConfigurationPanel2.form => KeywordSearchGlobalSearchSettingsPanel.form} (79%) rename KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/{KeywordSearchConfigurationPanel2.java => KeywordSearchGlobalSearchSettingsPanel.java} (84%) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties index 839bc956d9..ca352d1d69 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties @@ -48,33 +48,12 @@ ExtractedContentPanel.pageTotalLabel.text=- ExtractedContentPanel.hitLabel.toolTipText= KeywordSearchEditListPanel.ingestMessagesCheckbox.text=Send messages to inbox during ingest KeywordSearchEditListPanel.ingestMessagesCheckbox.toolTipText=Send messages during ingest when hits on keyword from this list occur -KeywordSearchConfigurationPanel2.skipNSRLCheckBox.text=Do not add files in NSRL (known files) to keyword index during ingest -KeywordSearchConfigurationPanel2.skipNSRLCheckBox.toolTipText=Requires Hash DB service to had run previously, or be selected for next ingest. -KeywordSearchConfigurationPanel2.filesIndexedValue.text=- -KeywordSearchConfigurationPanel2.filesIndexedLabel.text=Files in keyword index: -KeywordSearchConfigurationPanel3.languagesLabel.text=Enabled scripts (languages): -KeywordSearchConfigurationPanel2.chunksLabel.text=Chunks in keyword index: -KeywordSearchConfigurationPanel2.chunksValLabel.text=- -KeywordSearchConfigurationPanel3.enableUTF8Checkbox.text=Enable UTF8 text extraction -KeywordSearchConfigurationPanel3.enableUTF16Checkbox.text=Enable UTF16LE and UTF16BE string extraction KeywordSearchEditListPanel.keywordOptionsLabel.text=Keyword Options KeywordSearchEditListPanel.listOptionsLabel.text=List Options -KeywordSearchConfigurationPanel3.ingestSettingsLabel.text=Ingest settings for string extraction from unknown file types (changes effective on next ingest): -KeywordSearchConfigurationPanel2.settingsLabel.text=Settings -KeywordSearchConfigurationPanel2.informationLabel.text=Information KeywordSearchListsManagementPanel.keywordListsLabel.text=Keyword Lists: KeywordSearchEditListPanel.keywordsLabel.text=Keywords: -KeywordSearchConfigurationPanel2.timeRadioButton1.toolTipText=20 mins. (fastest ingest time) -KeywordSearchConfigurationPanel2.timeRadioButton1.text=20 minutes (slowest feedback, fastest ingest) -KeywordSearchConfigurationPanel2.timeRadioButton2.toolTipText=10 minutes (faster overall ingest time than default) -KeywordSearchConfigurationPanel2.timeRadioButton2.text=10 minutes (slower feedback, faster ingest) -KeywordSearchConfigurationPanel2.timeRadioButton3.toolTipText=5 minutes (overall ingest time will be longer) -KeywordSearchConfigurationPanel2.timeRadioButton3.text=5 minutes (default) OpenIDE-Module-Short-Description=Keyword Search ingest module, extracted text viewer and keyword search tools KeywordSearchListsViewerPanel.manageListsButton.toolTipText=Manage keyword lists, their settings and associated keywords. The settings are shared among all cases. -KeywordSearchConfigurationPanel2.frequencyLabel.text=Results update frequency during ingest: -KeywordSearchConfigurationPanel2.timeRadioButton4.text_1=1 minute (faster feedback, longest ingest) -KeywordSearchConfigurationPanel2.timeRadioButton4.toolTipText=1 minute (overall ingest time will be longest) AbstractKeywordSearchPerformer.search.dialogErrorHeader=Keyword Search Error AbstractKeywordSearchPerformer.search.invalidSyntaxHeader=Invalid query syntax. AbstractKeywordSearchPerformer.search.searchIngestInProgressTitle=Keyword Search Ingest in Progress @@ -256,7 +235,6 @@ Server.addDoc.exception.msg2=Could not add document to index via update handler\ Server.close.exception.msg=Cannot close Core Server.close.exception.msg2=Cannot close Core Server.solrServerNoPortException.msg=Indexing server could not bind to port {0}, port is not available, consider change the default {1} port. -KeywordSearchConfigurationPanel2.showSnippetsCB.text=Show Keyword Preview in Keyword Search Results (will result in longer search times) KeywordSearchJobSettingsPanel.keywordSearchEncodings.text=- KeywordSearchJobSettingsPanel.languagesValLabel.toolTipText= KeywordSearchJobSettingsPanel.languagesValLabel.text=- @@ -264,3 +242,25 @@ KeywordSearchJobSettingsPanel.encodingsLabel.text=Encodings: KeywordSearchJobSettingsPanel.titleLabel.text=Select keyword lists to enable during ingest: KeywordSearchJobSettingsPanel.languagesLabel.toolTipText=Scripts enabled for string extraction from unknown file types. Changes can be done in Advanced Settings. KeywordSearchJobSettingsPanel.languagesLabel.text=Scripts enabled for string extraction from unknown file types: +KeywordSearchGlobalLanguageSettingsPanel.enableUTF8Checkbox.text=Enable UTF8 text extraction +KeywordSearchGlobalLanguageSettingsPanel.ingestSettingsLabel.text=Ingest settings for string extraction from unknown file types (changes effective on next ingest): +KeywordSearchGlobalLanguageSettingsPanel.enableUTF16Checkbox.text=Enable UTF16LE and UTF16BE string extraction +KeywordSearchGlobalLanguageSettingsPanel.languagesLabel.text=Enabled scripts (languages): +KeywordSearchGlobalSearchSettingsPanel.timeRadioButton1.toolTipText=20 mins. (fastest ingest time) +KeywordSearchGlobalSearchSettingsPanel.timeRadioButton1.text=20 minutes (slowest feedback, fastest ingest) +KeywordSearchGlobalSearchSettingsPanel.timeRadioButton2.toolTipText=10 minutes (faster overall ingest time than default) +KeywordSearchGlobalSearchSettingsPanel.timeRadioButton2.text=10 minutes (slower feedback, faster ingest) +KeywordSearchGlobalSearchSettingsPanel.frequencyLabel.text=Results update frequency during ingest: +KeywordSearchGlobalSearchSettingsPanel.skipNSRLCheckBox.toolTipText=Requires Hash DB service to had run previously, or be selected for next ingest. +KeywordSearchGlobalSearchSettingsPanel.skipNSRLCheckBox.text=Do not add files in NSRL (known files) to keyword index during ingest +KeywordSearchGlobalSearchSettingsPanel.informationLabel.text=Information +KeywordSearchGlobalSearchSettingsPanel.settingsLabel.text=Settings +KeywordSearchGlobalSearchSettingsPanel.filesIndexedValue.text=- +KeywordSearchGlobalSearchSettingsPanel.filesIndexedLabel.text=Files in keyword index: +KeywordSearchGlobalSearchSettingsPanel.showSnippetsCB.text=Show Keyword Preview in Keyword Search Results (will result in longer search times) +KeywordSearchGlobalSearchSettingsPanel.chunksValLabel.text=- +KeywordSearchGlobalSearchSettingsPanel.timeRadioButton4.toolTipText=1 minute (overall ingest time will be longest) +KeywordSearchGlobalSearchSettingsPanel.timeRadioButton4.text_1=1 minute (faster feedback, longest ingest) +KeywordSearchGlobalSearchSettingsPanel.chunksLabel.text=Chunks in keyword index: +KeywordSearchGlobalSearchSettingsPanel.timeRadioButton3.toolTipText=5 minutes (overall ingest time will be longer) +KeywordSearchGlobalSearchSettingsPanel.timeRadioButton3.text=5 minutes (default) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties index 2a1367fb8b..42b6157f01 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties @@ -41,31 +41,12 @@ ExtractedContentPanel.pageButtonsLabel.text=\u30da\u30fc\u30b8 ExtractedContentPanel.pagesLabel.text=\u30da\u30fc\u30b8\uff1a KeywordSearchEditListPanel.ingestMessagesCheckbox.text=\u51e6\u7406\u4e2d\u306b\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u30a4\u30f3\u30dc\u30c3\u30af\u30b9\u306b\u9001\u4fe1 KeywordSearchEditListPanel.ingestMessagesCheckbox.toolTipText=\u3053\u306e\u30ea\u30b9\u30c8\u306e\u30ad\u30fc\u30ef\u30fc\u30c9\u304c\u691c\u7d22\u306b\u30d2\u30c3\u30c8\u3057\u305f\u5834\u5408\u3001\u51e6\u7406\u4e2d\u306b\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u30a4\u30f3\u30dc\u30c3\u30af\u30b9\u306b\u9001\u4fe1 -KeywordSearchConfigurationPanel2.skipNSRLCheckBox.text=\u51e6\u7406\u4e2d\u306bNSRL\u306e\u30d5\u30a1\u30a4\u30eb\uff08\u65e2\u77e5\u306e\u30d5\u30a1\u30a4\u30eb\uff09\u3092\u30ad\u30fc\u30ef\u30fc\u30c9\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306b\u8ffd\u52a0\u3057\u306a\u3044 -KeywordSearchConfigurationPanel2.skipNSRLCheckBox.toolTipText=Hash DB\u30b5\u30fc\u30d3\u30b9\u3092\u4e8b\u524d\u306b\u5b9f\u884c\u3059\u308b\u304b\u3001\u6b21\u56de\u306e\u51e6\u7406\u306b\u9078\u629e\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 -KeywordSearchConfigurationPanel2.filesIndexedLabel.text=\u30ad\u30fc\u30ef\u30fc\u30c9\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5185\u306e\u30d5\u30a1\u30a4\u30eb\uff1a -KeywordSearchConfigurationPanel3.languagesLabel.text=\u6709\u52b9\u306a\u30b9\u30af\u30ea\u30d7\u30c8\uff08\u8a00\u8a9e\uff09\uff1a -KeywordSearchConfigurationPanel2.chunksLabel.text=\u30ad\u30fc\u30ef\u30fc\u30c9\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5185\u306e\u30c1\u30e3\u30f3\u30af\uff1a -KeywordSearchConfigurationPanel3.enableUTF8Checkbox.text=UTF8\u30c6\u30ad\u30b9\u30c8\u62bd\u51fa\u306e\u6709\u52b9\u5316 -KeywordSearchConfigurationPanel3.enableUTF16Checkbox.text=UTF16LE\u3068UTF16BE\u30b9\u30c8\u30ea\u30f3\u30b0\u62bd\u51fa\u306e\u6709\u52b9\u5316 KeywordSearchEditListPanel.keywordOptionsLabel.text=\u30ad\u30fc\u30ef\u30fc\u30c9\u30aa\u30d7\u30b7\u30e7\u30f3 KeywordSearchEditListPanel.listOptionsLabel.text=\u30ea\u30b9\u30c8\u30aa\u30d7\u30b7\u30e7\u30f3 -KeywordSearchConfigurationPanel3.ingestSettingsLabel.text=\u4e0d\u660e\u306a\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f\u304b\u3089\u306e\u30b9\u30c8\u30ea\u30f3\u30b0\u62bd\u51fa\u306e\u51e6\u7406\u65b9\u6cd5\u306e\u8a2d\u5b9a\uff08\u5909\u66f4\u306f\u6b21\u56de\u306e\u51e6\u7406\u304b\u3089\u6709\u52b9\uff09\uff1a -KeywordSearchConfigurationPanel2.settingsLabel.text=\u8a2d\u5b9a -KeywordSearchConfigurationPanel2.informationLabel.text=\u30a4\u30f3\u30d5\u30a9\u30e1\u30fc\u30b7\u30e7\u30f3 KeywordSearchListsManagementPanel.keywordListsLabel.text=\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8\uff1a KeywordSearchEditListPanel.keywordsLabel.text=\u30ad\u30fc\u30ef\u30fc\u30c9\uff1a -KeywordSearchConfigurationPanel2.timeRadioButton1.toolTipText=\uff12\uff10\u5206\uff08\u6700\u77ed\u306e\u51e6\u7406\u6642\u9593\uff09 -KeywordSearchConfigurationPanel2.timeRadioButton1.text=\uff12\uff10\u5206\uff08\u6700\u3082\u9045\u3044\u30d5\u30a3\u30fc\u30c9\u30d0\u30c3\u30af\u3001\u6700\u77ed\u306e\u51e6\u7406\u6642\u9593\uff09 -KeywordSearchConfigurationPanel2.timeRadioButton2.toolTipText=\uff11\uff10\u5206\uff08\u30c7\u30d5\u30a9\u30eb\u30c8\u3088\u308a\u5168\u4f53\u7684\u306b\u901f\u3044\u51e6\u7406\u6642\u9593\uff09 -KeywordSearchConfigurationPanel2.timeRadioButton2.text=\uff11\uff10\u5206\uff08\u3088\u308a\u9045\u3044\u30d5\u30a3\u30fc\u30c9\u30d0\u30c3\u30af\u3001\u3088\u308a\u901f\u3044\u51e6\u7406\u6642\u9593\uff09 -KeywordSearchConfigurationPanel2.timeRadioButton3.toolTipText=\uff15\u5206\uff08\u5168\u4f53\u7684\u306a\u51e6\u7406\u6642\u9593\u304c\u9577\u304f\u306a\u308a\u307e\u3059\uff09 -KeywordSearchConfigurationPanel2.timeRadioButton3.text=\uff15\u5206\uff08\u30c7\u30d5\u30a9\u30eb\u30c8\uff09 OpenIDE-Module-Short-Description=\u30ad\u30fc\u30ef\u30fc\u30c9\u691c\u7d22\u51e6\u7406\u30e2\u30b8\u30e5\u30fc\u30eb\u3001\u62bd\u51fa\u3055\u308c\u305f\u30c6\u30ad\u30b9\u30c8\u30d3\u30e5\u30fc\u30a2\u3001\u30ad\u30fc\u30ef\u30fc\u30c9\u691c\u7d22\u30c4\u30fc\u30eb KeywordSearchListsViewerPanel.manageListsButton.toolTipText=\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8\u3001\u30ea\u30b9\u30c8\u306e\u8a2d\u5b9a\u3068\u95a2\u9023\u3059\u308b\u30ad\u30fc\u30ef\u30fc\u30c9\u306e\u7ba1\u7406\u3002\u3053\u306e\u8a2d\u5b9a\u306f\u5168\u3066\u306e\u30b1\u30fc\u30b9\u306b\u9069\u7528\u3055\u308c\u307e\u3059\u3002 -KeywordSearchConfigurationPanel2.frequencyLabel.text=\u51e6\u7406\u4e2d\u306e\u7d50\u679c\u66f4\u65b0\u306e\u983b\u5ea6\uff1a -KeywordSearchConfigurationPanel2.timeRadioButton4.text_1=\uff11\u5206\uff08\u3088\u308a\u901f\u3044\u30d5\u30a3\u30fc\u30c9\u30d0\u30c3\u30af\u3001\u6700\u3082\u9577\u3044\u51e6\u7406\u6642\u9593\uff09 -KeywordSearchConfigurationPanel2.timeRadioButton4.toolTipText=\uff11\u5206\uff08\u5168\u4f53\u7684\u306a\u51e6\u7406\u6642\u9593\u304c\u9577\u304f\u306a\u308a\u307e\u3059\uff09 AbstractKeywordSearchPerformer.search.dialogErrorHeader=\u30ad\u30fc\u30ef\u30fc\u30c9\u691c\u7d22\u30a8\u30e9\u30fc AbstractKeywordSearchPerformer.search.invalidSyntaxHeader=\u30b7\u30f3\u30bf\u30c3\u30af\u30b9\u30a8\u30e9\u30fc AbstractKeywordSearchPerformer.search.searchIngestInProgressTitle=\u30ad\u30fc\u30ef\u30fc\u30c9\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\u3092\u5b9f\u884c\u4e2d @@ -167,8 +148,6 @@ ExtractedContentPanel.pagePreviousButton.actionCommand= ExtractedContentPanel.pageOfLabel.text=of ExtractedContentPanel.pageCurLabel.text=- ExtractedContentPanel.pageTotalLabel.text=- -KeywordSearchConfigurationPanel2.filesIndexedValue.text=- -KeywordSearchConfigurationPanel2.chunksValLabel.text=- AbstractFileChunk.index.exception.msg=\u30d5\u30a1\u30a4\u30eb\u30b9\u30c8\u30ea\u30f3\u30b0\u30c1\u30e3\u30f3\u30af\u306e\u51e6\u7406\u4e2d\u306b\u554f\u984c\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a {0}, \u30c1\u30e3\u30f3\u30af\: {1} AbstractFileStringContentStream.getSize.exception.msg=\u30b9\u30c8\u30ea\u30f3\u30b0\u5168\u4f53\u304c\u5909\u63db\u3055\u308c\u306a\u3051\u308c\u3070\u3001\u5909\u63db\u3055\u308c\u305f\u30b9\u30c8\u30ea\u30f3\u30b0\u5185\u306e\u30ad\u30e3\u30e9\u30af\u30bf\u30fc\u6570\u306f\u4e0d\u660e\u3067\u3059\u3002 AbstractFileStringContentStream.getSrcInfo.text=\u30d5\u30a1\u30a4\u30eb\uff1a{0} @@ -255,3 +234,24 @@ KeywordSearchJobSettingsPanel.encodingsLabel.text=\u30a8\u30f3\u30b3\u30fc\u30c7 KeywordSearchJobSettingsPanel.titleLabel.text=\u51e6\u7406\u4e2d\u306b\u6709\u52b9\u306a\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8\u3092\u9078\u629e\uff1a KeywordSearchJobSettingsPanel.languagesLabel.toolTipText=\u4e0d\u660e\u306a\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f\u304b\u3089\u306e\u30b9\u30c8\u30ea\u30f3\u30b0\u62bd\u51fa\u3092\u6709\u52b9\u306b\u3057\u305f\u30b9\u30af\u30ea\u30d7\u30c8\u3002\u30a2\u30c9\u30d0\u30f3\u30b9\u8a2d\u5b9a\u304b\u3089\u5909\u66f4\u304c\u53ef\u80fd\u3067\u3059\u3002 KeywordSearchJobSettingsPanel.languagesLabel.text=\u4e0d\u660e\u306a\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f\u304b\u3089\u306e\u30b9\u30c8\u30ea\u30f3\u30b0\u62bd\u51fa\u3092\u6709\u52b9\u306b\u3057\u305f\u30b9\u30af\u30ea\u30d7\u30c8\uff1a +KeywordSearchGlobalLanguageSettingsPanel.enableUTF8Checkbox.text=UTF8\u30c6\u30ad\u30b9\u30c8\u62bd\u51fa\u306e\u6709\u52b9\u5316 +KeywordSearchGlobalLanguageSettingsPanel.ingestSettingsLabel.text=\u4e0d\u660e\u306a\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f\u304b\u3089\u306e\u30b9\u30c8\u30ea\u30f3\u30b0\u62bd\u51fa\u306e\u51e6\u7406\u65b9\u6cd5\u306e\u8a2d\u5b9a\uff08\u5909\u66f4\u306f\u6b21\u56de\u306e\u51e6\u7406\u304b\u3089\u6709\u52b9\uff09\uff1a +KeywordSearchGlobalLanguageSettingsPanel.enableUTF16Checkbox.text=UTF16LE\u3068UTF16BE\u30b9\u30c8\u30ea\u30f3\u30b0\u62bd\u51fa\u306e\u6709\u52b9\u5316 +KeywordSearchGlobalLanguageSettingsPanel.languagesLabel.text=\u6709\u52b9\u306a\u30b9\u30af\u30ea\u30d7\u30c8\uff08\u8a00\u8a9e\uff09\uff1a +KeywordSearchGlobalSearchSettingsPanel.timeRadioButton1.toolTipText=\uff12\uff10\u5206\uff08\u6700\u77ed\u306e\u51e6\u7406\u6642\u9593\uff09 +KeywordSearchGlobalSearchSettingsPanel.timeRadioButton1.text=\uff12\uff10\u5206\uff08\u6700\u3082\u9045\u3044\u30d5\u30a3\u30fc\u30c9\u30d0\u30c3\u30af\u3001\u6700\u77ed\u306e\u51e6\u7406\u6642\u9593\uff09 +KeywordSearchGlobalSearchSettingsPanel.timeRadioButton2.toolTipText=\uff11\uff10\u5206\uff08\u30c7\u30d5\u30a9\u30eb\u30c8\u3088\u308a\u5168\u4f53\u7684\u306b\u901f\u3044\u51e6\u7406\u6642\u9593\uff09 +KeywordSearchGlobalSearchSettingsPanel.timeRadioButton2.text=\uff11\uff10\u5206\uff08\u3088\u308a\u9045\u3044\u30d5\u30a3\u30fc\u30c9\u30d0\u30c3\u30af\u3001\u3088\u308a\u901f\u3044\u51e6\u7406\u6642\u9593\uff09 +KeywordSearchGlobalSearchSettingsPanel.frequencyLabel.text=\u51e6\u7406\u4e2d\u306e\u7d50\u679c\u66f4\u65b0\u306e\u983b\u5ea6\uff1a +KeywordSearchGlobalSearchSettingsPanel.skipNSRLCheckBox.toolTipText=Hash DB\u30b5\u30fc\u30d3\u30b9\u3092\u4e8b\u524d\u306b\u5b9f\u884c\u3059\u308b\u304b\u3001\u6b21\u56de\u306e\u51e6\u7406\u306b\u9078\u629e\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 +KeywordSearchGlobalSearchSettingsPanel.skipNSRLCheckBox.text=\u51e6\u7406\u4e2d\u306bNSRL\u306e\u30d5\u30a1\u30a4\u30eb\uff08\u65e2\u77e5\u306e\u30d5\u30a1\u30a4\u30eb\uff09\u3092\u30ad\u30fc\u30ef\u30fc\u30c9\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306b\u8ffd\u52a0\u3057\u306a\u3044 +KeywordSearchGlobalSearchSettingsPanel.informationLabel.text=\u30a4\u30f3\u30d5\u30a9\u30e1\u30fc\u30b7\u30e7\u30f3 +KeywordSearchGlobalSearchSettingsPanel.settingsLabel.text=\u8a2d\u5b9a +KeywordSearchGlobalSearchSettingsPanel.filesIndexedValue.text=- +KeywordSearchGlobalSearchSettingsPanel.filesIndexedLabel.text=\u30ad\u30fc\u30ef\u30fc\u30c9\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5185\u306e\u30d5\u30a1\u30a4\u30eb\uff1a +KeywordSearchGlobalSearchSettingsPanel.chunksValLabel.text=- +KeywordSearchGlobalSearchSettingsPanel.timeRadioButton4.toolTipText=\uff11\u5206\uff08\u5168\u4f53\u7684\u306a\u51e6\u7406\u6642\u9593\u304c\u9577\u304f\u306a\u308a\u307e\u3059\uff09 +KeywordSearchGlobalSearchSettingsPanel.timeRadioButton4.text_1=\uff11\u5206\uff08\u3088\u308a\u901f\u3044\u30d5\u30a3\u30fc\u30c9\u30d0\u30c3\u30af\u3001\u6700\u3082\u9577\u3044\u51e6\u7406\u6642\u9593\uff09 +KeywordSearchGlobalSearchSettingsPanel.chunksLabel.text=\u30ad\u30fc\u30ef\u30fc\u30c9\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5185\u306e\u30c1\u30e3\u30f3\u30af\uff1a +KeywordSearchGlobalSearchSettingsPanel.timeRadioButton3.toolTipText=\uff15\u5206\uff08\u5168\u4f53\u7684\u306a\u51e6\u7406\u6642\u9593\u304c\u9577\u304f\u306a\u308a\u307e\u3059\uff09 +KeywordSearchGlobalSearchSettingsPanel.timeRadioButton3.text=\uff15\u5206\uff08\u30c7\u30d5\u30a9\u30eb\u30c8\uff09 diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel3.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalLanguageSettingsPanel.form similarity index 89% rename from KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel3.form rename to KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalLanguageSettingsPanel.form index 828ee693cd..563fa4c57b 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel3.form +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalLanguageSettingsPanel.form @@ -58,7 +58,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -106,7 +106,7 @@ - + @@ -116,7 +116,7 @@ - + diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel3.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalLanguageSettingsPanel.java similarity index 91% rename from KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel3.java rename to KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalLanguageSettingsPanel.java index cd74942a82..00feaf10b6 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel3.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalLanguageSettingsPanel.java @@ -36,10 +36,10 @@ import org.sleuthkit.autopsy.ingest.IngestManager; /** * Advanced configuration panel handling languages config. */ -class KeywordSearchConfigurationPanel3 extends javax.swing.JPanel implements OptionsPanel { +class KeywordSearchGlobalLanguageSettingsPanel extends javax.swing.JPanel implements OptionsPanel { - private static KeywordSearchConfigurationPanel3 instance = null; - private final Logger logger = Logger.getLogger(KeywordSearchConfigurationPanel3.class.getName()); + private static KeywordSearchGlobalLanguageSettingsPanel instance = null; + private final Logger logger = Logger.getLogger(KeywordSearchGlobalLanguageSettingsPanel.class.getName()); private final Map scripts = new HashMap(); private ActionListener updateLanguagesAction; private List