From 06daab86232b81d20cdbfa322bf6311d3295f2c2 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Mon, 10 Apr 2017 16:21:03 -0400
Subject: [PATCH] First cut at adding list name and original term to Keyword
 class

---
 .../sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java    | 2 +-
 .../src/org/sleuthkit/autopsy/keywordsearch/Keyword.java        | 2 +-
 .../src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java    | 2 +-
 .../src/org/sleuthkit/autopsy/keywordsearch/RegexQuery.java     | 2 +-
 .../sleuthkit/autopsy/keywordsearch/TermsComponentQuery.java    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java
index f44fbe9182..4aa42cae2e 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java
@@ -162,7 +162,7 @@ class GlobalEditListPanel extends javax.swing.JPanel implements ListSelectionLis
                     final Keyword keyword = new Keyword(newWord, !dialog.isKeywordRegex(), dialog.isKeywordExact(), currentKeywordList.getName(), newWord);
                     if (currentKeywordList.hasKeyword(keyword)) {
                         dupeCount++;
-                        continue;
+                        continue; 
                     }
 
                     //check if valid
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Keyword.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Keyword.java
index 72764ffaa1..ae0743d560 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Keyword.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Keyword.java
@@ -61,7 +61,7 @@ class Keyword {
         this.isLiteral = isLiteral;
         this.isWholeWord = true;
         this.listName = listName;
-        this.originalTerm = originalTerm;
+        this.originalTerm = originalTerm; 
     }    
 
     Keyword(String searchTerm, boolean isLiteral, boolean isWholeWord, String listName, String originalTerm) {
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java
index 397af6acfd..ce113b2e75 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java
@@ -70,7 +70,7 @@ class LuceneQuery implements KeywordSearchQuery {
     LuceneQuery(KeywordList keywordList, Keyword keyword) {
         this.keywordList = keywordList;
         this.originalKeyword = keyword;
-        this.keywordStringEscaped = this.originalKeyword.getSearchTerm();
+        this.keywordStringEscaped = this.originalKeyword.getSearchTerm(); 
     }
 
     @Override
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/RegexQuery.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/RegexQuery.java
index 36a888a9a9..bb96ae81d5 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/RegexQuery.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/RegexQuery.java
@@ -206,7 +206,7 @@ final class RegexQuery implements KeywordSearchQuery {
                         for (KeywordHit hit : keywordHits) {
                             hitsMultiMap.put(new Keyword(hit.getHit(), true, originalKeyword.getListName(), originalKeyword.getOriginalTerm()), hit);
                         }
-                    } catch (TskException ex) {
+                    } catch (TskException ex) { 
                         //
                     }
                 }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermsComponentQuery.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermsComponentQuery.java
index e4121a9874..43388a3687 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermsComponentQuery.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermsComponentQuery.java
@@ -315,7 +315,7 @@ final class TermsComponentQuery implements KeywordSearchQuery {
             }
             results.addResult(new Keyword(term.getTerm(), false, originalKeyword.getListName(), originalKeyword.getOriginalTerm()), new ArrayList<>(termHits));
         }
-        return results;
+        return results; 
     }
 
     /**