diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java index 6bd240006a..e2ee055ab1 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java @@ -43,14 +43,13 @@ public class KeywordSearchConfigurationPanel2 extends javax.swing.JPanel impleme } private void activateWidgets() { - final KeywordSearchIngestModule service = KeywordSearchIngestModule.getDefault(); - skipNSRLCheckBox.setSelected(service.getSkipKnown()); + skipNSRLCheckBox.setSelected(KeywordSearchSettings.getSkipKnown()); boolean enable = !IngestManager.getDefault().isIngestRunning() - && !IngestManager.getDefault().isModuleRunning(KeywordSearchIngestModule.getDefault()); + && !IngestManager.getDefault().isModuleRunning(KeywordSearchSettings.getDefault()); skipNSRLCheckBox.setEnabled(enable); setTimeSettingEnabled(enable); - final UpdateFrequency curFreq = service.getUpdateFrequency(); + final UpdateFrequency curFreq = KeywordSearchSettings.getUpdateFrequency(); switch (curFreq) { case FAST: timeRadioButton1.setSelected(true); @@ -206,11 +205,8 @@ public class KeywordSearchConfigurationPanel2 extends javax.swing.JPanel impleme @Override public void store() { - final KeywordSearchIngestModule km = - KeywordSearchIngestModule.getDefault(); - - km.setSkipKnown(skipNSRLCheckBox.isSelected()); - km.setUpdateFrequency(getSelectedTimeValue()); + KeywordSearchSettings.setSkipKnown(skipNSRLCheckBox.isSelected()); + KeywordSearchSettings.setUpdateFrequency(getSelectedTimeValue()); } @Override @@ -241,7 +237,7 @@ public class KeywordSearchConfigurationPanel2 extends javax.swing.JPanel impleme timeGroup.add(timeRadioButton2); timeGroup.add(timeRadioButton3); - this.skipNSRLCheckBox.setSelected(KeywordSearchIngestModule.getDefault().getSkipKnown()); + this.skipNSRLCheckBox.setSelected(KeywordSearchSettings.getSkipKnown()); try { filesIndexedValue.setText(Integer.toString(KeywordSearch.getServer().queryNumIndexedFiles())); diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel3.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel3.java index 8e085976e2..bd7a7b7102 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel3.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel3.java @@ -74,8 +74,6 @@ public class KeywordSearchConfigurationPanel3 extends javax.swing.JPanel impleme toUpdate.add(s); } } - //KeywordSearchIngestModule.getDefault().setStringExtractScripts(toUpdate); - } }; @@ -114,18 +112,17 @@ public class KeywordSearchConfigurationPanel3 extends javax.swing.JPanel impleme } private void reloadScriptsCheckBoxes() { - final KeywordSearchIngestModule service = KeywordSearchIngestModule.getDefault(); - + boolean utf16 = - Boolean.parseBoolean(service.getStringExtractOption(AbstractFileExtract.ExtractOptions.EXTRACT_UTF16.toString())); + Boolean.parseBoolean(KeywordSearchSettings.getStringExtractOption(AbstractFileExtract.ExtractOptions.EXTRACT_UTF16.toString())); enableUTF16Checkbox.setSelected(utf16); boolean utf8 = - Boolean.parseBoolean(service.getStringExtractOption(AbstractFileExtract.ExtractOptions.EXTRACT_UTF8.toString())); + Boolean.parseBoolean(KeywordSearchSettings.getStringExtractOption(AbstractFileExtract.ExtractOptions.EXTRACT_UTF8.toString())); enableUTF8Checkbox.setSelected(utf8); - final List