You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by jo...@apache.org on 2016/12/26 13:34:37 UTC
[43/50] [abbrv] opennlp git commit: Define update and
clearAdaptiveData as default methods
Define update and clearAdaptiveData as default methods
See issue OPENNLP-856
Project: http://git-wip-us.apache.org/repos/asf/opennlp/repo
Commit: http://git-wip-us.apache.org/repos/asf/opennlp/commit/99323ad6
Tree: http://git-wip-us.apache.org/repos/asf/opennlp/tree/99323ad6
Diff: http://git-wip-us.apache.org/repos/asf/opennlp/diff/99323ad6
Branch: refs/heads/889
Commit: 99323ad68c5eb3f9bae4314984931acca3699521
Parents: 71e40d0
Author: Kottmann <jo...@apache.org>
Authored: Thu Dec 22 17:31:54 2016 +0100
Committer: Kottmann <jo...@apache.org>
Committed: Thu Dec 22 17:35:52 2016 +0100
----------------------------------------------------------------------
.../opennlp/tools/util/featuregen/AdaptiveFeatureGenerator.java | 4 ++--
.../tools/util/featuregen/AdditionalContextFeatureGenerator.java | 2 +-
.../tools/util/featuregen/BigramNameFeatureGenerator.java | 2 +-
.../tools/util/featuregen/BrownBigramFeatureGenerator.java | 2 +-
.../tools/util/featuregen/BrownTokenClassFeatureGenerator.java | 2 +-
.../tools/util/featuregen/BrownTokenFeatureGenerator.java | 2 +-
.../tools/util/featuregen/CharacterNgramFeatureGenerator.java | 2 +-
.../tools/util/featuregen/DictionaryFeatureGenerator.java | 2 +-
.../tools/util/featuregen/DocumentBeginFeatureGenerator.java | 2 +-
.../tools/util/featuregen/FastTokenClassFeatureGenerator.java | 2 +-
.../opennlp/tools/util/featuregen/FeatureGeneratorAdapter.java | 3 +++
.../main/java/opennlp/tools/util/featuregen/InSpanGenerator.java | 2 +-
.../tools/util/featuregen/OutcomePriorFeatureGenerator.java | 2 +-
.../opennlp/tools/util/featuregen/PrefixFeatureGenerator.java | 2 +-
.../opennlp/tools/util/featuregen/SentenceFeatureGenerator.java | 2 +-
.../opennlp/tools/util/featuregen/SuffixFeatureGenerator.java | 2 +-
.../tools/util/featuregen/TokenClassFeatureGenerator.java | 2 +-
.../opennlp/tools/util/featuregen/TokenFeatureGenerator.java | 2 +-
.../tools/util/featuregen/TokenPatternFeatureGenerator.java | 2 +-
.../tools/util/featuregen/TrigramNameFeatureGenerator.java | 2 +-
.../tools/util/featuregen/WordClusterFeatureGenerator.java | 2 +-
.../opennlp/tools/util/featuregen/IdentityFeatureGenerator.java | 2 +-
22 files changed, 25 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/opennlp/blob/99323ad6/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/AdaptiveFeatureGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/AdaptiveFeatureGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/AdaptiveFeatureGenerator.java
index 6969504..ce8e9e4 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/AdaptiveFeatureGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/AdaptiveFeatureGenerator.java
@@ -58,11 +58,11 @@ public interface AdaptiveFeatureGenerator {
* @param tokens The tokens of the sentence or other text unit which has been processed.
* @param outcomes The outcomes associated with the specified tokens.
*/
- void updateAdaptiveData(String[] tokens, String[] outcomes);
+ default void updateAdaptiveData(String[] tokens, String[] outcomes) {};
/**
* Informs the feature generator that the context of the adaptive data (typically a document)
* is no longer valid.
*/
- void clearAdaptiveData();
+ default void clearAdaptiveData() {};
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/99323ad6/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/AdditionalContextFeatureGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/AdditionalContextFeatureGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/AdditionalContextFeatureGenerator.java
index 233c31d..3606bfc 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/AdditionalContextFeatureGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/AdditionalContextFeatureGenerator.java
@@ -24,7 +24,7 @@ import java.util.List;
* The {@link AdditionalContextFeatureGenerator} generates the context from the passed
* in additional context.
*/
-public class AdditionalContextFeatureGenerator extends FeatureGeneratorAdapter {
+public class AdditionalContextFeatureGenerator implements AdaptiveFeatureGenerator {
private String[][] additionalContext;
http://git-wip-us.apache.org/repos/asf/opennlp/blob/99323ad6/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/BigramNameFeatureGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/BigramNameFeatureGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/BigramNameFeatureGenerator.java
index a3d16d8..779628b 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/BigramNameFeatureGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/BigramNameFeatureGenerator.java
@@ -19,7 +19,7 @@ package opennlp.tools.util.featuregen;
import java.util.List;
-public class BigramNameFeatureGenerator extends FeatureGeneratorAdapter {
+public class BigramNameFeatureGenerator implements AdaptiveFeatureGenerator {
public void createFeatures(List<String> features, String[] tokens, int index, String[] previousOutcomes) {
String wc = FeatureGeneratorUtil.tokenFeature(tokens[index]);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/99323ad6/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/BrownBigramFeatureGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/BrownBigramFeatureGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/BrownBigramFeatureGenerator.java
index 9329757..a932e74 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/BrownBigramFeatureGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/BrownBigramFeatureGenerator.java
@@ -22,7 +22,7 @@ import java.util.List;
/**
* Generates Brown cluster features for token bigrams.
*/
-public class BrownBigramFeatureGenerator extends FeatureGeneratorAdapter {
+public class BrownBigramFeatureGenerator implements AdaptiveFeatureGenerator {
private BrownCluster brownLexicon;
http://git-wip-us.apache.org/repos/asf/opennlp/blob/99323ad6/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/BrownTokenClassFeatureGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/BrownTokenClassFeatureGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/BrownTokenClassFeatureGenerator.java
index 8f53be9..db3d774 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/BrownTokenClassFeatureGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/BrownTokenClassFeatureGenerator.java
@@ -22,7 +22,7 @@ import java.util.List;
/**
* Generates Brown cluster features for current token and token class.
*/
-public class BrownTokenClassFeatureGenerator extends FeatureGeneratorAdapter {
+public class BrownTokenClassFeatureGenerator implements AdaptiveFeatureGenerator {
private BrownCluster brownLexicon;
http://git-wip-us.apache.org/repos/asf/opennlp/blob/99323ad6/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/BrownTokenFeatureGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/BrownTokenFeatureGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/BrownTokenFeatureGenerator.java
index 5689897..f41203f 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/BrownTokenFeatureGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/BrownTokenFeatureGenerator.java
@@ -22,7 +22,7 @@ import java.util.List;
/**
* Generates Brown cluster features for current token.
*/
-public class BrownTokenFeatureGenerator extends FeatureGeneratorAdapter {
+public class BrownTokenFeatureGenerator implements AdaptiveFeatureGenerator {
private BrownCluster brownLexicon;
http://git-wip-us.apache.org/repos/asf/opennlp/blob/99323ad6/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/CharacterNgramFeatureGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/CharacterNgramFeatureGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/CharacterNgramFeatureGenerator.java
index 6314dac..8c0edd9 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/CharacterNgramFeatureGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/CharacterNgramFeatureGenerator.java
@@ -28,7 +28,7 @@ import opennlp.tools.util.StringUtil;
* generate features about each token.
* The minimum and maximum length can be specified.
*/
-public class CharacterNgramFeatureGenerator extends FeatureGeneratorAdapter {
+public class CharacterNgramFeatureGenerator implements AdaptiveFeatureGenerator {
private final int minLength;
private final int maxLength;
http://git-wip-us.apache.org/repos/asf/opennlp/blob/99323ad6/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/DictionaryFeatureGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/DictionaryFeatureGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/DictionaryFeatureGenerator.java
index bbedcc2..68037ed 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/DictionaryFeatureGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/DictionaryFeatureGenerator.java
@@ -31,7 +31,7 @@ import opennlp.tools.namefind.DictionaryNameFinder;
* @see DictionaryNameFinder
* @see InSpanGenerator
*/
-public class DictionaryFeatureGenerator extends FeatureGeneratorAdapter {
+public class DictionaryFeatureGenerator implements AdaptiveFeatureGenerator {
private InSpanGenerator isg;
http://git-wip-us.apache.org/repos/asf/opennlp/blob/99323ad6/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/DocumentBeginFeatureGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/DocumentBeginFeatureGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/DocumentBeginFeatureGenerator.java
index b201e9a..efcfce4 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/DocumentBeginFeatureGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/DocumentBeginFeatureGenerator.java
@@ -19,7 +19,7 @@ package opennlp.tools.util.featuregen;
import java.util.List;
-public class DocumentBeginFeatureGenerator extends FeatureGeneratorAdapter {
+public class DocumentBeginFeatureGenerator implements AdaptiveFeatureGenerator {
private String firstSentence[];
http://git-wip-us.apache.org/repos/asf/opennlp/blob/99323ad6/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/FastTokenClassFeatureGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/FastTokenClassFeatureGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/FastTokenClassFeatureGenerator.java
index 980d2ad..5c82733 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/FastTokenClassFeatureGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/FastTokenClassFeatureGenerator.java
@@ -30,7 +30,7 @@ import opennlp.tools.util.StringUtil;
* @deprecated Use {@link TokenClassFeatureGenerator} instead!
*/
@Deprecated
-public class FastTokenClassFeatureGenerator extends FeatureGeneratorAdapter {
+public class FastTokenClassFeatureGenerator implements AdaptiveFeatureGenerator {
private static final String TOKEN_CLASS_PREFIX = "wc";
private static final String TOKEN_AND_CLASS_PREFIX = "w&c";
http://git-wip-us.apache.org/repos/asf/opennlp/blob/99323ad6/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/FeatureGeneratorAdapter.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/FeatureGeneratorAdapter.java b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/FeatureGeneratorAdapter.java
index f2947cf..8f444ce 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/FeatureGeneratorAdapter.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/FeatureGeneratorAdapter.java
@@ -22,7 +22,10 @@ package opennlp.tools.util.featuregen;
* This class provides empty implementations of some of the optional methods in
* {@link AdditionalContextFeatureGenerator} to make implementing feature generators
* easier.
+ *
+ * @deprecated use AdaptiveFeatureGenerator instead
*/
+@Deprecated // in 1.7.0
public abstract class FeatureGeneratorAdapter implements AdaptiveFeatureGenerator {
public void updateAdaptiveData(String[] tokens, String[] outcomes) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/99323ad6/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/InSpanGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/InSpanGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/InSpanGenerator.java
index acd81ba..bcffc7e 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/InSpanGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/InSpanGenerator.java
@@ -27,7 +27,7 @@ import opennlp.tools.util.Span;
* Generates features if the tokens are recognized by the provided
* {@link TokenNameFinder}.
*/
-public class InSpanGenerator extends FeatureGeneratorAdapter {
+public class InSpanGenerator implements AdaptiveFeatureGenerator {
private final String prefix;
http://git-wip-us.apache.org/repos/asf/opennlp/blob/99323ad6/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/OutcomePriorFeatureGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/OutcomePriorFeatureGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/OutcomePriorFeatureGenerator.java
index 9593e8d..c2281f5 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/OutcomePriorFeatureGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/OutcomePriorFeatureGenerator.java
@@ -23,7 +23,7 @@ import java.util.List;
/**
* The definition feature maps the underlying distribution of outcomes.
*/
-public class OutcomePriorFeatureGenerator extends FeatureGeneratorAdapter {
+public class OutcomePriorFeatureGenerator implements AdaptiveFeatureGenerator {
public static final String OUTCOME_PRIOR_FEATURE = "def";
http://git-wip-us.apache.org/repos/asf/opennlp/blob/99323ad6/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/PrefixFeatureGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/PrefixFeatureGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/PrefixFeatureGenerator.java
index 10b9c55..8d433b6 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/PrefixFeatureGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/PrefixFeatureGenerator.java
@@ -19,7 +19,7 @@ package opennlp.tools.util.featuregen;
import java.util.List;
-public class PrefixFeatureGenerator extends FeatureGeneratorAdapter {
+public class PrefixFeatureGenerator implements AdaptiveFeatureGenerator {
private static final int PREFIX_LENGTH = 4;
http://git-wip-us.apache.org/repos/asf/opennlp/blob/99323ad6/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/SentenceFeatureGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/SentenceFeatureGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/SentenceFeatureGenerator.java
index 66b10d4..f7b81dc 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/SentenceFeatureGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/SentenceFeatureGenerator.java
@@ -22,7 +22,7 @@ import java.util.List;
/**
* This feature generator creates sentence begin and end features.
*/
-public class SentenceFeatureGenerator extends FeatureGeneratorAdapter {
+public class SentenceFeatureGenerator implements AdaptiveFeatureGenerator {
private final boolean isGenerateFirstWordFeature;
private final boolean isGenerateLastWordFeature;
http://git-wip-us.apache.org/repos/asf/opennlp/blob/99323ad6/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/SuffixFeatureGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/SuffixFeatureGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/SuffixFeatureGenerator.java
index 5ec34aa..815cc9e 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/SuffixFeatureGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/SuffixFeatureGenerator.java
@@ -19,7 +19,7 @@ package opennlp.tools.util.featuregen;
import java.util.List;
-public class SuffixFeatureGenerator extends FeatureGeneratorAdapter {
+public class SuffixFeatureGenerator implements AdaptiveFeatureGenerator {
private static final int SUFFIX_LENGTH = 4;
http://git-wip-us.apache.org/repos/asf/opennlp/blob/99323ad6/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/TokenClassFeatureGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/TokenClassFeatureGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/TokenClassFeatureGenerator.java
index 4aad40c..7358d24 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/TokenClassFeatureGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/TokenClassFeatureGenerator.java
@@ -25,7 +25,7 @@ import opennlp.tools.util.StringUtil;
/**
* Generates features for different for the class of the token.
*/
-public class TokenClassFeatureGenerator extends FeatureGeneratorAdapter {
+public class TokenClassFeatureGenerator implements AdaptiveFeatureGenerator {
private static final String TOKEN_CLASS_PREFIX = "wc";
private static final String TOKEN_AND_CLASS_PREFIX = "w&c";
http://git-wip-us.apache.org/repos/asf/opennlp/blob/99323ad6/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/TokenFeatureGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/TokenFeatureGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/TokenFeatureGenerator.java
index b0c9c5a..5aee49b 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/TokenFeatureGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/TokenFeatureGenerator.java
@@ -25,7 +25,7 @@ import opennlp.tools.util.StringUtil;
/**
* Generates a feature which contains the token itself.
*/
-public class TokenFeatureGenerator extends FeatureGeneratorAdapter {
+public class TokenFeatureGenerator implements AdaptiveFeatureGenerator {
private static final String WORD_PREFIX = "w";
private boolean lowercase;
http://git-wip-us.apache.org/repos/asf/opennlp/blob/99323ad6/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/TokenPatternFeatureGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/TokenPatternFeatureGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/TokenPatternFeatureGenerator.java
index 48a855f..79e61b2 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/TokenPatternFeatureGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/TokenPatternFeatureGenerator.java
@@ -29,7 +29,7 @@ import opennlp.tools.util.StringUtil;
* Partitions tokens into sub-tokens based on character classes and generates
* class features for each of the sub-tokens and combinations of those sub-tokens.
*/
-public class TokenPatternFeatureGenerator extends FeatureGeneratorAdapter {
+public class TokenPatternFeatureGenerator implements AdaptiveFeatureGenerator {
private Pattern noLetters = Pattern.compile("[^a-zA-Z]");
private Tokenizer tokenizer;
http://git-wip-us.apache.org/repos/asf/opennlp/blob/99323ad6/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/TrigramNameFeatureGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/TrigramNameFeatureGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/TrigramNameFeatureGenerator.java
index 0fa61e0..7724eb5 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/TrigramNameFeatureGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/TrigramNameFeatureGenerator.java
@@ -23,7 +23,7 @@ import java.util.List;
* Adds trigram features based on tokens and token classes.
*
*/
-public class TrigramNameFeatureGenerator extends FeatureGeneratorAdapter {
+public class TrigramNameFeatureGenerator implements AdaptiveFeatureGenerator {
public void createFeatures(List<String> features, String[] tokens, int index,
String[] previousOutcomes) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/99323ad6/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/WordClusterFeatureGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/WordClusterFeatureGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/WordClusterFeatureGenerator.java
index 4bd0a6d..11e0e6b 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/WordClusterFeatureGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/WordClusterFeatureGenerator.java
@@ -21,7 +21,7 @@ import java.util.List;
import opennlp.tools.util.StringUtil;
-public class WordClusterFeatureGenerator extends FeatureGeneratorAdapter {
+public class WordClusterFeatureGenerator implements AdaptiveFeatureGenerator {
private WordClusterDictionary tokenDictionary;
private String resourceName;
http://git-wip-us.apache.org/repos/asf/opennlp/blob/99323ad6/opennlp-tools/src/test/java/opennlp/tools/util/featuregen/IdentityFeatureGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/util/featuregen/IdentityFeatureGenerator.java b/opennlp-tools/src/test/java/opennlp/tools/util/featuregen/IdentityFeatureGenerator.java
index 70cbd15..970fe63 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/util/featuregen/IdentityFeatureGenerator.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/util/featuregen/IdentityFeatureGenerator.java
@@ -19,7 +19,7 @@ package opennlp.tools.util.featuregen;
import java.util.List;
-class IdentityFeatureGenerator extends FeatureGeneratorAdapter {
+class IdentityFeatureGenerator implements AdaptiveFeatureGenerator {
public void createFeatures(List<String> features, String[] tokens, int index,
String[] previousOutcomes) {