storing changes

KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchModuleFactory.java

@@ -130,7 +130,12 @@ public boolean isDataArtifactIngestModuleFactory() {
 
     @Override
     public DataArtifactIngestModule createDataArtifactIngestModule(IngestModuleIngestJobSettings settings) {
-        return new KwsDataArtifactIngestModule();
+        if (!(settings instanceof KeywordSearchJobSettings)) {
+            throw new IllegalArgumentException(NbBundle.getMessage(this.getClass(),
+                    "KeywordSearchModuleFactory.createFileIngestModule.exception.msg"));
+        }
+        
+        return new KwsDataArtifactIngestModule((KeywordSearchJobSettings) settings);
     }    
     
     @Override
@@ -140,7 +145,12 @@ public boolean isAnalysisResultIngestModuleFactory() {
  
     @Override
     public AnalysisResultIngestModule createAnalysisResultIngestModule(IngestModuleIngestJobSettings settings) {
-        return new KwsAnalysisResultIngestModule();
+        if (!(settings instanceof KeywordSearchJobSettings)) {
+            throw new IllegalArgumentException(NbBundle.getMessage(this.getClass(),
+                    "KeywordSearchModuleFactory.createFileIngestModule.exception.msg"));
+        }
+        
+        return new KwsAnalysisResultIngestModule((KeywordSearchJobSettings) settings);
     }    
     
 }

KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KwsAnalysisResultIngestModule.java

@@ -41,7 +41,12 @@ public class KwsAnalysisResultIngestModule implements AnalysisResultIngestModule
     private static final int TSK_KEYWORD_HIT_TYPE_ID = BlackboardArtifact.Type.TSK_KEYWORD_HIT.getTypeID();
     private IngestJobContext context;
     private KeywordSearchService searchService;
+    private final KeywordSearchJobSettings settings;
 
+    KwsAnalysisResultIngestModule(KeywordSearchJobSettings settings) {
+        this.settings = settings;
+    }
+    
     @Override
     public void startUp(IngestJobContext context) throws IngestModule.IngestModuleException {
         this.context = context;

KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KwsDataArtifactIngestModule.java

@@ -40,7 +40,12 @@ public class KwsDataArtifactIngestModule implements DataArtifactIngestModule {
     private static final int TSK_ASSOCIATED_OBJECT_TYPE_ID = BlackboardArtifact.Type.TSK_ASSOCIATED_OBJECT.getTypeID();
     private IngestJobContext context;
     private KeywordSearchService searchService;
+    private final KeywordSearchJobSettings settings;
 
+    KwsDataArtifactIngestModule(KeywordSearchJobSettings settings) {
+        this.settings = settings;
+    }
+    
     @Override
     public void startUp(IngestJobContext context) throws IngestModuleException {
         this.context = context;