Deprecated old KWS api, using new one

This commit is contained in:
Eugene Livis
2015-11-04 15:51:16 -05:00
parent a112b9a019
commit f84ab97cf2
3 changed files with 16 additions and 5 deletions
@@ -23,8 +23,9 @@ import org.sleuthkit.datamodel.BlackboardArtifact;
import org.sleuthkit.datamodel.TskCoreException;
/**
*
* @deprecated Use org.sleuthkit.datamodel.KeywordSearchService instead.
*/
@Deprecated
public interface KeywordSearchService extends Closeable {
/**
@@ -37,8 +37,8 @@ import org.sleuthkit.autopsy.ingest.IngestMessage.MessageType;
import org.sleuthkit.autopsy.ingest.IngestModuleReferenceCounter;
import org.sleuthkit.autopsy.ingest.IngestServices;
import org.sleuthkit.autopsy.keywordsearch.Ingester.IngesterException;
import org.sleuthkit.autopsy.keywordsearchservice.KeywordSearchService;
import org.sleuthkit.autopsy.keywordsearchservice.KeywordSearchServiceException;
import org.sleuthkit.datamodel.KeywordSearchService;
import org.sleuthkit.datamodel.KeywordSearchServiceException;
import org.sleuthkit.autopsy.modules.filetypeid.FileTypeDetector;
import org.sleuthkit.datamodel.AbstractFile;
import org.sleuthkit.datamodel.TskCoreException;
@@ -25,7 +25,8 @@ import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.sleuthkit.datamodel.BlackboardArtifact;
import org.sleuthkit.datamodel.BlackboardAttribute;
import org.sleuthkit.datamodel.TskCoreException;
import org.sleuthkit.autopsy.keywordsearchservice.KeywordSearchService;
import org.sleuthkit.datamodel.KeywordSearchService;
import org.sleuthkit.datamodel.KeywordSearchServiceException;
import org.apache.solr.common.util.ContentStreamBase.StringStream;
import org.openide.util.lookup.ServiceProvider;
import org.sleuthkit.autopsy.casemodule.Case;
@@ -36,7 +37,6 @@ import org.sleuthkit.datamodel.SleuthkitCase;
import org.openide.util.NbBundle;
import java.net.InetAddress;
import java.util.MissingResourceException;
import org.sleuthkit.autopsy.keywordsearchservice.KeywordSearchServiceException;
/**
* An implementation of the KeywordSearchService interface that uses Solr for
@@ -223,4 +223,14 @@ public class SolrSearchService implements KeywordSearchService {
@Override
public void close() throws IOException {
}
/**
* Returns whether or not keyword search is enabled for the current job.
*
* @return True is keyword search is enabled for the current job, false
* otherwise.
*/
public boolean isActive() {
return true;
}
}