You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by cc...@apache.org on 2012/04/07 01:37:54 UTC

svn commit: r1310635 [1/8] - in /incubator/lucene.net/trunk: build/vs2010/contrib/ build/vs2010/test/ src/contrib/FastVectorHighlighter/ src/contrib/Highlighter/ src/contrib/Memory/ src/contrib/Memory/Properties/ src/contrib/Queries/ src/contrib/Querie...

Author: ccurrens
Date: Fri Apr  6 23:37:48 2012
New Revision: 1310635

URL: http://svn.apache.org/viewvc?rev=1310635&view=rev
Log:
[LUCENENET-481] Ported Contrib.MemoryIndex and Contrib.MemoryIndex.Test.  Can probably optimize some of the classes better, but it should work well now as a direct port
[LUCENENET-463] Ported Contrib.Highlighter and Contrib.Highlighter.Test.

Added:
    incubator/lucene.net/trunk/build/vs2010/contrib/Contrib.Memory.sln
    incubator/lucene.net/trunk/build/vs2010/test/Contrib.Memory.Test.sln
    incubator/lucene.net/trunk/src/contrib/Highlighter/IFormatter.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/IFragmenter.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/IScorer.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleSpanFragmenter.cs
    incubator/lucene.net/trunk/src/contrib/Memory/
    incubator/lucene.net/trunk/src/contrib/Memory/CollectionsHelper.cs
    incubator/lucene.net/trunk/src/contrib/Memory/Contrib.Memory.csproj
    incubator/lucene.net/trunk/src/contrib/Memory/EmptyCollector.cs
    incubator/lucene.net/trunk/src/contrib/Memory/KeywordTokenStream.cs
    incubator/lucene.net/trunk/src/contrib/Memory/Lucene.Net.snk   (with props)
    incubator/lucene.net/trunk/src/contrib/Memory/MemoryIndex.cs
    incubator/lucene.net/trunk/src/contrib/Memory/MemoryTermEnum.cs
    incubator/lucene.net/trunk/src/contrib/Memory/MemoryTermPositionVector.cs
    incubator/lucene.net/trunk/src/contrib/Memory/MemoryTermPositions.cs
    incubator/lucene.net/trunk/src/contrib/Memory/Properties/
    incubator/lucene.net/trunk/src/contrib/Memory/Properties/AssemblyInfo.cs
    incubator/lucene.net/trunk/src/contrib/Memory/TermComparer.cs
    incubator/lucene.net/trunk/test/contrib/Highlighter/Tokenizer.cs
    incubator/lucene.net/trunk/test/contrib/Memory/
    incubator/lucene.net/trunk/test/contrib/Memory/Contrib.Memory.Test.csproj
    incubator/lucene.net/trunk/test/contrib/Memory/MemoryIndexTest.cs
    incubator/lucene.net/trunk/test/contrib/Memory/Properties/
    incubator/lucene.net/trunk/test/contrib/Memory/Properties/AssemblyInfo.cs
    incubator/lucene.net/trunk/test/contrib/Memory/testqueries.txt
    incubator/lucene.net/trunk/test/contrib/Memory/testqueries2.txt
Removed:
    incubator/lucene.net/trunk/src/contrib/Highlighter/Formatter.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/Fragmenter.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/Scorer.cs
Modified:
    incubator/lucene.net/trunk/build/vs2010/contrib/Contrib.All.sln
    incubator/lucene.net/trunk/build/vs2010/test/Contrib.All.Test.sln
    incubator/lucene.net/trunk/src/contrib/FastVectorHighlighter/FieldQuery.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/Contrib.Highlighter.csproj
    incubator/lucene.net/trunk/src/contrib/Highlighter/DefaultEncoder.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/GradientFormatter.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/Highlighter.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/NullFragmenter.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/QueryScorer.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/QueryTermExtractor.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/QueryTermScorer.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleFragmenter.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleHTMLEncoder.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleHTMLFormatter.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/SpanGradientFormatter.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/TextFragment.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/TokenGroup.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/TokenSources.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/WeightedSpanTerm.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/WeightedSpanTermExtractor.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/WeightedTerm.cs
    incubator/lucene.net/trunk/src/contrib/Queries/BooleanFilter.cs
    incubator/lucene.net/trunk/src/contrib/Queries/BoostingQuery.cs
    incubator/lucene.net/trunk/src/contrib/Queries/FilterClause.cs
    incubator/lucene.net/trunk/src/contrib/Queries/FuzzyLikeThisQuery.cs
    incubator/lucene.net/trunk/src/contrib/Queries/Similar/MoreLikeThis.cs
    incubator/lucene.net/trunk/src/contrib/Queries/Similar/SimilarityQueries.cs
    incubator/lucene.net/trunk/src/contrib/Regex/SpanRegexQuery.cs
    incubator/lucene.net/trunk/src/contrib/Similarity/Similar/MoreLikeThis.cs
    incubator/lucene.net/trunk/src/contrib/Similarity/Similar/SimilarityQueries.cs
    incubator/lucene.net/trunk/src/contrib/SpellChecker/Spell/LuceneDictionary.cs
    incubator/lucene.net/trunk/src/contrib/SpellChecker/Spell/SpellChecker.cs
    incubator/lucene.net/trunk/src/contrib/WordNet/SynExpand/SynExpand.cs
    incubator/lucene.net/trunk/src/contrib/WordNet/SynLookup/SynLookup.cs
    incubator/lucene.net/trunk/src/contrib/WordNet/Syns2Index/Syns2Index.cs
    incubator/lucene.net/trunk/src/core/Index/DirectoryReader.cs
    incubator/lucene.net/trunk/src/core/Index/DocumentsWriter.cs
    incubator/lucene.net/trunk/src/core/Index/ParallelReader.cs
    incubator/lucene.net/trunk/src/core/Index/PositionBasedTermVectorMapper.cs
    incubator/lucene.net/trunk/src/core/Index/SegmentMerger.cs
    incubator/lucene.net/trunk/src/core/Index/SegmentTermDocs.cs
    incubator/lucene.net/trunk/src/core/Index/TermBuffer.cs
    incubator/lucene.net/trunk/src/core/Index/TermInfosWriter.cs
    incubator/lucene.net/trunk/src/core/Index/TermVectorEntry.cs
    incubator/lucene.net/trunk/src/core/Index/TermVectorOffsetInfo.cs
    incubator/lucene.net/trunk/src/core/QueryParser/MultiFieldQueryParser.cs
    incubator/lucene.net/trunk/src/core/QueryParser/QueryParser.cs
    incubator/lucene.net/trunk/src/core/Search/BooleanClause.cs
    incubator/lucene.net/trunk/src/core/Search/BooleanQuery.cs
    incubator/lucene.net/trunk/src/core/Search/FieldCacheRangeFilter.cs
    incubator/lucene.net/trunk/src/core/Search/FilteredTermEnum.cs
    incubator/lucene.net/trunk/src/core/Search/FuzzyQuery.cs
    incubator/lucene.net/trunk/src/core/Search/FuzzyTermEnum.cs
    incubator/lucene.net/trunk/src/core/Search/MultiPhraseQuery.cs
    incubator/lucene.net/trunk/src/core/Search/MultiTermQuery.cs
    incubator/lucene.net/trunk/src/core/Search/NumericRangeQuery.cs
    incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadSpanUtil.cs
    incubator/lucene.net/trunk/src/core/Search/Query.cs
    incubator/lucene.net/trunk/src/core/Search/WildcardQuery.cs
    incubator/lucene.net/trunk/src/core/Support/HashMap.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/AR/TestArabicAnalyzer.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/AR/TestArabicNormalizationFilter.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/AR/TestArabicStemFilter.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Br/TestBrazilianStemmer.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Cjk/TestCJKTokenizer.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Cn/TestChineseTokenizer.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Cz/TestCzechAnalyzer.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/De/TestGermanStemFilter.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/El/GreekAnalyzerTest.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Fa/TestPersianAnalyzer.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Fa/TestPersianNormalizationFilter.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Fr/TestElision.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Fr/TestFrenchAnalyzer.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Miscellaneous/PatternAnalyzerTest.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Miscellaneous/TestPrefixAndSuffixAwareTokenFilter.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Miscellaneous/TestPrefixAwareTokenFilter.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestEdgeNGramTokenFilter.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestEdgeNGramTokenizer.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestNGramTokenFilter.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestNGramTokenizer.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Nl/TestDutchStemmer.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Payloads/NumericPayloadTokenFilterTest.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Payloads/TokenOffsetPayloadTokenFilterTest.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Payloads/TypeAsPayloadTokenFilterTest.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Position/PositionFilterTest.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Query/QueryAutoStopWordAnalyzerTest.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Reverse/TestReverseStringFilter.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Ru/TestRussianAnalyzer.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Shingle/ShingleAnalyzerWrapperTest.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Shingle/ShingleFilterTest.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Shingle/TestShingleMatrixFilter.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Sinks/DateRecognizerSinkTokenizerTest.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Sinks/TokenRangeSinkTokenizerTest.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Sinks/TokenTypeSinkTokenizerTest.cs
    incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/FieldPhraseListTest.cs
    incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/FieldQueryTest.cs
    incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/FieldTermStackTest.cs
    incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/IndexTimeSynonymTest.cs
    incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/Support.cs
    incubator/lucene.net/trunk/test/contrib/Highlighter/Contrib.Highlighter.Test.csproj
    incubator/lucene.net/trunk/test/contrib/Highlighter/HighlighterTest.cs
    incubator/lucene.net/trunk/test/contrib/Queries/BooleanFilterTest.cs
    incubator/lucene.net/trunk/test/contrib/Queries/Similar/TestMoreLikeThis.cs
    incubator/lucene.net/trunk/test/contrib/Snowball/Analysis/Snowball/TestSnowball.cs
    incubator/lucene.net/trunk/test/core/Analysis/BaseTokenStreamTestCase.cs
    incubator/lucene.net/trunk/test/core/Analysis/TestASCIIFoldingFilter.cs
    incubator/lucene.net/trunk/test/core/Analysis/TestAnalyzers.cs
    incubator/lucene.net/trunk/test/core/Analysis/TestCachingTokenFilter.cs
    incubator/lucene.net/trunk/test/core/Analysis/TestISOLatin1AccentFilter.cs
    incubator/lucene.net/trunk/test/core/Analysis/TestKeywordAnalyzer.cs
    incubator/lucene.net/trunk/test/core/Analysis/TestLengthFilter.cs
    incubator/lucene.net/trunk/test/core/Analysis/TestMappingCharFilter.cs
    incubator/lucene.net/trunk/test/core/Analysis/TestNumericTokenStream.cs
    incubator/lucene.net/trunk/test/core/Analysis/TestPerFieldAnalzyerWrapper.cs
    incubator/lucene.net/trunk/test/core/Analysis/TestStandardAnalyzer.cs
    incubator/lucene.net/trunk/test/core/Analysis/TestStopAnalyzer.cs
    incubator/lucene.net/trunk/test/core/Analysis/TestStopFilter.cs
    incubator/lucene.net/trunk/test/core/Analysis/TestTeeSinkTokenFilter.cs
    incubator/lucene.net/trunk/test/core/Index/TestDocumentWriter.cs
    incubator/lucene.net/trunk/test/core/Index/TestFilterIndexReader.cs
    incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs
    incubator/lucene.net/trunk/test/core/Index/TestOmitTf.cs
    incubator/lucene.net/trunk/test/core/Index/TestParallelReader.cs
    incubator/lucene.net/trunk/test/core/Index/TestPayloads.cs
    incubator/lucene.net/trunk/test/core/Index/TestTerm.cs
    incubator/lucene.net/trunk/test/core/QueryParser/TestMultiAnalyzer.cs
    incubator/lucene.net/trunk/test/core/QueryParser/TestMultiFieldQueryParser.cs
    incubator/lucene.net/trunk/test/core/QueryParser/TestQueryParser.cs
    incubator/lucene.net/trunk/test/core/Search/Payloads/TestPayloadTermQuery.cs
    incubator/lucene.net/trunk/test/core/Search/Spans/TestBasics.cs
    incubator/lucene.net/trunk/test/core/Search/Spans/TestSpansAdvanced.cs
    incubator/lucene.net/trunk/test/core/Search/Spans/TestSpansAdvanced2.cs
    incubator/lucene.net/trunk/test/core/Search/TestBoolean2.cs
    incubator/lucene.net/trunk/test/core/Search/TestBooleanMinShouldMatch.cs
    incubator/lucene.net/trunk/test/core/Search/TestBooleanOr.cs
    incubator/lucene.net/trunk/test/core/Search/TestBooleanPrefixQuery.cs
    incubator/lucene.net/trunk/test/core/Search/TestBooleanQuery.cs
    incubator/lucene.net/trunk/test/core/Search/TestBooleanScorer.cs
    incubator/lucene.net/trunk/test/core/Search/TestComplexExplanations.cs
    incubator/lucene.net/trunk/test/core/Search/TestCustomSearcherSort.cs
    incubator/lucene.net/trunk/test/core/Search/TestDisjunctionMaxQuery.cs
    incubator/lucene.net/trunk/test/core/Search/TestElevationComparator.cs
    incubator/lucene.net/trunk/test/core/Search/TestExplanations.cs
    incubator/lucene.net/trunk/test/core/Search/TestFilteredQuery.cs
    incubator/lucene.net/trunk/test/core/Search/TestFilteredSearch.cs
    incubator/lucene.net/trunk/test/core/Search/TestMatchAllDocsQuery.cs
    incubator/lucene.net/trunk/test/core/Search/TestMultiPhraseQuery.cs
    incubator/lucene.net/trunk/test/core/Search/TestMultiTermConstantScore.cs
    incubator/lucene.net/trunk/test/core/Search/TestPhraseQuery.cs
    incubator/lucene.net/trunk/test/core/Search/TestPositionIncrement.cs
    incubator/lucene.net/trunk/test/core/Search/TestPrefixInBooleanQuery.cs
    incubator/lucene.net/trunk/test/core/Search/TestQueryWrapperFilter.cs
    incubator/lucene.net/trunk/test/core/Search/TestScorerPerf.cs
    incubator/lucene.net/trunk/test/core/Search/TestSimilarity.cs
    incubator/lucene.net/trunk/test/core/Search/TestSimpleExplanations.cs
    incubator/lucene.net/trunk/test/core/Search/TestSort.cs
    incubator/lucene.net/trunk/test/core/Search/TestTopScoreDocCollector.cs
    incubator/lucene.net/trunk/test/core/Search/TestWildcard.cs
    incubator/lucene.net/trunk/test/core/Support/TestOldPatches.cs
    incubator/lucene.net/trunk/test/core/Support/TestSerialization.cs
    incubator/lucene.net/trunk/test/core/TestDemo.cs

Modified: incubator/lucene.net/trunk/build/vs2010/contrib/Contrib.All.sln
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/build/vs2010/contrib/Contrib.All.sln?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/build/vs2010/contrib/Contrib.All.sln (original)
+++ incubator/lucene.net/trunk/build/vs2010/contrib/Contrib.All.sln Fri Apr  6 23:37:48 2012
@@ -51,52 +51,18 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleFacetedSearch", "..\..\..\src\contrib\SimpleFacetedSearch\SimpleFacetedSearch.csproj", "{66772190-FB3F-48F5-8E05-0B302BACEA73}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contrib.Memory", "..\..\..\src\contrib\Memory\Contrib.Memory.csproj", "{112B9A7C-29CC-4539-8F5A-45669C07CD4D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FEF899EB-610C-4D3C-A556-A01F56F4AFE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FEF899EB-610C-4D3C-A556-A01F56F4AFE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FEF899EB-610C-4D3C-A556-A01F56F4AFE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FEF899EB-610C-4D3C-A556-A01F56F4AFE0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4286E961-9143-4821-B46D-3D39D3736386}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4286E961-9143-4821-B46D-3D39D3736386}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4286E961-9143-4821-B46D-3D39D3736386}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4286E961-9143-4821-B46D-3D39D3736386}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9D2E3153-076F-49C5-B83D-FB2573536B5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9D2E3153-076F-49C5-B83D-FB2573536B5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9D2E3153-076F-49C5-B83D-FB2573536B5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9D2E3153-076F-49C5-B83D-FB2573536B5F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{901D5415-383C-4AA6-A256-879558841BEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{901D5415-383C-4AA6-A256-879558841BEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{901D5415-383C-4AA6-A256-879558841BEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{901D5415-383C-4AA6-A256-879558841BEA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{481CF6E3-52AF-4621-9DEB-022122079AF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{481CF6E3-52AF-4621-9DEB-022122079AF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{481CF6E3-52AF-4621-9DEB-022122079AF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{481CF6E3-52AF-4621-9DEB-022122079AF6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B9C12C92-199A-426E-B892-3531E2600217}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B9C12C92-199A-426E-B892-3531E2600217}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B9C12C92-199A-426E-B892-3531E2600217}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B9C12C92-199A-426E-B892-3531E2600217}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8F9D7A92-F122-413E-9D8D-027E4ECD327C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8F9D7A92-F122-413E-9D8D-027E4ECD327C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8F9D7A92-F122-413E-9D8D-027E4ECD327C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8F9D7A92-F122-413E-9D8D-027E4ECD327C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{35C347F4-24B2-4BE5-8117-A0E3001551CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{35C347F4-24B2-4BE5-8117-A0E3001551CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{35C347F4-24B2-4BE5-8117-A0E3001551CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{35C347F4-24B2-4BE5-8117-A0E3001551CE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FF45EE91-9CA3-443D-8231-75E9FA1AF40E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FF45EE91-9CA3-443D-8231-75E9FA1AF40E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF45EE91-9CA3-443D-8231-75E9FA1AF40E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FF45EE91-9CA3-443D-8231-75E9FA1AF40E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{112B9A7C-29CC-4539-8F5A-45669C07CD4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{112B9A7C-29CC-4539-8F5A-45669C07CD4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{112B9A7C-29CC-4539-8F5A-45669C07CD4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{112B9A7C-29CC-4539-8F5A-45669C07CD4D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1407C9BA-337C-4C6C-B065-68328D3871B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1407C9BA-337C-4C6C-B065-68328D3871B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1407C9BA-337C-4C6C-B065-68328D3871B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -105,18 +71,58 @@ Global
 		{2CA12E3F-76E1-4FA6-9E87-37079A7B7C69}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2CA12E3F-76E1-4FA6-9E87-37079A7B7C69}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2CA12E3F-76E1-4FA6-9E87-37079A7B7C69}.Release|Any CPU.Build.0 = Release|Any CPU
+		{35C347F4-24B2-4BE5-8117-A0E3001551CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{35C347F4-24B2-4BE5-8117-A0E3001551CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{35C347F4-24B2-4BE5-8117-A0E3001551CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{35C347F4-24B2-4BE5-8117-A0E3001551CE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4286E961-9143-4821-B46D-3D39D3736386}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4286E961-9143-4821-B46D-3D39D3736386}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4286E961-9143-4821-B46D-3D39D3736386}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4286E961-9143-4821-B46D-3D39D3736386}.Release|Any CPU.Build.0 = Release|Any CPU
+		{481CF6E3-52AF-4621-9DEB-022122079AF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{481CF6E3-52AF-4621-9DEB-022122079AF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{481CF6E3-52AF-4621-9DEB-022122079AF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{481CF6E3-52AF-4621-9DEB-022122079AF6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.Build.0 = Release|Any CPU
+		{66772190-FB3F-48F5-8E05-0B302BACEA73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{66772190-FB3F-48F5-8E05-0B302BACEA73}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{66772190-FB3F-48F5-8E05-0B302BACEA73}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{66772190-FB3F-48F5-8E05-0B302BACEA73}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7563D4D9-AE91-42BA-A270-1D264660F6DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7563D4D9-AE91-42BA-A270-1D264660F6DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7563D4D9-AE91-42BA-A270-1D264660F6DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7563D4D9-AE91-42BA-A270-1D264660F6DF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8F9D7A92-F122-413E-9D8D-027E4ECD327C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F9D7A92-F122-413E-9D8D-027E4ECD327C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F9D7A92-F122-413E-9D8D-027E4ECD327C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8F9D7A92-F122-413E-9D8D-027E4ECD327C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{901D5415-383C-4AA6-A256-879558841BEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{901D5415-383C-4AA6-A256-879558841BEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{901D5415-383C-4AA6-A256-879558841BEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{901D5415-383C-4AA6-A256-879558841BEA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D2E3153-076F-49C5-B83D-FB2573536B5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D2E3153-076F-49C5-B83D-FB2573536B5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D2E3153-076F-49C5-B83D-FB2573536B5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D2E3153-076F-49C5-B83D-FB2573536B5F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A26BD3B7-DF90-43B4-99E2-6A617CDE1579}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A26BD3B7-DF90-43B4-99E2-6A617CDE1579}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A26BD3B7-DF90-43B4-99E2-6A617CDE1579}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A26BD3B7-DF90-43B4-99E2-6A617CDE1579}.Release|Any CPU.Build.0 = Release|Any CPU
-		{66772190-FB3F-48F5-8E05-0B302BACEA73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{66772190-FB3F-48F5-8E05-0B302BACEA73}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{66772190-FB3F-48F5-8E05-0B302BACEA73}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{66772190-FB3F-48F5-8E05-0B302BACEA73}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9C12C92-199A-426E-B892-3531E2600217}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9C12C92-199A-426E-B892-3531E2600217}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9C12C92-199A-426E-B892-3531E2600217}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9C12C92-199A-426E-B892-3531E2600217}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FEF899EB-610C-4D3C-A556-A01F56F4AFE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FEF899EB-610C-4D3C-A556-A01F56F4AFE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FEF899EB-610C-4D3C-A556-A01F56F4AFE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FEF899EB-610C-4D3C-A556-A01F56F4AFE0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FF45EE91-9CA3-443D-8231-75E9FA1AF40E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FF45EE91-9CA3-443D-8231-75E9FA1AF40E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FF45EE91-9CA3-443D-8231-75E9FA1AF40E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FF45EE91-9CA3-443D-8231-75E9FA1AF40E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Added: incubator/lucene.net/trunk/build/vs2010/contrib/Contrib.Memory.sln
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/build/vs2010/contrib/Contrib.Memory.sln?rev=1310635&view=auto
==============================================================================
--- incubator/lucene.net/trunk/build/vs2010/contrib/Contrib.Memory.sln (added)
+++ incubator/lucene.net/trunk/build/vs2010/contrib/Contrib.Memory.sln Fri Apr  6 23:37:48 2012
@@ -0,0 +1,46 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual C# Express 2010
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lucene.Net", "..\..\..\src\core\Lucene.Net.csproj", "{5D4AD9BE-1FFB-41AB-9943-25737971BF57}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contrib.Memory", "..\..\..\src\contrib\Memory\Contrib.Memory.csproj", "{112B9A7C-29CC-4539-8F5A-45669C07CD4D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{112B9A7C-29CC-4539-8F5A-45669C07CD4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{112B9A7C-29CC-4539-8F5A-45669C07CD4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{112B9A7C-29CC-4539-8F5A-45669C07CD4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{112B9A7C-29CC-4539-8F5A-45669C07CD4D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Modified: incubator/lucene.net/trunk/build/vs2010/test/Contrib.All.Test.sln
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/build/vs2010/test/Contrib.All.Test.sln?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/build/vs2010/test/Contrib.All.Test.sln (original)
+++ incubator/lucene.net/trunk/build/vs2010/test/Contrib.All.Test.sln Fri Apr  6 23:37:48 2012
@@ -1,6 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+# Visual C# Express 2010
 #
 #
 # Licensed to the Apache Software Foundation (ASF) under one
@@ -69,106 +69,120 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contrib.Similarity", "..\..\..\src\contrib\Similarity\Contrib.Similarity.csproj", "{B9C12C92-199A-426E-B892-3531E2600217}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contrib.Memory", "..\..\..\src\contrib\Memory\Contrib.Memory.csproj", "{112B9A7C-29CC-4539-8F5A-45669C07CD4D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contrib.Memory.Test", "..\..\..\test\contrib\Memory\Contrib.Memory.Test.csproj", "{66C13054-FF41-4C1D-BD0D-8DA009D1DFFD}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FEF899EB-610C-4D3C-A556-A01F56F4AFE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FEF899EB-610C-4D3C-A556-A01F56F4AFE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FEF899EB-610C-4D3C-A556-A01F56F4AFE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FEF899EB-610C-4D3C-A556-A01F56F4AFE0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{112B9A7C-29CC-4539-8F5A-45669C07CD4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{112B9A7C-29CC-4539-8F5A-45669C07CD4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{112B9A7C-29CC-4539-8F5A-45669C07CD4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{112B9A7C-29CC-4539-8F5A-45669C07CD4D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FC2A6B-4DE9-403F-8CEF-10850F57B96E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FC2A6B-4DE9-403F-8CEF-10850F57B96E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FC2A6B-4DE9-403F-8CEF-10850F57B96E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FC2A6B-4DE9-403F-8CEF-10850F57B96E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{31E10ECB-1385-4C06-970B-2C030FBD4893}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{31E10ECB-1385-4C06-970B-2C030FBD4893}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31E10ECB-1385-4C06-970B-2C030FBD4893}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{31E10ECB-1385-4C06-970B-2C030FBD4893}.Release|Any CPU.Build.0 = Release|Any CPU
+		{33ED01FD-A87C-4208-BA49-2586EFE32974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{33ED01FD-A87C-4208-BA49-2586EFE32974}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{33ED01FD-A87C-4208-BA49-2586EFE32974}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{33ED01FD-A87C-4208-BA49-2586EFE32974}.Release|Any CPU.Build.0 = Release|Any CPU
+		{35C347F4-24B2-4BE5-8117-A0E3001551CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{35C347F4-24B2-4BE5-8117-A0E3001551CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{35C347F4-24B2-4BE5-8117-A0E3001551CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{35C347F4-24B2-4BE5-8117-A0E3001551CE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4286E961-9143-4821-B46D-3D39D3736386}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4286E961-9143-4821-B46D-3D39D3736386}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4286E961-9143-4821-B46D-3D39D3736386}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4286E961-9143-4821-B46D-3D39D3736386}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9D2E3153-076F-49C5-B83D-FB2573536B5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9D2E3153-076F-49C5-B83D-FB2573536B5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9D2E3153-076F-49C5-B83D-FB2573536B5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9D2E3153-076F-49C5-B83D-FB2573536B5F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{901D5415-383C-4AA6-A256-879558841BEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{901D5415-383C-4AA6-A256-879558841BEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{901D5415-383C-4AA6-A256-879558841BEA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{481CF6E3-52AF-4621-9DEB-022122079AF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{481CF6E3-52AF-4621-9DEB-022122079AF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{481CF6E3-52AF-4621-9DEB-022122079AF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{481CF6E3-52AF-4621-9DEB-022122079AF6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8F9D7A92-F122-413E-9D8D-027E4ECD327C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8F9D7A92-F122-413E-9D8D-027E4ECD327C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8F9D7A92-F122-413E-9D8D-027E4ECD327C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8F9D7A92-F122-413E-9D8D-027E4ECD327C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{35C347F4-24B2-4BE5-8117-A0E3001551CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{35C347F4-24B2-4BE5-8117-A0E3001551CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{35C347F4-24B2-4BE5-8117-A0E3001551CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{35C347F4-24B2-4BE5-8117-A0E3001551CE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FF45EE91-9CA3-443D-8231-75E9FA1AF40E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FF45EE91-9CA3-443D-8231-75E9FA1AF40E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF45EE91-9CA3-443D-8231-75E9FA1AF40E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FF45EE91-9CA3-443D-8231-75E9FA1AF40E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4DCB81AA-ECC1-4B3D-A0C9-28E54F5B125C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4DCB81AA-ECC1-4B3D-A0C9-28E54F5B125C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4DCB81AA-ECC1-4B3D-A0C9-28E54F5B125C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4DCB81AA-ECC1-4B3D-A0C9-28E54F5B125C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.Build.0 = Release|Any CPU
+		{66772190-FB3F-48F5-8E05-0B302BACEA73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{66772190-FB3F-48F5-8E05-0B302BACEA73}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{66772190-FB3F-48F5-8E05-0B302BACEA73}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{66772190-FB3F-48F5-8E05-0B302BACEA73}.Release|Any CPU.Build.0 = Release|Any CPU
+		{66C13054-FF41-4C1D-BD0D-8DA009D1DFFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{66C13054-FF41-4C1D-BD0D-8DA009D1DFFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{66C13054-FF41-4C1D-BD0D-8DA009D1DFFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{66C13054-FF41-4C1D-BD0D-8DA009D1DFFD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{67D27628-F1D5-4499-9818-B669731925C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{67D27628-F1D5-4499-9818-B669731925C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{67D27628-F1D5-4499-9818-B669731925C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{67D27628-F1D5-4499-9818-B669731925C8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AAF68BCF-F781-45FC-98B3-2B9CEE411E01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AAF68BCF-F781-45FC-98B3-2B9CEE411E01}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AAF68BCF-F781-45FC-98B3-2B9CEE411E01}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AAF68BCF-F781-45FC-98B3-2B9CEE411E01}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A065904B-1EBA-48DA-8D3D-D92A85BA41FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A065904B-1EBA-48DA-8D3D-D92A85BA41FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A065904B-1EBA-48DA-8D3D-D92A85BA41FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A065904B-1EBA-48DA-8D3D-D92A85BA41FC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{33ED01FD-A87C-4208-BA49-2586EFE32974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{33ED01FD-A87C-4208-BA49-2586EFE32974}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{33ED01FD-A87C-4208-BA49-2586EFE32974}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{33ED01FD-A87C-4208-BA49-2586EFE32974}.Release|Any CPU.Build.0 = Release|Any CPU
-		{31E10ECB-1385-4C06-970B-2C030FBD4893}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{31E10ECB-1385-4C06-970B-2C030FBD4893}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{31E10ECB-1385-4C06-970B-2C030FBD4893}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8685A826-9B7A-42C8-88F3-EEE6B41D6D81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8685A826-9B7A-42C8-88F3-EEE6B41D6D81}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8685A826-9B7A-42C8-88F3-EEE6B41D6D81}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8685A826-9B7A-42C8-88F3-EEE6B41D6D81}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8F9D7A92-F122-413E-9D8D-027E4ECD327C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F9D7A92-F122-413E-9D8D-027E4ECD327C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F9D7A92-F122-413E-9D8D-027E4ECD327C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8F9D7A92-F122-413E-9D8D-027E4ECD327C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{901D5415-383C-4AA6-A256-879558841BEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{901D5415-383C-4AA6-A256-879558841BEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{901D5415-383C-4AA6-A256-879558841BEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{901D5415-383C-4AA6-A256-879558841BEA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{992216FA-372D-4412-8D7C-E252AE042F48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{992216FA-372D-4412-8D7C-E252AE042F48}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{992216FA-372D-4412-8D7C-E252AE042F48}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{992216FA-372D-4412-8D7C-E252AE042F48}.Release|Any CPU.Build.0 = Release|Any CPU
-		{19FC2A6B-4DE9-403F-8CEF-10850F57B96E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{19FC2A6B-4DE9-403F-8CEF-10850F57B96E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{19FC2A6B-4DE9-403F-8CEF-10850F57B96E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{19FC2A6B-4DE9-403F-8CEF-10850F57B96E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4DCB81AA-ECC1-4B3D-A0C9-28E54F5B125C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4DCB81AA-ECC1-4B3D-A0C9-28E54F5B125C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4DCB81AA-ECC1-4B3D-A0C9-28E54F5B125C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4DCB81AA-ECC1-4B3D-A0C9-28E54F5B125C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F04CA2F4-E182-46A8-B914-F46AF5319E83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F04CA2F4-E182-46A8-B914-F46AF5319E83}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F04CA2F4-E182-46A8-B914-F46AF5319E83}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F04CA2F4-E182-46A8-B914-F46AF5319E83}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F1875552-0E59-46AA-976E-6183733FD2AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F1875552-0E59-46AA-976E-6183733FD2AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1875552-0E59-46AA-976E-6183733FD2AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F1875552-0E59-46AA-976E-6183733FD2AB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D2E3153-076F-49C5-B83D-FB2573536B5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D2E3153-076F-49C5-B83D-FB2573536B5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D2E3153-076F-49C5-B83D-FB2573536B5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D2E3153-076F-49C5-B83D-FB2573536B5F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A065904B-1EBA-48DA-8D3D-D92A85BA41FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A065904B-1EBA-48DA-8D3D-D92A85BA41FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A065904B-1EBA-48DA-8D3D-D92A85BA41FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A065904B-1EBA-48DA-8D3D-D92A85BA41FC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A26BD3B7-DF90-43B4-99E2-6A617CDE1579}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A26BD3B7-DF90-43B4-99E2-6A617CDE1579}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A26BD3B7-DF90-43B4-99E2-6A617CDE1579}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A26BD3B7-DF90-43B4-99E2-6A617CDE1579}.Release|Any CPU.Build.0 = Release|Any CPU
-		{66772190-FB3F-48F5-8E05-0B302BACEA73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{66772190-FB3F-48F5-8E05-0B302BACEA73}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{66772190-FB3F-48F5-8E05-0B302BACEA73}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{66772190-FB3F-48F5-8E05-0B302BACEA73}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D8CC9461-64E0-416E-BA6E-1DF6FA66CBF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D8CC9461-64E0-416E-BA6E-1DF6FA66CBF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D8CC9461-64E0-416E-BA6E-1DF6FA66CBF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D8CC9461-64E0-416E-BA6E-1DF6FA66CBF5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AAF68BCF-F781-45FC-98B3-2B9CEE411E01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AAF68BCF-F781-45FC-98B3-2B9CEE411E01}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AAF68BCF-F781-45FC-98B3-2B9CEE411E01}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AAF68BCF-F781-45FC-98B3-2B9CEE411E01}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B9C12C92-199A-426E-B892-3531E2600217}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B9C12C92-199A-426E-B892-3531E2600217}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B9C12C92-199A-426E-B892-3531E2600217}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B9C12C92-199A-426E-B892-3531E2600217}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D8CC9461-64E0-416E-BA6E-1DF6FA66CBF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D8CC9461-64E0-416E-BA6E-1DF6FA66CBF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D8CC9461-64E0-416E-BA6E-1DF6FA66CBF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D8CC9461-64E0-416E-BA6E-1DF6FA66CBF5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F04CA2F4-E182-46A8-B914-F46AF5319E83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F04CA2F4-E182-46A8-B914-F46AF5319E83}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F04CA2F4-E182-46A8-B914-F46AF5319E83}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F04CA2F4-E182-46A8-B914-F46AF5319E83}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F1875552-0E59-46AA-976E-6183733FD2AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F1875552-0E59-46AA-976E-6183733FD2AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1875552-0E59-46AA-976E-6183733FD2AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F1875552-0E59-46AA-976E-6183733FD2AB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FEF899EB-610C-4D3C-A556-A01F56F4AFE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FEF899EB-610C-4D3C-A556-A01F56F4AFE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FEF899EB-610C-4D3C-A556-A01F56F4AFE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FEF899EB-610C-4D3C-A556-A01F56F4AFE0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FF45EE91-9CA3-443D-8231-75E9FA1AF40E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FF45EE91-9CA3-443D-8231-75E9FA1AF40E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FF45EE91-9CA3-443D-8231-75E9FA1AF40E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FF45EE91-9CA3-443D-8231-75E9FA1AF40E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Added: incubator/lucene.net/trunk/build/vs2010/test/Contrib.Memory.Test.sln
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/build/vs2010/test/Contrib.Memory.Test.sln?rev=1310635&view=auto
==============================================================================
--- incubator/lucene.net/trunk/build/vs2010/test/Contrib.Memory.Test.sln (added)
+++ incubator/lucene.net/trunk/build/vs2010/test/Contrib.Memory.Test.sln Fri Apr  6 23:37:48 2012
@@ -0,0 +1,52 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual C# Express 2010
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lucene.Net", "..\..\..\src\core\Lucene.Net.csproj", "{5D4AD9BE-1FFB-41AB-9943-25737971BF57}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contrib.Memory", "..\..\..\src\contrib\Memory\Contrib.Memory.csproj", "{112B9A7C-29CC-4539-8F5A-45669C07CD4D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contrib.Memory.Test", "..\..\..\test\contrib\Memory\Contrib.Memory.Test.csproj", "{66C13054-FF41-4C1D-BD0D-8DA009D1DFFD}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{112B9A7C-29CC-4539-8F5A-45669C07CD4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{112B9A7C-29CC-4539-8F5A-45669C07CD4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{112B9A7C-29CC-4539-8F5A-45669C07CD4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{112B9A7C-29CC-4539-8F5A-45669C07CD4D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.Build.0 = Release|Any CPU
+		{66C13054-FF41-4C1D-BD0D-8DA009D1DFFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{66C13054-FF41-4C1D-BD0D-8DA009D1DFFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{66C13054-FF41-4C1D-BD0D-8DA009D1DFFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{66C13054-FF41-4C1D-BD0D-8DA009D1DFFD}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Modified: incubator/lucene.net/trunk/src/contrib/FastVectorHighlighter/FieldQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/FastVectorHighlighter/FieldQuery.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/FastVectorHighlighter/FieldQuery.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/FastVectorHighlighter/FieldQuery.cs Fri Apr  6 23:37:48 2012
@@ -71,8 +71,8 @@ namespace Lucene.Net.Search.Vectorhighli
                 BooleanQuery bq = (BooleanQuery)sourceQuery;
                 foreach (BooleanClause clause in bq.GetClauses())
                 {
-                    if (!clause.IsProhibited())
-                        flatten(clause.GetQuery(), flatQueries);
+                    if (!clause.IsProhibited)
+                        flatten(clause.Query, flatQueries);
                 }
             }
             else if (sourceQuery is DisjunctionMaxQuery)

Modified: incubator/lucene.net/trunk/src/contrib/Highlighter/Contrib.Highlighter.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Highlighter/Contrib.Highlighter.csproj?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Highlighter/Contrib.Highlighter.csproj (original)
+++ incubator/lucene.net/trunk/src/contrib/Highlighter/Contrib.Highlighter.csproj Fri Apr  6 23:37:48 2012
@@ -125,10 +125,10 @@
     <Compile Include="IEncoder.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Formatter.cs">
+    <Compile Include="IFormatter.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Fragmenter.cs">
+    <Compile Include="IFragmenter.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="GradientFormatter.cs">
@@ -148,7 +148,7 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="QueryTermScorer.cs" />
-    <Compile Include="Scorer.cs">
+    <Compile Include="IScorer.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="SimpleFragmenter.cs">
@@ -160,6 +160,7 @@
     <Compile Include="SimpleHTMLFormatter.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="SimpleSpanFragmenter.cs" />
     <Compile Include="SpanGradientFormatter.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -180,6 +181,10 @@
     <Content Include="Package.html" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Memory\Contrib.Memory.csproj">
+      <Project>{112b9a7c-29cc-4539-8f5a-45669c07cd4d}</Project>
+      <Name>Contrib.Memory</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\core\Lucene.Net.csproj">
       <Project>{5D4AD9BE-1FFB-41AB-9943-25737971BF57}</Project>
       <Name>Lucene.Net</Name>

Modified: incubator/lucene.net/trunk/src/contrib/Highlighter/DefaultEncoder.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Highlighter/DefaultEncoder.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Highlighter/DefaultEncoder.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Highlighter/DefaultEncoder.cs Fri Apr  6 23:37:48 2012
@@ -15,9 +15,7 @@
  * limitations under the License.
  */
 
-using Lucene.Net.Search.Highlight;
-
-namespace Lucene.Net.Highlight
+namespace Lucene.Net.Search.Highlight
 {
 	/// <summary>Simple <see cref="IEncoder"/> implementation that does not modify the output</summary>
 	public class DefaultEncoder : IEncoder

Modified: incubator/lucene.net/trunk/src/contrib/Highlighter/GradientFormatter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Highlighter/GradientFormatter.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Highlighter/GradientFormatter.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Highlighter/GradientFormatter.cs Fri Apr  6 23:37:48 2012
@@ -16,31 +16,22 @@
  */
 
 using System;
-using Lucene.Net.Search.Highlight;
 
-namespace Lucene.Net.Highlight
+namespace Lucene.Net.Search.Highlight
 {
-	/// <summary> Formats text with different color intensity depending on the score of the
-	/// term.
-	/// 
+	/// <summary>
+	/// Formats text with different color intensity depending on the score of the term.
 	/// </summary>
-	/// <author>  maharwood
-	/// </author>
 	public class GradientFormatter : IFormatter
 	{
 		private float maxScore;
-		
-		internal int fgRMin, fgGMin, fgBMin;
-		
-		internal int fgRMax, fgGMax, fgBMax;
-		
-		protected internal bool highlightForeground;
-		
-		internal int bgRMin, bgGMin, bgBMin;
-		
-		internal int bgRMax, bgGMax, bgBMax;
-		
-		protected internal bool highlightBackground;
+
+        protected internal int fgRMin, fgGMin, fgBMin;
+        protected internal int fgRMax, fgGMax, fgBMax;
+		protected bool highlightForeground;
+        protected internal int bgRMin, bgGMin, bgBMin;
+        protected internal int bgRMax, bgGMax, bgBMax;
+		protected bool highlightBackground;
 		
 		/// <summary> Sets the color range for the IDF scores</summary>
         /// <param name="maxScore">