From a646f233a5676a9c681b6050cf779a9e47a768b6 Mon Sep 17 00:00:00 2001 From: Douglas Lovell Date: Wed, 28 Oct 2015 11:17:46 -0600 Subject: [PATCH] improve the option name --- src/main/java/org/ahocorasick/trie/Trie.java | 4 +--- src/main/java/org/ahocorasick/trie/TrieConfig.java | 12 ++++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/ahocorasick/trie/Trie.java b/src/main/java/org/ahocorasick/trie/Trie.java index 1ada938..deed616 100644 --- a/src/main/java/org/ahocorasick/trie/Trie.java +++ b/src/main/java/org/ahocorasick/trie/Trie.java @@ -32,8 +32,6 @@ public class Trie { public Transition nextTransition(); } - - private class WordTokenizer implements KeywordTokenizer { private final java.util.StringTokenizer st; public WordTokenizer(String keyword) { @@ -58,7 +56,7 @@ public class Trie { private KeywordTokenizer keywordTokenizer(String keyword) { KeywordTokenizer kwt; - if (trieConfig.hasOnlyWordNodes()) { + if (trieConfig.hasWordTransitions()) { kwt = new WordTokenizer(keyword); } else { diff --git a/src/main/java/org/ahocorasick/trie/TrieConfig.java b/src/main/java/org/ahocorasick/trie/TrieConfig.java index 60a0b02..c7c6f72 100644 --- a/src/main/java/org/ahocorasick/trie/TrieConfig.java +++ b/src/main/java/org/ahocorasick/trie/TrieConfig.java @@ -8,7 +8,7 @@ public class TrieConfig { private boolean caseInsensitive = false; - private boolean wordNodes = false; + private boolean wordTransitions = false; public boolean isAllowOverlaps() { return allowOverlaps; @@ -19,7 +19,7 @@ public class TrieConfig { } public boolean isOnlyWholeWords() { - return wordNodes || onlyWholeWords; + return onlyWholeWords; } public void setOnlyWholeWords(boolean onlyWholeWords) { @@ -34,11 +34,11 @@ public class TrieConfig { this.caseInsensitive = caseInsensitive; } - public boolean hasOnlyWordNodes() { - return wordNodes; + public boolean hasWordTransitions() { + return wordTransitions; } - public void setOnlyWordNodes(boolean wordNodes) { - this.wordNodes = wordNodes; + public void setWordTransitions(boolean wordNodes) { + this.wordTransitions = wordNodes; } }