You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by us...@apache.org on 2010/02/27 23:51:55 UTC
svn commit: r917067 [1/8] - in /lucene/java/branches/flex_1458: ./ contrib/
contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/
contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/
contrib/analyzers/common/src/java/org/apache/l...
Author: uschindler
Date: Sat Feb 27 22:51:44 2010
New Revision: 917067
URL: http://svn.apache.org/viewvc?rev=917067&view=rev
Log:
Merge up to trunk rev 917019.
I left out only one revision:
Revision: 916755
Author: mikemccand
Date: 17:52:39, Freitag, 26. Februar 2010
Message: LUCENE-2282: allow public but internal access to oal.index.IndexFileNames API
Removed:
lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/InterceptTestCaseEvents.java
Modified:
lucene/java/branches/flex_1458/ (props changed)
lucene/java/branches/flex_1458/CHANGES.txt
lucene/java/branches/flex_1458/build.xml (props changed)
lucene/java/branches/flex_1458/contrib/ (props changed)
lucene/java/branches/flex_1458/contrib/CHANGES.txt (props changed)
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cn/ChineseAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/CharVector.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/Hyphenation.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternConsumer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/da/DanishAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/en/EnglishAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/es/SpanishAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fi/FinnishAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hu/HungarianAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/it/ItalianAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/PatternAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilter.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenFilter.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/no/NorwegianAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/pt/PortugueseAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ro/RomanianAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianStemmer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleMatrixFilter.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/DateRecognizerSinkFilter.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sv/SwedishAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ar/TestArabicNormalizationFilter.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ar/TestArabicStemFilter.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemmer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/cjk/TestCJKTokenizer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/da/TestDanishAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/en/TestEnglishAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/es/TestSpanishAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilter.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/fi/TestFinnishAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/fr/TestElision.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/hi/TestHindiNormalizer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/hi/TestHindiStemmer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/hu/TestHungarianAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/in/TestIndicNormalizer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/in/TestIndicTokenizer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/it/TestItalianAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/PatternAnalyzerTest.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAndSuffixAwareTokenFilter.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAwareTokenFilter.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenFilterTest.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/nl/TestDutchStemmer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/no/TestNorwegianAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterTest.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterTest.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilter.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ro/TestRomanianAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/TestRussianStem.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/ShingleFilterTest.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/TestShingleMatrixFilter.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/sinks/DateRecognizerSinkTokenizerTest.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/sinks/TokenRangeSinkTokenizerTest.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/sinks/TokenTypeSinkTokenizerTest.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/sv/TestSwedishAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/tr/TestTurkishAnalyzer.java
lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilter.java
lucene/java/branches/flex_1458/contrib/ant/src/test/org/apache/lucene/ant/IndexTaskTest.java
lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishContentSource.java
lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/QueryMaker.java
lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/Points.java
lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/TaskStats.java
lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NearRealtimeReaderTask.java
lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewShingleAnalyzerTask.java
lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java
lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java
lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/stats/TimeData.java
lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractReuters.java
lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractWikipedia.java
lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksParse.java
lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lucene/benchmark/quality/TestQualityRun.java
lucene/java/branches/flex_1458/contrib/db/bdb-je/src/test/org/apache/lucene/store/je/JEStoreTest.java
lucene/java/branches/flex_1458/contrib/db/bdb/src/java/org/apache/lucene/store/db/Block.java
lucene/java/branches/flex_1458/contrib/db/bdb/src/java/org/apache/lucene/store/db/DbDirectory.java
lucene/java/branches/flex_1458/contrib/db/bdb/src/test/org/apache/lucene/store/db/DbStoreTest.java
lucene/java/branches/flex_1458/contrib/db/bdb/src/test/org/apache/lucene/store/db/SanityLoadLibrary.java
lucene/java/branches/flex_1458/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldFragList.java
lucene/java/branches/flex_1458/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java
lucene/java/branches/flex_1458/contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java
lucene/java/branches/flex_1458/contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java
lucene/java/branches/flex_1458/contrib/highlighter/src/test/ (props changed)
lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java
lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
lucene/java/branches/flex_1458/contrib/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilter.java
lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocument.java
lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java
lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java
lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexWriter.java
lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTerm.java
lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermEnum.java
lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java (contents, props changed)
lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestSerialization.java
lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java
lucene/java/branches/flex_1458/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
lucene/java/branches/flex_1458/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java
lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/misc/ChainedFilter.java
lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java
lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java
lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java
lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/index/TestTermVectorAccessor.java
lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/misc/ChainedFilterTest.java
lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/misc/SweetSpotSimilarityTest.java
lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java
lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/queryParser/analyzing/TestAnalyzingQueryParser.java
lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java
lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/queryParser/ext/TestExtendableQueryParser.java
lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java
lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java
lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java
lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/FuzzyLikeThisQueryTest.java
lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java
lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java
lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/config/QueryConfigHandler.java
lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/MultiFieldQueryParserWrapper.java
lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserWrapper.java
lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/BoostAttributeImpl.java
lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultPhraseSlopAttributeImpl.java
lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapAttributeImpl.java
lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionMapAttributeImpl.java
lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FuzzyAttributeImpl.java
lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/PositionIncrementsAttributeImpl.java
lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiAnalyzerQPHelper.java
lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiAnalyzerWrapper.java
lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQPHelper.java
lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQueryParserWrapper.java
lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java
lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java
lucene/java/branches/flex_1458/contrib/regex/src/java/org/apache/lucene/search/regex/SpanRegexQuery.java
lucene/java/branches/flex_1458/contrib/regex/src/test/org/apache/lucene/search/regex/TestRegexQuery.java
lucene/java/branches/flex_1458/contrib/regex/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java
lucene/java/branches/flex_1458/contrib/remote/src/test/org/apache/lucene/search/RemoteCachingWrapperFilterHelper.java
lucene/java/branches/flex_1458/contrib/remote/src/test/org/apache/lucene/search/TestRemoteCachingWrapperFilter.java
lucene/java/branches/flex_1458/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSearchable.java
lucene/java/branches/flex_1458/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSort.java
lucene/java/branches/flex_1458/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFieldComparatorSource.java
lucene/java/branches/flex_1458/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceHandler.java
lucene/java/branches/flex_1458/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesian.java
lucene/java/branches/flex_1458/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestDistance.java
lucene/java/branches/flex_1458/contrib/spellchecker/src/java/org/apache/lucene/search/spell/JaroWinklerDistance.java
lucene/java/branches/flex_1458/contrib/spellchecker/src/java/org/apache/lucene/search/spell/NGramDistance.java
lucene/java/branches/flex_1458/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java
lucene/java/branches/flex_1458/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestSpellChecker.java
lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/DistanceQuery.java
lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/FieldsQuery.java
lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SimpleTerm.java
lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SpanNearClauseFactory.java
lucene/java/branches/flex_1458/contrib/surround/src/test/org/apache/lucene/queryParser/surround/query/BooleanQueryTst.java
lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/BaseListModel.java
lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/BaseTableModel.java
lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/DataStore.java
lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/TestBasicList.java
lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene/swing/models/TestBasicTable.java
lucene/java/branches/flex_1458/contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizer.java
lucene/java/branches/flex_1458/contrib/wikipedia/src/test/org/apache/lucene/wikipedia/analysis/WikipediaTokenizerTest.java
lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/AnalyzerUtil.java
lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynExpand.java
lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynonymMap.java
lucene/java/branches/flex_1458/contrib/wordnet/src/test/org/apache/lucene/wordnet/TestSynonymTokenFilter.java
lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/QueryTemplateManager.java
lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/BoostingTermBuilder.java
lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/DuplicateFilterBuilder.java
lucene/java/branches/flex_1458/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java
lucene/java/branches/flex_1458/src/demo/org/apache/lucene/demo/IndexFiles.java
lucene/java/branches/flex_1458/src/demo/org/apache/lucene/demo/html/Entities.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/CharArrayMap.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/CharArraySet.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/NumericTokenStream.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/StopAnalyzer.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/TeeSinkTokenFilter.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/Token.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/Tokenizer.java (props changed)
lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/standard/StandardAnalyzer.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/tokenattributes/TermAttributeImpl.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/document/AbstractField.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/document/NumericField.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/CheckIndex.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/DocFieldConsumers.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/DocFieldConsumersPerThread.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/FieldsReader.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexReader.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexWriter.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/MultiReader.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/Payload.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/ReusableStringReader.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentInfo.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentInfos.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/StoredFieldsWriter.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermVectorsReader.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermVectorsTermsWriter.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermVectorsTermsWriterPerField.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermVectorsWriter.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermsHash.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/DisjunctionSumScorer.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/DocIdSetIterator.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FieldCache.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FieldCacheImpl.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FieldComparator.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FieldValueHitQueue.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FilteredDocIdSetIterator.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/IndexSearcher.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java (props changed)
lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/ReqExclScorer.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/ReqOptSumScorer.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/Similarity.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/ByteFieldSource.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/CustomScoreProvider.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/CustomScoreQuery.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/DocValues.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/FloatFieldSource.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/IntFieldSource.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/OrdFieldSource.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/ReverseOrdFieldSource.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/ShortFieldSource.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/ValueSourceQuery.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/IndexOutput.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/LockObtainFailedException.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/LockReleaseFailedException.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/MMapDirectory.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/NoLockFactory.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/SimpleFSLockFactory.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/SingleInstanceLockFactory.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/AverageGuessMemoryModel.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/IndexableBinaryStringTools.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/MemoryModel.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/NumericUtils.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/OpenBitSet.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/Parameter.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/RamUsageEstimator.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/TestMergeSchedulerExternal.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/TestASCIIFoldingFilter.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/TestAnalyzers.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/TestCharArrayMap.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/TestCharArraySet.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/TestCharTokenizers.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java (props changed)
lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/TestKeywordAnalyzer.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/TestMappingCharFilter.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/TestToken.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/collation/CollationTestBase.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/collation/TestCollationKeyFilter.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestBinaryDocument.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestDateTools.java (props changed)
lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestDocument.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestNumberTools.java (props changed)
lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/DocHelper.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestAtomicUpdate.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (contents, props changed)
lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestCompoundFile.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestDirectoryReader.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestDoc.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestFieldsReader.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestIndexReader.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestIndexWriterReader.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestMultiReader.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestNorms.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestParallelTermEnum.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestPayloads.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestSegmentReader.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestStressIndexing.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestStressIndexing2.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestTermVectorsReader.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/queryParser/TestQueryParser.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/CachingWrapperFilterHelper.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/CheckHits.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/JustCompileSearch.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestBoolean2.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestComplexExplanations.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestCustomSearcherSort.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestDateSort.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestDocIdSet.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestElevationComparator.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestExplanations.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestFieldCache.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestFilteredQuery.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestPhraseQuery.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestQueryTermVector.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestScorerPerf.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestSort.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestTermRangeFilter.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestTermRangeQuery.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestTermVectors.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestThreadSafe.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/function/TestCustomScoreQuery.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/function/TestFieldScoreQuery.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/function/TestOrdValues.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/spans/TestBasics.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/spans/TestSpans.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/store/TestBufferedIndexInput.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/store/TestLockFactory.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/store/TestRAMDirectory.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/store/TestWindowsMMap.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/LuceneTestCase.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/LuceneTestCaseJ4.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestAttributeSource.java (props changed)
lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestBitVector.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestIndexableBinaryStringTools.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestRamUsageEstimator.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestStringIntern.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestVirtualMethod.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/cache/TestDoubleBarrelLRUCache.java
Propchange: lucene/java/branches/flex_1458/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 27 22:51:44 2010
@@ -2,4 +2,4 @@
/lucene/java/branches/lucene_2_9:817269-818600,829134,829881,831036,896850,909334
/lucene/java/branches/lucene_2_9_back_compat_tests:818601-821336
/lucene/java/branches/lucene_3_0:880793,896906
-/lucene/java/trunk:824912-825292,827043-833960,880727-886190,889185,889614-916543
+/lucene/java/trunk:824912-825292,827043-833960,880727-886190,889185,889614-916543,916596,916685,916769,917019
Modified: lucene/java/branches/flex_1458/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/CHANGES.txt?rev=917067&r1=917066&r2=917067&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/CHANGES.txt (original)
+++ lucene/java/branches/flex_1458/CHANGES.txt Sat Feb 27 22:51:44 2010
@@ -200,7 +200,9 @@
* LUCENE-2195: Speedup CharArraySet if set is empty.
(Simon Willnauer via Robert Muir)
-
+
+* LUCENE-2285: Code cleanup. (Shai Erera via Uwe Schindler)
+
Build
* LUCENE-2124: Moved the JDK-based collation support from contrib/collation
@@ -223,10 +225,11 @@
* LUCENE-2170: Fix thread starvation problems. (Uwe Schindler)
-* LUCENE-2248, LUCENE-2251: Refactor tests to not use Version.LUCENE_CURRENT,
- but instead use a global static value from LuceneTestCase(J4), that
- contains the release version. (Uwe Schindler, Simon Willnauer)
-
+* LUCENE-2248, LUCENE-2251, LUCENE-2285: Refactor tests to not use
+ Version.LUCENE_CURRENT, but instead use a global static value
+ from LuceneTestCase(J4), that contains the release version.
+ (Uwe Schindler, Simon Willnauer, Shai Erera)
+
================== Release 2.9.2 / 3.0.1 2010-02-26 ====================
Changes in backwards compatibility policy
Propchange: lucene/java/branches/flex_1458/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 27 22:51:44 2010
@@ -1 +1,2 @@
/lucene/java/branches/lucene_2_9/build.xml:909334
+/lucene/java/trunk/build.xml:916596,916685,916769,917019
Propchange: lucene/java/branches/flex_1458/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 27 22:51:44 2010
@@ -2,4 +2,4 @@
/lucene/java/branches/lucene_2_9/contrib:817269-818600,825998,829134,829816,829881,831036,896850,909334
/lucene/java/branches/lucene_2_9_back_compat_tests/contrib:818601-821336
/lucene/java/branches/lucene_3_0/contrib:880793,896906
-/lucene/java/trunk/contrib:824912-825292,827043-833960,880727-886190,889185,889614-916543
+/lucene/java/trunk/contrib:824912-825292,827043-833960,880727-886190,889185,889614-916543,916596,916685,916769,917019
Propchange: lucene/java/branches/flex_1458/contrib/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 27 22:51:44 2010
@@ -2,4 +2,4 @@
/lucene/java/branches/lucene_2_9/contrib/CHANGES.txt:817269-818600,825998,826775,829134,829816,829881,831036,896850
/lucene/java/branches/lucene_2_9_back_compat_tests/contrib/CHANGES.txt:818601-821336
/lucene/java/branches/lucene_3_0/contrib/CHANGES.txt:880793,896906
-/lucene/java/trunk/contrib/CHANGES.txt:829439-833960,880727-886190,889185,889622,889667,889866-899001
+/lucene/java/trunk/contrib/CHANGES.txt:829439-833960,880727-886190,889185,889622,889667,889866-899001,916596,916685,916769,917019
Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java?rev=917067&r1=917066&r2=917067&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java Sat Feb 27 22:51:44 2010
@@ -25,7 +25,6 @@
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.LowerCaseFilter;
-import org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents; // javadoc @link
import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.KeywordMarkerTokenFilter;
import org.apache.lucene.analysis.StopFilter;
@@ -162,14 +161,16 @@
this(matchVersion, WordlistLoader.getWordSet( stopwords, STOPWORDS_COMMENT));
}
-
/**
- * Creates {@link TokenStreamComponents} used to tokenize all the text in the provided {@link Reader}.
- *
- * @return {@link TokenStreamComponents} built from an {@link ArabicLetterTokenizer} filtered with
- * {@link LowerCaseFilter}, {@link StopFilter}, {@link ArabicNormalizationFilter},
- * {@link KeywordMarkerTokenFilter} if a stem exclusion set is provided
- * and {@link ArabicStemFilter}.
+ * Creates
+ * {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * used to tokenize all the text in the provided {@link Reader}.
+ *
+ * @return {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * built from an {@link ArabicLetterTokenizer} filtered with
+ * {@link LowerCaseFilter}, {@link StopFilter},
+ * {@link ArabicNormalizationFilter}, {@link KeywordMarkerTokenFilter}
+ * if a stem exclusion set is provided and {@link ArabicStemFilter}.
*/
@Override
protected TokenStreamComponents createComponents(String fieldName,
Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java?rev=917067&r1=917066&r2=917067&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java Sat Feb 27 22:51:44 2010
@@ -24,7 +24,6 @@
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.LowerCaseFilter;
-import org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents; // javadoc @link
import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.KeywordMarkerTokenFilter;
import org.apache.lucene.analysis.StopFilter;
@@ -117,15 +116,18 @@
super(matchVersion, stopwords);
this.stemExclusionSet = CharArraySet.unmodifiableSet(CharArraySet.copy(
matchVersion, stemExclusionSet)); }
-
+
/**
- * Creates a {@link TokenStreamComponents} which tokenizes all the text in the provided
- * {@link Reader}.
+ * Creates a
+ * {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * which tokenizes all the text in the provided {@link Reader}.
*
- * @return A {@link TokenStreamComponents} built from an {@link StandardTokenizer}
- * filtered with {@link StandardFilter}, {@link LowerCaseFilter},
- * {@link StopFilter}, {@link KeywordMarkerTokenFilter} if a stem
- * exclusion set is provided and {@link BulgarianStemFilter}.
+ * @return A
+ * {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * built from an {@link StandardTokenizer} filtered with
+ * {@link StandardFilter}, {@link LowerCaseFilter}, {@link StopFilter}
+ * , {@link KeywordMarkerTokenFilter} if a stem exclusion set is
+ * provided and {@link BulgarianStemFilter}.
*/
@Override
public TokenStreamComponents createComponents(String fieldName, Reader reader) {
Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java?rev=917067&r1=917066&r2=917067&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java Sat Feb 27 22:51:44 2010
@@ -29,7 +29,6 @@
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.LowerCaseFilter;
-import org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents; // javadoc @link
import org.apache.lucene.analysis.KeywordMarkerTokenFilter;
import org.apache.lucene.analysis.StopFilter;
import org.apache.lucene.analysis.StopwordAnalyzerBase;
@@ -191,12 +190,16 @@
excltable = WordlistLoader.getWordSet( exclusionlist );
setPreviousTokenStream(null); // force a new stemmer to be created
}
+
/**
- * Creates {@link TokenStreamComponents} used to tokenize all the text in the provided {@link Reader}.
- *
- * @return {@link TokenStreamComponents} built from a {@link StandardTokenizer} filtered with
- * {@link LowerCaseFilter}, {@link StandardFilter}, {@link StopFilter}, and
- * {@link BrazilianStemFilter}.
+ * Creates
+ * {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * used to tokenize all the text in the provided {@link Reader}.
+ *
+ * @return {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * built from a {@link StandardTokenizer} filtered with
+ * {@link LowerCaseFilter}, {@link StandardFilter}, {@link StopFilter}
+ * , and {@link BrazilianStemFilter}.
*/
@Override
protected TokenStreamComponents createComponents(String fieldName,
Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java?rev=917067&r1=917066&r2=917067&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java Sat Feb 27 22:51:44 2010
@@ -19,7 +19,6 @@
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.CharArraySet;
-import org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents; // javadoc @link
import org.apache.lucene.analysis.StopFilter;
import org.apache.lucene.analysis.StopwordAnalyzerBase;
import org.apache.lucene.analysis.Tokenizer;
Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cn/ChineseAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cn/ChineseAnalyzer.java?rev=917067&r1=917066&r2=917067&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cn/ChineseAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cn/ChineseAnalyzer.java Sat Feb 27 22:51:44 2010
@@ -20,7 +20,6 @@
import java.io.Reader;
import org.apache.lucene.analysis.ReusableAnalyzerBase;
-import org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents; // javadoc @link
import org.apache.lucene.analysis.standard.StandardAnalyzer; // javadoc @link
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.Tokenizer;
@@ -35,11 +34,13 @@
public final class ChineseAnalyzer extends ReusableAnalyzerBase {
/**
- * Creates {@link TokenStreamComponents} used to tokenize all the text in the
- * provided {@link Reader}.
+ * Creates
+ * {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * used to tokenize all the text in the provided {@link Reader}.
*
- * @return {@link TokenStreamComponents} built from a
- * {@link ChineseTokenizer} filtered with {@link ChineseFilter}
+ * @return {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * built from a {@link ChineseTokenizer} filtered with
+ * {@link ChineseFilter}
*/
@Override
protected TokenStreamComponents createComponents(String fieldName,
Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java?rev=917067&r1=917066&r2=917067&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java Sat Feb 27 22:51:44 2010
@@ -113,7 +113,7 @@
* strings.
*/
public HyphenationCompoundWordTokenFilter(Version matchVersion, TokenStream input,
- HyphenationTree hyphenator, Set dictionary) {
+ HyphenationTree hyphenator, Set<?> dictionary) {
this(input, hyphenator, dictionary, DEFAULT_MIN_WORD_SIZE,
DEFAULT_MIN_SUBWORD_SIZE, DEFAULT_MAX_SUBWORD_SIZE, false);
}
@@ -145,7 +145,7 @@
* Add only the longest matching subword to the stream
*/
public HyphenationCompoundWordTokenFilter(Version matchVersion, TokenStream input,
- HyphenationTree hyphenator, Set dictionary, int minWordSize,
+ HyphenationTree hyphenator, Set<?> dictionary, int minWordSize,
int minSubwordSize, int maxSubwordSize, boolean onlyLongestMatch) {
super(matchVersion, input, dictionary, minWordSize, minSubwordSize, maxSubwordSize,
onlyLongestMatch);
@@ -201,7 +201,7 @@
*/
@Deprecated
public HyphenationCompoundWordTokenFilter(TokenStream input,
- HyphenationTree hyphenator, Set dictionary) {
+ HyphenationTree hyphenator, Set<?> dictionary) {
this(Version.LUCENE_30, input, hyphenator, dictionary, DEFAULT_MIN_WORD_SIZE,
DEFAULT_MIN_SUBWORD_SIZE, DEFAULT_MAX_SUBWORD_SIZE, false);
}
@@ -223,7 +223,7 @@
*/
@Deprecated
public HyphenationCompoundWordTokenFilter(TokenStream input,
- HyphenationTree hyphenator, Set dictionary, int minWordSize,
+ HyphenationTree hyphenator, Set<?> dictionary, int minWordSize,
int minSubwordSize, int maxSubwordSize, boolean onlyLongestMatch) {
super(Version.LUCENE_30, input, dictionary, minWordSize, minSubwordSize, maxSubwordSize,
onlyLongestMatch);
Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/CharVector.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/CharVector.java?rev=917067&r1=917066&r2=917067&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/CharVector.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/CharVector.java Sat Feb 27 22:51:44 2010
@@ -83,7 +83,7 @@
@Override
public Object clone() {
- CharVector cv = new CharVector((char[]) array.clone(), blockSize);
+ CharVector cv = new CharVector(array.clone(), blockSize);
cv.n = this.n;
return cv;
}
Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/Hyphenation.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/Hyphenation.java?rev=917067&r1=917066&r2=917067&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/Hyphenation.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/Hyphenation.java Sat Feb 27 22:51:44 2010
@@ -27,11 +27,6 @@
private int[] hyphenPoints;
/**
- * number of hyphenation points in word
- */
- private int len;
-
- /**
* rawWord as made of alternating strings and {@link Hyphen Hyphen} instances
*/
Hyphenation(int[] points) {
Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java?rev=917067&r1=917066&r2=917067&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java Sat Feb 27 22:51:44 2010
@@ -44,7 +44,7 @@
/**
* This map stores hyphenation exceptions
*/
- protected HashMap<String,ArrayList> stoplist;
+ protected HashMap<String,ArrayList<Object>> stoplist;
/**
* This map stores the character classes
@@ -57,7 +57,7 @@
private transient TernaryTree ivalues;
public HyphenationTree() {
- stoplist = new HashMap<String,ArrayList>(23); // usually a small table
+ stoplist = new HashMap<String,ArrayList<Object>>(23); // usually a small table
classmap = new TernaryTree();
vspace = new ByteVector();
vspace.alloc(1); // this reserves index 0, which we don't use
@@ -363,7 +363,7 @@
if (stoplist.containsKey(sw)) {
// assume only simple hyphens (Hyphen.pre="-", Hyphen.post = Hyphen.no =
// null)
- ArrayList hw = stoplist.get(sw);
+ ArrayList<Object> hw = stoplist.get(sw);
int j = 0;
for (i = 0; i < hw.size(); i++) {
Object o = hw.get(i);
@@ -443,7 +443,7 @@
* @param hyphenatedword a vector of alternating strings and
* {@link Hyphen hyphen} objects.
*/
- public void addException(String word, ArrayList hyphenatedword) {
+ public void addException(String word, ArrayList<Object> hyphenatedword) {
stoplist.put(word, hyphenatedword);
}
Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternConsumer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternConsumer.java?rev=917067&r1=917066&r2=917067&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternConsumer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternConsumer.java Sat Feb 27 22:51:44 2010
@@ -42,7 +42,7 @@
* his own hyphenation. A hyphenatedword is a vector of alternating String's
* and {@link Hyphen Hyphen} instances
*/
- void addException(String word, ArrayList hyphenatedword);
+ void addException(String word, ArrayList<Object> hyphenatedword);
/**
* Add hyphenation patterns.
Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java?rev=917067&r1=917066&r2=917067&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java Sat Feb 27 22:51:44 2010
@@ -51,7 +51,7 @@
StringBuilder token;
- ArrayList exception;
+ ArrayList<Object> exception;
char hyphenChar;
@@ -199,8 +199,8 @@
return pat.toString();
}
- protected ArrayList normalizeException(ArrayList ex) {
- ArrayList res = new ArrayList();
+ protected ArrayList<Object> normalizeException(ArrayList<?> ex) {
+ ArrayList<Object> res = new ArrayList<Object>();
for (int i = 0; i < ex.size(); i++) {
Object item = ex.get(i);
if (item instanceof String) {
@@ -230,7 +230,7 @@
return res;
}
- protected String getExceptionWord(ArrayList ex) {
+ protected String getExceptionWord(ArrayList<?> ex) {
StringBuilder res = new StringBuilder();
for (int i = 0; i < ex.size(); i++) {
Object item = ex.get(i);
@@ -291,7 +291,7 @@
currElement = ELEM_PATTERNS;
} else if (local.equals("exceptions")) {
currElement = ELEM_EXCEPTIONS;
- exception = new ArrayList();
+ exception = new ArrayList<Object>();
} else if (local.equals("hyphen")) {
if (token.length() > 0) {
exception.add(token.toString());
@@ -308,6 +308,7 @@
* java.lang.String, java.lang.String)
*/
@Override
+ @SuppressWarnings("unchecked")
public void endElement(String uri, String local, String raw) {
if (token.length() > 0) {
@@ -319,7 +320,7 @@
case ELEM_EXCEPTIONS:
exception.add(word);
exception = normalizeException(exception);
- consumer.addException(getExceptionWord(exception),
+ consumer.addException(getExceptionWord(exception),
(ArrayList) exception.clone());
break;
case ELEM_PATTERNS:
@@ -344,6 +345,7 @@
/**
* @see org.xml.sax.ContentHandler#characters(char[], int, int)
*/
+ @SuppressWarnings("unchecked")
@Override
public void characters(char ch[], int start, int length) {
StringBuffer chars = new StringBuffer(length);
@@ -428,7 +430,7 @@
System.out.println("class: " + c);
}
- public void addException(String w, ArrayList e) {
+ public void addException(String w, ArrayList<Object> e) {
System.out.println("exception: " + w + " : " + e.toString());
}
Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java?rev=917067&r1=917066&r2=917067&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java Sat Feb 27 22:51:44 2010
@@ -351,10 +351,10 @@
@Override
public Object clone() {
TernaryTree t = new TernaryTree();
- t.lo = (char[]) this.lo.clone();
- t.hi = (char[]) this.hi.clone();
- t.eq = (char[]) this.eq.clone();
- t.sc = (char[]) this.sc.clone();
+ t.lo = this.lo.clone();
+ t.hi = this.hi.clone();
+ t.eq = this.eq.clone();
+ t.sc = this.sc.clone();
t.kv = (CharVector) this.kv.clone();
t.root = this.root;
t.freenode = this.freenode;
Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java?rev=917067&r1=917066&r2=917067&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java Sat Feb 27 22:51:44 2010
@@ -18,7 +18,6 @@
*/
import org.apache.lucene.analysis.ReusableAnalyzerBase;
-import org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents; // javadoc @link
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.KeywordMarkerTokenFilter;
@@ -216,16 +215,20 @@
stoptable = Collections.emptySet();
}
}
+
/**
- * Creates {@link TokenStreamComponents} used to tokenize all the text in the provided
- * {@link Reader}.
- *
- * @return {@link TokenStreamComponents} built from a {@link StandardTokenizer}
- * filtered with {@link StandardFilter}, {@link LowerCaseFilter},
- * {@link StopFilter}, and {@link CzechStemFilter} (only if version is
- * >= LUCENE_31). If a version is >= LUCENE_31 and a stem exclusion set
- * is provided via {@link #CzechAnalyzer(Version, Set, Set)} a
- * {@link KeywordMarkerTokenFilter} is added before {@link CzechStemFilter}.
+ * Creates
+ * {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * used to tokenize all the text in the provided {@link Reader}.
+ *
+ * @return {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * built from a {@link StandardTokenizer} filtered with
+ * {@link StandardFilter}, {@link LowerCaseFilter}, {@link StopFilter}
+ * , and {@link CzechStemFilter} (only if version is >= LUCENE_31). If
+ * a version is >= LUCENE_31 and a stem exclusion set is provided via
+ * {@link #CzechAnalyzer(Version, Set, Set)} a
+ * {@link KeywordMarkerTokenFilter} is added before
+ * {@link CzechStemFilter}.
*/
@Override
protected TokenStreamComponents createComponents(String fieldName,
Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/da/DanishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/da/DanishAnalyzer.java?rev=917067&r1=917066&r2=917067&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/da/DanishAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/da/DanishAnalyzer.java Sat Feb 27 22:51:44 2010
@@ -30,7 +30,6 @@
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.WordlistLoader;
-import org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents; // javadoc @link
import org.apache.lucene.analysis.snowball.SnowballFilter;
import org.apache.lucene.analysis.standard.StandardFilter;
import org.apache.lucene.analysis.standard.StandardTokenizer;
@@ -106,13 +105,16 @@
}
/**
- * Creates a {@link TokenStreamComponents} which tokenizes all the text in the provided
- * {@link Reader}.
+ * Creates a
+ * {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * which tokenizes all the text in the provided {@link Reader}.
*
- * @return A {@link TokenStreamComponents} built from an {@link StandardTokenizer}
- * filtered with {@link StandardFilter}, {@link LowerCaseFilter},
- * {@link StopFilter}, {@link KeywordMarkerTokenFilter} if a stem
- * exclusion set is provided and {@link SnowballFilter}.
+ * @return A
+ * {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * built from an {@link StandardTokenizer} filtered with
+ * {@link StandardFilter}, {@link LowerCaseFilter}, {@link StopFilter}
+ * , {@link KeywordMarkerTokenFilter} if a stem exclusion set is
+ * provided and {@link SnowballFilter}.
*/
@Override
protected TokenStreamComponents createComponents(String fieldName,
Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java?rev=917067&r1=917066&r2=917067&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java Sat Feb 27 22:51:44 2010
@@ -29,7 +29,6 @@
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.LowerCaseFilter;
-import org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents; // javadoc @link
import org.apache.lucene.analysis.KeywordMarkerTokenFilter;
import org.apache.lucene.analysis.StopFilter;
import org.apache.lucene.analysis.StopwordAnalyzerBase;
@@ -222,16 +221,17 @@
exclusionSet = WordlistLoader.getWordSet(exclusionlist);
setPreviousTokenStream(null); // force a new stemmer to be created
}
-
+
/**
- * Creates {@link TokenStreamComponents} used to tokenize all the text in the
- * provided {@link Reader}.
+ * Creates
+ * {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * used to tokenize all the text in the provided {@link Reader}.
*
- * @return {@link TokenStreamComponents} built from a
- * {@link StandardTokenizer} filtered with {@link StandardFilter},
- * {@link LowerCaseFilter}, {@link StopFilter},
- * {@link KeywordMarkerTokenFilter} if a stem exclusion set is provided, and
- * {@link SnowballFilter}
+ * @return {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * built from a {@link StandardTokenizer} filtered with
+ * {@link StandardFilter}, {@link LowerCaseFilter}, {@link StopFilter}
+ * , {@link KeywordMarkerTokenFilter} if a stem exclusion set is
+ * provided, and {@link SnowballFilter}
*/
@Override
protected TokenStreamComponents createComponents(String fieldName,
Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java?rev=917067&r1=917066&r2=917067&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java Sat Feb 27 22:51:44 2010
@@ -19,7 +19,6 @@
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.CharArraySet;
-import org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents; // javadoc @link
import org.apache.lucene.analysis.StopFilter;
import org.apache.lucene.analysis.StopwordAnalyzerBase;
import org.apache.lucene.analysis.TokenStream;
@@ -120,15 +119,17 @@
{
this(matchVersion, stopwords.keySet());
}
-
- /**
- * Creates {@link TokenStreamComponents} used to tokenize all the text in the
- * provided {@link Reader}.
- *
- * @return {@link TokenStreamComponents} built from a
- * {@link StandardTokenizer} filtered with
- * {@link GreekLowerCaseFilter}, {@link StandardFilter} and {@link StopFilter}
- */
+
+ /**
+ * Creates
+ * {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * used to tokenize all the text in the provided {@link Reader}.
+ *
+ * @return {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * built from a {@link StandardTokenizer} filtered with
+ * {@link GreekLowerCaseFilter}, {@link StandardFilter} and
+ * {@link StopFilter}
+ */
@Override
protected TokenStreamComponents createComponents(String fieldName,
Reader reader) {
Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/en/EnglishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/en/EnglishAnalyzer.java?rev=917067&r1=917066&r2=917067&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/en/EnglishAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/en/EnglishAnalyzer.java Sat Feb 27 22:51:44 2010
@@ -29,7 +29,6 @@
import org.apache.lucene.analysis.StopwordAnalyzerBase;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
-import org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents; // javadoc @link
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.analysis.standard.StandardFilter;
import org.apache.lucene.analysis.standard.StandardTokenizer;
@@ -90,13 +89,16 @@
}
/**
- * Creates a {@link TokenStreamComponents} which tokenizes all the text in the provided
- * {@link Reader}.
+ * Creates a
+ * {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * which tokenizes all the text in the provided {@link Reader}.
*
- * @return A {@link TokenStreamComponents} built from an {@link StandardTokenizer}
- * filtered with {@link StandardFilter}, {@link LowerCaseFilter},
- * {@link StopFilter}, {@link KeywordMarkerTokenFilter} if a stem
- * exclusion set is provided and {@link PorterStemFilter}.
+ * @return A
+ * {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * built from an {@link StandardTokenizer} filtered with
+ * {@link StandardFilter}, {@link LowerCaseFilter}, {@link StopFilter}
+ * , {@link KeywordMarkerTokenFilter} if a stem exclusion set is
+ * provided and {@link PorterStemFilter}.
*/
@Override
protected TokenStreamComponents createComponents(String fieldName,
Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/es/SpanishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/es/SpanishAnalyzer.java?rev=917067&r1=917066&r2=917067&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/es/SpanishAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/es/SpanishAnalyzer.java Sat Feb 27 22:51:44 2010
@@ -30,7 +30,6 @@
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.WordlistLoader;
-import org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents; // javadoc @link
import org.apache.lucene.analysis.snowball.SnowballFilter;
import org.apache.lucene.analysis.standard.StandardFilter;
import org.apache.lucene.analysis.standard.StandardTokenizer;
@@ -106,13 +105,16 @@
}
/**
- * Creates a {@link TokenStreamComponents} which tokenizes all the text in the provided
- * {@link Reader}.
+ * Creates a
+ * {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * which tokenizes all the text in the provided {@link Reader}.
*
- * @return A {@link TokenStreamComponents} built from an {@link StandardTokenizer}
- * filtered with {@link StandardFilter}, {@link LowerCaseFilter},
- * {@link StopFilter}, {@link KeywordMarkerTokenFilter} if a stem
- * exclusion set is provided and {@link SnowballFilter}.
+ * @return A
+ * {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * built from an {@link StandardTokenizer} filtered with
+ * {@link StandardFilter}, {@link LowerCaseFilter}, {@link StopFilter}
+ * , {@link KeywordMarkerTokenFilter} if a stem exclusion set is
+ * provided and {@link SnowballFilter}.
*/
@Override
protected TokenStreamComponents createComponents(String fieldName,
Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java?rev=917067&r1=917066&r2=917067&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java Sat Feb 27 22:51:44 2010
@@ -25,7 +25,6 @@
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.LowerCaseFilter;
-import org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents; // javadoc @link
import org.apache.lucene.analysis.StopFilter;
import org.apache.lucene.analysis.StopwordAnalyzerBase;
import org.apache.lucene.analysis.TokenStream;
@@ -136,12 +135,13 @@
}
/**
- * Creates {@link TokenStreamComponents} used to tokenize all the text in the provided
- * {@link Reader}.
+ * Creates
+ * {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * used to tokenize all the text in the provided {@link Reader}.
*
- * @return {@link TokenStreamComponents} built from a {@link ArabicLetterTokenizer}
- * filtered with {@link LowerCaseFilter},
- * {@link ArabicNormalizationFilter},
+ * @return {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * built from a {@link ArabicLetterTokenizer} filtered with
+ * {@link LowerCaseFilter}, {@link ArabicNormalizationFilter},
* {@link PersianNormalizationFilter} and Persian Stop words
*/
@Override
Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fi/FinnishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fi/FinnishAnalyzer.java?rev=917067&r1=917066&r2=917067&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fi/FinnishAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fi/FinnishAnalyzer.java Sat Feb 27 22:51:44 2010
@@ -30,7 +30,6 @@
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.WordlistLoader;
-import org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents; // javadoc @link
import org.apache.lucene.analysis.snowball.SnowballFilter;
import org.apache.lucene.analysis.standard.StandardFilter;
import org.apache.lucene.analysis.standard.StandardTokenizer;
@@ -106,13 +105,16 @@
}
/**
- * Creates a {@link TokenStreamComponents} which tokenizes all the text in the provided
- * {@link Reader}.
+ * Creates a
+ * {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * which tokenizes all the text in the provided {@link Reader}.
*
- * @return A {@link TokenStreamComponents} built from an {@link StandardTokenizer}
- * filtered with {@link StandardFilter}, {@link LowerCaseFilter},
- * {@link StopFilter}, {@link KeywordMarkerTokenFilter} if a stem
- * exclusion set is provided and {@link SnowballFilter}.
+ * @return A
+ * {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * built from an {@link StandardTokenizer} filtered with
+ * {@link StandardFilter}, {@link LowerCaseFilter}, {@link StopFilter}
+ * , {@link KeywordMarkerTokenFilter} if a stem exclusion set is
+ * provided and {@link SnowballFilter}.
*/
@Override
protected TokenStreamComponents createComponents(String fieldName,
Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java?rev=917067&r1=917066&r2=917067&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java Sat Feb 27 22:51:44 2010
@@ -20,7 +20,6 @@
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.LowerCaseFilter;
-import org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents; // javadoc @link
import org.apache.lucene.analysis.KeywordMarkerTokenFilter;
import org.apache.lucene.analysis.StopFilter;
import org.apache.lucene.analysis.StopwordAnalyzerBase;
@@ -225,14 +224,16 @@
}
/**
- * Creates {@link TokenStreamComponents} used to tokenize all the text in the provided
- * {@link Reader}.
- *
- * @return {@link TokenStreamComponents} built from a {@link StandardTokenizer}
- * filtered with {@link StandardFilter}, {@link ElisionFilter},
+ * Creates
+ * {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * used to tokenize all the text in the provided {@link Reader}.
+ *
+ * @return {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * built from a {@link StandardTokenizer} filtered with
+ * {@link StandardFilter}, {@link ElisionFilter},
* {@link LowerCaseFilter}, {@link StopFilter},
- * {@link KeywordMarkerTokenFilter} if a stem exclusion set is provided,
- * and {@link SnowballFilter}
+ * {@link KeywordMarkerTokenFilter} if a stem exclusion set is
+ * provided, and {@link SnowballFilter}
*/
@Override
protected TokenStreamComponents createComponents(String fieldName,
Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java?rev=917067&r1=917066&r2=917067&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java Sat Feb 27 22:51:44 2010
@@ -22,7 +22,6 @@
import java.util.Set;
import org.apache.lucene.analysis.LowerCaseFilter;
-import org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents; // javadoc @link
import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.KeywordMarkerTokenFilter;
import org.apache.lucene.analysis.StopFilter;
@@ -106,15 +105,16 @@
}
/**
- * Creates {@link TokenStreamComponents} used to tokenize all the text in the provided
- * {@link Reader}.
+ * Creates
+ * {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * used to tokenize all the text in the provided {@link Reader}.
*
- * @return {@link TokenStreamComponents} built from a {@link IndicTokenizer}
- * filtered with {@link LowerCaseFilter},
- * {@link IndicNormalizationFilter},
- * {@link HindiNormalizationFilter},
- * {@link KeywordMarkerTokenFilter} if a stem exclusion set is provided,
- * {@link HindiStemFilter}, and Hindi Stop words
+ * @return {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * built from a {@link IndicTokenizer} filtered with
+ * {@link LowerCaseFilter}, {@link IndicNormalizationFilter},
+ * {@link HindiNormalizationFilter}, {@link KeywordMarkerTokenFilter}
+ * if a stem exclusion set is provided, {@link HindiStemFilter}, and
+ * Hindi Stop words
*/
@Override
protected TokenStreamComponents createComponents(String fieldName,
Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hu/HungarianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hu/HungarianAnalyzer.java?rev=917067&r1=917066&r2=917067&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hu/HungarianAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hu/HungarianAnalyzer.java Sat Feb 27 22:51:44 2010
@@ -30,7 +30,6 @@
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.WordlistLoader;
-import org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents; // javadoc @link
import org.apache.lucene.analysis.snowball.SnowballFilter;
import org.apache.lucene.analysis.standard.StandardFilter;
import org.apache.lucene.analysis.standard.StandardTokenizer;
@@ -106,13 +105,16 @@
}
/**
- * Creates a {@link TokenStreamComponents} which tokenizes all the text in the provided
- * {@link Reader}.
+ * Creates a
+ * {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * which tokenizes all the text in the provided {@link Reader}.
*
- * @return A {@link TokenStreamComponents} built from an {@link StandardTokenizer}
- * filtered with {@link StandardFilter}, {@link LowerCaseFilter},
- * {@link StopFilter}, {@link KeywordMarkerTokenFilter} if a stem
- * exclusion set is provided and {@link SnowballFilter}.
+ * @return A
+ * {@link org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
+ * built from an {@link StandardTokenizer} filtered with
+ * {@link StandardFilter}, {@link LowerCaseFilter}, {@link StopFilter}
+ * , {@link KeywordMarkerTokenFilter} if a stem exclusion set is
+ * provided and {@link SnowballFilter}.
*/
@Override
protected TokenStreamComponents createComponents(String fieldName,
RE: svn commit: r917067 [1/8] - in /lucene/java/branches/flex_1458: ./ contrib/ contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/ contrib/analyzers/common/src/java/org/apache/
Posted by Uwe Schindler <uw...@thetaphi.de>.
Hi Mike,
as noted in the merge svn log, I merged flex up to trunk 917019, but I left out the merge of:
> Revision: 916755
> Author: mikemccand
> Date: 17:52:39, Freitag, 26. Februar 2010
> Message: LUCENE-2282: allow public but internal access to oal.index.IndexFileNames API
I found it would be better if you do it yourself. Don’t forget to mark this version as merged in svn:mergeinfo (using propedit), even if you apply the patch by hand for flex, so it will appear as merged in our GUIs!
Uwe
-----
Uwe Schindler
H.-H.-Meier-Allee 63, D-28213 Bremen
http://www.thetaphi.de
eMail: uwe@thetaphi.de
> -----Original Message-----
> From: uschindler@apache.org [mailto:uschindler@apache.org]
> Sent: Saturday, February 27, 2010 11:52 PM
> To: java-commits@lucene.apache.org
> Subject: svn commit: r917067 [1/8] - in
> /lucene/java/branches/flex_1458: ./ contrib/
> contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/
> contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/
> contrib/analyzers/common/src/java/org/apache/l...
>
> Author: uschindler
> Date: Sat Feb 27 22:51:44 2010
> New Revision: 917067
>
> URL: http://svn.apache.org/viewvc?rev=917067&view=rev
> Log:
> Merge up to trunk rev 917019.
>
> I left out only one revision:
> Revision: 916755
> Author: mikemccand
> Date: 17:52:39, Freitag, 26. Februar 2010
> Message: LUCENE-2282: allow public but internal access to
> oal.index.IndexFileNames API
>
> Removed:
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/Intercep
> tTestCaseEvents.java
> Modified:
> lucene/java/branches/flex_1458/ (props changed)
> lucene/java/branches/flex_1458/CHANGES.txt
> lucene/java/branches/flex_1458/build.xml (props changed)
> lucene/java/branches/flex_1458/contrib/ (props changed)
> lucene/java/branches/flex_1458/contrib/CHANGES.txt (props
> changed)
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/ar/ArabicAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/bg/BulgarianAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/br/BrazilianAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/cjk/CJKAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/cn/ChineseAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/hyphenation/CharVector.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/hyphenation/Hyphenation.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/hyphenation/HyphenationTree.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/hyphenation/PatternConsumer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/hyphenation/PatternParser.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/hyphenation/TernaryTree.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/cz/CzechAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/da/DanishAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/de/GermanAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/el/GreekAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/en/EnglishAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/es/SpanishAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/fa/PersianAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/fi/FinnishAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/fr/FrenchAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/hi/HindiAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/hu/HungarianAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/it/ItalianAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/miscellaneous/PatternAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/ngram/EdgeNGramTokenFilter.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/ngram/NGramTokenFilter.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/no/NorwegianAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/pt/PortugueseAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/ro/RomanianAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/ru/RussianAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/ru/RussianStemmer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/shingle/ShingleFilter.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/shingle/ShingleMatrixFilter.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/sinks/DateRecognizerSinkFilter.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/sv/SwedishAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/th/ThaiAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/tr/TurkishAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/ar/TestArabicAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/ar/TestArabicNormalizationFilter.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/ar/TestArabicStemFilter.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/bg/TestBulgarianAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/bg/TestBulgarianStemmer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/br/TestBrazilianStemmer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/cjk/TestCJKTokenizer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/compound/TestCompoundWordTokenFilter.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/cz/TestCzechAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/cz/TestCzechStemmer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/da/TestDanishAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/de/TestGermanAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/de/TestGermanStemFilter.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/el/GreekAnalyzerTest.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/en/TestEnglishAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/es/TestSpanishAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/fa/TestPersianAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/fa/TestPersianNormalizationFilter.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/fi/TestFinnishAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/fr/TestElision.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/fr/TestFrenchAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/hi/TestHindiAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/hi/TestHindiNormalizer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/hi/TestHindiStemmer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/hu/TestHungarianAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/in/TestIndicNormalizer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/in/TestIndicTokenizer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/it/TestItalianAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/miscellaneous/PatternAnalyzerTest.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/miscellaneous/TestPrefixAndSuffixAwareTokenFilter.
> java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/miscellaneous/TestPrefixAwareTokenFilter.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/ngram/NGramTokenFilterTest.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/ngram/NGramTokenizerTest.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/nl/TestDutchStemmer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/no/TestNorwegianAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/payloads/DelimitedPayloadTokenFilterTest.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterTest.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/pt/TestPortugueseAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/reverse/TestReverseStringFilter.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/ro/TestRomanianAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/ru/TestRussianAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/ru/TestRussianStem.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/shingle/ShingleFilterTest.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/shingle/TestShingleMatrixFilter.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/sinks/DateRecognizerSinkTokenizerTest.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/sinks/TokenRangeSinkTokenizerTest.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/sinks/TokenTypeSinkTokenizerTest.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/snowball/TestSnowball.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/sv/TestSwedishAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/th/TestThaiAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/tr/TestTurkishAnalyzer.java
>
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/tr/TestTurkishLowerCaseFilter.java
>
> lucene/java/branches/flex_1458/contrib/ant/src/test/org/apache/lucene/a
> nt/IndexTaskTest.java
>
> lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lu
> cene/benchmark/byTask/feeds/LongToEnglishContentSource.java
>
> lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lu
> cene/benchmark/byTask/feeds/QueryMaker.java
>
> lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lu
> cene/benchmark/byTask/stats/Points.java
>
> lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lu
> cene/benchmark/byTask/stats/TaskStats.java
>
> lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lu
> cene/benchmark/byTask/tasks/NearRealtimeReaderTask.java
>
> lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lu
> cene/benchmark/byTask/tasks/NewShingleAnalyzerTask.java
>
> lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lu
> cene/benchmark/byTask/tasks/ReadTokensTask.java
>
> lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lu
> cene/benchmark/byTask/utils/Config.java
>
> lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lu
> cene/benchmark/stats/TimeData.java
>
> lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lu
> cene/benchmark/utils/ExtractReuters.java
>
> lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lu
> cene/benchmark/utils/ExtractWikipedia.java
>
> lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lu
> cene/benchmark/byTask/TestPerfTasksLogic.java
>
> lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lu
> cene/benchmark/byTask/TestPerfTasksParse.java
>
> lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lu
> cene/benchmark/quality/TestQualityRun.java
> lucene/java/branches/flex_1458/contrib/db/bdb-
> je/src/test/org/apache/lucene/store/je/JEStoreTest.java
>
> lucene/java/branches/flex_1458/contrib/db/bdb/src/java/org/apache/lucen
> e/store/db/Block.java
>
> lucene/java/branches/flex_1458/contrib/db/bdb/src/java/org/apache/lucen
> e/store/db/DbDirectory.java
>
> lucene/java/branches/flex_1458/contrib/db/bdb/src/test/org/apache/lucen
> e/store/db/DbStoreTest.java
>
> lucene/java/branches/flex_1458/contrib/db/bdb/src/test/org/apache/lucen
> e/store/db/SanityLoadLibrary.java
> lucene/java/branches/flex_1458/contrib/fast-vector-
> highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldFrag
> List.java
> lucene/java/branches/flex_1458/contrib/fast-vector-
> highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTerm
> Stack.java
> lucene/java/branches/flex_1458/contrib/fast-vector-
> highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractT
> estCase.java
> lucene/java/branches/flex_1458/contrib/fast-vector-
> highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFra
> gmentsBuilderTest.java
> lucene/java/branches/flex_1458/contrib/highlighter/src/test/
> (props changed)
>
> lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/
> lucene/search/highlight/HighlighterPhraseTest.java
>
> lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/
> lucene/search/highlight/HighlighterTest.java
>
> lucene/java/branches/flex_1458/contrib/icu/src/test/org/apache/lucene/c
> ollation/TestICUCollationKeyFilter.java
>
> lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache
> /lucene/store/instantiated/InstantiatedDocument.java
>
> lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache
> /lucene/store/instantiated/InstantiatedIndex.java
>
> lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache
> /lucene/store/instantiated/InstantiatedIndexReader.java
>
> lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache
> /lucene/store/instantiated/InstantiatedIndexWriter.java
>
> lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache
> /lucene/store/instantiated/InstantiatedTerm.java
>
> lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache
> /lucene/store/instantiated/InstantiatedTermEnum.java
>
> lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/apache
> /lucene/store/instantiated/TestIndicesEquals.java (contents, props
> changed)
>
> lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/apache
> /lucene/store/instantiated/TestSerialization.java
>
> lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/apache
> /lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java
>
> lucene/java/branches/flex_1458/contrib/memory/src/java/org/apache/lucen
> e/index/memory/MemoryIndex.java
>
> lucene/java/branches/flex_1458/contrib/memory/src/test/org/apache/lucen
> e/index/memory/MemoryIndexTest.java
>
> lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/
> index/BalancedSegmentMergePolicy.java
>
> lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/
> misc/ChainedFilter.java
>
> lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/
> index/TestFieldNormModifier.java
>
> lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/
> index/TestIndexSplitter.java
>
> lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/
> index/TestMultiPassIndexSplitter.java
>
> lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/
> index/TestTermVectorAccessor.java
>
> lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/
> misc/ChainedFilterTest.java
>
> lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/
> misc/SweetSpotSimilarityTest.java
>
> lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/
> misc/TestLengthNormModifier.java
>
> lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/
> queryParser/analyzing/TestAnalyzingQueryParser.java
>
> lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/
> queryParser/complexPhrase/TestComplexPhraseQuery.java
>
> lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/
> queryParser/ext/TestExtendableQueryParser.java
>
> lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/
> queryParser/precedence/TestPrecedenceQueryParser.java
>
> lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/luce
> ne/search/BooleanFilterTest.java
>
> lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/luce
> ne/search/DuplicateFilterTest.java
>
> lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/luce
> ne/search/FuzzyLikeThisQueryTest.java
>
> lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/luce
> ne/search/TermsFilterTest.java
>
> lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/luce
> ne/search/similar/TestMoreLikeThis.java
>
> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/
> lucene/queryParser/core/config/QueryConfigHandler.java
>
> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/
> lucene/queryParser/standard/MultiFieldQueryParserWrapper.java
>
> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/
> lucene/queryParser/standard/QueryParserWrapper.java
>
> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/
> lucene/queryParser/standard/config/BoostAttributeImpl.java
>
> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/
> lucene/queryParser/standard/config/DefaultPhraseSlopAttributeImpl.java
>
> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/
> lucene/queryParser/standard/config/FieldBoostMapAttributeImpl.java
>
> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/
> lucene/queryParser/standard/config/FieldDateResolutionMapAttributeImpl.
> java
>
> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/
> lucene/queryParser/standard/config/FuzzyAttributeImpl.java
>
> lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/
> lucene/queryParser/standard/config/PositionIncrementsAttributeImpl.java
>
> lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/
> lucene/queryParser/standard/TestMultiAnalyzerQPHelper.java
>
> lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/
> lucene/queryParser/standard/TestMultiAnalyzerWrapper.java
>
> lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/
> lucene/queryParser/standard/TestMultiFieldQPHelper.java
>
> lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/
> lucene/queryParser/standard/TestMultiFieldQueryParserWrapper.java
>
> lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/
> lucene/queryParser/standard/TestQPHelper.java
>
> lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/
> lucene/queryParser/standard/TestQueryParserWrapper.java
>
> lucene/java/branches/flex_1458/contrib/regex/src/java/org/apache/lucene
> /search/regex/SpanRegexQuery.java
>
> lucene/java/branches/flex_1458/contrib/regex/src/test/org/apache/lucene
> /search/regex/TestRegexQuery.java
>
> lucene/java/branches/flex_1458/contrib/regex/src/test/org/apache/lucene
> /search/regex/TestSpanRegexQuery.java
>
> lucene/java/branches/flex_1458/contrib/remote/src/test/org/apache/lucen
> e/search/RemoteCachingWrapperFilterHelper.java
>
> lucene/java/branches/flex_1458/contrib/remote/src/test/org/apache/lucen
> e/search/TestRemoteCachingWrapperFilter.java
>
> lucene/java/branches/flex_1458/contrib/remote/src/test/org/apache/lucen
> e/search/TestRemoteSearchable.java
>
> lucene/java/branches/flex_1458/contrib/remote/src/test/org/apache/lucen
> e/search/TestRemoteSort.java
>
> lucene/java/branches/flex_1458/contrib/spatial/src/java/org/apache/luce
> ne/spatial/tier/DistanceFieldComparatorSource.java
>
> lucene/java/branches/flex_1458/contrib/spatial/src/java/org/apache/luce
> ne/spatial/tier/DistanceHandler.java
>
> lucene/java/branches/flex_1458/contrib/spatial/src/test/org/apache/luce
> ne/spatial/tier/TestCartesian.java
>
> lucene/java/branches/flex_1458/contrib/spatial/src/test/org/apache/luce
> ne/spatial/tier/TestDistance.java
>
> lucene/java/branches/flex_1458/contrib/spellchecker/src/java/org/apache
> /lucene/search/spell/JaroWinklerDistance.java
>
> lucene/java/branches/flex_1458/contrib/spellchecker/src/java/org/apache
> /lucene/search/spell/NGramDistance.java
>
> lucene/java/branches/flex_1458/contrib/spellchecker/src/test/org/apache
> /lucene/search/spell/TestLuceneDictionary.java
>
> lucene/java/branches/flex_1458/contrib/spellchecker/src/test/org/apache
> /lucene/search/spell/TestSpellChecker.java
>
> lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/luc
> ene/queryParser/surround/query/DistanceQuery.java
>
> lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/luc
> ene/queryParser/surround/query/FieldsQuery.java
>
> lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/luc
> ene/queryParser/surround/query/SimpleTerm.java
>
> lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/luc
> ene/queryParser/surround/query/SpanNearClauseFactory.java
>
> lucene/java/branches/flex_1458/contrib/surround/src/test/org/apache/luc
> ene/queryParser/surround/query/BooleanQueryTst.java
>
> lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene
> /swing/models/BaseListModel.java
>
> lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene
> /swing/models/BaseTableModel.java
>
> lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene
> /swing/models/DataStore.java
>
> lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene
> /swing/models/TestBasicList.java
>
> lucene/java/branches/flex_1458/contrib/swing/src/test/org/apache/lucene
> /swing/models/TestBasicTable.java
>
> lucene/java/branches/flex_1458/contrib/wikipedia/src/java/org/apache/lu
> cene/wikipedia/analysis/WikipediaTokenizer.java
>
> lucene/java/branches/flex_1458/contrib/wikipedia/src/test/org/apache/lu
> cene/wikipedia/analysis/WikipediaTokenizerTest.java
>
> lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/luce
> ne/wordnet/AnalyzerUtil.java
>
> lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/luce
> ne/wordnet/SynExpand.java
>
> lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/luce
> ne/wordnet/SynonymMap.java
>
> lucene/java/branches/flex_1458/contrib/wordnet/src/test/org/apache/luce
> ne/wordnet/TestSynonymTokenFilter.java
> lucene/java/branches/flex_1458/contrib/xml-query-
> parser/src/java/org/apache/lucene/xmlparser/QueryTemplateManager.java
> lucene/java/branches/flex_1458/contrib/xml-query-
> parser/src/java/org/apache/lucene/xmlparser/builders/BoostingTermBuilde
> r.java
> lucene/java/branches/flex_1458/contrib/xml-query-
> parser/src/java/org/apache/lucene/xmlparser/builders/DuplicateFilterBui
> lder.java
> lucene/java/branches/flex_1458/contrib/xml-query-
> parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.ja
> va
>
> lucene/java/branches/flex_1458/src/demo/org/apache/lucene/demo/IndexFil
> es.java
>
> lucene/java/branches/flex_1458/src/demo/org/apache/lucene/demo/html/Ent
> ities.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/Char
> ArrayMap.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/Char
> ArraySet.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/Nume
> ricTokenStream.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/Stop
> Analyzer.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/TeeS
> inkTokenFilter.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/Toke
> n.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/Toke
> nizer.java (props changed)
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/stan
> dard/StandardAnalyzer.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/stan
> dard/StandardTokenizer.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/toke
> nattributes/TermAttributeImpl.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/document/Abst
> ractField.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/document/Nume
> ricField.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/CheckIn
> dex.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/Concurr
> entMergeScheduler.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/DocFiel
> dConsumers.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/DocFiel
> dConsumersPerThread.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/FieldsR
> eader.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexRe
> ader.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexWr
> iter.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/MultiRe
> ader.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/Payload
> .java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/Reusabl
> eStringReader.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/Segment
> Info.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/Segment
> Infos.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/StoredF
> ieldsWriter.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermVec
> torsReader.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermVec
> torsTermsWriter.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermVec
> torsTermsWriterPerField.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermVec
> torsWriter.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermsHa
> sh.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/Disjun
> ctionMaxScorer.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/Disjun
> ctionSumScorer.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/DocIdS
> etIterator.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FieldC
> ache.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FieldC
> acheImpl.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FieldC
> omparator.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FieldV
> alueHitQueue.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/Filter
> edDocIdSetIterator.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/IndexS
> earcher.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/MultiT
> ermQueryWrapperFilter.java (props changed)
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/ReqExc
> lScorer.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/ReqOpt
> SumScorer.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/Simila
> rity.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/functi
> on/ByteFieldSource.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/functi
> on/CustomScoreProvider.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/functi
> on/CustomScoreQuery.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/functi
> on/DocValues.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/functi
> on/FloatFieldSource.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/functi
> on/IntFieldSource.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/functi
> on/OrdFieldSource.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/functi
> on/ReverseOrdFieldSource.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/functi
> on/ShortFieldSource.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/functi
> on/ValueSourceQuery.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/IndexOu
> tput.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/LockObt
> ainFailedException.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/LockRel
> easeFailedException.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/MMapDir
> ectory.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/NoLockF
> actory.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/SimpleF
> SLockFactory.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/SingleI
> nstanceLockFactory.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/AverageG
> uessMemoryModel.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/Indexabl
> eBinaryStringTools.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/MemoryMo
> del.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/NumericU
> tils.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/OpenBitS
> et.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/Paramete
> r.java
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/RamUsage
> Estimator.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/TestMergeSche
> dulerExternal.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/Test
> ASCIIFoldingFilter.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/Test
> Analyzers.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/Test
> CharArrayMap.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/Test
> CharArraySet.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/Test
> CharTokenizers.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/Test
> ISOLatin1AccentFilter.java (props changed)
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/Test
> KeywordAnalyzer.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/Test
> MappingCharFilter.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/Test
> Token.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/collation/Col
> lationTestBase.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/collation/Tes
> tCollationKeyFilter.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/Test
> BinaryDocument.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/Test
> DateTools.java (props changed)
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/Test
> Document.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/Test
> NumberTools.java (props changed)
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/DocHelp
> er.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestAto
> micUpdate.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestBac
> kwardsCompatibility.java (contents, props changed)
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestCom
> poundFile.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestDir
> ectoryReader.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestDoc
> .java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestFie
> ldsReader.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestInd
> exReader.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestInd
> exReaderCloneNorms.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestInd
> exWriter.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestInd
> exWriterLockRelease.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestInd
> exWriterReader.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestMul
> tiReader.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestNor
> ms.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestPar
> allelTermEnum.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestPay
> loads.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestSeg
> mentReader.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestStr
> essIndexing.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestStr
> essIndexing2.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestTer
> mVectorsReader.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/queryParser/T
> estQueryParser.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/Cachin
> gWrapperFilterHelper.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/CheckH
> its.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/JustCo
> mpileSearch.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestBo
> olean2.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestBo
> oleanMinShouldMatch.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestCo
> mplexExplanations.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestCu
> stomSearcherSort.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestDa
> teSort.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestDi
> sjunctionMaxQuery.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestDo
> cIdSet.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestEl
> evationComparator.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestEx
> planations.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestFi
> eldCache.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestFi
> eldCacheRangeFilter.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestFi
> lteredQuery.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestMu
> ltiTermConstantScore.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestMu
> ltiThreadTermVectors.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestPh
> raseQuery.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestQu
> eryTermVector.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestSc
> orerPerf.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestSo
> rt.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestTe
> rmRangeFilter.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestTe
> rmRangeQuery.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestTe
> rmVectors.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestTh
> readSafe.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestTi
> meLimitingCollector.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/functi
> on/TestCustomScoreQuery.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/functi
> on/TestFieldScoreQuery.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/functi
> on/TestOrdValues.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/payloa
> ds/TestPayloadNearQuery.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/spans/
> TestBasics.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/spans/
> TestFieldMaskingSpanQuery.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/spans/
> TestNearSpansOrdered.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/spans/
> TestSpans.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/spans/
> TestSpansAdvanced.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/store/TestBuf
> feredIndexInput.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/store/TestLoc
> kFactory.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/store/TestRAM
> Directory.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/store/TestWin
> dowsMMap.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/LuceneTe
> stCase.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/LuceneTe
> stCaseJ4.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestAttr
> ibuteSource.java (props changed)
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestBitV
> ector.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestFiel
> dCacheSanityChecker.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestInde
> xableBinaryStringTools.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestRamU
> sageEstimator.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestStri
> ngIntern.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestVirt
> ualMethod.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/cache/Te
> stDoubleBarrelLRUCache.java
>
> Propchange: lucene/java/branches/flex_1458/
> -----------------------------------------------------------------------
> -------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sat Feb 27 22:51:44 2010
> @@ -2,4 +2,4 @@
> /lucene/java/branches/lucene_2_9:817269-
> 818600,829134,829881,831036,896850,909334
> /lucene/java/branches/lucene_2_9_back_compat_tests:818601-821336
> /lucene/java/branches/lucene_3_0:880793,896906
> -/lucene/java/trunk:824912-825292,827043-833960,880727-
> 886190,889185,889614-916543
> +/lucene/java/trunk:824912-825292,827043-833960,880727-
> 886190,889185,889614-916543,916596,916685,916769,917019
>
> Modified: lucene/java/branches/flex_1458/CHANGES.txt
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/CHANGES.txt
> ?rev=917067&r1=917066&r2=917067&view=diff
> =======================================================================
> =======
> --- lucene/java/branches/flex_1458/CHANGES.txt (original)
> +++ lucene/java/branches/flex_1458/CHANGES.txt Sat Feb 27 22:51:44 2010
> @@ -200,7 +200,9 @@
>
> * LUCENE-2195: Speedup CharArraySet if set is empty.
> (Simon Willnauer via Robert Muir)
> -
> +
> +* LUCENE-2285: Code cleanup. (Shai Erera via Uwe Schindler)
> +
> Build
>
> * LUCENE-2124: Moved the JDK-based collation support from
> contrib/collation
> @@ -223,10 +225,11 @@
>
> * LUCENE-2170: Fix thread starvation problems. (Uwe Schindler)
>
> -* LUCENE-2248, LUCENE-2251: Refactor tests to not use
> Version.LUCENE_CURRENT,
> - but instead use a global static value from LuceneTestCase(J4), that
> - contains the release version. (Uwe Schindler, Simon Willnauer)
> -
> +* LUCENE-2248, LUCENE-2251, LUCENE-2285: Refactor tests to not use
> + Version.LUCENE_CURRENT, but instead use a global static value
> + from LuceneTestCase(J4), that contains the release version.
> + (Uwe Schindler, Simon Willnauer, Shai Erera)
> +
> ================== Release 2.9.2 / 3.0.1 2010-02-26
> ====================
>
> Changes in backwards compatibility policy
>
> Propchange: lucene/java/branches/flex_1458/build.xml
> -----------------------------------------------------------------------
> -------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sat Feb 27 22:51:44 2010
> @@ -1 +1,2 @@
> /lucene/java/branches/lucene_2_9/build.xml:909334
> +/lucene/java/trunk/build.xml:916596,916685,916769,917019
>
> Propchange: lucene/java/branches/flex_1458/contrib/
> -----------------------------------------------------------------------
> -------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sat Feb 27 22:51:44 2010
> @@ -2,4 +2,4 @@
> /lucene/java/branches/lucene_2_9/contrib:817269-
> 818600,825998,829134,829816,829881,831036,896850,909334
> /lucene/java/branches/lucene_2_9_back_compat_tests/contrib:818601-
> 821336
> /lucene/java/branches/lucene_3_0/contrib:880793,896906
> -/lucene/java/trunk/contrib:824912-825292,827043-833960,880727-
> 886190,889185,889614-916543
> +/lucene/java/trunk/contrib:824912-825292,827043-833960,880727-
> 886190,889185,889614-916543,916596,916685,916769,917019
>
> Propchange: lucene/java/branches/flex_1458/contrib/CHANGES.txt
> -----------------------------------------------------------------------
> -------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sat Feb 27 22:51:44 2010
> @@ -2,4 +2,4 @@
> /lucene/java/branches/lucene_2_9/contrib/CHANGES.txt:817269-
> 818600,825998,826775,829134,829816,829881,831036,896850
>
> /lucene/java/branches/lucene_2_9_back_compat_tests/contrib/CHANGES.txt:
> 818601-821336
> /lucene/java/branches/lucene_3_0/contrib/CHANGES.txt:880793,896906
> -/lucene/java/trunk/contrib/CHANGES.txt:829439-833960,880727-
> 886190,889185,889622,889667,889866-899001
> +/lucene/java/trunk/contrib/CHANGES.txt:829439-833960,880727-
> 886190,889185,889622,889667,889866-899001,916596,916685,916769,917019
>
> Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/ar/ArabicAnalyzer.java
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.jav
> a?rev=917067&r1=917066&r2=917067&view=diff
> =======================================================================
> =======
> ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/ar/ArabicAnalyzer.java (original)
> +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/ar/ArabicAnalyzer.java Sat Feb 27 22:51:44 2010
> @@ -25,7 +25,6 @@
>
> import org.apache.lucene.analysis.Analyzer;
> import org.apache.lucene.analysis.LowerCaseFilter;
> -import
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents;
> // javadoc @link
> import org.apache.lucene.analysis.CharArraySet;
> import org.apache.lucene.analysis.KeywordMarkerTokenFilter;
> import org.apache.lucene.analysis.StopFilter;
> @@ -162,14 +161,16 @@
> this(matchVersion, WordlistLoader.getWordSet( stopwords,
> STOPWORDS_COMMENT));
> }
>
> -
> /**
> - * Creates {@link TokenStreamComponents} used to tokenize all the
> text in the provided {@link Reader}.
> - *
> - * @return {@link TokenStreamComponents} built from an {@link
> ArabicLetterTokenizer} filtered with
> - * {@link LowerCaseFilter}, {@link StopFilter},
> {@link ArabicNormalizationFilter},
> - * {@link KeywordMarkerTokenFilter} if a stem exclusion set is
> provided
> - * and {@link ArabicStemFilter}.
> + * Creates
> + * {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * used to tokenize all the text in the provided {@link Reader}.
> + *
> + * @return {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * built from an {@link ArabicLetterTokenizer} filtered with
> + * {@link LowerCaseFilter}, {@link StopFilter},
> + * {@link ArabicNormalizationFilter}, {@link
> KeywordMarkerTokenFilter}
> + * if a stem exclusion set is provided and {@link
> ArabicStemFilter}.
> */
> @Override
> protected TokenStreamComponents createComponents(String fieldName,
>
> Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/bg/BulgarianAnalyzer.java
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.
> java?rev=917067&r1=917066&r2=917067&view=diff
> =======================================================================
> =======
> ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/bg/BulgarianAnalyzer.java (original)
> +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/bg/BulgarianAnalyzer.java Sat Feb 27 22:51:44 2010
> @@ -24,7 +24,6 @@
>
> import org.apache.lucene.analysis.Analyzer;
> import org.apache.lucene.analysis.LowerCaseFilter;
> -import
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents;
> // javadoc @link
> import org.apache.lucene.analysis.CharArraySet;
> import org.apache.lucene.analysis.KeywordMarkerTokenFilter;
> import org.apache.lucene.analysis.StopFilter;
> @@ -117,15 +116,18 @@
> super(matchVersion, stopwords);
> this.stemExclusionSet =
> CharArraySet.unmodifiableSet(CharArraySet.copy(
> matchVersion, stemExclusionSet)); }
> -
> +
> /**
> - * Creates a {@link TokenStreamComponents} which tokenizes all the
> text in the provided
> - * {@link Reader}.
> + * Creates a
> + * {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * which tokenizes all the text in the provided {@link Reader}.
> *
> - * @return A {@link TokenStreamComponents} built from an {@link
> StandardTokenizer}
> - * filtered with {@link StandardFilter}, {@link
> LowerCaseFilter},
> - * {@link StopFilter}, {@link KeywordMarkerTokenFilter} if a
> stem
> - * exclusion set is provided and {@link
> BulgarianStemFilter}.
> + * @return A
> + * {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * built from an {@link StandardTokenizer} filtered with
> + * {@link StandardFilter}, {@link LowerCaseFilter}, {@link
> StopFilter}
> + * , {@link KeywordMarkerTokenFilter} if a stem exclusion
> set is
> + * provided and {@link BulgarianStemFilter}.
> */
> @Override
> public TokenStreamComponents createComponents(String fieldName,
> Reader reader) {
>
> Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/br/BrazilianAnalyzer.java
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.
> java?rev=917067&r1=917066&r2=917067&view=diff
> =======================================================================
> =======
> ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/br/BrazilianAnalyzer.java (original)
> +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/br/BrazilianAnalyzer.java Sat Feb 27 22:51:44 2010
> @@ -29,7 +29,6 @@
> import org.apache.lucene.analysis.Analyzer;
> import org.apache.lucene.analysis.CharArraySet;
> import org.apache.lucene.analysis.LowerCaseFilter;
> -import
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents;
> // javadoc @link
> import org.apache.lucene.analysis.KeywordMarkerTokenFilter;
> import org.apache.lucene.analysis.StopFilter;
> import org.apache.lucene.analysis.StopwordAnalyzerBase;
> @@ -191,12 +190,16 @@
> excltable = WordlistLoader.getWordSet( exclusionlist );
> setPreviousTokenStream(null); // force a new stemmer to be
> created
> }
> +
> /**
> - * Creates {@link TokenStreamComponents} used to tokenize all the
> text in the provided {@link Reader}.
> - *
> - * @return {@link TokenStreamComponents} built from a {@link
> StandardTokenizer} filtered with
> - * {@link LowerCaseFilter}, {@link StandardFilter}, {@link
> StopFilter}, and
> - * {@link BrazilianStemFilter}.
> + * Creates
> + * {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * used to tokenize all the text in the provided {@link Reader}.
> + *
> + * @return {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * built from a {@link StandardTokenizer} filtered with
> + * {@link LowerCaseFilter}, {@link StandardFilter}, {@link
> StopFilter}
> + * , and {@link BrazilianStemFilter}.
> */
> @Override
> protected TokenStreamComponents createComponents(String fieldName,
>
> Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/cjk/CJKAnalyzer.java
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java?
> rev=917067&r1=917066&r2=917067&view=diff
> =======================================================================
> =======
> ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/cjk/CJKAnalyzer.java (original)
> +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/cjk/CJKAnalyzer.java Sat Feb 27 22:51:44 2010
> @@ -19,7 +19,6 @@
>
> import org.apache.lucene.analysis.Analyzer;
> import org.apache.lucene.analysis.CharArraySet;
> -import
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents;
> // javadoc @link
> import org.apache.lucene.analysis.StopFilter;
> import org.apache.lucene.analysis.StopwordAnalyzerBase;
> import org.apache.lucene.analysis.Tokenizer;
>
> Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/cn/ChineseAnalyzer.java
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/java/org/apache/lucene/analysis/cn/ChineseAnalyzer.ja
> va?rev=917067&r1=917066&r2=917067&view=diff
> =======================================================================
> =======
> ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/cn/ChineseAnalyzer.java (original)
> +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/cn/ChineseAnalyzer.java Sat Feb 27 22:51:44 2010
> @@ -20,7 +20,6 @@
> import java.io.Reader;
>
> import org.apache.lucene.analysis.ReusableAnalyzerBase;
> -import
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents;
> // javadoc @link
> import org.apache.lucene.analysis.standard.StandardAnalyzer; //
> javadoc @link
> import org.apache.lucene.analysis.Analyzer;
> import org.apache.lucene.analysis.Tokenizer;
> @@ -35,11 +34,13 @@
> public final class ChineseAnalyzer extends ReusableAnalyzerBase {
>
> /**
> - * Creates {@link TokenStreamComponents} used to tokenize all the
> text in the
> - * provided {@link Reader}.
> + * Creates
> + * {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * used to tokenize all the text in the provided {@link Reader}.
> *
> - * @return {@link TokenStreamComponents} built from a
> - * {@link ChineseTokenizer} filtered with {@link
> ChineseFilter}
> + * @return {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * built from a {@link ChineseTokenizer} filtered with
> + * {@link ChineseFilter}
> */
> @Override
> protected TokenStreamComponents createComponents(String fieldName,
>
> Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/java/org/apache/lucene/analysis/compound/HyphenationC
> ompoundWordTokenFilter.java?rev=917067&r1=917066&r2=917067&view=diff
> =======================================================================
> =======
> ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java
> (original)
> +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java
> Sat Feb 27 22:51:44 2010
> @@ -113,7 +113,7 @@
> * strings.
> */
> public HyphenationCompoundWordTokenFilter(Version matchVersion,
> TokenStream input,
> - HyphenationTree hyphenator, Set dictionary) {
> + HyphenationTree hyphenator, Set<?> dictionary) {
> this(input, hyphenator, dictionary, DEFAULT_MIN_WORD_SIZE,
> DEFAULT_MIN_SUBWORD_SIZE, DEFAULT_MAX_SUBWORD_SIZE, false);
> }
> @@ -145,7 +145,7 @@
> * Add only the longest matching subword to the stream
> */
> public HyphenationCompoundWordTokenFilter(Version matchVersion,
> TokenStream input,
> - HyphenationTree hyphenator, Set dictionary, int minWordSize,
> + HyphenationTree hyphenator, Set<?> dictionary, int minWordSize,
> int minSubwordSize, int maxSubwordSize, boolean
> onlyLongestMatch) {
> super(matchVersion, input, dictionary, minWordSize,
> minSubwordSize, maxSubwordSize,
> onlyLongestMatch);
> @@ -201,7 +201,7 @@
> */
> @Deprecated
> public HyphenationCompoundWordTokenFilter(TokenStream input,
> - HyphenationTree hyphenator, Set dictionary) {
> + HyphenationTree hyphenator, Set<?> dictionary) {
> this(Version.LUCENE_30, input, hyphenator, dictionary,
> DEFAULT_MIN_WORD_SIZE,
> DEFAULT_MIN_SUBWORD_SIZE, DEFAULT_MAX_SUBWORD_SIZE, false);
> }
> @@ -223,7 +223,7 @@
> */
> @Deprecated
> public HyphenationCompoundWordTokenFilter(TokenStream input,
> - HyphenationTree hyphenator, Set dictionary, int minWordSize,
> + HyphenationTree hyphenator, Set<?> dictionary, int minWordSize,
> int minSubwordSize, int maxSubwordSize, boolean
> onlyLongestMatch) {
> super(Version.LUCENE_30, input, dictionary, minWordSize,
> minSubwordSize, maxSubwordSize,
> onlyLongestMatch);
>
> Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/hyphenation/CharVector.java
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/
> CharVector.java?rev=917067&r1=917066&r2=917067&view=diff
> =======================================================================
> =======
> ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/hyphenation/CharVector.java (original)
> +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/hyphenation/CharVector.java Sat Feb 27
> 22:51:44 2010
> @@ -83,7 +83,7 @@
>
> @Override
> public Object clone() {
> - CharVector cv = new CharVector((char[]) array.clone(), blockSize);
> + CharVector cv = new CharVector(array.clone(), blockSize);
> cv.n = this.n;
> return cv;
> }
>
> Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/hyphenation/Hyphenation.java
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/
> Hyphenation.java?rev=917067&r1=917066&r2=917067&view=diff
> =======================================================================
> =======
> ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/hyphenation/Hyphenation.java (original)
> +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/hyphenation/Hyphenation.java Sat Feb 27
> 22:51:44 2010
> @@ -27,11 +27,6 @@
> private int[] hyphenPoints;
>
> /**
> - * number of hyphenation points in word
> - */
> - private int len;
> -
> - /**
> * rawWord as made of alternating strings and {@link Hyphen Hyphen}
> instances
> */
> Hyphenation(int[] points) {
>
> Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/hyphenation/HyphenationTree.java
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/
> HyphenationTree.java?rev=917067&r1=917066&r2=917067&view=diff
> =======================================================================
> =======
> ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/hyphenation/HyphenationTree.java
> (original)
> +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/hyphenation/HyphenationTree.java Sat Feb
> 27 22:51:44 2010
> @@ -44,7 +44,7 @@
> /**
> * This map stores hyphenation exceptions
> */
> - protected HashMap<String,ArrayList> stoplist;
> + protected HashMap<String,ArrayList<Object>> stoplist;
>
> /**
> * This map stores the character classes
> @@ -57,7 +57,7 @@
> private transient TernaryTree ivalues;
>
> public HyphenationTree() {
> - stoplist = new HashMap<String,ArrayList>(23); // usually a small
> table
> + stoplist = new HashMap<String,ArrayList<Object>>(23); // usually a
> small table
> classmap = new TernaryTree();
> vspace = new ByteVector();
> vspace.alloc(1); // this reserves index 0, which we don't use
> @@ -363,7 +363,7 @@
> if (stoplist.containsKey(sw)) {
> // assume only simple hyphens (Hyphen.pre="-", Hyphen.post =
> Hyphen.no =
> // null)
> - ArrayList hw = stoplist.get(sw);
> + ArrayList<Object> hw = stoplist.get(sw);
> int j = 0;
> for (i = 0; i < hw.size(); i++) {
> Object o = hw.get(i);
> @@ -443,7 +443,7 @@
> * @param hyphenatedword a vector of alternating strings and
> * {@link Hyphen hyphen} objects.
> */
> - public void addException(String word, ArrayList hyphenatedword) {
> + public void addException(String word, ArrayList<Object>
> hyphenatedword) {
> stoplist.put(word, hyphenatedword);
> }
>
>
> Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/hyphenation/PatternConsumer.java
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/
> PatternConsumer.java?rev=917067&r1=917066&r2=917067&view=diff
> =======================================================================
> =======
> ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/hyphenation/PatternConsumer.java
> (original)
> +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/hyphenation/PatternConsumer.java Sat Feb
> 27 22:51:44 2010
> @@ -42,7 +42,7 @@
> * his own hyphenation. A hyphenatedword is a vector of alternating
> String's
> * and {@link Hyphen Hyphen} instances
> */
> - void addException(String word, ArrayList hyphenatedword);
> + void addException(String word, ArrayList<Object> hyphenatedword);
>
> /**
> * Add hyphenation patterns.
>
> Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/hyphenation/PatternParser.java
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/
> PatternParser.java?rev=917067&r1=917066&r2=917067&view=diff
> =======================================================================
> =======
> ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/hyphenation/PatternParser.java (original)
> +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/hyphenation/PatternParser.java Sat Feb 27
> 22:51:44 2010
> @@ -51,7 +51,7 @@
>
> StringBuilder token;
>
> - ArrayList exception;
> + ArrayList<Object> exception;
>
> char hyphenChar;
>
> @@ -199,8 +199,8 @@
> return pat.toString();
> }
>
> - protected ArrayList normalizeException(ArrayList ex) {
> - ArrayList res = new ArrayList();
> + protected ArrayList<Object> normalizeException(ArrayList<?> ex) {
> + ArrayList<Object> res = new ArrayList<Object>();
> for (int i = 0; i < ex.size(); i++) {
> Object item = ex.get(i);
> if (item instanceof String) {
> @@ -230,7 +230,7 @@
> return res;
> }
>
> - protected String getExceptionWord(ArrayList ex) {
> + protected String getExceptionWord(ArrayList<?> ex) {
> StringBuilder res = new StringBuilder();
> for (int i = 0; i < ex.size(); i++) {
> Object item = ex.get(i);
> @@ -291,7 +291,7 @@
> currElement = ELEM_PATTERNS;
> } else if (local.equals("exceptions")) {
> currElement = ELEM_EXCEPTIONS;
> - exception = new ArrayList();
> + exception = new ArrayList<Object>();
> } else if (local.equals("hyphen")) {
> if (token.length() > 0) {
> exception.add(token.toString());
> @@ -308,6 +308,7 @@
> * java.lang.String, java.lang.String)
> */
> @Override
> + @SuppressWarnings("unchecked")
> public void endElement(String uri, String local, String raw) {
>
> if (token.length() > 0) {
> @@ -319,7 +320,7 @@
> case ELEM_EXCEPTIONS:
> exception.add(word);
> exception = normalizeException(exception);
> - consumer.addException(getExceptionWord(exception),
> + consumer.addException(getExceptionWord(exception),
> (ArrayList) exception.clone());
> break;
> case ELEM_PATTERNS:
> @@ -344,6 +345,7 @@
> /**
> * @see org.xml.sax.ContentHandler#characters(char[], int, int)
> */
> + @SuppressWarnings("unchecked")
> @Override
> public void characters(char ch[], int start, int length) {
> StringBuffer chars = new StringBuffer(length);
> @@ -428,7 +430,7 @@
> System.out.println("class: " + c);
> }
>
> - public void addException(String w, ArrayList e) {
> + public void addException(String w, ArrayList<Object> e) {
> System.out.println("exception: " + w + " : " + e.toString());
> }
>
>
> Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/hyphenation/TernaryTree.java
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/
> TernaryTree.java?rev=917067&r1=917066&r2=917067&view=diff
> =======================================================================
> =======
> ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/hyphenation/TernaryTree.java (original)
> +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/compound/hyphenation/TernaryTree.java Sat Feb 27
> 22:51:44 2010
> @@ -351,10 +351,10 @@
> @Override
> public Object clone() {
> TernaryTree t = new TernaryTree();
> - t.lo = (char[]) this.lo.clone();
> - t.hi = (char[]) this.hi.clone();
> - t.eq = (char[]) this.eq.clone();
> - t.sc = (char[]) this.sc.clone();
> + t.lo = this.lo.clone();
> + t.hi = this.hi.clone();
> + t.eq = this.eq.clone();
> + t.sc = this.sc.clone();
> t.kv = (CharVector) this.kv.clone();
> t.root = this.root;
> t.freenode = this.freenode;
>
> Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/cz/CzechAnalyzer.java
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java
> ?rev=917067&r1=917066&r2=917067&view=diff
> =======================================================================
> =======
> ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/cz/CzechAnalyzer.java (original)
> +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/cz/CzechAnalyzer.java Sat Feb 27 22:51:44 2010
> @@ -18,7 +18,6 @@
> */
>
> import org.apache.lucene.analysis.ReusableAnalyzerBase;
> -import
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents;
> // javadoc @link
> import org.apache.lucene.analysis.Analyzer;
> import org.apache.lucene.analysis.CharArraySet;
> import org.apache.lucene.analysis.KeywordMarkerTokenFilter;
> @@ -216,16 +215,20 @@
> stoptable = Collections.emptySet();
> }
> }
> +
> /**
> - * Creates {@link TokenStreamComponents} used to tokenize all the
> text in the provided
> - * {@link Reader}.
> - *
> - * @return {@link TokenStreamComponents} built from a {@link
> StandardTokenizer}
> - * filtered with {@link StandardFilter}, {@link
> LowerCaseFilter},
> - * {@link StopFilter}, and {@link CzechStemFilter} (only if
> version is
> - * >= LUCENE_31). If a version is >= LUCENE_31 and a stem
> exclusion set
> - * is provided via {@link #CzechAnalyzer(Version, Set, Set)}
> a
> - * {@link KeywordMarkerTokenFilter} is added before {@link
> CzechStemFilter}.
> + * Creates
> + * {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * used to tokenize all the text in the provided {@link Reader}.
> + *
> + * @return {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * built from a {@link StandardTokenizer} filtered with
> + * {@link StandardFilter}, {@link LowerCaseFilter}, {@link
> StopFilter}
> + * , and {@link CzechStemFilter} (only if version is >=
> LUCENE_31). If
> + * a version is >= LUCENE_31 and a stem exclusion set is
> provided via
> + * {@link #CzechAnalyzer(Version, Set, Set)} a
> + * {@link KeywordMarkerTokenFilter} is added before
> + * {@link CzechStemFilter}.
> */
> @Override
> protected TokenStreamComponents createComponents(String fieldName,
>
> Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/da/DanishAnalyzer.java
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/java/org/apache/lucene/analysis/da/DanishAnalyzer.jav
> a?rev=917067&r1=917066&r2=917067&view=diff
> =======================================================================
> =======
> ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/da/DanishAnalyzer.java (original)
> +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/da/DanishAnalyzer.java Sat Feb 27 22:51:44 2010
> @@ -30,7 +30,6 @@
> import org.apache.lucene.analysis.TokenStream;
> import org.apache.lucene.analysis.Tokenizer;
> import org.apache.lucene.analysis.WordlistLoader;
> -import
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents;
> // javadoc @link
> import org.apache.lucene.analysis.snowball.SnowballFilter;
> import org.apache.lucene.analysis.standard.StandardFilter;
> import org.apache.lucene.analysis.standard.StandardTokenizer;
> @@ -106,13 +105,16 @@
> }
>
> /**
> - * Creates a {@link TokenStreamComponents} which tokenizes all the
> text in the provided
> - * {@link Reader}.
> + * Creates a
> + * {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * which tokenizes all the text in the provided {@link Reader}.
> *
> - * @return A {@link TokenStreamComponents} built from an {@link
> StandardTokenizer}
> - * filtered with {@link StandardFilter}, {@link
> LowerCaseFilter},
> - * {@link StopFilter}, {@link KeywordMarkerTokenFilter} if a
> stem
> - * exclusion set is provided and {@link SnowballFilter}.
> + * @return A
> + * {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * built from an {@link StandardTokenizer} filtered with
> + * {@link StandardFilter}, {@link LowerCaseFilter}, {@link
> StopFilter}
> + * , {@link KeywordMarkerTokenFilter} if a stem exclusion
> set is
> + * provided and {@link SnowballFilter}.
> */
> @Override
> protected TokenStreamComponents createComponents(String fieldName,
>
> Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/de/GermanAnalyzer.java
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.jav
> a?rev=917067&r1=917066&r2=917067&view=diff
> =======================================================================
> =======
> ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/de/GermanAnalyzer.java (original)
> +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/de/GermanAnalyzer.java Sat Feb 27 22:51:44 2010
> @@ -29,7 +29,6 @@
> import org.apache.lucene.analysis.Analyzer;
> import org.apache.lucene.analysis.CharArraySet;
> import org.apache.lucene.analysis.LowerCaseFilter;
> -import
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents;
> // javadoc @link
> import org.apache.lucene.analysis.KeywordMarkerTokenFilter;
> import org.apache.lucene.analysis.StopFilter;
> import org.apache.lucene.analysis.StopwordAnalyzerBase;
> @@ -222,16 +221,17 @@
> exclusionSet = WordlistLoader.getWordSet(exclusionlist);
> setPreviousTokenStream(null); // force a new stemmer to be created
> }
> -
> +
> /**
> - * Creates {@link TokenStreamComponents} used to tokenize all the
> text in the
> - * provided {@link Reader}.
> + * Creates
> + * {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * used to tokenize all the text in the provided {@link Reader}.
> *
> - * @return {@link TokenStreamComponents} built from a
> - * {@link StandardTokenizer} filtered with {@link
> StandardFilter},
> - * {@link LowerCaseFilter}, {@link StopFilter},
> - * {@link KeywordMarkerTokenFilter} if a stem exclusion set
> is provided, and
> - * {@link SnowballFilter}
> + * @return {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * built from a {@link StandardTokenizer} filtered with
> + * {@link StandardFilter}, {@link LowerCaseFilter}, {@link
> StopFilter}
> + * , {@link KeywordMarkerTokenFilter} if a stem exclusion
> set is
> + * provided, and {@link SnowballFilter}
> */
> @Override
> protected TokenStreamComponents createComponents(String fieldName,
>
> Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/el/GreekAnalyzer.java
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java
> ?rev=917067&r1=917066&r2=917067&view=diff
> =======================================================================
> =======
> ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/el/GreekAnalyzer.java (original)
> +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/el/GreekAnalyzer.java Sat Feb 27 22:51:44 2010
> @@ -19,7 +19,6 @@
>
> import org.apache.lucene.analysis.Analyzer;
> import org.apache.lucene.analysis.CharArraySet;
> -import
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents;
> // javadoc @link
> import org.apache.lucene.analysis.StopFilter;
> import org.apache.lucene.analysis.StopwordAnalyzerBase;
> import org.apache.lucene.analysis.TokenStream;
> @@ -120,15 +119,17 @@
> {
> this(matchVersion, stopwords.keySet());
> }
> -
> - /**
> - * Creates {@link TokenStreamComponents} used to tokenize all the
> text in the
> - * provided {@link Reader}.
> - *
> - * @return {@link TokenStreamComponents} built from a
> - * {@link StandardTokenizer} filtered with
> - * {@link GreekLowerCaseFilter}, {@link StandardFilter} and
> {@link StopFilter}
> - */
> +
> + /**
> + * Creates
> + * {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * used to tokenize all the text in the provided {@link Reader}.
> + *
> + * @return {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * built from a {@link StandardTokenizer} filtered with
> + * {@link GreekLowerCaseFilter}, {@link StandardFilter} and
> + * {@link StopFilter}
> + */
> @Override
> protected TokenStreamComponents createComponents(String fieldName,
> Reader reader) {
>
> Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/en/EnglishAnalyzer.java
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/java/org/apache/lucene/analysis/en/EnglishAnalyzer.ja
> va?rev=917067&r1=917066&r2=917067&view=diff
> =======================================================================
> =======
> ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/en/EnglishAnalyzer.java (original)
> +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/en/EnglishAnalyzer.java Sat Feb 27 22:51:44 2010
> @@ -29,7 +29,6 @@
> import org.apache.lucene.analysis.StopwordAnalyzerBase;
> import org.apache.lucene.analysis.TokenStream;
> import org.apache.lucene.analysis.Tokenizer;
> -import
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents;
> // javadoc @link
> import org.apache.lucene.analysis.standard.StandardAnalyzer;
> import org.apache.lucene.analysis.standard.StandardFilter;
> import org.apache.lucene.analysis.standard.StandardTokenizer;
> @@ -90,13 +89,16 @@
> }
>
> /**
> - * Creates a {@link TokenStreamComponents} which tokenizes all the
> text in the provided
> - * {@link Reader}.
> + * Creates a
> + * {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * which tokenizes all the text in the provided {@link Reader}.
> *
> - * @return A {@link TokenStreamComponents} built from an {@link
> StandardTokenizer}
> - * filtered with {@link StandardFilter}, {@link
> LowerCaseFilter},
> - * {@link StopFilter}, {@link KeywordMarkerTokenFilter} if a
> stem
> - * exclusion set is provided and {@link PorterStemFilter}.
> + * @return A
> + * {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * built from an {@link StandardTokenizer} filtered with
> + * {@link StandardFilter}, {@link LowerCaseFilter}, {@link
> StopFilter}
> + * , {@link KeywordMarkerTokenFilter} if a stem exclusion
> set is
> + * provided and {@link PorterStemFilter}.
> */
> @Override
> protected TokenStreamComponents createComponents(String fieldName,
>
> Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/es/SpanishAnalyzer.java
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/java/org/apache/lucene/analysis/es/SpanishAnalyzer.ja
> va?rev=917067&r1=917066&r2=917067&view=diff
> =======================================================================
> =======
> ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/es/SpanishAnalyzer.java (original)
> +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/es/SpanishAnalyzer.java Sat Feb 27 22:51:44 2010
> @@ -30,7 +30,6 @@
> import org.apache.lucene.analysis.TokenStream;
> import org.apache.lucene.analysis.Tokenizer;
> import org.apache.lucene.analysis.WordlistLoader;
> -import
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents;
> // javadoc @link
> import org.apache.lucene.analysis.snowball.SnowballFilter;
> import org.apache.lucene.analysis.standard.StandardFilter;
> import org.apache.lucene.analysis.standard.StandardTokenizer;
> @@ -106,13 +105,16 @@
> }
>
> /**
> - * Creates a {@link TokenStreamComponents} which tokenizes all the
> text in the provided
> - * {@link Reader}.
> + * Creates a
> + * {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * which tokenizes all the text in the provided {@link Reader}.
> *
> - * @return A {@link TokenStreamComponents} built from an {@link
> StandardTokenizer}
> - * filtered with {@link StandardFilter}, {@link
> LowerCaseFilter},
> - * {@link StopFilter}, {@link KeywordMarkerTokenFilter} if a
> stem
> - * exclusion set is provided and {@link SnowballFilter}.
> + * @return A
> + * {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * built from an {@link StandardTokenizer} filtered with
> + * {@link StandardFilter}, {@link LowerCaseFilter}, {@link
> StopFilter}
> + * , {@link KeywordMarkerTokenFilter} if a stem exclusion
> set is
> + * provided and {@link SnowballFilter}.
> */
> @Override
> protected TokenStreamComponents createComponents(String fieldName,
>
> Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/fa/PersianAnalyzer.java
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.ja
> va?rev=917067&r1=917066&r2=917067&view=diff
> =======================================================================
> =======
> ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/fa/PersianAnalyzer.java (original)
> +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/fa/PersianAnalyzer.java Sat Feb 27 22:51:44 2010
> @@ -25,7 +25,6 @@
>
> import org.apache.lucene.analysis.Analyzer;
> import org.apache.lucene.analysis.LowerCaseFilter;
> -import
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents;
> // javadoc @link
> import org.apache.lucene.analysis.StopFilter;
> import org.apache.lucene.analysis.StopwordAnalyzerBase;
> import org.apache.lucene.analysis.TokenStream;
> @@ -136,12 +135,13 @@
> }
>
> /**
> - * Creates {@link TokenStreamComponents} used to tokenize all the
> text in the provided
> - * {@link Reader}.
> + * Creates
> + * {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * used to tokenize all the text in the provided {@link Reader}.
> *
> - * @return {@link TokenStreamComponents} built from a {@link
> ArabicLetterTokenizer}
> - * filtered with {@link LowerCaseFilter},
> - * {@link ArabicNormalizationFilter},
> + * @return {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * built from a {@link ArabicLetterTokenizer} filtered with
> + * {@link LowerCaseFilter}, {@link
> ArabicNormalizationFilter},
> * {@link PersianNormalizationFilter} and Persian Stop words
> */
> @Override
>
> Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/fi/FinnishAnalyzer.java
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/java/org/apache/lucene/analysis/fi/FinnishAnalyzer.ja
> va?rev=917067&r1=917066&r2=917067&view=diff
> =======================================================================
> =======
> ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/fi/FinnishAnalyzer.java (original)
> +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/fi/FinnishAnalyzer.java Sat Feb 27 22:51:44 2010
> @@ -30,7 +30,6 @@
> import org.apache.lucene.analysis.TokenStream;
> import org.apache.lucene.analysis.Tokenizer;
> import org.apache.lucene.analysis.WordlistLoader;
> -import
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents;
> // javadoc @link
> import org.apache.lucene.analysis.snowball.SnowballFilter;
> import org.apache.lucene.analysis.standard.StandardFilter;
> import org.apache.lucene.analysis.standard.StandardTokenizer;
> @@ -106,13 +105,16 @@
> }
>
> /**
> - * Creates a {@link TokenStreamComponents} which tokenizes all the
> text in the provided
> - * {@link Reader}.
> + * Creates a
> + * {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * which tokenizes all the text in the provided {@link Reader}.
> *
> - * @return A {@link TokenStreamComponents} built from an {@link
> StandardTokenizer}
> - * filtered with {@link StandardFilter}, {@link
> LowerCaseFilter},
> - * {@link StopFilter}, {@link KeywordMarkerTokenFilter} if a
> stem
> - * exclusion set is provided and {@link SnowballFilter}.
> + * @return A
> + * {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * built from an {@link StandardTokenizer} filtered with
> + * {@link StandardFilter}, {@link LowerCaseFilter}, {@link
> StopFilter}
> + * , {@link KeywordMarkerTokenFilter} if a stem exclusion
> set is
> + * provided and {@link SnowballFilter}.
> */
> @Override
> protected TokenStreamComponents createComponents(String fieldName,
>
> Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/fr/FrenchAnalyzer.java
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.jav
> a?rev=917067&r1=917066&r2=917067&view=diff
> =======================================================================
> =======
> ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/fr/FrenchAnalyzer.java (original)
> +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/fr/FrenchAnalyzer.java Sat Feb 27 22:51:44 2010
> @@ -20,7 +20,6 @@
> import org.apache.lucene.analysis.Analyzer;
> import org.apache.lucene.analysis.CharArraySet;
> import org.apache.lucene.analysis.LowerCaseFilter;
> -import
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents;
> // javadoc @link
> import org.apache.lucene.analysis.KeywordMarkerTokenFilter;
> import org.apache.lucene.analysis.StopFilter;
> import org.apache.lucene.analysis.StopwordAnalyzerBase;
> @@ -225,14 +224,16 @@
> }
>
> /**
> - * Creates {@link TokenStreamComponents} used to tokenize all the
> text in the provided
> - * {@link Reader}.
> - *
> - * @return {@link TokenStreamComponents} built from a {@link
> StandardTokenizer}
> - * filtered with {@link StandardFilter}, {@link
> ElisionFilter},
> + * Creates
> + * {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * used to tokenize all the text in the provided {@link Reader}.
> + *
> + * @return {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * built from a {@link StandardTokenizer} filtered with
> + * {@link StandardFilter}, {@link ElisionFilter},
> * {@link LowerCaseFilter}, {@link StopFilter},
> - * {@link KeywordMarkerTokenFilter} if a stem exclusion set
> is provided,
> - * and {@link SnowballFilter}
> + * {@link KeywordMarkerTokenFilter} if a stem exclusion set
> is
> + * provided, and {@link SnowballFilter}
> */
> @Override
> protected TokenStreamComponents createComponents(String fieldName,
>
> Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/hi/HindiAnalyzer.java
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java
> ?rev=917067&r1=917066&r2=917067&view=diff
> =======================================================================
> =======
> ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/hi/HindiAnalyzer.java (original)
> +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/hi/HindiAnalyzer.java Sat Feb 27 22:51:44 2010
> @@ -22,7 +22,6 @@
> import java.util.Set;
>
> import org.apache.lucene.analysis.LowerCaseFilter;
> -import
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents;
> // javadoc @link
> import org.apache.lucene.analysis.CharArraySet;
> import org.apache.lucene.analysis.KeywordMarkerTokenFilter;
> import org.apache.lucene.analysis.StopFilter;
> @@ -106,15 +105,16 @@
> }
>
> /**
> - * Creates {@link TokenStreamComponents} used to tokenize all the
> text in the provided
> - * {@link Reader}.
> + * Creates
> + * {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * used to tokenize all the text in the provided {@link Reader}.
> *
> - * @return {@link TokenStreamComponents} built from a {@link
> IndicTokenizer}
> - * filtered with {@link LowerCaseFilter},
> - * {@link IndicNormalizationFilter},
> - * {@link HindiNormalizationFilter},
> - * {@link KeywordMarkerTokenFilter} if a stem exclusion set
> is provided,
> - * {@link HindiStemFilter}, and Hindi Stop words
> + * @return {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * built from a {@link IndicTokenizer} filtered with
> + * {@link LowerCaseFilter}, {@link
> IndicNormalizationFilter},
> + * {@link HindiNormalizationFilter}, {@link
> KeywordMarkerTokenFilter}
> + * if a stem exclusion set is provided, {@link
> HindiStemFilter}, and
> + * Hindi Stop words
> */
> @Override
> protected TokenStreamComponents createComponents(String fieldName,
>
> Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/hu/HungarianAnalyzer.java
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/java/org/apache/lucene/analysis/hu/HungarianAnalyzer.
> java?rev=917067&r1=917066&r2=917067&view=diff
> =======================================================================
> =======
> ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/hu/HungarianAnalyzer.java (original)
> +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/hu/HungarianAnalyzer.java Sat Feb 27 22:51:44 2010
> @@ -30,7 +30,6 @@
> import org.apache.lucene.analysis.TokenStream;
> import org.apache.lucene.analysis.Tokenizer;
> import org.apache.lucene.analysis.WordlistLoader;
> -import
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents;
> // javadoc @link
> import org.apache.lucene.analysis.snowball.SnowballFilter;
> import org.apache.lucene.analysis.standard.StandardFilter;
> import org.apache.lucene.analysis.standard.StandardTokenizer;
> @@ -106,13 +105,16 @@
> }
>
> /**
> - * Creates a {@link TokenStreamComponents} which tokenizes all the
> text in the provided
> - * {@link Reader}.
> + * Creates a
> + * {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * which tokenizes all the text in the provided {@link Reader}.
> *
> - * @return A {@link TokenStreamComponents} built from an {@link
> StandardTokenizer}
> - * filtered with {@link StandardFilter}, {@link
> LowerCaseFilter},
> - * {@link StopFilter}, {@link KeywordMarkerTokenFilter} if a
> stem
> - * exclusion set is provided and {@link SnowballFilter}.
> + * @return A
> + * {@link
> org.apache.lucene.analysis.ReusableAnalyzerBase.TokenStreamComponents}
> + * built from an {@link StandardTokenizer} filtered with
> + * {@link StandardFilter}, {@link LowerCaseFilter}, {@link
> StopFilter}
> + * , {@link KeywordMarkerTokenFilter} if a stem exclusion
> set is
> + * provided and {@link SnowballFilter}.
> */
> @Override
> protected TokenStreamComponents createComponents(String fieldName,
>
---------------------------------------------------------------------
To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: java-dev-help@lucene.apache.org