First cut at adding list name and original term to Keyword class

This commit is contained in:
Eugene Livis 2017-04-10 16:21:03 -04:00
parent 530c1745b3
commit 06daab8623
5 changed files with 5 additions and 5 deletions

View File

@ -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

View File

@ -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) {

View File

@ -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

View File

@ -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) {
//
}
}

View File

@ -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;
}
/**