diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobSettings.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobSettings.java index f3c9f520d2..9fc5442371 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobSettings.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobSettings.java @@ -398,7 +398,7 @@ public class IngestJobSettings { * * @return The list of module names associated with the key. */ - static HashSet getModulesNamesFromSetting(String context, String key, String defaultSetting) { + private static HashSet getModulesNamesFromSetting(String context, String key, String defaultSetting) { if (ModuleSettings.settingExists(context, key) == false) { ModuleSettings.setConfigSetting(context, key, defaultSetting); } @@ -435,13 +435,12 @@ public class IngestJobSettings { * Get a set which contains all the names of enabled modules for the * specified context. * - * @param defaultSetting - The default list of module names. - * @param context -the execution context (profile name) to check + * @param context -the execution context (profile name) to check * * @return the names of the enabled modules */ - static HashSet getEnabledModules(String context, String defaultSetting) { - return getModulesNamesFromSetting(context, ENABLED_MODULES_KEY, defaultSetting); + static List getEnabledModules(String context) { + return new ArrayList<>(getModulesNamesFromSetting(context, ENABLED_MODULES_KEY, "")); } /** diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestOptionsPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestOptionsPanel.java index 959484653d..7ee74a726e 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestOptionsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestOptionsPanel.java @@ -39,9 +39,8 @@ public class IngestOptionsPanel extends IngestModuleGlobalSettingsPanel implemen "IngestOptionsPanel.fileFiltersTab.text=File Filters", "IngestOptionsPanel.fileFiltersTab.toolTipText=Settings for creating and editing ingest file filters.", "IngestOptionsPanel.profilesTab.text=Profiles", - "IngestOptionsPanel.profilesTab.toolTipText=Settings for creating and editing profiles.", - "IngestOptionsPanel.title.text=Ingest" - }) + "IngestOptionsPanel.profilesTab.toolTipText=Settings for creating and editing profiles."}) + private FilesSetDefsPanel filterPanel; private IngestSettingsPanel settingsPanel; private ProfileSettingsPanel profilePanel; @@ -59,7 +58,6 @@ public class IngestOptionsPanel extends IngestModuleGlobalSettingsPanel implemen } private void customizeComponents() { - setName(NbBundle.getMessage(IngestOptionsPanel.class, "IngestOptionsPanel.title.text")); filterPanel = new FilesSetDefsPanel(PANEL_TYPE.FILE_INGEST_FILTERS); settingsPanel = new IngestSettingsPanel(); profilePanel = new ProfileSettingsPanel(); diff --git a/Core/src/org/sleuthkit/autopsy/ingest/ProfileSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/ProfileSettingsPanel.java index fb23bc075b..1b1fbc40c0 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/ProfileSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/ProfileSettingsPanel.java @@ -429,7 +429,7 @@ class ProfileSettingsPanel extends IngestModuleGlobalSettingsPanel implements Op filterDescArea.setText(NbBundle.getMessage(ProfileSettingsPanel.class, "ProfileSettingsPanel.messages.filterLoadFailed")); } selectedModulesArea.setText(""); - for (String moduleName : IngestJobSettings.getEnabledModules(selectedProfile.getName(), "")) { + for (String moduleName : IngestJobSettings.getEnabledModules(selectedProfile.getName())) { selectedModulesArea.append(moduleName + "\n"); }