Index: contrib/analyzers/common/build.xml =================================================================== --- contrib/analyzers/common/build.xml (revision 820469) +++ contrib/analyzers/common/build.xml (working copy) @@ -22,9 +22,6 @@ Additional Analyzers - - - Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilter.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilter.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilter.java (working copy) @@ -36,7 +36,7 @@ public ArabicNormalizationFilter(TokenStream input) { super(input); normalizer = new ArabicNormalizer(); - termAtt = (TermAttribute) addAttribute(TermAttribute.class); + termAtt = addAttribute(TermAttribute.class); } public boolean incrementToken() throws IOException { Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilter.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilter.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilter.java (working copy) @@ -36,7 +36,7 @@ public ArabicStemFilter(TokenStream input) { super(input); stemmer = new ArabicStemmer(); - termAtt = (TermAttribute) addAttribute(TermAttribute.class); + termAtt = addAttribute(TermAttribute.class); } public boolean incrementToken() throws IOException { Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilter.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilter.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilter.java (working copy) @@ -40,7 +40,7 @@ public BrazilianStemFilter(TokenStream in) { super(in); stemmer = new BrazilianStemmer(); - termAtt = (TermAttribute) addAttribute(TermAttribute.class); + termAtt = addAttribute(TermAttribute.class); } public BrazilianStemFilter(TokenStream in, Set exclusiontable) { Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/cjk/CJKTokenizer.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/cjk/CJKTokenizer.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/cjk/CJKTokenizer.java (working copy) @@ -127,9 +127,9 @@ } private void init() { - termAtt = (TermAttribute) addAttribute(TermAttribute.class); - offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); - typeAtt = (TypeAttribute) addAttribute(TypeAttribute.class); + termAtt = addAttribute(TermAttribute.class); + offsetAtt = addAttribute(OffsetAttribute.class); + typeAtt = addAttribute(TypeAttribute.class); } //~ Methods ---------------------------------------------------------------- Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/cn/ChineseFilter.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/cn/ChineseFilter.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/cn/ChineseFilter.java (working copy) @@ -66,7 +66,7 @@ stopTable = new HashMap(STOP_WORDS.length); for (int i = 0; i < STOP_WORDS.length; i++) stopTable.put(STOP_WORDS[i], STOP_WORDS[i]); - termAtt = (TermAttribute) addAttribute(TermAttribute.class); + termAtt = addAttribute(TermAttribute.class); } public boolean incrementToken() throws IOException { Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/cn/ChineseTokenizer.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/cn/ChineseTokenizer.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/cn/ChineseTokenizer.java (working copy) @@ -74,8 +74,8 @@ } private void init() { - termAtt = (TermAttribute) addAttribute(TermAttribute.class); - offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); + termAtt = addAttribute(TermAttribute.class); + offsetAtt = addAttribute(OffsetAttribute.class); } private int offset = 0, bufferIndex=0, dataLen=0; Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java (working copy) @@ -106,12 +106,12 @@ addAllLowerCase(this.dictionary, dictionary); } - termAtt = (TermAttribute) addAttribute(TermAttribute.class); - offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); - flagsAtt = (FlagsAttribute) addAttribute(FlagsAttribute.class); - posIncAtt = (PositionIncrementAttribute) addAttribute(PositionIncrementAttribute.class); - typeAtt = (TypeAttribute) addAttribute(TypeAttribute.class); - payloadAtt = (PayloadAttribute) addAttribute(PayloadAttribute.class); + termAtt = addAttribute(TermAttribute.class); + offsetAtt = addAttribute(OffsetAttribute.class); + flagsAtt = addAttribute(FlagsAttribute.class); + posIncAtt = addAttribute(PositionIncrementAttribute.class); + typeAtt = addAttribute(TypeAttribute.class); + payloadAtt = addAttribute(PayloadAttribute.class); } /** Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanStemFilter.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanStemFilter.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanStemFilter.java (working copy) @@ -48,7 +48,7 @@ { super(in); stemmer = new GermanStemmer(); - termAtt = (TermAttribute) addAttribute(TermAttribute.class); + termAtt = addAttribute(TermAttribute.class); } /** Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilter.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilter.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilter.java (working copy) @@ -42,7 +42,7 @@ { super(in); this.charset = charset; - termAtt = (TermAttribute) addAttribute(TermAttribute.class); + termAtt = addAttribute(TermAttribute.class); } public GreekLowerCaseFilter(TokenStream in) Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilter.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilter.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilter.java (working copy) @@ -37,7 +37,7 @@ public PersianNormalizationFilter(TokenStream input) { super(input); normalizer = new PersianNormalizer(); - termAtt = (TermAttribute) addAttribute(TermAttribute.class); + termAtt = addAttribute(TermAttribute.class); } public boolean incrementToken() throws IOException { Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/ElisionFilter.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/ElisionFilter.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/ElisionFilter.java (working copy) @@ -57,7 +57,7 @@ super(input); this.articles = new HashSet(Arrays.asList(new String[] { "l", "m", "t", "qu", "n", "s", "j" })); - termAtt = (TermAttribute) addAttribute(TermAttribute.class); + termAtt = addAttribute(TermAttribute.class); } /** @@ -66,7 +66,7 @@ public ElisionFilter(TokenStream input, Set articles) { super(input); setArticles(articles); - termAtt = (TermAttribute) addAttribute(TermAttribute.class); + termAtt = addAttribute(TermAttribute.class); } /** @@ -75,7 +75,7 @@ public ElisionFilter(TokenStream input, String[] articles) { super(input); setArticles(new HashSet(Arrays.asList(articles))); - termAtt = (TermAttribute) addAttribute(TermAttribute.class); + termAtt = addAttribute(TermAttribute.class); } /** Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchStemFilter.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchStemFilter.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchStemFilter.java (working copy) @@ -47,7 +47,7 @@ public FrenchStemFilter( TokenStream in ) { super(in); stemmer = new FrenchStemmer(); - termAtt = (TermAttribute) addAttribute(TermAttribute.class); + termAtt = addAttribute(TermAttribute.class); } Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAwareTokenFilter.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAwareTokenFilter.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAwareTokenFilter.java (working copy) @@ -64,19 +64,19 @@ this.prefix = prefix; prefixExhausted = false; - termAtt = (TermAttribute) addAttribute(TermAttribute.class); - posIncrAtt = (PositionIncrementAttribute) addAttribute(PositionIncrementAttribute.class); - payloadAtt = (PayloadAttribute) addAttribute(PayloadAttribute.class); - offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); - typeAtt = (TypeAttribute) addAttribute(TypeAttribute.class); - flagsAtt = (FlagsAttribute) addAttribute(FlagsAttribute.class); + termAtt = addAttribute(TermAttribute.class); + posIncrAtt = addAttribute(PositionIncrementAttribute.class); + payloadAtt = addAttribute(PayloadAttribute.class); + offsetAtt = addAttribute(OffsetAttribute.class); + typeAtt = addAttribute(TypeAttribute.class); + flagsAtt = addAttribute(FlagsAttribute.class); - p_termAtt = (TermAttribute) prefix.addAttribute(TermAttribute.class); - p_posIncrAtt = (PositionIncrementAttribute) prefix.addAttribute(PositionIncrementAttribute.class); - p_payloadAtt = (PayloadAttribute) prefix.addAttribute(PayloadAttribute.class); - p_offsetAtt = (OffsetAttribute) prefix.addAttribute(OffsetAttribute.class); - p_typeAtt = (TypeAttribute) prefix.addAttribute(TypeAttribute.class); - p_flagsAtt = (FlagsAttribute) prefix.addAttribute(FlagsAttribute.class); + p_termAtt = prefix.addAttribute(TermAttribute.class); + p_posIncrAtt = prefix.addAttribute(PositionIncrementAttribute.class); + p_payloadAtt = prefix.addAttribute(PayloadAttribute.class); + p_offsetAtt = prefix.addAttribute(OffsetAttribute.class); + p_typeAtt = prefix.addAttribute(TypeAttribute.class); + p_flagsAtt = prefix.addAttribute(FlagsAttribute.class); } private Token previousPrefixToken = new Token(); Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilter.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilter.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilter.java (working copy) @@ -77,8 +77,8 @@ protected EdgeNGramTokenFilter(TokenStream input) { super(input); - this.termAtt = (TermAttribute) addAttribute(TermAttribute.class); - this.offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); + this.termAtt = addAttribute(TermAttribute.class); + this.offsetAtt = addAttribute(OffsetAttribute.class); } /** @@ -107,8 +107,8 @@ this.minGram = minGram; this.maxGram = maxGram; this.side = side; - this.termAtt = (TermAttribute) addAttribute(TermAttribute.class); - this.offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); + this.termAtt = addAttribute(TermAttribute.class); + this.offsetAtt = addAttribute(OffsetAttribute.class); } /** Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizer.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizer.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizer.java (working copy) @@ -175,8 +175,8 @@ this.maxGram = maxGram; this.side = side; - this.termAtt = (TermAttribute) addAttribute(TermAttribute.class); - this.offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); + this.termAtt = addAttribute(TermAttribute.class); + this.offsetAtt = addAttribute(OffsetAttribute.class); } Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenFilter.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenFilter.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenFilter.java (working copy) @@ -59,8 +59,8 @@ this.minGram = minGram; this.maxGram = maxGram; - this.termAtt = (TermAttribute) addAttribute(TermAttribute.class); - this.offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); + this.termAtt = addAttribute(TermAttribute.class); + this.offsetAtt = addAttribute(OffsetAttribute.class); } /** Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizer.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizer.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizer.java (working copy) @@ -96,8 +96,8 @@ this.minGram = minGram; this.maxGram = maxGram; - this.termAtt = (TermAttribute) addAttribute(TermAttribute.class); - this.offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); + this.termAtt = addAttribute(TermAttribute.class); + this.offsetAtt = addAttribute(OffsetAttribute.class); } /** Returns the next token in the stream, or null at EOS. */ Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/DutchStemFilter.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/DutchStemFilter.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/DutchStemFilter.java (working copy) @@ -47,7 +47,7 @@ public DutchStemFilter(TokenStream _in) { super(_in); stemmer = new DutchStemmer(); - termAtt = (TermAttribute) addAttribute(TermAttribute.class); + termAtt = addAttribute(TermAttribute.class); } /** Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilter.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilter.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilter.java (working copy) @@ -53,8 +53,8 @@ public DelimitedPayloadTokenFilter(TokenStream input, char delimiter, PayloadEncoder encoder) { super(input); - termAtt = (TermAttribute) addAttribute(TermAttribute.class); - payAtt = (PayloadAttribute) addAttribute(PayloadAttribute.class); + termAtt = addAttribute(TermAttribute.class); + payAtt = addAttribute(PayloadAttribute.class); this.delimiter = delimiter; this.encoder = encoder; } Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilter.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilter.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilter.java (working copy) @@ -44,8 +44,8 @@ //Need to encode the payload thePayload = new Payload(PayloadHelper.encodeFloat(payload)); this.typeMatch = typeMatch; - payloadAtt = (PayloadAttribute) addAttribute(PayloadAttribute.class); - typeAtt = (TypeAttribute) addAttribute(TypeAttribute.class); + payloadAtt = addAttribute(PayloadAttribute.class); + typeAtt = addAttribute(TypeAttribute.class); } public final boolean incrementToken() throws IOException { Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilter.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilter.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilter.java (working copy) @@ -39,8 +39,8 @@ public TokenOffsetPayloadTokenFilter(TokenStream input) { super(input); - offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); - payAtt = (PayloadAttribute) addAttribute(PayloadAttribute.class); + offsetAtt = addAttribute(OffsetAttribute.class); + payAtt = addAttribute(PayloadAttribute.class); } public final boolean incrementToken() throws IOException { Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilter.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilter.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilter.java (working copy) @@ -39,8 +39,8 @@ public TypeAsPayloadTokenFilter(TokenStream input) { super(input); - payloadAtt = (PayloadAttribute) addAttribute(PayloadAttribute.class); - typeAtt = (TypeAttribute) addAttribute(TypeAttribute.class); + payloadAtt = addAttribute(PayloadAttribute.class); + typeAtt = addAttribute(TypeAttribute.class); } Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/position/PositionFilter.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/position/PositionFilter.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/position/PositionFilter.java (working copy) @@ -46,7 +46,7 @@ */ public PositionFilter(final TokenStream input) { super(input); - posIncrAtt = (PositionIncrementAttribute) addAttribute(PositionIncrementAttribute.class); + posIncrAtt = addAttribute(PositionIncrementAttribute.class); } /** Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilter.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilter.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilter.java (working copy) @@ -87,7 +87,7 @@ public ReverseStringFilter(TokenStream in, char marker) { super(in); this.marker = marker; - termAtt = (TermAttribute) addAttribute(TermAttribute.class); + termAtt = addAttribute(TermAttribute.class); } public boolean incrementToken() throws IOException { Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianLowerCaseFilter.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianLowerCaseFilter.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianLowerCaseFilter.java (working copy) @@ -45,7 +45,7 @@ { super(in); this.charset = charset; - termAtt = (TermAttribute) addAttribute(TermAttribute.class); + termAtt = addAttribute(TermAttribute.class); } public RussianLowerCaseFilter(TokenStream in) Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianStemFilter.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianStemFilter.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianStemFilter.java (working copy) @@ -50,7 +50,7 @@ { super(in); stemmer = new RussianStemmer(charset); - termAtt = (TermAttribute) addAttribute(TermAttribute.class); + termAtt = addAttribute(TermAttribute.class); } public RussianStemFilter(TokenStream in) Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java (working copy) @@ -84,10 +84,10 @@ public ShingleFilter(TokenStream input, int maxShingleSize) { super(input); setMaxShingleSize(maxShingleSize); - this.termAtt = (TermAttribute) addAttribute(TermAttribute.class); - this.offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); - this.posIncrAtt = (PositionIncrementAttribute) addAttribute(PositionIncrementAttribute.class); - this.typeAtt = (TypeAttribute) addAttribute(TypeAttribute.class); + this.termAtt = addAttribute(TermAttribute.class); + this.offsetAtt = addAttribute(OffsetAttribute.class); + this.posIncrAtt = addAttribute(PositionIncrementAttribute.class); + this.typeAtt = addAttribute(TypeAttribute.class); } /** Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleMatrixFilter.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleMatrixFilter.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleMatrixFilter.java (working copy) @@ -228,22 +228,22 @@ this.ignoringSinglePrefixOrSuffixShingle = ignoringSinglePrefixOrSuffixShingle; this.settingsCodec = settingsCodec; - termAtt = (TermAttribute) addAttribute(TermAttribute.class); - posIncrAtt = (PositionIncrementAttribute) addAttribute(PositionIncrementAttribute.class); - payloadAtt = (PayloadAttribute) addAttribute(PayloadAttribute.class); - offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); - typeAtt = (TypeAttribute) addAttribute(TypeAttribute.class); - flagsAtt = (FlagsAttribute) addAttribute(FlagsAttribute.class); + termAtt = addAttribute(TermAttribute.class); + posIncrAtt = addAttribute(PositionIncrementAttribute.class); + payloadAtt = addAttribute(PayloadAttribute.class); + offsetAtt = addAttribute(OffsetAttribute.class); + typeAtt = addAttribute(TypeAttribute.class); + flagsAtt = addAttribute(FlagsAttribute.class); // set the input to be an empty token stream, we already have the data. this.input = new EmptyTokenStream(); - in_termAtt = (TermAttribute) input.addAttribute(TermAttribute.class); - in_posIncrAtt = (PositionIncrementAttribute) input.addAttribute(PositionIncrementAttribute.class); - in_payloadAtt = (PayloadAttribute) input.addAttribute(PayloadAttribute.class); - in_offsetAtt = (OffsetAttribute) input.addAttribute(OffsetAttribute.class); - in_typeAtt = (TypeAttribute) input.addAttribute(TypeAttribute.class); - in_flagsAtt = (FlagsAttribute) input.addAttribute(FlagsAttribute.class); + in_termAtt = input.addAttribute(TermAttribute.class); + in_posIncrAtt = input.addAttribute(PositionIncrementAttribute.class); + in_payloadAtt = input.addAttribute(PayloadAttribute.class); + in_offsetAtt = input.addAttribute(OffsetAttribute.class); + in_typeAtt = input.addAttribute(TypeAttribute.class); + in_flagsAtt = input.addAttribute(FlagsAttribute.class); } /** @@ -310,19 +310,19 @@ this.spacerCharacter = spacerCharacter; this.ignoringSinglePrefixOrSuffixShingle = ignoringSinglePrefixOrSuffixShingle; this.settingsCodec = settingsCodec; - termAtt = (TermAttribute) addAttribute(TermAttribute.class); - posIncrAtt = (PositionIncrementAttribute) addAttribute(PositionIncrementAttribute.class); - payloadAtt = (PayloadAttribute) addAttribute(PayloadAttribute.class); - offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); - typeAtt = (TypeAttribute) addAttribute(TypeAttribute.class); - flagsAtt = (FlagsAttribute) addAttribute(FlagsAttribute.class); + termAtt = addAttribute(TermAttribute.class); + posIncrAtt = addAttribute(PositionIncrementAttribute.class); + payloadAtt = addAttribute(PayloadAttribute.class); + offsetAtt = addAttribute(OffsetAttribute.class); + typeAtt = addAttribute(TypeAttribute.class); + flagsAtt = addAttribute(FlagsAttribute.class); - in_termAtt = (TermAttribute) input.addAttribute(TermAttribute.class); - in_posIncrAtt = (PositionIncrementAttribute) input.addAttribute(PositionIncrementAttribute.class); - in_payloadAtt = (PayloadAttribute) input.addAttribute(PayloadAttribute.class); - in_offsetAtt = (OffsetAttribute) input.addAttribute(OffsetAttribute.class); - in_typeAtt = (TypeAttribute) input.addAttribute(TypeAttribute.class); - in_flagsAtt = (FlagsAttribute) input.addAttribute(FlagsAttribute.class); + in_termAtt = input.addAttribute(TermAttribute.class); + in_posIncrAtt = input.addAttribute(PositionIncrementAttribute.class); + in_payloadAtt = input.addAttribute(PayloadAttribute.class); + in_offsetAtt = input.addAttribute(OffsetAttribute.class); + in_typeAtt = input.addAttribute(TypeAttribute.class); + in_flagsAtt = input.addAttribute(FlagsAttribute.class); } // internal filter instance variables Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/DateRecognizerSinkFilter.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/DateRecognizerSinkFilter.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/DateRecognizerSinkFilter.java (working copy) @@ -51,7 +51,7 @@ public boolean accept(AttributeSource source) { if (termAtt == null) { - termAtt = (TermAttribute) source.addAttribute(TermAttribute.class); + termAtt = source.addAttribute(TermAttribute.class); } try { Date date = dateFormat.parse(termAtt.term());//We don't care about the date, just that we can parse it as a date Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/TokenTypeSinkFilter.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/TokenTypeSinkFilter.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/TokenTypeSinkFilter.java (working copy) @@ -31,7 +31,7 @@ public boolean accept(AttributeSource source) { if (typeAtt == null) { - typeAtt = (TypeAttribute) source.addAttribute(TypeAttribute.class); + typeAtt = source.addAttribute(TypeAttribute.class); } //check to see if this is a Category Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/ThaiWordFilter.java =================================================================== --- contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/ThaiWordFilter.java (revision 820469) +++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/ThaiWordFilter.java (working copy) @@ -44,8 +44,8 @@ public ThaiWordFilter(TokenStream input) { super(input); breaker = BreakIterator.getWordInstance(new Locale("th")); - termAtt = (TermAttribute) addAttribute(TermAttribute.class); - offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); + termAtt = addAttribute(TermAttribute.class); + offsetAtt = addAttribute(OffsetAttribute.class); } public final boolean incrementToken() throws IOException { Index: contrib/analyzers/common/src/test/org/apache/lucene/analysis/cjk/TestCJKTokenizer.java =================================================================== --- contrib/analyzers/common/src/test/org/apache/lucene/analysis/cjk/TestCJKTokenizer.java (revision 820469) +++ contrib/analyzers/common/src/test/org/apache/lucene/analysis/cjk/TestCJKTokenizer.java (working copy) @@ -48,9 +48,9 @@ public void checkCJKToken(final String str, final TestToken[] out_tokens) throws IOException { CJKTokenizer tokenizer = new CJKTokenizer(new StringReader(str)); - TermAttribute termAtt = (TermAttribute) tokenizer.getAttribute(TermAttribute.class); - OffsetAttribute offsetAtt = (OffsetAttribute) tokenizer.getAttribute(OffsetAttribute.class); - TypeAttribute typeAtt = (TypeAttribute) tokenizer.getAttribute(TypeAttribute.class); + TermAttribute termAtt = tokenizer.getAttribute(TermAttribute.class); + OffsetAttribute offsetAtt = tokenizer.getAttribute(OffsetAttribute.class); + TypeAttribute typeAtt = tokenizer.getAttribute(TypeAttribute.class); for (int i = 0; i < out_tokens.length; i++) { assertTrue(tokenizer.incrementToken()); assertEquals(termAtt.term(), out_tokens[i].termText); @@ -63,9 +63,9 @@ public void checkCJKTokenReusable(final Analyzer a, final String str, final TestToken[] out_tokens) throws IOException { TokenStream ts = a.reusableTokenStream("dummy", new StringReader(str)); - TermAttribute termAtt = (TermAttribute) ts.getAttribute(TermAttribute.class); - OffsetAttribute offsetAtt = (OffsetAttribute) ts.getAttribute(OffsetAttribute.class); - TypeAttribute typeAtt = (TypeAttribute) ts.getAttribute(TypeAttribute.class); + TermAttribute termAtt = ts.getAttribute(TermAttribute.class); + OffsetAttribute offsetAtt = ts.getAttribute(OffsetAttribute.class); + TypeAttribute typeAtt = ts.getAttribute(TypeAttribute.class); for (int i = 0; i < out_tokens.length; i++) { assertTrue(ts.incrementToken()); assertEquals(termAtt.term(), out_tokens[i].termText); @@ -220,7 +220,7 @@ public void testTokenStream() throws Exception { Analyzer analyzer = new CJKAnalyzer(); TokenStream ts = analyzer.tokenStream("dummy", new StringReader("\u4e00\u4e01\u4e02")); - TermAttribute termAtt = (TermAttribute) ts.getAttribute(TermAttribute.class); + TermAttribute termAtt = ts.getAttribute(TermAttribute.class); assertTrue(ts.incrementToken()); assertEquals("\u4e00\u4e01", termAtt.term()); assertTrue(ts.incrementToken()); Index: contrib/analyzers/common/src/test/org/apache/lucene/analysis/cn/TestChineseTokenizer.java =================================================================== --- contrib/analyzers/common/src/test/org/apache/lucene/analysis/cn/TestChineseTokenizer.java (revision 820469) +++ contrib/analyzers/common/src/test/org/apache/lucene/analysis/cn/TestChineseTokenizer.java (working copy) @@ -38,7 +38,7 @@ int correctStartOffset = 0; int correctEndOffset = 1; - OffsetAttribute offsetAtt = (OffsetAttribute) tokenizer.getAttribute(OffsetAttribute.class); + OffsetAttribute offsetAtt = tokenizer.getAttribute(OffsetAttribute.class); while (tokenizer.incrementToken()) { assertEquals(correctStartOffset, offsetAtt.startOffset()); assertEquals(correctEndOffset, offsetAtt.endOffset()); Index: contrib/analyzers/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java =================================================================== --- contrib/analyzers/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java (revision 820469) +++ contrib/analyzers/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java (working copy) @@ -173,7 +173,7 @@ CompoundWordTokenFilterBase.DEFAULT_MIN_SUBWORD_SIZE, CompoundWordTokenFilterBase.DEFAULT_MAX_SUBWORD_SIZE, false); - TermAttribute termAtt = (TermAttribute) tf.getAttribute(TermAttribute.class); + TermAttribute termAtt = tf.getAttribute(TermAttribute.class); assertTrue(tf.incrementToken()); assertEquals("Rindfleischüberwachungsgesetz", termAtt.term()); assertTrue(tf.incrementToken()); Index: contrib/analyzers/common/src/test/org/apache/lucene/analysis/fr/TestElision.java =================================================================== --- contrib/analyzers/common/src/test/org/apache/lucene/analysis/fr/TestElision.java (revision 820469) +++ contrib/analyzers/common/src/test/org/apache/lucene/analysis/fr/TestElision.java (working copy) @@ -50,7 +50,7 @@ private List filtre(TokenFilter filter) throws IOException { List tas = new ArrayList(); - TermAttribute termAtt = (TermAttribute) filter.getAttribute(TermAttribute.class); + TermAttribute termAtt = filter.getAttribute(TermAttribute.class); while (filter.incrementToken()) { tas.add(termAtt.term()); } Index: contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAndSuffixAwareTokenFilter.java =================================================================== --- contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAndSuffixAwareTokenFilter.java (revision 820469) +++ contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAndSuffixAwareTokenFilter.java (working copy) @@ -45,8 +45,8 @@ private void assertNext(TokenStream ts, String text, int startOffset, int endOffset) throws IOException { - TermAttribute termAtt = (TermAttribute) ts.addAttribute(TermAttribute.class); - OffsetAttribute offsetAtt = (OffsetAttribute) ts.addAttribute(OffsetAttribute.class); + TermAttribute termAtt = ts.addAttribute(TermAttribute.class); + OffsetAttribute offsetAtt = ts.addAttribute(OffsetAttribute.class); assertTrue(ts.incrementToken()); assertEquals(text, termAtt.term()); Index: contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAwareTokenFilter.java =================================================================== --- contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAwareTokenFilter.java (revision 820469) +++ contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAwareTokenFilter.java (working copy) @@ -54,8 +54,8 @@ private void assertNext(TokenStream ts, String text, int startOffset, int endOffset) throws IOException { - TermAttribute termAtt = (TermAttribute) ts.addAttribute(TermAttribute.class); - OffsetAttribute offsetAtt = (OffsetAttribute) ts.addAttribute(OffsetAttribute.class); + TermAttribute termAtt = ts.addAttribute(TermAttribute.class); + OffsetAttribute offsetAtt = ts.addAttribute(OffsetAttribute.class); assertTrue(ts.incrementToken()); assertEquals(text, termAtt.term()); Index: contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterTest.java =================================================================== --- contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterTest.java (revision 820469) +++ contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterTest.java (working copy) @@ -35,8 +35,8 @@ public void testPayloads() throws Exception { String test = "The quick|JJ red|JJ fox|NN jumped|VB over the lazy|JJ brown|JJ dogs|NN"; DelimitedPayloadTokenFilter filter = new DelimitedPayloadTokenFilter(new WhitespaceTokenizer(new StringReader(test))); - TermAttribute termAtt = (TermAttribute) filter.getAttribute(TermAttribute.class); - PayloadAttribute payAtt = (PayloadAttribute) filter.getAttribute(PayloadAttribute.class); + TermAttribute termAtt = filter.getAttribute(TermAttribute.class); + PayloadAttribute payAtt = filter.getAttribute(PayloadAttribute.class); assertTermEquals("The", filter, termAtt, payAtt, null); assertTermEquals("quick", filter, termAtt, payAtt, "JJ".getBytes("UTF-8")); assertTermEquals("red", filter, termAtt, payAtt, "JJ".getBytes("UTF-8")); @@ -71,8 +71,8 @@ public void testFloatEncoding() throws Exception { String test = "The quick|1.0 red|2.0 fox|3.5 jumped|0.5 over the lazy|5 brown|99.3 dogs|83.7"; DelimitedPayloadTokenFilter filter = new DelimitedPayloadTokenFilter(new WhitespaceTokenizer(new StringReader(test)), '|', new FloatEncoder()); - TermAttribute termAtt = (TermAttribute) filter.getAttribute(TermAttribute.class); - PayloadAttribute payAtt = (PayloadAttribute) filter.getAttribute(PayloadAttribute.class); + TermAttribute termAtt = filter.getAttribute(TermAttribute.class); + PayloadAttribute payAtt = filter.getAttribute(PayloadAttribute.class); assertTermEquals("The", filter, termAtt, payAtt, null); assertTermEquals("quick", filter, termAtt, payAtt, PayloadHelper.encodeFloat(1.0f)); assertTermEquals("red", filter, termAtt, payAtt, PayloadHelper.encodeFloat(2.0f)); @@ -89,8 +89,8 @@ public void testIntEncoding() throws Exception { String test = "The quick|1 red|2 fox|3 jumped over the lazy|5 brown|99 dogs|83"; DelimitedPayloadTokenFilter filter = new DelimitedPayloadTokenFilter(new WhitespaceTokenizer(new StringReader(test)), '|', new IntegerEncoder()); - TermAttribute termAtt = (TermAttribute) filter.getAttribute(TermAttribute.class); - PayloadAttribute payAtt = (PayloadAttribute) filter.getAttribute(PayloadAttribute.class); + TermAttribute termAtt = filter.getAttribute(TermAttribute.class); + PayloadAttribute payAtt = filter.getAttribute(PayloadAttribute.class); assertTermEquals("The", filter, termAtt, payAtt, null); assertTermEquals("quick", filter, termAtt, payAtt, PayloadHelper.encodeInt(1)); assertTermEquals("red", filter, termAtt, payAtt, PayloadHelper.encodeInt(2)); @@ -105,8 +105,8 @@ } void assertTermEquals(String expected, TokenStream stream, byte[] expectPay) throws Exception { - TermAttribute termAtt = (TermAttribute) stream.getAttribute(TermAttribute.class); - PayloadAttribute payloadAtt = (PayloadAttribute) stream.getAttribute(PayloadAttribute.class); + TermAttribute termAtt = stream.getAttribute(TermAttribute.class); + PayloadAttribute payloadAtt = stream.getAttribute(PayloadAttribute.class); assertTrue(stream.incrementToken()); assertEquals(expected, termAtt.term()); Payload payload = payloadAtt.getPayload(); Index: contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java =================================================================== --- contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java (revision 820469) +++ contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java (working copy) @@ -39,9 +39,9 @@ NumericPayloadTokenFilter nptf = new NumericPayloadTokenFilter(new WordTokenFilter(new WhitespaceTokenizer(new StringReader(test))), 3, "D"); boolean seenDogs = false; - TermAttribute termAtt = (TermAttribute) nptf.getAttribute(TermAttribute.class); - TypeAttribute typeAtt = (TypeAttribute) nptf.getAttribute(TypeAttribute.class); - PayloadAttribute payloadAtt = (PayloadAttribute) nptf.getAttribute(PayloadAttribute.class); + TermAttribute termAtt = nptf.getAttribute(TermAttribute.class); + TypeAttribute typeAtt = nptf.getAttribute(TypeAttribute.class); + PayloadAttribute payloadAtt = nptf.getAttribute(PayloadAttribute.class); while (nptf.incrementToken()) { if (termAtt.term().equals("dogs")) { seenDogs = true; @@ -65,8 +65,8 @@ private WordTokenFilter(TokenStream input) { super(input); - termAtt = (TermAttribute) addAttribute(TermAttribute.class); - typeAtt = (TypeAttribute) addAttribute(TypeAttribute.class); + termAtt = addAttribute(TermAttribute.class); + typeAtt = addAttribute(TypeAttribute.class); } public boolean incrementToken() throws IOException { Index: contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterTest.java =================================================================== --- contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterTest.java (revision 820469) +++ contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterTest.java (working copy) @@ -37,8 +37,8 @@ TokenOffsetPayloadTokenFilter nptf = new TokenOffsetPayloadTokenFilter(new WhitespaceTokenizer(new StringReader(test))); int count = 0; - PayloadAttribute payloadAtt = (PayloadAttribute) nptf.getAttribute(PayloadAttribute.class); - OffsetAttribute offsetAtt = (OffsetAttribute) nptf.getAttribute(OffsetAttribute.class); + PayloadAttribute payloadAtt = nptf.getAttribute(PayloadAttribute.class); + OffsetAttribute offsetAtt = nptf.getAttribute(OffsetAttribute.class); while (nptf.incrementToken()) { Payload pay = payloadAtt.getPayload(); Index: contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java =================================================================== --- contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java (revision 820469) +++ contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java (working copy) @@ -39,9 +39,9 @@ TypeAsPayloadTokenFilter nptf = new TypeAsPayloadTokenFilter(new WordTokenFilter(new WhitespaceTokenizer(new StringReader(test)))); int count = 0; - TermAttribute termAtt = (TermAttribute) nptf.getAttribute(TermAttribute.class); - TypeAttribute typeAtt = (TypeAttribute) nptf.getAttribute(TypeAttribute.class); - PayloadAttribute payloadAtt = (PayloadAttribute) nptf.getAttribute(PayloadAttribute.class); + TermAttribute termAtt = nptf.getAttribute(TermAttribute.class); + TypeAttribute typeAtt = nptf.getAttribute(TypeAttribute.class); + PayloadAttribute payloadAtt = nptf.getAttribute(PayloadAttribute.class); while (nptf.incrementToken()) { assertTrue(typeAtt.type() + " is not null and it should be", typeAtt.type().equals(String.valueOf(Character.toUpperCase(termAtt.termBuffer()[0])))); @@ -61,8 +61,8 @@ private WordTokenFilter(TokenStream input) { super(input); - termAtt = (TermAttribute) addAttribute(TermAttribute.class); - typeAtt = (TypeAttribute) addAttribute(TypeAttribute.class); + termAtt = addAttribute(TermAttribute.class); + typeAtt = addAttribute(TypeAttribute.class); } public boolean incrementToken() throws IOException { Index: contrib/analyzers/common/src/test/org/apache/lucene/analysis/position/PositionFilterTest.java =================================================================== --- contrib/analyzers/common/src/test/org/apache/lucene/analysis/position/PositionFilterTest.java (revision 820469) +++ contrib/analyzers/common/src/test/org/apache/lucene/analysis/position/PositionFilterTest.java (working copy) @@ -35,7 +35,7 @@ public TestTokenStream(String[] testToken) { super(); this.testToken = testToken; - termAtt = (TermAttribute) addAttribute(TermAttribute.class); + termAtt = addAttribute(TermAttribute.class); } public final boolean incrementToken() throws IOException { Index: contrib/analyzers/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java =================================================================== --- contrib/analyzers/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java (revision 820469) +++ contrib/analyzers/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java (working copy) @@ -193,7 +193,7 @@ QueryAutoStopWordAnalyzer a = new QueryAutoStopWordAnalyzer(new WhitespaceAnalyzer()); a.addStopWords(reader, 10); TokenStream ts = a.tokenStream("repetitiveField", new StringReader("this boring")); - TermAttribute termAtt = (TermAttribute) ts.getAttribute(TermAttribute.class); + TermAttribute termAtt = ts.getAttribute(TermAttribute.class); assertTrue(ts.incrementToken()); assertEquals("this", termAtt.term()); assertFalse(ts.incrementToken()); Index: contrib/analyzers/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilter.java =================================================================== --- contrib/analyzers/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilter.java (revision 820469) +++ contrib/analyzers/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilter.java (working copy) @@ -29,7 +29,7 @@ TokenStream stream = new WhitespaceTokenizer( new StringReader("Do have a nice day")); // 1-4 length string ReverseStringFilter filter = new ReverseStringFilter(stream); - TermAttribute text = (TermAttribute) filter.getAttribute(TermAttribute.class); + TermAttribute text = filter.getAttribute(TermAttribute.class); assertTrue(filter.incrementToken()); assertEquals("oD", text.term()); assertTrue(filter.incrementToken()); @@ -47,7 +47,7 @@ TokenStream stream = new WhitespaceTokenizer(new StringReader( "Do have a nice day")); // 1-4 length string ReverseStringFilter filter = new ReverseStringFilter(stream, '\u0001'); - TermAttribute text = (TermAttribute) filter + TermAttribute text = filter .getAttribute(TermAttribute.class); assertTrue(filter.incrementToken()); assertEquals("\u0001oD", text.term()); Index: contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java =================================================================== --- contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java (revision 820469) +++ contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java (working copy) @@ -77,8 +77,8 @@ new RussianLetterTokenizer( sampleUnicode); - TermAttribute text = (TermAttribute) in.getAttribute(TermAttribute.class); - TermAttribute sampleText = (TermAttribute) sample.getAttribute(TermAttribute.class); + TermAttribute text = in.getAttribute(TermAttribute.class); + TermAttribute sampleText = sample.getAttribute(TermAttribute.class); for (;;) { @@ -113,8 +113,8 @@ sampleKOI8, RussianCharsets.KOI8); - TermAttribute text = (TermAttribute) in.getAttribute(TermAttribute.class); - TermAttribute sampleText = (TermAttribute) sample.getAttribute(TermAttribute.class); + TermAttribute text = in.getAttribute(TermAttribute.class); + TermAttribute sampleText = sample.getAttribute(TermAttribute.class); for (;;) { @@ -147,8 +147,8 @@ sample1251, RussianCharsets.CP1251); - TermAttribute text = (TermAttribute) in.getAttribute(TermAttribute.class); - TermAttribute sampleText = (TermAttribute) sample.getAttribute(TermAttribute.class); + TermAttribute text = in.getAttribute(TermAttribute.class); + TermAttribute sampleText = sample.getAttribute(TermAttribute.class); for (;;) { @@ -174,7 +174,7 @@ RussianAnalyzer ra = new RussianAnalyzer(); TokenStream stream = ra.tokenStream("", reader); - TermAttribute termText = (TermAttribute) stream.getAttribute(TermAttribute.class); + TermAttribute termText = stream.getAttribute(TermAttribute.class); try { assertTrue(stream.incrementToken()); assertEquals("text", termText.term()); Index: contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java =================================================================== --- contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java (revision 820469) +++ contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java (working copy) @@ -157,8 +157,8 @@ new StringReader("this sentence")); int j = -1; - PositionIncrementAttribute posIncrAtt = (PositionIncrementAttribute) ts.addAttribute(PositionIncrementAttribute.class); - TermAttribute termAtt = (TermAttribute) ts.addAttribute(TermAttribute.class); + PositionIncrementAttribute posIncrAtt = ts.addAttribute(PositionIncrementAttribute.class); + TermAttribute termAtt = ts.addAttribute(TermAttribute.class); while (ts.incrementToken()) { j += posIncrAtt.getPositionIncrement(); @@ -185,7 +185,7 @@ TokenStream ts = analyzer.tokenStream("content", new StringReader("test sentence")); - TermAttribute termAtt = (TermAttribute) ts.addAttribute(TermAttribute.class); + TermAttribute termAtt = ts.addAttribute(TermAttribute.class); while (ts.incrementToken()) { String termText = termAtt.term(); Index: contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/ShingleFilterTest.java =================================================================== --- contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/ShingleFilterTest.java (revision 820469) +++ contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/ShingleFilterTest.java (working copy) @@ -42,10 +42,10 @@ public TestTokenStream(Token[] testToken) { super(); this.testToken = testToken; - this.termAtt = (TermAttribute) addAttribute(TermAttribute.class); - this.offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); - this.posIncrAtt = (PositionIncrementAttribute) addAttribute(PositionIncrementAttribute.class); - this.typeAtt = (TypeAttribute) addAttribute(TypeAttribute.class); + this.termAtt = addAttribute(TermAttribute.class); + this.offsetAtt = addAttribute(OffsetAttribute.class); + this.posIncrAtt = addAttribute(PositionIncrementAttribute.class); + this.typeAtt = addAttribute(TypeAttribute.class); } public final boolean incrementToken() throws IOException { @@ -299,10 +299,10 @@ ShingleFilter filter = new ShingleFilter(new TestTokenStream(tokensToShingle), maxSize); filter.setOutputUnigrams(outputUnigrams); - TermAttribute termAtt = (TermAttribute) filter.addAttribute(TermAttribute.class); - OffsetAttribute offsetAtt = (OffsetAttribute) filter.addAttribute(OffsetAttribute.class); - PositionIncrementAttribute posIncrAtt = (PositionIncrementAttribute) filter.addAttribute(PositionIncrementAttribute.class); - TypeAttribute typeAtt = (TypeAttribute) filter.addAttribute(TypeAttribute.class); + TermAttribute termAtt = filter.addAttribute(TermAttribute.class); + OffsetAttribute offsetAtt = filter.addAttribute(OffsetAttribute.class); + PositionIncrementAttribute posIncrAtt = filter.addAttribute(PositionIncrementAttribute.class); + TypeAttribute typeAtt = filter.addAttribute(TypeAttribute.class); int i = 0; while (filter.incrementToken()) { Index: contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/TestShingleMatrixFilter.java =================================================================== --- contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/TestShingleMatrixFilter.java (revision 820469) +++ contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/TestShingleMatrixFilter.java (working copy) @@ -454,16 +454,16 @@ // assert-methods start here private void assertNext(TokenStream ts, String text) throws IOException { - TermAttribute termAtt = (TermAttribute) ts.addAttribute(TermAttribute.class); + TermAttribute termAtt = ts.addAttribute(TermAttribute.class); assertTrue(ts.incrementToken()); assertEquals(text, termAtt.term()); } private void assertNext(TokenStream ts, String text, int positionIncrement, float boost) throws IOException { - TermAttribute termAtt = (TermAttribute) ts.addAttribute(TermAttribute.class); - PositionIncrementAttribute posIncrAtt = (PositionIncrementAttribute) ts.addAttribute(PositionIncrementAttribute.class); - PayloadAttribute payloadAtt = (PayloadAttribute) ts.addAttribute(PayloadAttribute.class); + TermAttribute termAtt = ts.addAttribute(TermAttribute.class); + PositionIncrementAttribute posIncrAtt = ts.addAttribute(PositionIncrementAttribute.class); + PayloadAttribute payloadAtt = ts.addAttribute(PayloadAttribute.class); assertTrue(ts.incrementToken()); assertEquals(text, termAtt.term()); @@ -472,10 +472,10 @@ } private void assertNext(TokenStream ts, String text, int positionIncrement, float boost, int startOffset, int endOffset) throws IOException { - TermAttribute termAtt = (TermAttribute) ts.addAttribute(TermAttribute.class); - PositionIncrementAttribute posIncrAtt = (PositionIncrementAttribute) ts.addAttribute(PositionIncrementAttribute.class); - PayloadAttribute payloadAtt = (PayloadAttribute) ts.addAttribute(PayloadAttribute.class); - OffsetAttribute offsetAtt = (OffsetAttribute) ts.addAttribute(OffsetAttribute.class); + TermAttribute termAtt = ts.addAttribute(TermAttribute.class); + PositionIncrementAttribute posIncrAtt = ts.addAttribute(PositionIncrementAttribute.class); + PayloadAttribute payloadAtt = ts.addAttribute(PayloadAttribute.class); + OffsetAttribute offsetAtt = ts.addAttribute(OffsetAttribute.class); assertTrue(ts.incrementToken()); assertEquals(text, termAtt.term()); @@ -486,8 +486,8 @@ } private void assertNext(TokenStream ts, String text, int startOffset, int endOffset) throws IOException { - TermAttribute termAtt = (TermAttribute) ts.addAttribute(TermAttribute.class); - OffsetAttribute offsetAtt = (OffsetAttribute) ts.addAttribute(OffsetAttribute.class); + TermAttribute termAtt = ts.addAttribute(TermAttribute.class); + OffsetAttribute offsetAtt = ts.addAttribute(OffsetAttribute.class); assertTrue(ts.incrementToken()); assertEquals(text, termAtt.term()); @@ -515,12 +515,12 @@ public TokenListStream(Collection tokens) { this.tokens = tokens; - termAtt = (TermAttribute) addAttribute(TermAttribute.class); - posIncrAtt = (PositionIncrementAttribute) addAttribute(PositionIncrementAttribute.class); - payloadAtt = (PayloadAttribute) addAttribute(PayloadAttribute.class); - offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); - typeAtt = (TypeAttribute) addAttribute(TypeAttribute.class); - flagsAtt = (FlagsAttribute) addAttribute(FlagsAttribute.class); + termAtt = addAttribute(TermAttribute.class); + posIncrAtt = addAttribute(PositionIncrementAttribute.class); + payloadAtt = addAttribute(PayloadAttribute.class); + offsetAtt = addAttribute(OffsetAttribute.class); + typeAtt = addAttribute(TypeAttribute.class); + flagsAtt = addAttribute(FlagsAttribute.class); } private Iterator iterator; Index: contrib/analyzers/common/src/test/org/apache/lucene/analysis/sinks/TokenTypeSinkTokenizerTest.java =================================================================== --- contrib/analyzers/common/src/test/org/apache/lucene/analysis/sinks/TokenTypeSinkTokenizerTest.java (revision 820469) +++ contrib/analyzers/common/src/test/org/apache/lucene/analysis/sinks/TokenTypeSinkTokenizerTest.java (working copy) @@ -44,8 +44,8 @@ boolean seenDogs = false; - TermAttribute termAtt = (TermAttribute) ttf.addAttribute(TermAttribute.class); - TypeAttribute typeAtt = (TypeAttribute) ttf.addAttribute(TypeAttribute.class); + TermAttribute termAtt = ttf.addAttribute(TermAttribute.class); + TypeAttribute typeAtt = ttf.addAttribute(TypeAttribute.class); ttf.reset(); while (ttf.incrementToken()) { if (termAtt.term().equals("dogs")) { @@ -72,8 +72,8 @@ private WordTokenFilter(TokenStream input) { super(input); - termAtt = (TermAttribute) addAttribute(TermAttribute.class); - typeAtt = (TypeAttribute) addAttribute(TypeAttribute.class); + termAtt = addAttribute(TermAttribute.class); + typeAtt = addAttribute(TypeAttribute.class); } public final boolean incrementToken() throws IOException { Index: contrib/analyzers/smartcn/build.xml =================================================================== --- contrib/analyzers/smartcn/build.xml (revision 820469) +++ contrib/analyzers/smartcn/build.xml (working copy) @@ -22,9 +22,6 @@ Smart Chinese Analyzer - - - Index: contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SentenceTokenizer.java =================================================================== --- contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SentenceTokenizer.java (revision 820469) +++ contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SentenceTokenizer.java (working copy) @@ -68,9 +68,9 @@ } private void init() { - termAtt = (TermAttribute) addAttribute(TermAttribute.class); - offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); - typeAtt = (TypeAttribute) addAttribute(TypeAttribute.class); + termAtt = addAttribute(TermAttribute.class); + offsetAtt = addAttribute(OffsetAttribute.class); + typeAtt = addAttribute(TypeAttribute.class); } public boolean incrementToken() throws IOException { Index: contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordTokenFilter.java =================================================================== --- contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordTokenFilter.java (revision 820469) +++ contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordTokenFilter.java (working copy) @@ -56,9 +56,9 @@ public WordTokenFilter(TokenStream in) { super(in); this.wordSegmenter = new WordSegmenter(); - termAtt = (TermAttribute) addAttribute(TermAttribute.class); - offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); - typeAtt = (TypeAttribute) addAttribute(TypeAttribute.class); + termAtt = addAttribute(TermAttribute.class); + offsetAtt = addAttribute(OffsetAttribute.class); + typeAtt = addAttribute(TypeAttribute.class); } public boolean incrementToken() throws IOException { Index: contrib/collation/src/java/org/apache/lucene/collation/CollationKeyFilter.java =================================================================== --- contrib/collation/src/java/org/apache/lucene/collation/CollationKeyFilter.java (revision 820469) +++ contrib/collation/src/java/org/apache/lucene/collation/CollationKeyFilter.java (working copy) @@ -85,7 +85,7 @@ public CollationKeyFilter(TokenStream input, Collator collator) { super(input); this.collator = collator; - termAtt = (TermAttribute) addAttribute(TermAttribute.class); + termAtt = addAttribute(TermAttribute.class); } public boolean incrementToken() throws IOException { Index: contrib/collation/src/java/org/apache/lucene/collation/ICUCollationKeyFilter.java =================================================================== --- contrib/collation/src/java/org/apache/lucene/collation/ICUCollationKeyFilter.java (revision 820469) +++ contrib/collation/src/java/org/apache/lucene/collation/ICUCollationKeyFilter.java (working copy) @@ -83,7 +83,7 @@ public ICUCollationKeyFilter(TokenStream input, Collator collator) { super(input); this.collator = collator; - termAtt = (TermAttribute) addAttribute(TermAttribute.class); + termAtt = addAttribute(TermAttribute.class); } public boolean incrementToken() throws IOException { Index: contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java =================================================================== --- contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java (revision 820469) +++ contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java (working copy) @@ -195,8 +195,8 @@ ch = 0; } - TermAttribute termAtt = (TermAttribute) addAttribute(TermAttribute.class); - OffsetAttribute offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); + TermAttribute termAtt = addAttribute(TermAttribute.class); + OffsetAttribute offsetAtt = addAttribute(OffsetAttribute.class); public boolean incrementToken() throws IOException { if( !getNextPartialSnippet() ) return false; Index: contrib/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java =================================================================== --- contrib/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java (revision 820469) +++ contrib/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java (working copy) @@ -217,8 +217,8 @@ ArrayList docFrags = new ArrayList(); StringBuffer newText=new StringBuffer(); - TermAttribute termAtt = (TermAttribute) tokenStream.addAttribute(TermAttribute.class); - OffsetAttribute offsetAtt = (OffsetAttribute) tokenStream.addAttribute(OffsetAttribute.class); + TermAttribute termAtt = tokenStream.addAttribute(TermAttribute.class); + OffsetAttribute offsetAtt = tokenStream.addAttribute(OffsetAttribute.class); tokenStream.addAttribute(PositionIncrementAttribute.class); tokenStream.reset(); Index: contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryScorer.java =================================================================== --- contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryScorer.java (revision 820469) +++ contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryScorer.java (working copy) @@ -175,8 +175,8 @@ */ public TokenStream init(TokenStream tokenStream) throws IOException { position = -1; - termAtt = (TermAttribute) tokenStream.addAttribute(TermAttribute.class); - posIncAtt = (PositionIncrementAttribute) tokenStream.addAttribute(PositionIncrementAttribute.class); + termAtt = tokenStream.addAttribute(TermAttribute.class); + posIncAtt = tokenStream.addAttribute(PositionIncrementAttribute.class); if(!skipInitExtractor) { if(fieldWeightedSpanTerms != null) { fieldWeightedSpanTerms.clear(); Index: contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermScorer.java =================================================================== --- contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermScorer.java (revision 820469) +++ contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermScorer.java (working copy) @@ -95,7 +95,7 @@ * @see org.apache.lucene.search.highlight.Scorer#init(org.apache.lucene.analysis.TokenStream) */ public TokenStream init(TokenStream tokenStream) { - termAtt = (TermAttribute) tokenStream.addAttribute(TermAttribute.class); + termAtt = tokenStream.addAttribute(TermAttribute.class); return null; } Index: contrib/highlighter/src/java/org/apache/lucene/search/highlight/SimpleFragmenter.java =================================================================== --- contrib/highlighter/src/java/org/apache/lucene/search/highlight/SimpleFragmenter.java (revision 820469) +++ contrib/highlighter/src/java/org/apache/lucene/search/highlight/SimpleFragmenter.java (working copy) @@ -47,7 +47,7 @@ * @see org.apache.lucene.search.highlight.Fragmenter#start(java.lang.String, org.apache.lucene.analysis.TokenStream) */ public void start(String originalText, TokenStream stream) { - offsetAtt = (OffsetAttribute) stream.addAttribute(OffsetAttribute.class); + offsetAtt = stream.addAttribute(OffsetAttribute.class); currentNumFrags = 1; } Index: contrib/highlighter/src/java/org/apache/lucene/search/highlight/SimpleSpanFragmenter.java =================================================================== --- contrib/highlighter/src/java/org/apache/lucene/search/highlight/SimpleSpanFragmenter.java (revision 820469) +++ contrib/highlighter/src/java/org/apache/lucene/search/highlight/SimpleSpanFragmenter.java (working copy) @@ -101,8 +101,8 @@ position = -1; currentNumFrags = 1; textSize = originalText.length(); - termAtt = (TermAttribute) tokenStream.addAttribute(TermAttribute.class); - posIncAtt = (PositionIncrementAttribute) tokenStream.addAttribute(PositionIncrementAttribute.class); - offsetAtt = (OffsetAttribute) tokenStream.addAttribute(OffsetAttribute.class); + termAtt = tokenStream.addAttribute(TermAttribute.class); + posIncAtt = tokenStream.addAttribute(PositionIncrementAttribute.class); + offsetAtt = tokenStream.addAttribute(OffsetAttribute.class); } } Index: contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenGroup.java =================================================================== --- contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenGroup.java (revision 820469) +++ contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenGroup.java (working copy) @@ -41,8 +41,8 @@ private TermAttribute termAtt; public TokenGroup(TokenStream tokenStream) { - offsetAtt = (OffsetAttribute) tokenStream.addAttribute(OffsetAttribute.class); - termAtt = (TermAttribute) tokenStream.addAttribute(TermAttribute.class); + offsetAtt = tokenStream.addAttribute(OffsetAttribute.class); + termAtt = tokenStream.addAttribute(TermAttribute.class); } void addToken(float score) { Index: contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java =================================================================== --- contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java (revision 820469) +++ contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java (working copy) @@ -147,8 +147,8 @@ StoredTokenStream(Token tokens[]) { this.tokens = tokens; - termAtt = (TermAttribute) addAttribute(TermAttribute.class); - offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); + termAtt = addAttribute(TermAttribute.class); + offsetAtt = addAttribute(OffsetAttribute.class); } public boolean incrementToken() throws IOException { Index: contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java =================================================================== --- contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (revision 820469) +++ contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (working copy) @@ -1316,9 +1316,9 @@ private PositionIncrementAttribute posIncrAtt; private OffsetAttribute offsetAtt; { - termAtt = (TermAttribute) addAttribute(TermAttribute.class); - posIncrAtt = (PositionIncrementAttribute) addAttribute(PositionIncrementAttribute.class); - offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); + termAtt = addAttribute(TermAttribute.class); + posIncrAtt = addAttribute(PositionIncrementAttribute.class); + offsetAtt = addAttribute(OffsetAttribute.class); lst = new ArrayList(); Token t; t = createToken("hi", 0, 2); @@ -1363,9 +1363,9 @@ private PositionIncrementAttribute posIncrAtt; private OffsetAttribute offsetAtt; { - termAtt = (TermAttribute) addAttribute(TermAttribute.class); - posIncrAtt = (PositionIncrementAttribute) addAttribute(PositionIncrementAttribute.class); - offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); + termAtt = addAttribute(TermAttribute.class); + posIncrAtt = addAttribute(PositionIncrementAttribute.class); + offsetAtt = addAttribute(OffsetAttribute.class); lst = new ArrayList(); Token t; t = createToken("hispeed", 0, 8); @@ -1686,13 +1686,13 @@ public SynonymTokenizer(TokenStream realStream, Map synonyms) { this.realStream = realStream; this.synonyms = synonyms; - realTermAtt = (TermAttribute) realStream.addAttribute(TermAttribute.class); - realPosIncrAtt = (PositionIncrementAttribute) realStream.addAttribute(PositionIncrementAttribute.class); - realOffsetAtt = (OffsetAttribute) realStream.addAttribute(OffsetAttribute.class); + realTermAtt = realStream.addAttribute(TermAttribute.class); + realPosIncrAtt = realStream.addAttribute(PositionIncrementAttribute.class); + realOffsetAtt = realStream.addAttribute(OffsetAttribute.class); - termAtt = (TermAttribute) addAttribute(TermAttribute.class); - posIncrAtt = (PositionIncrementAttribute) addAttribute(PositionIncrementAttribute.class); - offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); + termAtt = addAttribute(TermAttribute.class); + posIncrAtt = addAttribute(PositionIncrementAttribute.class); + offsetAtt = addAttribute(OffsetAttribute.class); } public boolean incrementToken() throws IOException { Index: contrib/lucli/src/java/lucli/LuceneMethods.java =================================================================== --- contrib/lucli/src/java/lucli/LuceneMethods.java (revision 820469) +++ contrib/lucli/src/java/lucli/LuceneMethods.java (working copy) @@ -282,8 +282,8 @@ int position = 0; // Tokenize field and add to postingTable TokenStream stream = analyzer.tokenStream(fieldName, reader); - TermAttribute termAtt = (TermAttribute) stream.addAttribute(TermAttribute.class); - PositionIncrementAttribute posIncrAtt = (PositionIncrementAttribute) stream.addAttribute(PositionIncrementAttribute.class); + TermAttribute termAtt = stream.addAttribute(TermAttribute.class); + PositionIncrementAttribute posIncrAtt = stream.addAttribute(PositionIncrementAttribute.class); try { while (stream.incrementToken()) { Index: contrib/memory/src/java/org/apache/lucene/index/memory/AnalyzerUtil.java =================================================================== --- contrib/memory/src/java/org/apache/lucene/index/memory/AnalyzerUtil.java (revision 820469) +++ contrib/memory/src/java/org/apache/lucene/index/memory/AnalyzerUtil.java (working copy) @@ -75,10 +75,10 @@ public TokenStream tokenStream(final String fieldName, Reader reader) { return new TokenFilter(child.tokenStream(fieldName, reader)) { private int position = -1; - private TermAttribute termAtt = (TermAttribute) addAttribute(TermAttribute.class); - private PositionIncrementAttribute posIncrAtt = (PositionIncrementAttribute) addAttribute(PositionIncrementAttribute.class); - private OffsetAttribute offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); - private TypeAttribute typeAtt = (TypeAttribute) addAttribute(TypeAttribute.class); + private TermAttribute termAtt = addAttribute(TermAttribute.class); + private PositionIncrementAttribute posIncrAtt = addAttribute(PositionIncrementAttribute.class); + private OffsetAttribute offsetAtt = addAttribute(OffsetAttribute.class); + private TypeAttribute typeAtt = addAttribute(TypeAttribute.class); public boolean incrementToken() throws IOException { boolean hasNext = input.incrementToken(); @@ -307,7 +307,7 @@ // compute frequencies of distinct terms HashMap map = new HashMap(); TokenStream stream = analyzer.tokenStream("", new StringReader(text)); - TermAttribute termAtt = (TermAttribute) stream.addAttribute(TermAttribute.class); + TermAttribute termAtt = stream.addAttribute(TermAttribute.class); try { while (stream.incrementToken()) { MutableInteger freq = (MutableInteger) map.get(termAtt.term()); Index: contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java =================================================================== --- contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (revision 820469) +++ contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (working copy) @@ -276,8 +276,8 @@ return new TokenStream() { private Iterator iter = keywords.iterator(); private int start = 0; - private TermAttribute termAtt = (TermAttribute) addAttribute(TermAttribute.class); - private OffsetAttribute offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); + private TermAttribute termAtt = addAttribute(TermAttribute.class); + private OffsetAttribute offsetAtt = addAttribute(OffsetAttribute.class); public boolean incrementToken() { if (!iter.hasNext()) return false; @@ -338,9 +338,9 @@ int numOverlapTokens = 0; int pos = -1; - TermAttribute termAtt = (TermAttribute) stream.addAttribute(TermAttribute.class); - PositionIncrementAttribute posIncrAttribute = (PositionIncrementAttribute) stream.addAttribute(PositionIncrementAttribute.class); - OffsetAttribute offsetAtt = (OffsetAttribute) stream.addAttribute(OffsetAttribute.class); + TermAttribute termAtt = stream.addAttribute(TermAttribute.class); + PositionIncrementAttribute posIncrAttribute = stream.addAttribute(PositionIncrementAttribute.class); + OffsetAttribute offsetAtt = stream.addAttribute(OffsetAttribute.class); stream.reset(); while (stream.incrementToken()) { Index: contrib/memory/src/java/org/apache/lucene/index/memory/PatternAnalyzer.java =================================================================== --- contrib/memory/src/java/org/apache/lucene/index/memory/PatternAnalyzer.java (revision 820469) +++ contrib/memory/src/java/org/apache/lucene/index/memory/PatternAnalyzer.java (working copy) @@ -332,8 +332,8 @@ private Matcher matcher; private int pos = 0; private static final Locale locale = Locale.getDefault(); - private TermAttribute termAtt = (TermAttribute) addAttribute(TermAttribute.class); - private OffsetAttribute offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); + private TermAttribute termAtt = addAttribute(TermAttribute.class); + private OffsetAttribute offsetAtt = addAttribute(OffsetAttribute.class); public PatternTokenizer(String str, Pattern pattern, boolean toLowerCase) { this.str = str; @@ -390,8 +390,8 @@ private final boolean toLowerCase; private final Set stopWords; private static final Locale locale = Locale.getDefault(); - private TermAttribute termAtt = (TermAttribute) addAttribute(TermAttribute.class); - private OffsetAttribute offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); + private TermAttribute termAtt = addAttribute(TermAttribute.class); + private OffsetAttribute offsetAtt = addAttribute(OffsetAttribute.class); public FastStringTokenizer(String str, boolean isLetter, boolean toLowerCase, Set stopWords) { this.str = str; Index: contrib/memory/src/java/org/apache/lucene/index/memory/SynonymTokenFilter.java =================================================================== --- contrib/memory/src/java/org/apache/lucene/index/memory/SynonymTokenFilter.java (revision 820469) +++ contrib/memory/src/java/org/apache/lucene/index/memory/SynonymTokenFilter.java (working copy) @@ -72,9 +72,9 @@ this.synonyms = synonyms; this.maxSynonyms = maxSynonyms; - this.termAtt = (TermAttribute) addAttribute(TermAttribute.class); - this.typeAtt = (TypeAttribute) addAttribute(TypeAttribute.class); - this.posIncrAtt = (PositionIncrementAttribute) addAttribute(PositionIncrementAttribute.class); + this.termAtt = addAttribute(TermAttribute.class); + this.typeAtt = addAttribute(TypeAttribute.class); + this.posIncrAtt = addAttribute(PositionIncrementAttribute.class); } /** Returns the next token in the stream, or null at EOS. */ Index: contrib/misc/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java =================================================================== --- contrib/misc/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java (revision 820469) +++ contrib/misc/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java (working copy) @@ -106,7 +106,7 @@ // get Analyzer from superclass and tokenize the term TokenStream source = getAnalyzer().tokenStream(field, new StringReader(termStr)); - TermAttribute termAtt = (TermAttribute) source.addAttribute(TermAttribute.class); + TermAttribute termAtt = source.addAttribute(TermAttribute.class); int countTokens = 0; while (true) { @@ -188,7 +188,7 @@ // get Analyzer from superclass and tokenize the term TokenStream source = getAnalyzer().tokenStream(field, new StringReader(termStr)); List tlist = new ArrayList(); - TermAttribute termAtt = (TermAttribute) source.addAttribute(TermAttribute.class); + TermAttribute termAtt = source.addAttribute(TermAttribute.class); while (true) { try { @@ -234,7 +234,7 @@ throws ParseException { // get Analyzer from superclass and tokenize the term TokenStream source = getAnalyzer().tokenStream(field, new StringReader(termStr)); - TermAttribute termAtt = (TermAttribute) source.addAttribute(TermAttribute.class); + TermAttribute termAtt = source.addAttribute(TermAttribute.class); String nextToken = null; boolean multipleTokens = false; @@ -269,7 +269,7 @@ throws ParseException { // get Analyzer from superclass and tokenize the terms TokenStream source = getAnalyzer().tokenStream(field, new StringReader(part1)); - TermAttribute termAtt = (TermAttribute) source.addAttribute(TermAttribute.class); + TermAttribute termAtt = source.addAttribute(TermAttribute.class); boolean multipleTokens = false; // part1 @@ -293,7 +293,7 @@ // part2 source = getAnalyzer().tokenStream(field, new StringReader(part2)); - termAtt = (TermAttribute) source.addAttribute(TermAttribute.class); + termAtt = source.addAttribute(TermAttribute.class); try { if (source.incrementToken()) { Index: contrib/misc/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java =================================================================== --- contrib/misc/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java (revision 820469) +++ contrib/misc/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java (working copy) @@ -67,8 +67,8 @@ boolean inPhrase = false; int savedStart = 0, savedEnd = 0; - TermAttribute termAtt = (TermAttribute) addAttribute(TermAttribute.class); - OffsetAttribute offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); + TermAttribute termAtt = addAttribute(TermAttribute.class); + OffsetAttribute offsetAtt = addAttribute(OffsetAttribute.class); public boolean incrementToken() throws IOException { if (inPhrase) { Index: contrib/queries/src/java/org/apache/lucene/search/FuzzyLikeThisQuery.java =================================================================== --- contrib/queries/src/java/org/apache/lucene/search/FuzzyLikeThisQuery.java (revision 820469) +++ contrib/queries/src/java/org/apache/lucene/search/FuzzyLikeThisQuery.java (working copy) @@ -182,7 +182,7 @@ { if(f.queryString==null) return; TokenStream ts=analyzer.tokenStream(f.fieldName,new StringReader(f.queryString)); - TermAttribute termAtt = (TermAttribute) ts.addAttribute(TermAttribute.class); + TermAttribute termAtt = ts.addAttribute(TermAttribute.class); int corpusNumDocs=reader.numDocs(); Term internSavingTemplateTerm =new Term(f.fieldName); //optimization to avoid constructing new Term() objects Index: contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThis.java =================================================================== --- contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThis.java (revision 820469) +++ contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThis.java (working copy) @@ -829,7 +829,7 @@ TokenStream ts = analyzer.tokenStream(fieldName, r); int tokenCount=0; // for every token - TermAttribute termAtt = (TermAttribute) ts.addAttribute(TermAttribute.class); + TermAttribute termAtt = ts.addAttribute(TermAttribute.class); while (ts.incrementToken()) { String word = termAtt.term(); Index: contrib/queries/src/java/org/apache/lucene/search/similar/SimilarityQueries.java =================================================================== --- contrib/queries/src/java/org/apache/lucene/search/similar/SimilarityQueries.java (revision 820469) +++ contrib/queries/src/java/org/apache/lucene/search/similar/SimilarityQueries.java (working copy) @@ -86,7 +86,7 @@ throws IOException { TokenStream ts = a.tokenStream( field, new StringReader( body)); - TermAttribute termAtt = (TermAttribute) ts.addAttribute(TermAttribute.class); + TermAttribute termAtt = ts.addAttribute(TermAttribute.class); BooleanQuery tmp = new BooleanQuery(); Set already = new HashSet(); // ignore dups Index: contrib/snowball/src/java/org/apache/lucene/analysis/snowball/SnowballFilter.java =================================================================== --- contrib/snowball/src/java/org/apache/lucene/analysis/snowball/SnowballFilter.java (revision 820469) +++ contrib/snowball/src/java/org/apache/lucene/analysis/snowball/SnowballFilter.java (working copy) @@ -39,7 +39,7 @@ public SnowballFilter(TokenStream input, SnowballProgram stemmer) { super(input); this.stemmer = stemmer; - termAtt = (TermAttribute) addAttribute(TermAttribute.class); + termAtt = addAttribute(TermAttribute.class); } /** @@ -60,7 +60,7 @@ } catch (Exception e) { throw new RuntimeException(e.toString()); } - termAtt = (TermAttribute) addAttribute(TermAttribute.class); + termAtt = addAttribute(TermAttribute.class); } /** Returns the next input Token, after being stemmed */ Index: contrib/snowball/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java =================================================================== --- contrib/snowball/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java (revision 820469) +++ contrib/snowball/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java (working copy) @@ -69,12 +69,12 @@ public void testFilterTokens() throws Exception { SnowballFilter filter = new SnowballFilter(new TestTokenStream(), "English"); - TermAttribute termAtt = (TermAttribute) filter.getAttribute(TermAttribute.class); - OffsetAttribute offsetAtt = (OffsetAttribute) filter.getAttribute(OffsetAttribute.class); - TypeAttribute typeAtt = (TypeAttribute) filter.getAttribute(TypeAttribute.class); - PayloadAttribute payloadAtt = (PayloadAttribute) filter.getAttribute(PayloadAttribute.class); - PositionIncrementAttribute posIncAtt = (PositionIncrementAttribute) filter.getAttribute(PositionIncrementAttribute.class); - FlagsAttribute flagsAtt = (FlagsAttribute) filter.getAttribute(FlagsAttribute.class); + TermAttribute termAtt = filter.getAttribute(TermAttribute.class); + OffsetAttribute offsetAtt = filter.getAttribute(OffsetAttribute.class); + TypeAttribute typeAtt = filter.getAttribute(TypeAttribute.class); + PayloadAttribute payloadAtt = filter.getAttribute(PayloadAttribute.class); + PositionIncrementAttribute posIncAtt = filter.getAttribute(PositionIncrementAttribute.class); + FlagsAttribute flagsAtt = filter.getAttribute(FlagsAttribute.class); filter.incrementToken(); @@ -97,12 +97,12 @@ TestTokenStream() { super(); - termAtt = (TermAttribute) addAttribute(TermAttribute.class); - offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); - typeAtt = (TypeAttribute) addAttribute(TypeAttribute.class); - payloadAtt = (PayloadAttribute) addAttribute(PayloadAttribute.class); - posIncAtt = (PositionIncrementAttribute) addAttribute(PositionIncrementAttribute.class); - flagsAtt = (FlagsAttribute) addAttribute(FlagsAttribute.class); + termAtt = addAttribute(TermAttribute.class); + offsetAtt = addAttribute(OffsetAttribute.class); + typeAtt = addAttribute(TypeAttribute.class); + payloadAtt = addAttribute(PayloadAttribute.class); + posIncAtt = addAttribute(PositionIncrementAttribute.class); + flagsAtt = addAttribute(FlagsAttribute.class); } public boolean incrementToken() { Index: contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizer.java =================================================================== --- contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizer.java (revision 820469) +++ contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizer.java (working copy) @@ -181,11 +181,11 @@ private void init(int tokenOutput, Set untokenizedTypes) { this.tokenOutput = tokenOutput; this.untokenizedTypes = untokenizedTypes; - this.offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class); - this.typeAtt = (TypeAttribute) addAttribute(TypeAttribute.class); - this.posIncrAtt = (PositionIncrementAttribute) addAttribute(PositionIncrementAttribute.class); - this.termAtt = (TermAttribute) addAttribute(TermAttribute.class); - this.flagsAtt = (FlagsAttribute) addAttribute(FlagsAttribute.class); + this.offsetAtt = addAttribute(OffsetAttribute.class); + this.typeAtt = addAttribute(TypeAttribute.class); + this.posIncrAtt = addAttribute(PositionIncrementAttribute.class); + this.termAtt = addAttribute(TermAttribute.class); + this.flagsAtt = addAttribute(FlagsAttribute.class); } /** @deprecated Will be removed in Lucene 3.0. This method is final, as it should Index: contrib/wikipedia/src/test/org/apache/lucene/wikipedia/analysis/WikipediaTokenizerTest.java =================================================================== --- contrib/wikipedia/src/test/org/apache/lucene/wikipedia/analysis/WikipediaTokenizerTest.java (revision 820469) +++ contrib/wikipedia/src/test/org/apache/lucene/wikipedia/analysis/WikipediaTokenizerTest.java (working copy) @@ -128,8 +128,8 @@ int numBoldItalics = 0; int numCategory = 0; int numCitation = 0; - TermAttribute termAtt = (TermAttribute) tf.addAttribute(TermAttribute.class); - TypeAttribute typeAtt = (TypeAttribute) tf.addAttribute(TypeAttribute.class); + TermAttribute termAtt = tf.addAttribute(TermAttribute.class); + TypeAttribute typeAtt = tf.addAttribute(TypeAttribute.class); while (tf.incrementToken()) { String tokText = termAtt.term(); @@ -164,8 +164,8 @@ } private void checkLinkPhrases(WikipediaTokenizer tf) throws IOException { - TermAttribute termAtt = (TermAttribute) tf.addAttribute(TermAttribute.class); - PositionIncrementAttribute posIncrAtt = (PositionIncrementAttribute) tf.addAttribute(PositionIncrementAttribute.class); + TermAttribute termAtt = tf.addAttribute(TermAttribute.class); + PositionIncrementAttribute posIncrAtt = tf.addAttribute(PositionIncrementAttribute.class); assertTrue(tf.incrementToken()); assertTrue(termAtt.term() + " is not equal to " + "click", termAtt.term().equals("click") == true); @@ -229,8 +229,8 @@ public void testLinks() throws Exception { String test = "[http://lucene.apache.org/java/docs/index.html#news here] [http://lucene.apache.org/java/docs/index.html?b=c here] [https://lucene.apache.org/java/docs/index.html?b=c here]"; WikipediaTokenizer tf = new WikipediaTokenizer(new StringReader(test)); - TermAttribute termAtt = (TermAttribute) tf.addAttribute(TermAttribute.class); - TypeAttribute typeAtt = (TypeAttribute) tf.addAttribute(TypeAttribute.class); + TermAttribute termAtt = tf.addAttribute(TermAttribute.class); + TypeAttribute typeAtt = tf.addAttribute(TypeAttribute.class); assertTrue(tf.incrementToken()); assertTrue(termAtt.term() + " is not equal to " + "http://lucene.apache.org/java/docs/index.html#news", @@ -262,9 +262,9 @@ checkLinkPhrases(tf); String test = "[[Category:a b c d]] [[Category:e f g]] [[link here]] [[link there]] ''italics here'' something ''more italics'' [[Category:h i j]]"; tf = new WikipediaTokenizer(new StringReader(test), WikipediaTokenizer.UNTOKENIZED_ONLY, untoks); - TermAttribute termAtt = (TermAttribute) tf.addAttribute(TermAttribute.class); - PositionIncrementAttribute posIncrAtt = (PositionIncrementAttribute) tf.addAttribute(PositionIncrementAttribute.class); - OffsetAttribute offsetAtt = (OffsetAttribute) tf.addAttribute(OffsetAttribute.class); + TermAttribute termAtt = tf.addAttribute(TermAttribute.class); + PositionIncrementAttribute posIncrAtt = tf.addAttribute(PositionIncrementAttribute.class); + OffsetAttribute offsetAtt = tf.addAttribute(OffsetAttribute.class); assertTrue(tf.incrementToken()); assertTrue(termAtt.term() + " is not equal to " + "a b c d", @@ -338,11 +338,11 @@ String test = "[[Category:a b c d]] [[Category:e f g]] [[link here]] [[link there]] ''italics here'' something ''more italics'' [[Category:h i j]]"; //should output all the indivual tokens plus the untokenized tokens as well. Untokenized tokens WikipediaTokenizer tf = new WikipediaTokenizer(new StringReader(test), WikipediaTokenizer.BOTH, untoks); - TermAttribute termAtt = (TermAttribute) tf.addAttribute(TermAttribute.class); - TypeAttribute typeAtt = (TypeAttribute) tf.addAttribute(TypeAttribute.class); - PositionIncrementAttribute posIncrAtt = (PositionIncrementAttribute) tf.addAttribute(PositionIncrementAttribute.class); - OffsetAttribute offsetAtt = (OffsetAttribute) tf.addAttribute(OffsetAttribute.class); - FlagsAttribute flagsAtt = (FlagsAttribute) tf.addAttribute(FlagsAttribute.class); + TermAttribute termAtt = tf.addAttribute(TermAttribute.class); + TypeAttribute typeAtt = tf.addAttribute(TypeAttribute.class); + PositionIncrementAttribute posIncrAtt = tf.addAttribute(PositionIncrementAttribute.class); + OffsetAttribute offsetAtt = tf.addAttribute(OffsetAttribute.class); + FlagsAttribute flagsAtt = tf.addAttribute(FlagsAttribute.class); assertTrue(tf.incrementToken()); assertTrue(termAtt.term() + " is not equal to " + "a b c d", Index: contrib/wordnet/src/java/org/apache/lucene/wordnet/SynExpand.java =================================================================== --- contrib/wordnet/src/java/org/apache/lucene/wordnet/SynExpand.java (revision 820469) +++ contrib/wordnet/src/java/org/apache/lucene/wordnet/SynExpand.java (working copy) @@ -114,7 +114,7 @@ // [1] Parse query into separate words so that when we expand we can avoid dups TokenStream ts = a.tokenStream( field, new StringReader( query)); - TermAttribute termAtt = (TermAttribute) ts.addAttribute(TermAttribute.class); + TermAttribute termAtt = ts.addAttribute(TermAttribute.class); while (ts.incrementToken()) { String word = termAtt.term(); Index: contrib/wordnet/src/java/org/apache/lucene/wordnet/SynLookup.java =================================================================== --- contrib/wordnet/src/java/org/apache/lucene/wordnet/SynLookup.java (revision 820469) +++ contrib/wordnet/src/java/org/apache/lucene/wordnet/SynLookup.java (working copy) @@ -101,7 +101,7 @@ // [1] Parse query into separate words so that when we expand we can avoid dups TokenStream ts = a.tokenStream( field, new StringReader( query)); - TermAttribute termAtt = (TermAttribute) ts.addAttribute(TermAttribute.class); + TermAttribute termAtt = ts.addAttribute(TermAttribute.class); while (ts.incrementToken()) { String word = termAtt.term(); Index: contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/LikeThisQueryBuilder.java =================================================================== --- contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/LikeThisQueryBuilder.java (revision 820469) +++ contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/LikeThisQueryBuilder.java (working copy) @@ -77,7 +77,7 @@ for (int i = 0; i < fields.length; i++) { TokenStream ts = analyzer.tokenStream(fields[i],new StringReader(stopWords)); - TermAttribute termAtt = (TermAttribute) ts.addAttribute(TermAttribute.class); + TermAttribute termAtt = ts.addAttribute(TermAttribute.class); try { while(ts.incrementToken()) { Index: contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanOrTermsBuilder.java =================================================================== --- contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanOrTermsBuilder.java (revision 820469) +++ contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanOrTermsBuilder.java (working copy) @@ -56,7 +56,7 @@ { ArrayList clausesList=new ArrayList(); TokenStream ts=analyzer.tokenStream(fieldName,new StringReader(value)); - TermAttribute termAtt = (TermAttribute) ts.addAttribute(TermAttribute.class); + TermAttribute termAtt = ts.addAttribute(TermAttribute.class); while (ts.incrementToken()) { SpanTermQuery stq=new SpanTermQuery(new Term(fieldName, termAtt.term())); Index: contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/TermsFilterBuilder.java =================================================================== --- contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/TermsFilterBuilder.java (revision 820469) +++ contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/TermsFilterBuilder.java (working copy) @@ -57,7 +57,7 @@ String text = DOMUtils.getNonBlankTextOrFail(e); String fieldName = DOMUtils.getAttributeWithInheritanceOrFail(e, "fieldName"); TokenStream ts = analyzer.tokenStream(fieldName, new StringReader(text)); - TermAttribute termAtt = (TermAttribute) ts.addAttribute(TermAttribute.class); + TermAttribute termAtt = ts.addAttribute(TermAttribute.class); try { Index: contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/TermsQueryBuilder.java =================================================================== --- contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/TermsQueryBuilder.java (revision 820469) +++ contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/TermsQueryBuilder.java (working copy) @@ -57,7 +57,7 @@ TokenStream ts = analyzer.tokenStream(fieldName, new StringReader(text)); try { - TermAttribute termAtt = (TermAttribute) ts.addAttribute(TermAttribute.class); + TermAttribute termAtt = ts.addAttribute(TermAttribute.class); Term term = null; while (ts.incrementToken()) { if (term == null)