Return-Path: X-Original-To: apmail-lucene-lucene-net-commits-archive@www.apache.org Delivered-To: apmail-lucene-lucene-net-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CC7D69881 for ; Fri, 13 Apr 2012 16:34:11 +0000 (UTC) Received: (qmail 15756 invoked by uid 500); 13 Apr 2012 16:34:11 -0000 Delivered-To: apmail-lucene-lucene-net-commits-archive@lucene.apache.org Received: (qmail 15733 invoked by uid 500); 13 Apr 2012 16:34:11 -0000 Mailing-List: contact lucene-net-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: lucene-net-dev@lucene.apache.org Delivered-To: mailing list lucene-net-commits@lucene.apache.org Received: (qmail 15726 invoked by uid 99); 13 Apr 2012 16:34:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Apr 2012 16:34:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Apr 2012 16:34:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B4B6223889E7; Fri, 13 Apr 2012 16:33:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1325831 [1/4] - in /incubator/lucene.net/trunk: src/contrib/Analyzers/AR/ src/contrib/Analyzers/BR/ src/contrib/Analyzers/CJK/ src/contrib/Analyzers/Cn/ src/contrib/Analyzers/Compound/ src/contrib/Analyzers/De/ src/contrib/Analyzers/El/ sr... Date: Fri, 13 Apr 2012 16:33:38 -0000 To: lucene-net-commits@lucene.apache.org From: ccurrens@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120413163345.B4B6223889E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ccurrens Date: Fri Apr 13 16:33:33 2012 New Revision: 1325831 URL: http://svn.apache.org/viewvc?rev=1325831&view=rev Log: Renamed Attribute Interfaces to start with I, per .NET code naming standards Added: incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/IFlagsAttribute.cs incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/IOffsetAttribute.cs incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/IPayloadAttribute.cs incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/IPositionIncrementAttribute.cs incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/ITermAttribute.cs incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/ITypeAttribute.cs incubator/lucene.net/trunk/src/core/Util/IAttribute.cs Removed: incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/FlagsAttributeImpl.cs incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/OffsetAttributeImpl.cs incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/PayloadAttributeImpl.cs incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/PositionIncrementAttributeImpl.cs incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/TermAttributeImpl.cs incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/TypeAttributeImpl.cs incubator/lucene.net/trunk/src/core/Util/AttributeImpl.cs Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/AR/ArabicNormalizationFilter.cs incubator/lucene.net/trunk/src/contrib/Analyzers/AR/ArabicStemFilter.cs incubator/lucene.net/trunk/src/contrib/Analyzers/BR/BrazilianStemFilter.cs incubator/lucene.net/trunk/src/contrib/Analyzers/CJK/CJKTokenizer.cs incubator/lucene.net/trunk/src/contrib/Analyzers/Cn/ChineseFilter.cs incubator/lucene.net/trunk/src/contrib/Analyzers/Cn/ChineseTokenizer.cs incubator/lucene.net/trunk/src/contrib/Analyzers/Compound/CompoundWordTokenFilterBase.cs incubator/lucene.net/trunk/src/contrib/Analyzers/De/GermanStemFilter.cs incubator/lucene.net/trunk/src/contrib/Analyzers/El/GreekLowerCaseFilter.cs incubator/lucene.net/trunk/src/contrib/Analyzers/Fa/PersianNormalizationFilter.cs incubator/lucene.net/trunk/src/contrib/Analyzers/Fr/ElisionFilter.cs incubator/lucene.net/trunk/src/contrib/Analyzers/Fr/FrenchStemFilter.cs incubator/lucene.net/trunk/src/contrib/Analyzers/Miscellaneous/PatternAnalyzer.cs incubator/lucene.net/trunk/src/contrib/Analyzers/Miscellaneous/PrefixAwareTokenStream.cs incubator/lucene.net/trunk/src/contrib/Analyzers/Miscellaneous/SingleTokenTokenStream.cs incubator/lucene.net/trunk/src/contrib/Analyzers/NGram/EdgeNGramTokenFilter.cs incubator/lucene.net/trunk/src/contrib/Analyzers/NGram/EdgeNGramTokenizer.cs incubator/lucene.net/trunk/src/contrib/Analyzers/NGram/NGramTokenFilter.cs incubator/lucene.net/trunk/src/contrib/Analyzers/NGram/NGramTokenizer.cs incubator/lucene.net/trunk/src/contrib/Analyzers/Nl/DutchStemFilter.cs incubator/lucene.net/trunk/src/contrib/Analyzers/Payloads/DelimitedPayloadTokenFilter.cs incubator/lucene.net/trunk/src/contrib/Analyzers/Payloads/NumericPayloadTokenFilter.cs incubator/lucene.net/trunk/src/contrib/Analyzers/Payloads/TokenOffsetPayloadTokenFilter.cs incubator/lucene.net/trunk/src/contrib/Analyzers/Payloads/TypeAsPayloadTokenFilter.cs incubator/lucene.net/trunk/src/contrib/Analyzers/Position/PositionFilter.cs incubator/lucene.net/trunk/src/contrib/Analyzers/Reverse/ReverseStringFilter.cs incubator/lucene.net/trunk/src/contrib/Analyzers/Ru/RussianLowerCaseFilter.cs incubator/lucene.net/trunk/src/contrib/Analyzers/Ru/RussianStemFilter.cs incubator/lucene.net/trunk/src/contrib/Analyzers/Shingle/ShingleFilter.cs incubator/lucene.net/trunk/src/contrib/Analyzers/Shingle/ShingleMatrixFilter.cs incubator/lucene.net/trunk/src/contrib/Analyzers/Sinks/DateRecognizerSinkFilter.cs incubator/lucene.net/trunk/src/contrib/Analyzers/Sinks/TokenTypeSinkFilter.cs incubator/lucene.net/trunk/src/contrib/Analyzers/Th/ThaiWordFilter.cs incubator/lucene.net/trunk/src/contrib/Core/Analysis/Ext/Analysis.Ext.cs incubator/lucene.net/trunk/src/contrib/Highlighter/Highlighter.cs incubator/lucene.net/trunk/src/contrib/Highlighter/QueryScorer.cs incubator/lucene.net/trunk/src/contrib/Highlighter/QueryTermScorer.cs incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleFragmenter.cs incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleSpanFragmenter.cs incubator/lucene.net/trunk/src/contrib/Highlighter/TokenGroup.cs incubator/lucene.net/trunk/src/contrib/Highlighter/TokenSources.cs incubator/lucene.net/trunk/src/contrib/Memory/KeywordTokenStream.cs incubator/lucene.net/trunk/src/contrib/Memory/MemoryIndex.cs incubator/lucene.net/trunk/src/contrib/Queries/FuzzyLikeThisQuery.cs incubator/lucene.net/trunk/src/contrib/Queries/Similar/MoreLikeThis.cs incubator/lucene.net/trunk/src/contrib/Queries/Similar/SimilarityQueries.cs incubator/lucene.net/trunk/src/contrib/Similarity/Similar/MoreLikeThis.cs incubator/lucene.net/trunk/src/contrib/Similarity/Similar/SimilarityQueries.cs incubator/lucene.net/trunk/src/contrib/Snowball/Lucene.Net/Analysis/Snowball/SnowballFilter.cs incubator/lucene.net/trunk/src/core/Analysis/ASCIIFoldingFilter.cs incubator/lucene.net/trunk/src/core/Analysis/CharTokenizer.cs incubator/lucene.net/trunk/src/core/Analysis/ISOLatin1AccentFilter.cs incubator/lucene.net/trunk/src/core/Analysis/KeywordTokenizer.cs incubator/lucene.net/trunk/src/core/Analysis/LengthFilter.cs incubator/lucene.net/trunk/src/core/Analysis/LowerCaseFilter.cs incubator/lucene.net/trunk/src/core/Analysis/NumericTokenStream.cs incubator/lucene.net/trunk/src/core/Analysis/PorterStemFilter.cs incubator/lucene.net/trunk/src/core/Analysis/Standard/StandardFilter.cs incubator/lucene.net/trunk/src/core/Analysis/Standard/StandardTokenizer.cs incubator/lucene.net/trunk/src/core/Analysis/Standard/StandardTokenizerImpl.cs incubator/lucene.net/trunk/src/core/Analysis/StopFilter.cs incubator/lucene.net/trunk/src/core/Analysis/TeeSinkTokenFilter.cs incubator/lucene.net/trunk/src/core/Analysis/Token.cs incubator/lucene.net/trunk/src/core/Analysis/TokenStream.cs incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/FlagsAttribute.cs incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/OffsetAttribute.cs incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/PayloadAttribute.cs incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/PositionIncrementAttribute.cs incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/TermAttribute.cs incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/TypeAttribute.cs incubator/lucene.net/trunk/src/core/Index/DocInverterPerField.cs incubator/lucene.net/trunk/src/core/Index/DocInverterPerThread.cs incubator/lucene.net/trunk/src/core/Index/FreqProxTermsWriterPerField.cs incubator/lucene.net/trunk/src/core/Index/TermVectorsTermsWriterPerField.cs incubator/lucene.net/trunk/src/core/Index/TermsHashPerField.cs incubator/lucene.net/trunk/src/core/Lucene.Net.csproj incubator/lucene.net/trunk/src/core/QueryParser/QueryParser.cs incubator/lucene.net/trunk/src/core/Search/QueryTermVector.cs incubator/lucene.net/trunk/src/core/Support/AttributeImplItem.cs incubator/lucene.net/trunk/src/core/Util/Attribute.cs incubator/lucene.net/trunk/src/core/Util/AttributeSource.cs incubator/lucene.net/trunk/test/contrib/Analyzers/Cn/TestChineseTokenizer.cs incubator/lucene.net/trunk/test/contrib/Analyzers/Fr/TestElision.cs incubator/lucene.net/trunk/test/contrib/Analyzers/Miscellaneous/TestSingleTokenTokenFilter.cs incubator/lucene.net/trunk/test/contrib/Analyzers/Payloads/DelimitedPayloadTokenFilterTest.cs incubator/lucene.net/trunk/test/contrib/Analyzers/Payloads/NumericPayloadTokenFilterTest.cs incubator/lucene.net/trunk/test/contrib/Analyzers/Payloads/TokenOffsetPayloadTokenFilterTest.cs incubator/lucene.net/trunk/test/contrib/Analyzers/Payloads/TypeAsPayloadTokenFilterTest.cs incubator/lucene.net/trunk/test/contrib/Analyzers/Position/PositionFilterTest.cs incubator/lucene.net/trunk/test/contrib/Analyzers/Query/QueryAutoStopWordAnalyzerTest.cs incubator/lucene.net/trunk/test/contrib/Analyzers/Reverse/TestReverseStringFilter.cs incubator/lucene.net/trunk/test/contrib/Analyzers/Ru/TestRussianAnalyzer.cs incubator/lucene.net/trunk/test/contrib/Analyzers/Shingle/ShingleAnalyzerWrapperTest.cs incubator/lucene.net/trunk/test/contrib/Analyzers/Shingle/ShingleFilterTest.cs incubator/lucene.net/trunk/test/contrib/Analyzers/Shingle/TestShingleMatrixFilter.cs incubator/lucene.net/trunk/test/contrib/Analyzers/Sinks/TokenTypeSinkTokenizerTest.cs incubator/lucene.net/trunk/test/contrib/Core/Analysis/Ext/Analysis.Ext.Test.cs incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/AbstractTestCase.cs incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/IndexTimeSynonymTest.cs incubator/lucene.net/trunk/test/contrib/Highlighter/HighlighterTest.cs incubator/lucene.net/trunk/test/contrib/Snowball/Analysis/Snowball/TestSnowball.cs incubator/lucene.net/trunk/test/core/Analysis/BaseTokenStreamTestCase.cs incubator/lucene.net/trunk/test/core/Analysis/TestASCIIFoldingFilter.cs incubator/lucene.net/trunk/test/core/Analysis/TestAnalyzers.cs incubator/lucene.net/trunk/test/core/Analysis/TestCachingTokenFilter.cs incubator/lucene.net/trunk/test/core/Analysis/TestISOLatin1AccentFilter.cs incubator/lucene.net/trunk/test/core/Analysis/TestKeywordAnalyzer.cs incubator/lucene.net/trunk/test/core/Analysis/TestLengthFilter.cs incubator/lucene.net/trunk/test/core/Analysis/TestNumericTokenStream.cs incubator/lucene.net/trunk/test/core/Analysis/TestPerFieldAnalzyerWrapper.cs incubator/lucene.net/trunk/test/core/Analysis/TestStandardAnalyzer.cs incubator/lucene.net/trunk/test/core/Analysis/TestStopAnalyzer.cs incubator/lucene.net/trunk/test/core/Analysis/TestStopFilter.cs incubator/lucene.net/trunk/test/core/Analysis/TestTeeSinkTokenFilter.cs incubator/lucene.net/trunk/test/core/Analysis/TestToken.cs incubator/lucene.net/trunk/test/core/Analysis/Tokenattributes/TestSimpleAttributeImpls.cs incubator/lucene.net/trunk/test/core/Analysis/Tokenattributes/TestTermAttributeImpl.cs incubator/lucene.net/trunk/test/core/Index/TestDocumentWriter.cs incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs incubator/lucene.net/trunk/test/core/Index/TestMultiLevelSkipList.cs incubator/lucene.net/trunk/test/core/Index/TestPayloads.cs incubator/lucene.net/trunk/test/core/Index/TestTermVectorsReader.cs incubator/lucene.net/trunk/test/core/Index/TestTermdocPerf.cs incubator/lucene.net/trunk/test/core/QueryParser/TestMultiAnalyzer.cs incubator/lucene.net/trunk/test/core/QueryParser/TestQueryParser.cs incubator/lucene.net/trunk/test/core/Search/Payloads/PayloadHelper.cs incubator/lucene.net/trunk/test/core/Search/Payloads/TestPayloadNearQuery.cs incubator/lucene.net/trunk/test/core/Search/Payloads/TestPayloadTermQuery.cs incubator/lucene.net/trunk/test/core/Search/Spans/TestPayloadSpans.cs incubator/lucene.net/trunk/test/core/Search/TestPositionIncrement.cs incubator/lucene.net/trunk/test/core/Search/TestTermRangeQuery.cs incubator/lucene.net/trunk/test/core/Support/TestSerialization.cs incubator/lucene.net/trunk/test/core/Util/TestAttributeSource.cs Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/AR/ArabicNormalizationFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/AR/ArabicNormalizationFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/AR/ArabicNormalizationFilter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/AR/ArabicNormalizationFilter.cs Fri Apr 13 16:33:33 2012 @@ -35,13 +35,13 @@ namespace Lucene.Net.Analysis.AR { protected ArabicNormalizer normalizer = null; - private TermAttribute termAtt; + private ITermAttribute termAtt; public ArabicNormalizationFilter(TokenStream input) : base(input) { normalizer = new ArabicNormalizer(); - termAtt = AddAttribute(); + termAtt = AddAttribute(); } public override bool IncrementToken() Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/AR/ArabicStemFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/AR/ArabicStemFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/AR/ArabicStemFilter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/AR/ArabicStemFilter.cs Fri Apr 13 16:33:33 2012 @@ -37,12 +37,12 @@ namespace Lucene.Net.Analysis.AR { private readonly ArabicStemmer stemmer; - private readonly TermAttribute termAtt; + private readonly ITermAttribute termAtt; public ArabicStemFilter(TokenStream input) : base(input) { stemmer = new ArabicStemmer(); - termAtt = AddAttribute(); + termAtt = AddAttribute(); } public override bool IncrementToken() Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/BR/BrazilianStemFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/BR/BrazilianStemFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/BR/BrazilianStemFilter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/BR/BrazilianStemFilter.cs Fri Apr 13 16:33:33 2012 @@ -37,13 +37,13 @@ namespace Lucene.Net.Analysis.BR */ private BrazilianStemmer stemmer = null; private ISet exclusions = null; - private TermAttribute termAtt; + private ITermAttribute termAtt; public BrazilianStemFilter(TokenStream input) : base(input) { stemmer = new BrazilianStemmer(); - termAtt = AddAttribute(); + termAtt = AddAttribute(); } public BrazilianStemFilter(TokenStream input, ISet exclusiontable) Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/CJK/CJKTokenizer.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/CJK/CJKTokenizer.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/CJK/CJKTokenizer.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/CJK/CJKTokenizer.cs Fri Apr 13 16:33:33 2012 @@ -120,9 +120,9 @@ namespace Lucene.Net.Analysis.CJK /// private bool preIsTokened = false; - private TermAttribute termAtt; - private OffsetAttribute offsetAtt; - private TypeAttribute typeAtt; + private ITermAttribute termAtt; + private IOffsetAttribute offsetAtt; + private ITypeAttribute typeAtt; //~ Constructors ----------------------------------------------------------- @@ -150,9 +150,9 @@ namespace Lucene.Net.Analysis.CJK private void Init() { - termAtt = AddAttribute(); - offsetAtt = AddAttribute(); - typeAtt = AddAttribute(); + termAtt = AddAttribute(); + offsetAtt = AddAttribute(); + typeAtt = AddAttribute(); } //~ Methods ---------------------------------------------------------------- Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Cn/ChineseFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Cn/ChineseFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/Cn/ChineseFilter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/Cn/ChineseFilter.cs Fri Apr 13 16:33:33 2012 @@ -57,13 +57,13 @@ namespace Lucene.Net.Analysis.Cn }; private CharArraySet stopTable; - private TermAttribute termAtt; + private ITermAttribute termAtt; public ChineseFilter(TokenStream _in) : base(_in) { stopTable = new CharArraySet(STOP_WORDS, false); - termAtt = AddAttribute(); + termAtt = AddAttribute(); } public override bool IncrementToken() Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Cn/ChineseTokenizer.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Cn/ChineseTokenizer.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/Cn/ChineseTokenizer.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/Cn/ChineseTokenizer.cs Fri Apr 13 16:33:33 2012 @@ -77,8 +77,8 @@ namespace Lucene.Net.Analysis.Cn private void Init() { - termAtt = AddAttribute(); - offsetAtt = AddAttribute(); + termAtt = AddAttribute(); + offsetAtt = AddAttribute(); } private int offset = 0, bufferIndex = 0, dataLen = 0; @@ -90,8 +90,8 @@ namespace Lucene.Net.Analysis.Cn private int length; private int start; - private TermAttribute termAtt; - private OffsetAttribute offsetAtt; + private ITermAttribute termAtt; + private IOffsetAttribute offsetAtt; private void Push(char c) { Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Compound/CompoundWordTokenFilterBase.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Compound/CompoundWordTokenFilterBase.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/Compound/CompoundWordTokenFilterBase.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/Compound/CompoundWordTokenFilterBase.cs Fri Apr 13 16:33:33 2012 @@ -18,7 +18,6 @@ using System; using System.Collections.Generic; using Lucene.Net.Analysis.Tokenattributes; -using FlagsAttribute = Lucene.Net.Analysis.Tokenattributes.FlagsAttribute; namespace Lucene.Net.Analysis.Compound { @@ -50,12 +49,12 @@ namespace Lucene.Net.Analysis.Compound protected readonly int maxSubwordSize; protected readonly bool onlyLongestMatch; - private TermAttribute termAtt; - private OffsetAttribute offsetAtt; - private FlagsAttribute flagsAtt; - private PositionIncrementAttribute posIncAtt; - private TypeAttribute typeAtt; - private PayloadAttribute payloadAtt; + private ITermAttribute termAtt; + private IOffsetAttribute offsetAtt; + private IFlagsAttribute flagsAtt; + private IPositionIncrementAttribute posIncAtt; + private ITypeAttribute typeAtt; + private IPayloadAttribute payloadAtt; private readonly Token wrapper = new Token(); @@ -108,12 +107,12 @@ namespace Lucene.Net.Analysis.Compound AddAllLowerCase(this.dictionary, dictionary); } - termAtt = AddAttribute(); - offsetAtt = AddAttribute(); - flagsAtt = AddAttribute(); - posIncAtt = AddAttribute(); - typeAtt = AddAttribute(); - payloadAtt = AddAttribute(); + termAtt = AddAttribute(); + offsetAtt = AddAttribute(); + flagsAtt = AddAttribute(); + posIncAtt = AddAttribute(); + typeAtt = AddAttribute(); + payloadAtt = AddAttribute(); } /** Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/De/GermanStemFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/De/GermanStemFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/De/GermanStemFilter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/De/GermanStemFilter.cs Fri Apr 13 16:33:33 2012 @@ -40,7 +40,7 @@ namespace Lucene.Net.Analysis.De private GermanStemmer stemmer = null; private ISet exclusionSet = null; - private TermAttribute termAtt; + private ITermAttribute termAtt; public GermanStemFilter(TokenStream _in) : this(_in, false) @@ -72,7 +72,7 @@ namespace Lucene.Net.Analysis.De { exclusionSet = exclusiontable; stemmer = normalizeDin2 ? new GermanDIN2Stemmer() : new GermanStemmer(); - termAtt = AddAttribute(); + termAtt = AddAttribute(); } /// Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/El/GreekLowerCaseFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/El/GreekLowerCaseFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/El/GreekLowerCaseFilter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/El/GreekLowerCaseFilter.cs Fri Apr 13 16:33:33 2012 @@ -35,12 +35,12 @@ namespace Lucene.Net.Analyzers.El */ public sealed class GreekLowerCaseFilter : TokenFilter { - private TermAttribute termAtt; + private ITermAttribute termAtt; public GreekLowerCaseFilter(TokenStream _in) : base(_in) { - termAtt = AddAttribute(); + termAtt = AddAttribute(); } public override bool IncrementToken() Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Fa/PersianNormalizationFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Fa/PersianNormalizationFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/Fa/PersianNormalizationFilter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/Fa/PersianNormalizationFilter.cs Fri Apr 13 16:33:33 2012 @@ -37,13 +37,13 @@ namespace Lucene.Net.Analyzers.Fa public sealed class PersianNormalizationFilter : TokenFilter { private readonly PersianNormalizer normalizer; - private readonly TermAttribute termAtt; + private readonly ITermAttribute termAtt; public PersianNormalizationFilter(TokenStream input) :base(input) { normalizer = new PersianNormalizer(); - termAtt = AddAttribute(); + termAtt = AddAttribute(); } public override bool IncrementToken() Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Fr/ElisionFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Fr/ElisionFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/Fr/ElisionFilter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/Fr/ElisionFilter.cs Fri Apr 13 16:33:33 2012 @@ -35,7 +35,7 @@ namespace Lucene.Net.Analyzers.Fr public sealed class ElisionFilter : TokenFilter { private CharArraySet articles = null; - private TermAttribute termAtt; + private ITermAttribute termAtt; private static char[] apostrophes = { '\'', '’' }; @@ -54,7 +54,7 @@ namespace Lucene.Net.Analyzers.Fr : base(input) { this.articles = new CharArraySet(new[] { "l", "m", "t", "qu", "n", "s", "j" }, true); - termAtt = AddAttribute(); + termAtt = AddAttribute(); } /** @@ -64,7 +64,7 @@ namespace Lucene.Net.Analyzers.Fr : base(input) { SetArticles(articles); - termAtt = AddAttribute(); + termAtt = AddAttribute(); } /** @@ -74,7 +74,7 @@ namespace Lucene.Net.Analyzers.Fr : base(input) { this.articles = new CharArraySet(articles, true); - termAtt = AddAttribute(); + termAtt = AddAttribute(); } /** Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Fr/FrenchStemFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Fr/FrenchStemFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/Fr/FrenchStemFilter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/Fr/FrenchStemFilter.cs Fri Apr 13 16:33:33 2012 @@ -51,14 +51,14 @@ namespace Lucene.Net.Analysis.Fr private FrenchStemmer stemmer = null; private ISet exclusions = null; - private TermAttribute termAtt; + private ITermAttribute termAtt; public FrenchStemFilter(TokenStream _in) : base(_in) { stemmer = new FrenchStemmer(); - termAtt = AddAttribute(); + termAtt = AddAttribute(); } Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Miscellaneous/PatternAnalyzer.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Miscellaneous/PatternAnalyzer.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/Miscellaneous/PatternAnalyzer.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/Miscellaneous/PatternAnalyzer.cs Fri Apr 13 16:33:33 2012 @@ -347,16 +347,16 @@ namespace Lucene.Net.Analyzers.Miscellan private Match matcher; private int pos = 0; private static readonly System.Globalization.CultureInfo locale = System.Globalization.CultureInfo.CurrentCulture; - private TermAttribute termAtt; - private OffsetAttribute offsetAtt; + private ITermAttribute termAtt; + private IOffsetAttribute offsetAtt; public RegexTokenizer(String str, Regex regex, bool toLowerCase) { this.str = str; this.matcher = regex.Match(str); this.toLowerCase = toLowerCase; - this.termAtt = AddAttribute(); - this.offsetAtt = AddAttribute(); + this.termAtt = AddAttribute(); + this.offsetAtt = AddAttribute(); } public sealed override bool IncrementToken() @@ -422,8 +422,8 @@ namespace Lucene.Net.Analyzers.Miscellan private readonly bool toLowerCase; private readonly ISet stopWords; private static readonly System.Globalization.CultureInfo locale = System.Globalization.CultureInfo.CurrentCulture; - private TermAttribute termAtt; - private OffsetAttribute offsetAtt; + private ITermAttribute termAtt; + private IOffsetAttribute offsetAtt; public FastStringTokenizer(String str, bool isLetter, bool toLowerCase, ISet stopWords) { @@ -431,8 +431,8 @@ namespace Lucene.Net.Analyzers.Miscellan this.isLetter = isLetter; this.toLowerCase = toLowerCase; this.stopWords = stopWords; - this.termAtt = AddAttribute(); - this.offsetAtt = AddAttribute(); + this.termAtt = AddAttribute(); + this.offsetAtt = AddAttribute(); } public override bool IncrementToken() Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Miscellaneous/PrefixAwareTokenStream.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Miscellaneous/PrefixAwareTokenStream.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/Miscellaneous/PrefixAwareTokenStream.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/Miscellaneous/PrefixAwareTokenStream.cs Fri Apr 13 16:33:33 2012 @@ -19,7 +19,6 @@ using System; using Lucene.Net.Analysis; using Lucene.Net.Analysis.Tokenattributes; using Lucene.Net.Index; -using FlagsAttribute = Lucene.Net.Analysis.Tokenattributes.FlagsAttribute; namespace Lucene.Net.Analyzers.Miscellaneous { @@ -34,22 +33,22 @@ namespace Lucene.Net.Analyzers.Miscellan /// public class PrefixAwareTokenFilter : TokenStream { - private readonly FlagsAttribute _flagsAtt; - private readonly OffsetAttribute _offsetAtt; - private readonly FlagsAttribute _pFlagsAtt; - - private readonly OffsetAttribute _pOffsetAtt; - private readonly PayloadAttribute _pPayloadAtt; - private readonly PositionIncrementAttribute _pPosIncrAtt; - private readonly TermAttribute _pTermAtt; - private readonly TypeAttribute _pTypeAtt; - private readonly PayloadAttribute _payloadAtt; - private readonly PositionIncrementAttribute _posIncrAtt; + private readonly IFlagsAttribute _flagsAtt; + private readonly IOffsetAttribute _offsetAtt; + private readonly IFlagsAttribute _pFlagsAtt; + + private readonly IOffsetAttribute _pOffsetAtt; + private readonly IPayloadAttribute _pPayloadAtt; + private readonly IPositionIncrementAttribute _pPosIncrAtt; + private readonly ITermAttribute _pTermAtt; + private readonly ITypeAttribute _pTypeAtt; + private readonly IPayloadAttribute _payloadAtt; + private readonly IPositionIncrementAttribute _posIncrAtt; private readonly Token _previousPrefixToken = new Token(); private readonly Token _reusableToken = new Token(); - private readonly TermAttribute _termAtt; - private readonly TypeAttribute _typeAtt; + private readonly ITermAttribute _termAtt; + private readonly ITypeAttribute _typeAtt; private bool _prefixExhausted; @@ -60,20 +59,20 @@ namespace Lucene.Net.Analyzers.Miscellan _prefixExhausted = false; // ReSharper disable DoNotCallOverridableMethodsInConstructor - _termAtt = AddAttribute(); - _posIncrAtt = AddAttribute(); - _payloadAtt = AddAttribute(); - _offsetAtt = AddAttribute(); - _typeAtt = AddAttribute(); - _flagsAtt = AddAttribute(); + _termAtt = AddAttribute(); + _posIncrAtt = AddAttribute(); + _payloadAtt = AddAttribute(); + _offsetAtt = AddAttribute(); + _typeAtt = AddAttribute(); + _flagsAtt = AddAttribute(); // ReSharper restore DoNotCallOverridableMethodsInConstructor - _pTermAtt = prefix.AddAttribute(); - _pPosIncrAtt = prefix.AddAttribute(); - _pPayloadAtt = prefix.AddAttribute(); - _pOffsetAtt = prefix.AddAttribute(); - _pTypeAtt = prefix.AddAttribute(); - _pFlagsAtt = prefix.AddAttribute(); + _pTermAtt = prefix.AddAttribute(); + _pPosIncrAtt = prefix.AddAttribute(); + _pPayloadAtt = prefix.AddAttribute(); + _pOffsetAtt = prefix.AddAttribute(); + _pTypeAtt = prefix.AddAttribute(); + _pFlagsAtt = prefix.AddAttribute(); } public TokenStream Prefix { get; set; } Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Miscellaneous/SingleTokenTokenStream.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Miscellaneous/SingleTokenTokenStream.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/Miscellaneous/SingleTokenTokenStream.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/Miscellaneous/SingleTokenTokenStream.cs Fri Apr 13 16:33:33 2012 @@ -20,6 +20,7 @@ using System.Diagnostics; using Lucene.Net.Analysis; using Lucene.Net.Analysis.Tokenattributes; using Lucene.Net.Util; +using Attribute = Lucene.Net.Util.Attribute; namespace Lucene.Net.Analyzers.Miscellaneous { @@ -32,7 +33,7 @@ namespace Lucene.Net.Analyzers.Miscellan // The token needs to be immutable, so work with clones! private Token _singleToken; - private readonly AttributeImpl _tokenAtt; + private readonly Attribute _tokenAtt; public SingleTokenTokenStream(Token token) : base(Token.TOKEN_ATTRIBUTE_FACTORY) @@ -40,7 +41,7 @@ namespace Lucene.Net.Analyzers.Miscellan Debug.Assert(token != null, "Token was null!"); _singleToken = (Token) token.Clone(); - _tokenAtt = (AttributeImpl)AddAttribute(); + _tokenAtt = (Attribute)AddAttribute(); Debug.Assert(_tokenAtt is Token); } Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/NGram/EdgeNGramTokenFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/NGram/EdgeNGramTokenFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/NGram/EdgeNGramTokenFilter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/NGram/EdgeNGramTokenFilter.cs Fri Apr 13 16:33:33 2012 @@ -85,14 +85,14 @@ namespace Lucene.Net.Analysis.NGram private int curGramSize; private int tokStart; - private TermAttribute termAtt; - private OffsetAttribute offsetAtt; + private ITermAttribute termAtt; + private IOffsetAttribute offsetAtt; protected EdgeNGramTokenFilter(TokenStream input) : base(input) { - this.termAtt = AddAttribute(); - this.offsetAtt = AddAttribute(); + this.termAtt = AddAttribute(); + this.offsetAtt = AddAttribute(); } /** @@ -126,8 +126,8 @@ namespace Lucene.Net.Analysis.NGram this.minGram = minGram; this.maxGram = maxGram; this.side = side; - this.termAtt = AddAttribute(); - this.offsetAtt = AddAttribute(); + this.termAtt = AddAttribute(); + this.offsetAtt = AddAttribute(); } /** Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/NGram/EdgeNGramTokenizer.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/NGram/EdgeNGramTokenizer.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/NGram/EdgeNGramTokenizer.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/NGram/EdgeNGramTokenizer.cs Fri Apr 13 16:33:33 2012 @@ -38,8 +38,8 @@ namespace Lucene.Net.Analysis.NGram public static int DEFAULT_MAX_GRAM_SIZE = 1; public static int DEFAULT_MIN_GRAM_SIZE = 1; - private TermAttribute termAtt; - private OffsetAttribute offsetAtt; + private ITermAttribute termAtt; + private IOffsetAttribute offsetAtt; /** Specifies which side of the input the n-gram should be generated from */ // Moved Side enum from this class to external definition @@ -163,8 +163,8 @@ namespace Lucene.Net.Analysis.NGram this.maxGram = maxGram; this.side = side; - this.termAtt = AddAttribute(); - this.offsetAtt = AddAttribute(); + this.termAtt = AddAttribute(); + this.offsetAtt = AddAttribute(); } Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/NGram/NGramTokenFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/NGram/NGramTokenFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/NGram/NGramTokenFilter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/NGram/NGramTokenFilter.cs Fri Apr 13 16:33:33 2012 @@ -40,8 +40,8 @@ namespace Lucene.Net.Analysis.NGram private int curPos; private int tokStart; - private TermAttribute termAtt; - private OffsetAttribute offsetAtt; + private ITermAttribute termAtt; + private IOffsetAttribute offsetAtt; /** * Creates NGramTokenFilter with given min and max n-grams. @@ -64,8 +64,8 @@ namespace Lucene.Net.Analysis.NGram this.minGram = minGram; this.maxGram = maxGram; - this.termAtt = AddAttribute(); - this.offsetAtt = AddAttribute(); + this.termAtt = AddAttribute(); + this.offsetAtt = AddAttribute(); } /** Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/NGram/NGramTokenizer.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/NGram/NGramTokenizer.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/NGram/NGramTokenizer.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/NGram/NGramTokenizer.cs Fri Apr 13 16:33:33 2012 @@ -40,8 +40,8 @@ namespace Lucene.Net.Analysis.NGram private string inStr; private bool started = false; - private TermAttribute termAtt; - private OffsetAttribute offsetAtt; + private ITermAttribute termAtt; + private IOffsetAttribute offsetAtt; /** * Creates NGramTokenizer with given min and max n-grams. @@ -104,8 +104,8 @@ namespace Lucene.Net.Analysis.NGram this.minGram = minGram; this.maxGram = maxGram; - this.termAtt = AddAttribute(); - this.offsetAtt = AddAttribute(); + this.termAtt = AddAttribute(); + this.offsetAtt = AddAttribute(); } /** Returns the next token in the stream, or null at EOS. */ Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Nl/DutchStemFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Nl/DutchStemFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/Nl/DutchStemFilter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/Nl/DutchStemFilter.cs Fri Apr 13 16:33:33 2012 @@ -48,13 +48,13 @@ namespace Lucene.Net.Analysis.Nl private DutchStemmer stemmer = null; private ISet exclusions = null; - private TermAttribute termAtt; + private ITermAttribute termAtt; public DutchStemFilter(TokenStream _in) : base(_in) { stemmer = new DutchStemmer(); - termAtt = AddAttribute(); + termAtt = AddAttribute(); } /** Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Payloads/DelimitedPayloadTokenFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Payloads/DelimitedPayloadTokenFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/Payloads/DelimitedPayloadTokenFilter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/Payloads/DelimitedPayloadTokenFilter.cs Fri Apr 13 16:33:33 2012 @@ -40,8 +40,8 @@ namespace Lucene.Net.Analyzers.Payloads { public static readonly char DEFAULT_DELIMITER = '|'; internal char delimiter = DEFAULT_DELIMITER; - internal TermAttribute termAtt; - internal PayloadAttribute payAtt; + internal ITermAttribute termAtt; + internal IPayloadAttribute payAtt; internal PayloadEncoder encoder; /// @@ -57,8 +57,8 @@ namespace Lucene.Net.Analyzers.Payloads public DelimitedPayloadTokenFilter(TokenStream input, char delimiter, PayloadEncoder encoder) : base(input) { - termAtt = AddAttribute(); - payAtt = AddAttribute(); + termAtt = AddAttribute(); + payAtt = AddAttribute(); this.delimiter = delimiter; this.encoder = encoder; } Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Payloads/NumericPayloadTokenFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Payloads/NumericPayloadTokenFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/Payloads/NumericPayloadTokenFilter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/Payloads/NumericPayloadTokenFilter.cs Fri Apr 13 16:33:33 2012 @@ -37,8 +37,8 @@ namespace Lucene.Net.Analyzers.Payloads private String typeMatch; private Payload thePayload; - private PayloadAttribute payloadAtt; - private TypeAttribute typeAtt; + private IPayloadAttribute payloadAtt; + private ITypeAttribute typeAtt; public NumericPayloadTokenFilter(TokenStream input, float payload, String typeMatch) : base(input) @@ -46,8 +46,8 @@ namespace Lucene.Net.Analyzers.Payloads //Need to encode the payload thePayload = new Payload(PayloadHelper.EncodeFloat(payload)); this.typeMatch = typeMatch; - payloadAtt = AddAttribute(); - typeAtt = AddAttribute(); + payloadAtt = AddAttribute(); + typeAtt = AddAttribute(); } public sealed override bool IncrementToken() Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Payloads/TokenOffsetPayloadTokenFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Payloads/TokenOffsetPayloadTokenFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/Payloads/TokenOffsetPayloadTokenFilter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/Payloads/TokenOffsetPayloadTokenFilter.cs Fri Apr 13 16:33:33 2012 @@ -36,14 +36,14 @@ namespace Lucene.Net.Analyzers.Payloads /// public class TokenOffsetPayloadTokenFilter : TokenFilter { - protected OffsetAttribute offsetAtt; - protected PayloadAttribute payAtt; + protected IOffsetAttribute offsetAtt; + protected IPayloadAttribute payAtt; public TokenOffsetPayloadTokenFilter(TokenStream input) : base(input) { - offsetAtt = AddAttribute(); - payAtt = AddAttribute(); + offsetAtt = AddAttribute(); + payAtt = AddAttribute(); } public sealed override bool IncrementToken() Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Payloads/TypeAsPayloadTokenFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Payloads/TypeAsPayloadTokenFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/Payloads/TypeAsPayloadTokenFilter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/Payloads/TypeAsPayloadTokenFilter.cs Fri Apr 13 16:33:33 2012 @@ -35,14 +35,14 @@ namespace Lucene.Net.Analyzers.Payloads /// public class TypeAsPayloadTokenFilter : TokenFilter { - private PayloadAttribute payloadAtt; - private TypeAttribute typeAtt; + private IPayloadAttribute payloadAtt; + private ITypeAttribute typeAtt; public TypeAsPayloadTokenFilter(TokenStream input) : base(input) { - payloadAtt = AddAttribute(); - typeAtt = AddAttribute(); + payloadAtt = AddAttribute(); + typeAtt = AddAttribute(); } public sealed override bool IncrementToken() Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Position/PositionFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Position/PositionFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/Position/PositionFilter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/Position/PositionFilter.cs Fri Apr 13 16:33:33 2012 @@ -40,7 +40,7 @@ namespace Lucene.Net.Analysis.Position /** The first token must have non-zero positionIncrement **/ private bool firstTokenPositioned = false; - private PositionIncrementAttribute posIncrAtt; + private IPositionIncrementAttribute posIncrAtt; /** * Constructs a PositionFilter that assigns a position increment of zero to @@ -51,7 +51,7 @@ namespace Lucene.Net.Analysis.Position public PositionFilter(TokenStream input) : base(input) { - posIncrAtt = AddAttribute(); + posIncrAtt = AddAttribute(); } /** Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Reverse/ReverseStringFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Reverse/ReverseStringFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/Reverse/ReverseStringFilter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/Reverse/ReverseStringFilter.cs Fri Apr 13 16:33:33 2012 @@ -39,7 +39,7 @@ namespace Lucene.Net.Analysis.Reverse public sealed class ReverseStringFilter : TokenFilter { - private TermAttribute termAtt; + private ITermAttribute termAtt; private readonly char marker; private const char NOMARKER = '\uFFFF'; @@ -93,7 +93,7 @@ namespace Lucene.Net.Analysis.Reverse : base(_in) { this.marker = marker; - termAtt = AddAttribute(); + termAtt = AddAttribute(); } public override bool IncrementToken() Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Ru/RussianLowerCaseFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Ru/RussianLowerCaseFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/Ru/RussianLowerCaseFilter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/Ru/RussianLowerCaseFilter.cs Fri Apr 13 16:33:33 2012 @@ -31,12 +31,12 @@ namespace Lucene.Net.Analysis.Ru [Obsolete("Use LowerCaseFilter instead, which has the same functionality. This filter will be removed in Lucene 4.0")] public sealed class RussianLowerCaseFilter : TokenFilter { - private TermAttribute termAtt; + private ITermAttribute termAtt; public RussianLowerCaseFilter(TokenStream _in) : base(_in) { - termAtt = AddAttribute(); + termAtt = AddAttribute(); } public sealed override bool IncrementToken() Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Ru/RussianStemFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Ru/RussianStemFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/Ru/RussianStemFilter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/Ru/RussianStemFilter.cs Fri Apr 13 16:33:33 2012 @@ -40,13 +40,13 @@ namespace Lucene.Net.Analysis.Ru */ private RussianStemmer stemmer = null; - private TermAttribute termAtt; + private ITermAttribute termAtt; public RussianStemFilter(TokenStream _in) : base(_in) { stemmer = new RussianStemmer(); - termAtt = AddAttribute(); + termAtt = AddAttribute(); } /** * Returns the next token in the stream, or null at EOS Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Shingle/ShingleFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Shingle/ShingleFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/Shingle/ShingleFilter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/Shingle/ShingleFilter.cs Fri Apr 13 16:33:33 2012 @@ -81,10 +81,10 @@ namespace Lucene.Net.Analyzers.Shingle : base(input) { SetMaxShingleSize(maxShingleSize); - this.termAtt = AddAttribute(); ; - this.offsetAtt = AddAttribute(); ; - this.posIncrAtt = AddAttribute(); ; - this.typeAtt = AddAttribute(); ; + this.termAtt = AddAttribute(); ; + this.offsetAtt = AddAttribute(); ; + this.posIncrAtt = AddAttribute(); ; + this.typeAtt = AddAttribute(); ; } /** @@ -238,10 +238,10 @@ namespace Lucene.Net.Analyzers.Shingle private AttributeSource.State currentToken; private bool hasCurrentToken; - private TermAttribute termAtt; - private OffsetAttribute offsetAtt; - private PositionIncrementAttribute posIncrAtt; - private TypeAttribute typeAtt; + private ITermAttribute termAtt; + private IOffsetAttribute offsetAtt; + private IPositionIncrementAttribute posIncrAtt; + private ITypeAttribute typeAtt; /** * Get the next token from the input stream and push it on the token buffer. Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Shingle/ShingleMatrixFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Shingle/ShingleMatrixFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/Shingle/ShingleMatrixFilter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/Shingle/ShingleMatrixFilter.cs Fri Apr 13 16:33:33 2012 @@ -25,7 +25,6 @@ using Lucene.Net.Analysis.Shingle.Matrix using Lucene.Net.Analysis.Tokenattributes; using Lucene.Net.Analyzers.Miscellaneous; using Lucene.Net.Support; -using FlagsAttribute = Lucene.Net.Analysis.Tokenattributes.FlagsAttribute; namespace Lucene.Net.Analyzers.Shingle { @@ -110,18 +109,18 @@ namespace Lucene.Net.Analyzers.Shingle public static TokenSettingsCodec DefaultSettingsCodec = new OneDimensionalNonWeightedTokenSettingsCodec(); public static bool IgnoringSinglePrefixOrSuffixShingleByDefault; - private readonly FlagsAttribute _flagsAtt; - private readonly FlagsAttribute _inFlagsAtt; + private readonly IFlagsAttribute _flagsAtt; + private readonly IFlagsAttribute _inFlagsAtt; - private readonly OffsetAttribute _inOffsetAtt; - private readonly PayloadAttribute _inPayloadAtt; - private readonly PositionIncrementAttribute _inPosIncrAtt; - private readonly TermAttribute _inTermAtt; - private readonly TypeAttribute _inTypeAtt; + private readonly IOffsetAttribute _inOffsetAtt; + private readonly IPayloadAttribute _inPayloadAtt; + private readonly IPositionIncrementAttribute _inPosIncrAtt; + private readonly ITermAttribute _inTermAtt; + private readonly ITypeAttribute _inTypeAtt; private readonly TokenStream _input; - private readonly OffsetAttribute _offsetAtt; - private readonly PayloadAttribute _payloadAtt; - private readonly PositionIncrementAttribute _posIncrAtt; + private readonly IOffsetAttribute _offsetAtt; + private readonly IPayloadAttribute _payloadAtt; + private readonly IPositionIncrementAttribute _posIncrAtt; private readonly Token _requestNextToken = new Token(); private readonly Token _reusableToken = new Token(); private readonly TokenSettingsCodec _settingsCodec; @@ -139,8 +138,8 @@ namespace Lucene.Net.Analyzers.Shingle private readonly HashSet> _shinglesSeen = new HashSet>(); - private readonly TermAttribute _termAtt; - private readonly TypeAttribute _typeAtt; + private readonly ITermAttribute _termAtt; + private readonly ITypeAttribute _typeAtt; private List _currentPermuationTokens; // Index to what row a token in currentShingleTokens represents @@ -175,23 +174,23 @@ namespace Lucene.Net.Analyzers.Shingle _settingsCodec = settingsCodec; // ReSharper disable DoNotCallOverridableMethodsInConstructor - _termAtt = AddAttribute(); - _posIncrAtt = AddAttribute(); - _payloadAtt = AddAttribute(); - _offsetAtt = AddAttribute(); - _typeAtt = AddAttribute(); - _flagsAtt = AddAttribute(); + _termAtt = AddAttribute(); + _posIncrAtt = AddAttribute(); + _payloadAtt = AddAttribute(); + _offsetAtt = AddAttribute(); + _typeAtt = AddAttribute(); + _flagsAtt = AddAttribute(); // ReSharper restore DoNotCallOverridableMethodsInConstructor // set the input to be an empty token stream, we already have the data. _input = new EmptyTokenStream(); - _inTermAtt = _input.AddAttribute(); - _inPosIncrAtt = _input.AddAttribute(); - _inPayloadAtt = _input.AddAttribute(); - _inOffsetAtt = _input.AddAttribute(); - _inTypeAtt = _input.AddAttribute(); - _inFlagsAtt = _input.AddAttribute(); + _inTermAtt = _input.AddAttribute(); + _inPosIncrAtt = _input.AddAttribute(); + _inPayloadAtt = _input.AddAttribute(); + _inOffsetAtt = _input.AddAttribute(); + _inTypeAtt = _input.AddAttribute(); + _inFlagsAtt = _input.AddAttribute(); } /// @@ -251,20 +250,20 @@ namespace Lucene.Net.Analyzers.Shingle _settingsCodec = settingsCodec; // ReSharper disable DoNotCallOverridableMethodsInConstructor - _termAtt = AddAttribute(); - _posIncrAtt = AddAttribute(); - _payloadAtt = AddAttribute(); - _offsetAtt = AddAttribute(); - _typeAtt = AddAttribute(); - _flagsAtt = AddAttribute(); + _termAtt = AddAttribute(); + _posIncrAtt = AddAttribute(); + _payloadAtt = AddAttribute(); + _offsetAtt = AddAttribute(); + _typeAtt = AddAttribute(); + _flagsAtt = AddAttribute(); // ReSharper restore DoNotCallOverridableMethodsInConstructor - _inTermAtt = input.AddAttribute(); - _inPosIncrAtt = input.AddAttribute(); - _inPayloadAtt = input.AddAttribute(); - _inOffsetAtt = input.AddAttribute(); - _inTypeAtt = input.AddAttribute(); - _inFlagsAtt = input.AddAttribute(); + _inTermAtt = input.AddAttribute(); + _inPosIncrAtt = input.AddAttribute(); + _inPayloadAtt = input.AddAttribute(); + _inOffsetAtt = input.AddAttribute(); + _inTypeAtt = input.AddAttribute(); + _inFlagsAtt = input.AddAttribute(); } public int MinimumShingleSize { get; set; } Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Sinks/DateRecognizerSinkFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Sinks/DateRecognizerSinkFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/Sinks/DateRecognizerSinkFilter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/Sinks/DateRecognizerSinkFilter.cs Fri Apr 13 16:33:33 2012 @@ -39,7 +39,7 @@ namespace Lucene.Net.Analysis.Sinks public const string DATE_TYPE = "date"; protected IFormatProvider dateFormat; - protected TermAttribute termAtt; + protected ITermAttribute termAtt; /** * Uses as the object. @@ -59,7 +59,7 @@ namespace Lucene.Net.Analysis.Sinks { if (termAtt == null) { - termAtt = source.AddAttribute(); + termAtt = source.AddAttribute(); } try { Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Sinks/TokenTypeSinkFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Sinks/TokenTypeSinkFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/Sinks/TokenTypeSinkFilter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/Sinks/TokenTypeSinkFilter.cs Fri Apr 13 16:33:33 2012 @@ -31,7 +31,7 @@ namespace Lucene.Net.Analysis.Sinks public class TokenTypeSinkFilter : TeeSinkTokenFilter.SinkFilter { private string typeToMatch; - private TypeAttribute typeAtt; + private ITypeAttribute typeAtt; public TokenTypeSinkFilter(string typeToMatch) { @@ -42,7 +42,7 @@ namespace Lucene.Net.Analysis.Sinks { if (typeAtt == null) { - typeAtt = source.AddAttribute(); + typeAtt = source.AddAttribute(); } return typeToMatch.Equals(typeAtt.Type); Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Th/ThaiWordFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Th/ThaiWordFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Analyzers/Th/ThaiWordFilter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Analyzers/Th/ThaiWordFilter.cs Fri Apr 13 16:33:33 2012 @@ -38,8 +38,8 @@ namespace Lucene.Net.Analysis.Th { //private BreakIterator breaker = null; - private TermAttribute termAtt; - private OffsetAttribute offsetAtt; + private ITermAttribute termAtt; + private IOffsetAttribute offsetAtt; private State thaiState = null; // I'm sure this is far slower than if we just created a simple UnicodeBlock class Modified: incubator/lucene.net/trunk/src/contrib/Core/Analysis/Ext/Analysis.Ext.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Core/Analysis/Ext/Analysis.Ext.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== Binary files - no diff available. Modified: incubator/lucene.net/trunk/src/contrib/Highlighter/Highlighter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Highlighter/Highlighter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Highlighter/Highlighter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Highlighter/Highlighter.cs Fri Apr 13 16:33:33 2012 @@ -165,9 +165,9 @@ namespace Lucene.Net.Search.Highlight var docFrags = new List(); var newText = new StringBuilder(); - var termAtt = tokenStream.AddAttribute(); - var offsetAtt = tokenStream.AddAttribute(); - tokenStream.AddAttribute(); + var termAtt = tokenStream.AddAttribute(); + var offsetAtt = tokenStream.AddAttribute(); + tokenStream.AddAttribute(); tokenStream.Reset(); var currentFrag = new TextFragment(newText, newText.Length, docFrags.Count); Modified: incubator/lucene.net/trunk/src/contrib/Highlighter/QueryScorer.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Highlighter/QueryScorer.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Highlighter/QueryScorer.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Highlighter/QueryScorer.cs Fri Apr 13 16:33:33 2012 @@ -41,8 +41,8 @@ namespace Lucene.Net.Search.Highlight private float maxTermWeight; private int position = -1; private String defaultField; - private TermAttribute termAtt; - private PositionIncrementAttribute posIncAtt; + private ITermAttribute termAtt; + private IPositionIncrementAttribute posIncAtt; private bool expandMultiTermQuery = true; private Query query; private String field; @@ -179,8 +179,8 @@ namespace Lucene.Net.Search.Highlight public TokenStream Init(TokenStream tokenStream) { position = -1; - termAtt = tokenStream.AddAttribute(); - posIncAtt = tokenStream.AddAttribute(); + termAtt = tokenStream.AddAttribute(); + posIncAtt = tokenStream.AddAttribute(); if (!skipInitExtractor) { if (fieldWeightedSpanTerms != null) Modified: incubator/lucene.net/trunk/src/contrib/Highlighter/QueryTermScorer.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Highlighter/QueryTermScorer.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Highlighter/QueryTermScorer.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Highlighter/QueryTermScorer.cs Fri Apr 13 16:33:33 2012 @@ -25,7 +25,7 @@ namespace Lucene.Net.Search.Highlight private float maxTermWeight = 0; private HashMap termsToFind; - private TermAttribute termAtt; + private ITermAttribute termAtt; /** * @@ -89,7 +89,7 @@ namespace Lucene.Net.Search.Highlight public TokenStream Init(TokenStream tokenStream) { - termAtt = tokenStream.AddAttribute(); + termAtt = tokenStream.AddAttribute(); return null; } Modified: incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleFragmenter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleFragmenter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleFragmenter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleFragmenter.cs Fri Apr 13 16:33:33 2012 @@ -32,7 +32,7 @@ namespace Lucene.Net.Search.Highlight private static int DEFAULT_FRAGMENT_SIZE = 100; private int currentNumFrags; private int fragmentSize; - private OffsetAttribute offsetAtt; + private IOffsetAttribute offsetAtt; public SimpleFragmenter() : this(DEFAULT_FRAGMENT_SIZE) @@ -56,7 +56,7 @@ namespace Lucene.Net.Search.Highlight public void Start(String originalText, TokenStream stream) { - offsetAtt = stream.AddAttribute(); + offsetAtt = stream.AddAttribute(); currentNumFrags = 1; } Modified: incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleSpanFragmenter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleSpanFragmenter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleSpanFragmenter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleSpanFragmenter.cs Fri Apr 13 16:33:33 2012 @@ -16,9 +16,9 @@ namespace Lucene.Net.Search.Highlight private QueryScorer queryScorer; private int waitForPos = -1; private int textSize; - private TermAttribute termAtt; - private PositionIncrementAttribute posIncAtt; - private OffsetAttribute offsetAtt; + private ITermAttribute termAtt; + private IPositionIncrementAttribute posIncAtt; + private IOffsetAttribute offsetAtt; /// QueryScorer that was used to score hits public SimpleSpanFragmenter(QueryScorer queryScorer) @@ -83,9 +83,9 @@ namespace Lucene.Net.Search.Highlight position = -1; currentNumFrags = 1; textSize = originalText.Length; - termAtt = tokenStream.AddAttribute(); - posIncAtt = tokenStream.AddAttribute(); - offsetAtt = tokenStream.AddAttribute(); + termAtt = tokenStream.AddAttribute(); + posIncAtt = tokenStream.AddAttribute(); + offsetAtt = tokenStream.AddAttribute(); } } } Modified: incubator/lucene.net/trunk/src/contrib/Highlighter/TokenGroup.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Highlighter/TokenGroup.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Highlighter/TokenGroup.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Highlighter/TokenGroup.cs Fri Apr 13 16:33:33 2012 @@ -38,14 +38,14 @@ namespace Lucene.Net.Search.Highlight public int MatchEndOffset { get; private set; } public int NumTokens { get; private set; } - private OffsetAttribute offsetAtt; - private TermAttribute termAtt; + private IOffsetAttribute offsetAtt; + private ITermAttribute termAtt; public TokenGroup(TokenStream tokenStream) { NumTokens = 0; - offsetAtt = tokenStream.AddAttribute(); - termAtt = tokenStream.AddAttribute(); + offsetAtt = tokenStream.AddAttribute(); + termAtt = tokenStream.AddAttribute(); } protected internal void AddToken(float score) Modified: incubator/lucene.net/trunk/src/contrib/Highlighter/TokenSources.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Highlighter/TokenSources.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Highlighter/TokenSources.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Highlighter/TokenSources.cs Fri Apr 13 16:33:33 2012 @@ -41,14 +41,14 @@ namespace Lucene.Net.Search.Highlight { protected internal Token[] tokens; protected internal int currentToken = 0; - protected internal TermAttribute termAtt; - protected internal OffsetAttribute offsetAtt; + protected internal ITermAttribute termAtt; + protected internal IOffsetAttribute offsetAtt; protected internal StoredTokenStream(Token[] tokens) { this.tokens = tokens; - termAtt = AddAttribute(); - offsetAtt = AddAttribute(); + termAtt = AddAttribute(); + offsetAtt = AddAttribute(); } public override bool IncrementToken() Modified: incubator/lucene.net/trunk/src/contrib/Memory/KeywordTokenStream.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Memory/KeywordTokenStream.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Memory/KeywordTokenStream.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Memory/KeywordTokenStream.cs Fri Apr 13 16:33:33 2012 @@ -14,14 +14,14 @@ namespace Lucene.Net.Index.Memory { private IEnumerator iter; private int start = 0; - private TermAttribute termAtt; - private OffsetAttribute offsetAtt; + private ITermAttribute termAtt; + private IOffsetAttribute offsetAtt; public KeywordTokenStream(IEnumerable keywords) { iter = keywords.GetEnumerator(); - termAtt = AddAttribute(); - offsetAtt = AddAttribute(); + termAtt = AddAttribute(); + offsetAtt = AddAttribute(); } public override bool IncrementToken() Modified: incubator/lucene.net/trunk/src/contrib/Memory/MemoryIndex.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Memory/MemoryIndex.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Memory/MemoryIndex.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Memory/MemoryIndex.cs Fri Apr 13 16:33:33 2012 @@ -273,9 +273,9 @@ namespace Lucene.Net.Index.Memory int numOverlapTokens = 0; int pos = -1; - var termAtt = stream.AddAttribute(); - var posIncrAttribute = stream.AddAttribute(); - var offsetAtt = stream.AddAttribute(); + var termAtt = stream.AddAttribute(); + var posIncrAttribute = stream.AddAttribute(); + var offsetAtt = stream.AddAttribute(); stream.Reset(); while (stream.IncrementToken()) Modified: incubator/lucene.net/trunk/src/contrib/Queries/FuzzyLikeThisQuery.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Queries/FuzzyLikeThisQuery.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Queries/FuzzyLikeThisQuery.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Queries/FuzzyLikeThisQuery.cs Fri Apr 13 16:33:33 2012 @@ -191,7 +191,7 @@ namespace Lucene.Net.Search { if (f.queryString == null) return; TokenStream ts = analyzer.TokenStream(f.fieldName, new System.IO.StringReader(f.queryString)); - TermAttribute termAtt = ts.AddAttribute(); + ITermAttribute termAtt = ts.AddAttribute(); int corpusNumDocs = reader.NumDocs(); Term internSavingTemplateTerm = new Term(f.fieldName); //optimization to avoid constructing new Term() objects Modified: incubator/lucene.net/trunk/src/contrib/Queries/Similar/MoreLikeThis.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Queries/Similar/MoreLikeThis.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Queries/Similar/MoreLikeThis.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Queries/Similar/MoreLikeThis.cs Fri Apr 13 16:33:33 2012 @@ -897,7 +897,7 @@ namespace Lucene.Net.Search.Similar TokenStream ts = analyzer.TokenStream(fieldName, r); int tokenCount=0; // for every token - TermAttribute termAtt = ts.AddAttribute(); + ITermAttribute termAtt = ts.AddAttribute(); while (ts.IncrementToken()) { string word = termAtt.Term(); Modified: incubator/lucene.net/trunk/src/contrib/Queries/Similar/SimilarityQueries.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Queries/Similar/SimilarityQueries.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Queries/Similar/SimilarityQueries.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Queries/Similar/SimilarityQueries.cs Fri Apr 13 16:33:33 2012 @@ -87,7 +87,7 @@ namespace Similarity.Net public static Query FormSimilarQuery(System.String body, Analyzer a, System.String field, ISet stop) { TokenStream ts = a.TokenStream(field, new System.IO.StringReader(body)); - TermAttribute termAtt = ts.AddAttribute(); + ITermAttribute termAtt = ts.AddAttribute(); BooleanQuery tmp = new BooleanQuery(); ISet already = new HashSet(); // ignore dups Modified: incubator/lucene.net/trunk/src/contrib/Similarity/Similar/MoreLikeThis.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Similarity/Similar/MoreLikeThis.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Similarity/Similar/MoreLikeThis.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Similarity/Similar/MoreLikeThis.cs Fri Apr 13 16:33:33 2012 @@ -827,7 +827,7 @@ namespace Similarity.Net TokenStream ts = analyzer.TokenStream(fieldName, r); int tokenCount=0; // for every token - var termAtt = ts.AddAttribute(); + var termAtt = ts.AddAttribute(); while (ts.IncrementToken()) { String word = termAtt.Term(); Modified: incubator/lucene.net/trunk/src/contrib/Similarity/Similar/SimilarityQueries.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Similarity/Similar/SimilarityQueries.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Similarity/Similar/SimilarityQueries.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Similarity/Similar/SimilarityQueries.cs Fri Apr 13 16:33:33 2012 @@ -93,7 +93,7 @@ namespace Similarity.Net System.Collections.Hashtable stop) { TokenStream ts = a.TokenStream(field, new StringReader(body)); - var termAtt = ts.AddAttribute(); + var termAtt = ts.AddAttribute(); var tmp = new BooleanQuery(); var already = new HashSet(); // ignore dups Modified: incubator/lucene.net/trunk/src/contrib/Snowball/Lucene.Net/Analysis/Snowball/SnowballFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Snowball/Lucene.Net/Analysis/Snowball/SnowballFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/contrib/Snowball/Lucene.Net/Analysis/Snowball/SnowballFilter.cs (original) +++ incubator/lucene.net/trunk/src/contrib/Snowball/Lucene.Net/Analysis/Snowball/SnowballFilter.cs Fri Apr 13 16:33:33 2012 @@ -38,14 +38,14 @@ namespace Lucene.Net.Analysis.Snowball private static readonly System.Object[] EMPTY_ARGS = new System.Object[0]; private SnowballProgram stemmer; - private TermAttribute termAtt; + private ITermAttribute termAtt; //private System.Reflection.MethodInfo stemMethod; public SnowballFilter(TokenStream input, SnowballProgram stemmer) : base(input) { this.stemmer = stemmer; - termAtt = AddAttribute(); + termAtt = AddAttribute(); } /// Construct the named stemming filter. @@ -66,7 +66,7 @@ namespace Lucene.Net.Analysis.Snowball { throw new System.SystemException(e.ToString()); } - termAtt = AddAttribute(); + termAtt = AddAttribute(); } /// Returns the next input Token, after being stemmed Modified: incubator/lucene.net/trunk/src/core/Analysis/ASCIIFoldingFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Analysis/ASCIIFoldingFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/core/Analysis/ASCIIFoldingFilter.cs (original) +++ incubator/lucene.net/trunk/src/core/Analysis/ASCIIFoldingFilter.cs Fri Apr 13 16:33:33 2012 @@ -16,8 +16,7 @@ */ using System; - -using TermAttribute = Lucene.Net.Analysis.Tokenattributes.TermAttribute; +using Lucene.Net.Analysis.Tokenattributes; using ArrayUtil = Lucene.Net.Util.ArrayUtil; namespace Lucene.Net.Analysis @@ -60,12 +59,12 @@ namespace Lucene.Net.Analysis { public ASCIIFoldingFilter(TokenStream input):base(input) { - termAtt = AddAttribute(); + termAtt = AddAttribute(); } private char[] output = new char[512]; private int outputPos; - private TermAttribute termAtt; + private ITermAttribute termAtt; public override bool IncrementToken() { Modified: incubator/lucene.net/trunk/src/core/Analysis/CharTokenizer.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Analysis/CharTokenizer.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/core/Analysis/CharTokenizer.cs (original) +++ incubator/lucene.net/trunk/src/core/Analysis/CharTokenizer.cs Fri Apr 13 16:33:33 2012 @@ -16,9 +16,7 @@ */ using System; - -using OffsetAttribute = Lucene.Net.Analysis.Tokenattributes.OffsetAttribute; -using TermAttribute = Lucene.Net.Analysis.Tokenattributes.TermAttribute; +using Lucene.Net.Analysis.Tokenattributes; using AttributeSource = Lucene.Net.Util.AttributeSource; namespace Lucene.Net.Analysis @@ -29,20 +27,20 @@ namespace Lucene.Net.Analysis { protected CharTokenizer(System.IO.TextReader input):base(input) { - offsetAtt = AddAttribute(); - termAtt = AddAttribute(); + offsetAtt = AddAttribute(); + termAtt = AddAttribute(); } protected CharTokenizer(AttributeSource source, System.IO.TextReader input):base(source, input) { - offsetAtt = AddAttribute(); - termAtt = AddAttribute(); + offsetAtt = AddAttribute(); + termAtt = AddAttribute(); } protected CharTokenizer(AttributeFactory factory, System.IO.TextReader input):base(factory, input) { - offsetAtt = AddAttribute(); - termAtt = AddAttribute(); + offsetAtt = AddAttribute(); + termAtt = AddAttribute(); } private int offset = 0, bufferIndex = 0, dataLen = 0; @@ -50,8 +48,8 @@ namespace Lucene.Net.Analysis private const int IO_BUFFER_SIZE = 4096; private char[] ioBuffer = new char[IO_BUFFER_SIZE]; - private TermAttribute termAtt; - private OffsetAttribute offsetAtt; + private ITermAttribute termAtt; + private IOffsetAttribute offsetAtt; /// Returns true iff a character should be included in a token. This /// tokenizer generates as tokens adjacent sequences of characters which Modified: incubator/lucene.net/trunk/src/core/Analysis/ISOLatin1AccentFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Analysis/ISOLatin1AccentFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/core/Analysis/ISOLatin1AccentFilter.cs (original) +++ incubator/lucene.net/trunk/src/core/Analysis/ISOLatin1AccentFilter.cs Fri Apr 13 16:33:33 2012 @@ -16,8 +16,7 @@ */ using System; - -using TermAttribute = Lucene.Net.Analysis.Tokenattributes.TermAttribute; +using Lucene.Net.Analysis.Tokenattributes; namespace Lucene.Net.Analysis { @@ -39,12 +38,12 @@ namespace Lucene.Net.Analysis { public ISOLatin1AccentFilter(TokenStream input):base(input) { - termAtt = AddAttribute(); + termAtt = AddAttribute(); } private char[] output = new char[256]; private int outputPos; - private TermAttribute termAtt; + private ITermAttribute termAtt; public override bool IncrementToken() { Modified: incubator/lucene.net/trunk/src/core/Analysis/KeywordTokenizer.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Analysis/KeywordTokenizer.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/core/Analysis/KeywordTokenizer.cs (original) +++ incubator/lucene.net/trunk/src/core/Analysis/KeywordTokenizer.cs Fri Apr 13 16:33:33 2012 @@ -16,9 +16,7 @@ */ using System; - -using OffsetAttribute = Lucene.Net.Analysis.Tokenattributes.OffsetAttribute; -using TermAttribute = Lucene.Net.Analysis.Tokenattributes.TermAttribute; +using Lucene.Net.Analysis.Tokenattributes; using AttributeSource = Lucene.Net.Util.AttributeSource; namespace Lucene.Net.Analysis @@ -32,8 +30,8 @@ namespace Lucene.Net.Analysis private bool done; private int finalOffset; - private TermAttribute termAtt; - private OffsetAttribute offsetAtt; + private ITermAttribute termAtt; + private IOffsetAttribute offsetAtt; public KeywordTokenizer(System.IO.TextReader input):this(input, DEFAULT_BUFFER_SIZE) { @@ -57,8 +55,8 @@ namespace Lucene.Net.Analysis private void Init(int bufferSize) { this.done = false; - termAtt = AddAttribute(); - offsetAtt = AddAttribute(); + termAtt = AddAttribute(); + offsetAtt = AddAttribute(); termAtt.ResizeTermBuffer(bufferSize); } Modified: incubator/lucene.net/trunk/src/core/Analysis/LengthFilter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Analysis/LengthFilter.cs?rev=1325831&r1=1325830&r2=1325831&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/core/Analysis/LengthFilter.cs (original) +++ incubator/lucene.net/trunk/src/core/Analysis/LengthFilter.cs Fri Apr 13 16:33:33 2012 @@ -16,8 +16,7 @@ */ using System; - -using TermAttribute = Lucene.Net.Analysis.Tokenattributes.TermAttribute; +using Lucene.Net.Analysis.Tokenattributes; namespace Lucene.Net.Analysis { @@ -29,7 +28,7 @@ namespace Lucene.Net.Analysis internal int min; internal int max; - private TermAttribute termAtt; + private ITermAttribute termAtt; /// Build a filter that removes words that are too long or too /// short from the text. @@ -39,7 +38,7 @@ namespace Lucene.Net.Analysis { this.min = min; this.max = max; - termAtt = AddAttribute(); + termAtt = AddAttribute(); } /// Returns the next input Token whose term() is the right len