From a00e311652af5c0e12954d413fa07800c0ed0528 Mon Sep 17 00:00:00 2001
From: Raman <raman@basistech.com>
Date: Wed, 10 Apr 2019 12:59:30 -0400
Subject: [PATCH] 4884: Add support for keyword lists to multi-case keyword
 search

---
 .../sleuthkit/autopsy/keywordsearch/Keyword.java  |  8 ++++----
 .../autopsy/keywordsearch/KeywordList.java        |  2 +-
 .../keywordsearch/KeywordListsManager.java        | 15 ++++++++++++++-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Keyword.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Keyword.java
index b56415094e..d7c7d7705f 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Keyword.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Keyword.java
@@ -31,7 +31,7 @@ import org.sleuthkit.datamodel.BlackboardAttribute;
  * with a keyword. This feature was added to support an initial implementation
  * of account number search and may be removed in the future.
  */
-class Keyword {
+public class Keyword {
 
     private String searchTerm;
     private boolean isLiteral;
@@ -123,7 +123,7 @@ class Keyword {
      *
      * @return The search term.
      */
-    String getSearchTerm() {
+    public String getSearchTerm() {
         return searchTerm;
     }
 
@@ -133,7 +133,7 @@ class Keyword {
      *
      * @return True or false.
      */
-    boolean searchTermIsLiteral() {
+    public boolean searchTermIsLiteral() {
         return isLiteral;
     }
 
@@ -144,7 +144,7 @@ class Keyword {
      *
      * @return True or false.
      */
-    boolean searchTermIsWholeWord() {
+    public boolean searchTermIsWholeWord() {
         return isWholeWord;
     }
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordList.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordList.java
index 13f094a89d..f2db250baa 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordList.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordList.java
@@ -167,7 +167,7 @@ public class KeywordList {
      *
      * @return A colleciton of Keyword objects.
      */
-    List<Keyword> getKeywords() {
+    public List<Keyword> getKeywords() {
         return keywords;
     }
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordListsManager.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordListsManager.java
index bdae07a971..0a83603bbb 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordListsManager.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordListsManager.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2014 Basis Technology Corp.
+ * Copyright 2014-2019 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -52,6 +52,8 @@ public class KeywordListsManager extends Observable {
 
     /**
      * Gets the singleton instance of the keyword lists manager.
+     * 
+     * @return an instance of KeywordListsManager.
      */
     public static synchronized KeywordListsManager getInstance() {
         if (instance == null) {
@@ -73,6 +75,17 @@ public class KeywordListsManager extends Observable {
         return names;
     }
     
+     /**
+     * Get keyword list by name.
+     *
+     * @param name id of the list
+     *
+     * @return keyword list representation, null if no list by that name
+     */
+    public KeywordList getList(String name) {
+        return XmlKeywordSearchList.getCurrent().getList(name);
+    }
+    
     /**
      * Force reload of the keyword lists XML file.
      */