From fedf10a67c4885e6d919f5c3de55dd7ea2d1b4cb Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Sat, 22 Oct 2016 18:50:32 -0400
Subject: [PATCH] Rename TermsComponentQuery to RegexQuery

---
 .../keywordsearch/KeywordSearchQueryDelegator.java        | 4 ++--
 .../{TermsComponentQuery.java => RegexQuery.java}         | 8 ++++----
 .../org/sleuthkit/autopsy/keywordsearch/SearchRunner.java | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/{TermsComponentQuery.java => RegexQuery.java} (98%)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryDelegator.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryDelegator.java
index 47e0f7145f..342285bb72 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryDelegator.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryDelegator.java
@@ -62,13 +62,13 @@ class KeywordSearchQueryDelegator {
                         query.escape();
                     } // literal, substring match
                     else {
-                        query = new TermsComponentQuery(keywordList, keyword);
+                        query = new RegexQuery(keywordList, keyword);
                         query.escape();
                         query.setSubstringQuery();
                     }
                 } // regexp
                 else {
-                    query = new TermsComponentQuery(keywordList, keyword);
+                    query = new RegexQuery(keywordList, keyword);
                 }
                 queryDelegates.add(query);
             }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermsComponentQuery.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/RegexQuery.java
similarity index 98%
rename from KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermsComponentQuery.java
rename to KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/RegexQuery.java
index 49343798b7..b2d0415dc1 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermsComponentQuery.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/RegexQuery.java
@@ -51,9 +51,9 @@ import org.sleuthkit.datamodel.TskData;
  * index that match the regex. In the second step, term queries are executed for
  * each matched term to produce the set of keyword hits for the regex.
  */
-final class TermsComponentQuery implements KeywordSearchQuery {
+final class RegexQuery implements KeywordSearchQuery {
 
-    private static final Logger LOGGER = Logger.getLogger(TermsComponentQuery.class.getName());
+    private static final Logger LOGGER = Logger.getLogger(RegexQuery.class.getName());
     private static final String MODULE_NAME = KeywordSearchModuleFactory.getModuleName();
     private static final String SEARCH_HANDLER = "/terms"; //NON-NLS
     private static final String SEARCH_FIELD = Server.Schema.CONTENT_WS.toString();
@@ -133,7 +133,7 @@ final class TermsComponentQuery implements KeywordSearchQuery {
     // object?
     // TODO: Why is the search term not escaped and given substring wildcards,
     // if needed, here in the constructor?
-    TermsComponentQuery(KeywordList keywordList, Keyword keyword) {
+    RegexQuery(KeywordList keywordList, Keyword keyword) {
         this.keywordList = keywordList;
         this.keyword = keyword;
         this.searchTerm = keyword.getSearchTerm();
@@ -203,7 +203,7 @@ final class TermsComponentQuery implements KeywordSearchQuery {
 
     /**
      * Gets the escaped search term for the query, assuming it has been escaped
-     * by a call to TermsComponentQuery.escape.
+     * by a call to RegexQuery.escape.
      *
      * @return The search term, possibly escaped.
      */
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java
index 00fd1db2a7..463bac77d3 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java
@@ -436,7 +436,7 @@ public final class SearchRunner {
 
                     boolean isRegex = !keywordQuery.searchTermIsLiteral();
                     if (isRegex) {
-                        keywordSearchQuery = new TermsComponentQuery(list, keywordQuery);
+                        keywordSearchQuery = new RegexQuery(list, keywordQuery);
                     } else {
                         keywordSearchQuery = new LuceneQuery(list, keywordQuery);
                         keywordSearchQuery.escape();