lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccurr...@apache.org
Subject svn commit: r1363077 [1/2] - in /incubator/lucene.net/trunk: build/scripts/ build/scripts/Similarity/ build/vs2010/contrib/ build/vs2010/test/ src/contrib/Analyzers/Shingle/ src/contrib/FastVectorHighlighter/ src/contrib/Highlighter/ src/contrib/Memory...
Date Wed, 18 Jul 2012 19:55:19 GMT
Author: ccurrens
Date: Wed Jul 18 19:55:17 2012
New Revision: 1363077

URL: http://svn.apache.org/viewvc?rev=1363077&view=rev
Log:
[LUCENENET-467]  Finished converting the last few methods to properties.
Removed Similarity project from solutions, build scripts and repo.  Had been merged into contrib.Queries

Removed:
    incubator/lucene.net/trunk/build/scripts/Similarity/
    incubator/lucene.net/trunk/build/vs2010/contrib/Contrib.Similarity.sln
    incubator/lucene.net/trunk/src/contrib/Similarity/
Modified:
    incubator/lucene.net/trunk/build/scripts/build.targets
    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/Analyzers/Shingle/ShingleAnalyzerWrapper.cs
    incubator/lucene.net/trunk/src/contrib/FastVectorHighlighter/FieldPhraseList.cs
    incubator/lucene.net/trunk/src/contrib/FastVectorHighlighter/FieldQuery.cs
    incubator/lucene.net/trunk/src/contrib/FastVectorHighlighter/FieldTermStack.cs
    incubator/lucene.net/trunk/src/contrib/FastVectorHighlighter/SimpleFragListBuilder.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/IScorer.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/QueryScorer.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/QueryTermScorer.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleFragmenter.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleHTMLFormatter.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/SpanGradientFormatter.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/TokenGroup.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/WeightedSpanTermExtractor.cs
    incubator/lucene.net/trunk/src/contrib/Memory/MemoryIndex.cs
    incubator/lucene.net/trunk/src/contrib/Queries/BooleanFilter.cs
    incubator/lucene.net/trunk/src/contrib/Queries/DuplicateFilter.cs
    incubator/lucene.net/trunk/src/contrib/Queries/FilterClause.cs
    incubator/lucene.net/trunk/src/contrib/Queries/Similar/MoreLikeThis.cs
    incubator/lucene.net/trunk/src/contrib/Queries/Similar/MoreLikeThisQuery.cs
    incubator/lucene.net/trunk/src/contrib/Regex/IRegexQueryCapable.cs
    incubator/lucene.net/trunk/src/contrib/Regex/RegexQuery.cs
    incubator/lucene.net/trunk/src/contrib/Regex/SpanRegexQuery.cs
    incubator/lucene.net/trunk/src/contrib/SpellChecker/Spell/IDictionary.cs
    incubator/lucene.net/trunk/src/contrib/SpellChecker/Spell/JaroWinklerDistance.cs
    incubator/lucene.net/trunk/src/contrib/SpellChecker/Spell/LuceneDictionary.cs
    incubator/lucene.net/trunk/src/contrib/SpellChecker/Spell/PlainTextDictionary.cs
    incubator/lucene.net/trunk/src/core/Index/ByteSliceWriter.cs
    incubator/lucene.net/trunk/src/core/Index/FieldsReader.cs
    incubator/lucene.net/trunk/src/core/Index/IndexWriter.cs
    incubator/lucene.net/trunk/src/core/Index/SegmentTermDocs.cs
    incubator/lucene.net/trunk/src/core/Index/TermInfosReader.cs
    incubator/lucene.net/trunk/src/core/Messages/MessageImpl.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/ComplexExplanation.cs
    incubator/lucene.net/trunk/src/core/Search/DisjunctionMaxQuery.cs
    incubator/lucene.net/trunk/src/core/Search/Explanation.cs
    incubator/lucene.net/trunk/src/core/Search/Function/CustomScoreQuery.cs
    incubator/lucene.net/trunk/src/core/Search/MultiPhraseQuery.cs
    incubator/lucene.net/trunk/src/core/Search/Spans/SpanWeight.cs
    incubator/lucene.net/trunk/src/core/Search/TermQuery.cs
    incubator/lucene.net/trunk/src/core/Search/TimeLimitingCollector.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/IndexTimeSynonymTest.cs
    incubator/lucene.net/trunk/test/contrib/Highlighter/HighlighterTest.cs
    incubator/lucene.net/trunk/test/contrib/Queries/DuplicateFilterTest.cs
    incubator/lucene.net/trunk/test/contrib/Queries/Similar/TestMoreLikeThis.cs
    incubator/lucene.net/trunk/test/contrib/Regex/TestRegexQuery.cs
    incubator/lucene.net/trunk/test/core/Index/TestByteSlices.cs
    incubator/lucene.net/trunk/test/core/Index/TestIndexWriterReader.cs
    incubator/lucene.net/trunk/test/core/Search/TestBooleanMinShouldMatch.cs
    incubator/lucene.net/trunk/test/core/Search/TestComplexExplanations.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

Modified: incubator/lucene.net/trunk/build/scripts/build.targets
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/build/scripts/build.targets?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/build/scripts/build.targets (original)
+++ incubator/lucene.net/trunk/build/scripts/build.targets Wed Jul 18 19:55:17 2012
@@ -61,7 +61,6 @@
 	<Import Project="Highlighter/project.targets" Condition="'$(Area)' == 'highlighter'" />
 	<Import Project="Queries/project.targets" Condition="'$(Area)' == 'queries'" />
 	<Import Project="Regex/project.targets" Condition="'$(Area)' == 'regex'" />
-	<Import Project="Similarity/project.targets" Condition="'$(Area)' == 'similarity'" />
 	<Import Project="SimpleFacetedSearch/project.targets" Condition="'$(Area)' == 'simplefacetedsearch'" />
 	<Import Project="Snowball/project.targets" Condition="'$(Area)' == 'snowball'" />
 	<Import Project="Spatial/project.targets" Condition="'$(Area)' == 'spatial'" />

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=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/build/vs2010/contrib/Contrib.All.sln (original)
+++ incubator/lucene.net/trunk/build/vs2010/contrib/Contrib.All.sln Wed Jul 18 19:55:17 2012
@@ -13,8 +13,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contrib.Queries", "..\..\..\src\contrib\Queries\Contrib.Queries.csproj", "{481CF6E3-52AF-4621-9DEB-022122079AF6}"
 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.Snowball", "..\..\..\src\contrib\Snowball\Contrib.Snowball.csproj", "{8F9D7A92-F122-413E-9D8D-027E4ECD327C}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contrib.Spatial", "..\..\..\src\contrib\Spatial\Contrib.Spatial.csproj", "{35C347F4-24B2-4BE5-8117-A0E3001551CE}"
@@ -145,14 +143,6 @@ Global
 		{A26BD3B7-DF90-43B4-99E2-6A617CDE1579}.Release35|Any CPU.Build.0 = Release35|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
-		{B9C12C92-199A-426E-B892-3531E2600217}.Debug35|Any CPU.ActiveCfg = Debug35|Any CPU
-		{B9C12C92-199A-426E-B892-3531E2600217}.Debug35|Any CPU.Build.0 = Debug35|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}.Release35|Any CPU.ActiveCfg = Release35|Any CPU
-		{B9C12C92-199A-426E-B892-3531E2600217}.Release35|Any CPU.Build.0 = Release35|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}.Debug35|Any CPU.ActiveCfg = Debug35|Any CPU
 		{FEF899EB-610C-4D3C-A556-A01F56F4AFE0}.Debug35|Any CPU.Build.0 = Debug35|Any CPU
 		{FEF899EB-610C-4D3C-A556-A01F56F4AFE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

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=1363077&r1=1363076&r2=1363077&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 Wed Jul 18 19:55:17 2012
@@ -46,8 +46,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleFacetedSearch.Test", "..\..\..\test\contrib\SimpleFacetedSearch\SimpleFacetedSearch.Test.csproj", "{D8CC9461-64E0-416E-BA6E-1DF6FA66CBF5}"
 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}"
@@ -220,14 +218,6 @@ Global
 		{AAF68BCF-F781-45FC-98B3-2B9CEE411E01}.Release35|Any CPU.Build.0 = Release35|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}.Debug35|Any CPU.ActiveCfg = Debug35|Any CPU
-		{B9C12C92-199A-426E-B892-3531E2600217}.Debug35|Any CPU.Build.0 = Debug35|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}.Release35|Any CPU.ActiveCfg = Release35|Any CPU
-		{B9C12C92-199A-426E-B892-3531E2600217}.Release35|Any CPU.Build.0 = Release35|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}.Debug35|Any CPU.ActiveCfg = Debug35|Any CPU
 		{D8CC9461-64E0-416E-BA6E-1DF6FA66CBF5}.Debug35|Any CPU.Build.0 = Debug35|Any CPU
 		{D8CC9461-64E0-416E-BA6E-1DF6FA66CBF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Shingle/ShingleAnalyzerWrapper.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Shingle/ShingleAnalyzerWrapper.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Analyzers/Shingle/ShingleAnalyzerWrapper.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Analyzers/Shingle/ShingleAnalyzerWrapper.cs Wed Jul 18 19:55:17 2012
@@ -66,41 +66,22 @@ namespace Lucene.Net.Analysis.Shingle
             this.maxShingleSize = nGramSize;
         }
 
-        /**
-         * The max shingle (ngram) size
-         * 
-         * @return The max shingle (ngram) size
-         */
-        public int GetMaxShingleSize()
+        /// <summary>
+        /// Gets or sets the max shingle (ngram) size
+        /// </summary>
+        public int MaxShingleSize
+        {
+            get { return maxShingleSize; }
+            set { this.maxShingleSize = value; }
+        }
+        /// <summary>
+        /// Gets or sets whether or not to have the filter pass the original tokens 
+        /// (the "unigrams") to the output stream
+        /// </summary>
+        public bool IsOutputUnigrams
         {
-            return maxShingleSize;
-        }
-
-        /**
-         * Set the maximum size of output shingles
-         * 
-         * @param maxShingleSize max shingle size
-         */
-        public void SetMaxShingleSize(int maxShingleSize)
-        {
-            this.maxShingleSize = maxShingleSize;
-        }
-
-        public bool IsOutputUnigrams()
-        {
-            return outputUnigrams;
-        }
-
-        /**
-         * Shall the filter pass the original tokens (the "unigrams") to the output
-         * stream?
-         * 
-         * @param outputUnigrams Whether or not the filter shall pass the original
-         *        tokens to the output stream
-         */
-        public void SetOutputUnigrams(bool outputUnigrams)
-        {
-            this.outputUnigrams = outputUnigrams;
+            get { return outputUnigrams; }
+            set { this.outputUnigrams = value; }
         }
 
         public override TokenStream TokenStream(String fieldName, TextReader reader)

Modified: incubator/lucene.net/trunk/src/contrib/FastVectorHighlighter/FieldPhraseList.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/FastVectorHighlighter/FieldPhraseList.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/FastVectorHighlighter/FieldPhraseList.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/FastVectorHighlighter/FieldPhraseList.cs Wed Jul 18 19:55:17 2012
@@ -54,7 +54,7 @@ namespace Lucene.Net.Search.Vectorhighli
         /// <param name="phraseLimit">maximum size of phraseList</param>
         public FieldPhraseList(FieldTermStack fieldTermStack, FieldQuery fieldQuery, int phraseLimit)
         {
-            String field = fieldTermStack.GetFieldName();
+            String field = fieldTermStack.FieldName;
 
             LinkedList<TermInfo> phraseCandidate = new LinkedList<TermInfo>();
             QueryPhraseMap currMap = null;
@@ -65,7 +65,7 @@ namespace Lucene.Net.Search.Vectorhighli
                 phraseCandidate.Clear();
 
                 TermInfo ti = fieldTermStack.Pop();
-                currMap = fieldQuery.GetFieldTermMap(field, ti.GetText());
+                currMap = fieldQuery.GetFieldTermMap(field, ti.Text);
 
                 // if not found, discard top TermInfo from stack, then try next element
                 if (currMap == null) continue;
@@ -77,14 +77,14 @@ namespace Lucene.Net.Search.Vectorhighli
                     ti = fieldTermStack.Pop();
                     nextMap = null;
                     if (ti != null)
-                        nextMap = currMap.GetTermMap(ti.GetText());
+                        nextMap = currMap.GetTermMap(ti.Text);
                     if (ti == null || nextMap == null)
                     {
                         if (ti != null)
                             fieldTermStack.Push(ti);
                         if (currMap.IsValidTermOrPhrase(new List<TermInfo>(phraseCandidate)))
                         {
-                            AddIfNoOverlap(new WeightedPhraseInfo(phraseCandidate, currMap.GetBoost(), currMap.GetTermOrPhraseNumber()));
+                            AddIfNoOverlap(new WeightedPhraseInfo(phraseCandidate, currMap.Boost, currMap.TermOrPhraseNumber));
                         }
                         else
                         {
@@ -96,7 +96,7 @@ namespace Lucene.Net.Search.Vectorhighli
                                 currMap = fieldQuery.SearchPhrase(field, new List<TermInfo>(phraseCandidate));
                                 if (currMap != null)
                                 {
-                                    AddIfNoOverlap(new WeightedPhraseInfo(phraseCandidate, currMap.GetBoost(), currMap.GetTermOrPhraseNumber()));
+                                    AddIfNoOverlap(new WeightedPhraseInfo(phraseCandidate, currMap.Boost, currMap.TermOrPhraseNumber));
                                     break;
                                 }
                             }
@@ -140,15 +140,15 @@ namespace Lucene.Net.Search.Vectorhighli
                 this.seqnum = number;
                 termsOffsets = new List<Toffs>(terms.Count);
                 TermInfo ti = terms.First.Value;
-                termsOffsets.Add(new Toffs(ti.GetStartOffset(), ti.GetEndOffset()));
+                termsOffsets.Add(new Toffs(ti.StartOffset, ti.EndOffset));
                 if (terms.Count == 1)
                 {
-                    text = ti.GetText();
+                    text = ti.Text;
                     return;
                 }
                 StringBuilder sb = new StringBuilder();
-                sb.Append(ti.GetText());
-                int pos = ti.GetPosition();
+                sb.Append(ti.Text);
+                int pos = ti.Position;
 
                 bool dummy = true;
                 foreach(TermInfo ti2 in terms)
@@ -157,37 +157,37 @@ namespace Lucene.Net.Search.Vectorhighli
                     if (dummy) { dummy = false; continue; } //Skip First Item {{DIGY}}
                     ti = ti2;
                     //ti = terms.get(i);
-                    sb.Append(ti.GetText());
-                    if (ti.GetPosition() - pos == 1)
+                    sb.Append(ti.Text);
+                    if (ti.Position - pos == 1)
                     {
                         Toffs to = termsOffsets[termsOffsets.Count - 1];
-                        to.SetEndOffset(ti.GetEndOffset());
+                        to.SetEndOffset(ti.EndOffset);
                     }
                     else
                     {
-                        termsOffsets.Add(new Toffs(ti.GetStartOffset(), ti.GetEndOffset()));
+                        termsOffsets.Add(new Toffs(ti.StartOffset, ti.EndOffset));
                     }
-                    pos = ti.GetPosition();
+                    pos = ti.Position;
                 }
                 text = sb.ToString();
             }
 
-            public int GetStartOffset()
+            public int StartOffset
             {
-                return termsOffsets[0].startOffset;
+                get { return termsOffsets[0].startOffset; }
             }
 
-            public int GetEndOffset()
+            public int EndOffset
             {
-                return termsOffsets[termsOffsets.Count - 1].endOffset;
+                get { return termsOffsets[termsOffsets.Count - 1].endOffset; }
             }
 
             public bool IsOffsetOverlap(WeightedPhraseInfo other)
             {
-                int so = GetStartOffset();
-                int eo = GetEndOffset();
-                int oso = other.GetStartOffset();
-                int oeo = other.GetEndOffset();
+                int so = StartOffset;
+                int eo = EndOffset;
+                int oso = other.StartOffset;
+                int oeo = other.EndOffset;
                 if (so <= oso && oso < eo) return true;
                 if (so < oeo && oeo <= eo) return true;
                 if (oso <= so && so < oeo) return true;

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=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/FastVectorHighlighter/FieldQuery.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/FastVectorHighlighter/FieldQuery.cs Wed Jul 18 19:55:17 2012
@@ -391,24 +391,24 @@ namespace Lucene.Net.Search.Vectorhighli
                 this.termOrPhraseNumber = fieldQuery.NextTermOrPhraseNumber();
             }
 
-            public bool IsTerminal()
+            public bool IsTerminal
             {
-                return terminal;
+                get { return terminal; }
             }
 
-            public int GetSlop()
+            public int Slop
             {
-                return slop;
+                get { return slop; }
             }
 
-            public float GetBoost()
+            public float Boost
             {
-                return boost;
+                get { return boost; }
             }
 
-            public int GetTermOrPhraseNumber()
+            public int TermOrPhraseNumber
             {
-                return termOrPhraseNumber;
+                get { return termOrPhraseNumber; }
             }
 
             public QueryPhraseMap SearchPhrase(List<TermInfo> phraseCandidate)
@@ -416,7 +416,7 @@ namespace Lucene.Net.Search.Vectorhighli
                 QueryPhraseMap currMap = this;
                 foreach (TermInfo ti in phraseCandidate)
                 {
-                    currMap = currMap.subMap[ti.GetText()];
+                    currMap = currMap.subMap[ti.Text];
                     if (currMap == null) return null;
                 }
                 return currMap.IsValidTermOrPhrase(phraseCandidate) ? currMap : null;
@@ -433,10 +433,10 @@ namespace Lucene.Net.Search.Vectorhighli
                 // else check whether the candidate is valid phrase
                 // compare position-gaps between terms to slop
 
-                int pos = phraseCandidate[0].GetPosition();
+                int pos = phraseCandidate[0].Position;
                 for (int i = 1; i < phraseCandidate.Count; i++)
                 {
-                    int nextPos = phraseCandidate[i].GetPosition();
+                    int nextPos = phraseCandidate[i].Position;
                     if (Math.Abs(nextPos - pos - 1) > slop) return false;
                     pos = nextPos;
                 }

Modified: incubator/lucene.net/trunk/src/contrib/FastVectorHighlighter/FieldTermStack.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/FastVectorHighlighter/FieldTermStack.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/FastVectorHighlighter/FieldTermStack.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/FastVectorHighlighter/FieldTermStack.cs Wed Jul 18 19:55:17 2012
@@ -149,19 +149,19 @@ namespace Lucene.Net.Search.Vectorhighli
 
         int PosComparer(TermInfo t1,TermInfo t2)
         {
-            return t1.GetPosition() - t2.GetPosition();
-        }
-                
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns>field name</returns>
-        public String GetFieldName()
-        {
-            return fieldName;
+            return t1.Position - t2.Position;
         }
 
-        /// <summary>
+       /// <summary>
+       /// 
+       /// </summary>
+       /// <value> field name </value>
+       public string FieldName
+       {
+           get { return fieldName; }
+       }
+
+       /// <summary>
         /// 
         /// </summary>
         /// <returns>the top TermInfo object of the stack</returns>
@@ -209,10 +209,25 @@ namespace Lucene.Net.Search.Vectorhighli
                 this.position = position;
             }
 
-            public String GetText() { return text; }
-            public int GetStartOffset() { return startOffset; }
-            public int GetEndOffset() { return endOffset; }
-            public int GetPosition() { return position; }
+            public string Text
+            {
+                get { return text; }
+            }
+
+            public int StartOffset
+            {
+                get { return startOffset; }
+            }
+
+            public int EndOffset
+            {
+                get { return endOffset; }
+            }
+
+            public int Position
+            {
+                get { return position; }
+            }
 
             public override string ToString()
             {

Modified: incubator/lucene.net/trunk/src/contrib/FastVectorHighlighter/SimpleFragListBuilder.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/FastVectorHighlighter/SimpleFragListBuilder.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/FastVectorHighlighter/SimpleFragListBuilder.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/FastVectorHighlighter/SimpleFragListBuilder.cs Wed Jul 18 19:55:17 2012
@@ -57,15 +57,15 @@ namespace Lucene.Net.Search.Vectorhighli
                 if (phraseInfo == null) break;
 
                 // if the phrase violates the border of previous fragment, discard it and try next phrase
-                if (phraseInfo.GetStartOffset() < startOffset) continue;
+                if (phraseInfo.StartOffset < startOffset) continue;
 
                 wpil.Clear();
                 wpil.Add(phraseInfo);
-                int st = phraseInfo.GetStartOffset() - MARGIN < startOffset ?
-                    startOffset : phraseInfo.GetStartOffset() - MARGIN;
+                int st = phraseInfo.StartOffset - MARGIN < startOffset ?
+                    startOffset : phraseInfo.StartOffset - MARGIN;
                 int en = st + fragCharSize;
-                if (phraseInfo.GetEndOffset() > en)
-                    en = phraseInfo.GetEndOffset();
+                if (phraseInfo.EndOffset > en)
+                    en = phraseInfo.EndOffset;
                 startOffset = en;
 
                 while (true)
@@ -78,7 +78,7 @@ namespace Lucene.Net.Search.Vectorhighli
                     }
                     else
                         break;
-                    if (phraseInfo.GetEndOffset() <= en)
+                    if (phraseInfo.EndOffset <= en)
                         wpil.Add(phraseInfo);
                     else
                         break;

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=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Highlighter/GradientFormatter.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Highlighter/GradientFormatter.cs Wed Jul 18 19:55:17 2012
@@ -103,9 +103,9 @@ namespace Lucene.Net.Search.Highlight
 		
 		public virtual string HighlightTerm(string originalText, TokenGroup tokenGroup)
 		{
-			if (tokenGroup.GetTotalScore() == 0)
+			if (tokenGroup.TotalScore == 0)
 				return originalText;
-			float score = tokenGroup.GetTotalScore();
+			float score = tokenGroup.TotalScore;
 			if (score == 0)
 			{
 				return originalText;

Modified: incubator/lucene.net/trunk/src/contrib/Highlighter/Highlighter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Highlighter/Highlighter.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Highlighter/Highlighter.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Highlighter/Highlighter.cs Wed Jul 18 19:55:17 2012
@@ -204,7 +204,7 @@ namespace Lucene.Net.Search.Highlight
                         throw new InvalidTokenOffsetsException("Token " + termAtt.Term
                                                                + " exceeds length of provided text sized " + text.Length);
                     }
-                    if ((tokenGroup.GetNumTokens() > 0) && (tokenGroup.IsDistinct()))
+                    if ((tokenGroup.NumTokens > 0) && (tokenGroup.IsDistinct()))
                     {
                         //the current token is distinct from previous tokens -
                         // markup the cached token group info
@@ -222,7 +222,7 @@ namespace Lucene.Net.Search.Highlight
                         //check if current token marks the start of a new fragment
                         if (_textFragmenter.IsNewFragment())
                         {
-                            currentFrag.Score = _fragmentScorer.GetFragmentScore();
+                            currentFrag.Score = _fragmentScorer.FragmentScore;
                             //record stats for a new fragment
                             currentFrag.TextEndPos = newText.Length;
                             currentFrag = new TextFragment(newText, newText.Length, docFrags.Count);
@@ -238,7 +238,7 @@ namespace Lucene.Net.Search.Highlight
                     //					break;
                     //				}
                 }
-                currentFrag.Score = _fragmentScorer.GetFragmentScore();
+                currentFrag.Score = _fragmentScorer.FragmentScore;
 
                 if (tokenGroup.NumTokens > 0)
                 {

Modified: incubator/lucene.net/trunk/src/contrib/Highlighter/IScorer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Highlighter/IScorer.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Highlighter/IScorer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Highlighter/IScorer.cs Wed Jul 18 19:55:17 2012
@@ -57,6 +57,6 @@ namespace Lucene.Net.Search.Highlight
         /// the Scorer returns the weighting it has derived for the most recent
         /// fragment, typically based on the results of {@link #getTokenScore()}.
         /// </summary>
-        float GetFragmentScore();
+        float FragmentScore { get; }
     }
 }
\ No newline at end of file

Modified: incubator/lucene.net/trunk/src/contrib/Highlighter/QueryScorer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Highlighter/QueryScorer.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Highlighter/QueryScorer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Highlighter/QueryScorer.cs Wed Jul 18 19:55:17 2012
@@ -132,17 +132,17 @@ namespace Lucene.Net.Search.Highlight
         }
 
         /// <seealso cref="IScorer.GetFragmentScore()"/>
-        public float GetFragmentScore()
+        public float FragmentScore
         {
-            return totalScore;
+            get { return totalScore; }
         }
 
         /// <summary>
         /// The highest weighted term (useful for passing to GradientFormatter to set top end of coloring scale).
         /// </summary>
-        public float GetMaxTermWeight()
+        public float MaxTermWeight
         {
-            return maxTermWeight;
+            get { return maxTermWeight; }
         }
 
         /// <seealso cref="IScorer.GetTokenScore"/>
@@ -218,7 +218,7 @@ namespace Lucene.Net.Search.Highlight
                                                 ? new WeightedSpanTermExtractor()
                                                 : new WeightedSpanTermExtractor(defaultField);
 
-            qse.SetExpandMultiTermQuery(expandMultiTermQuery);
+            qse.ExpandMultiTermQuery = expandMultiTermQuery;
             qse.SetWrapIfNotCachingTokenFilter(wrapToCaching);
             if (reader == null)
             {
@@ -230,9 +230,9 @@ namespace Lucene.Net.Search.Highlight
                 this.fieldWeightedSpanTerms = qse.GetWeightedSpanTermsWithScores(query,
                                                                                  tokenStream, field, reader);
             }
-            if (qse.IsCachedTokenStream())
+            if (qse.IsCachedTokenStream)
             {
-                return qse.GetTokenStream();
+                return qse.TokenStream;
             }
 
             return null;

Modified: incubator/lucene.net/trunk/src/contrib/Highlighter/QueryTermScorer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Highlighter/QueryTermScorer.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Highlighter/QueryTermScorer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Highlighter/QueryTermScorer.cs Wed Jul 18 19:55:17 2012
@@ -159,9 +159,9 @@ namespace Lucene.Net.Search.Highlight
          * @see org.apache.lucene.search.highlight.Scorer#getFragmentScore()
          */
 
-        public float GetFragmentScore()
+        public float FragmentScore
         {
-            return totalScore;
+            get { return totalScore; }
         }
 
         /*
@@ -182,9 +182,9 @@ namespace Lucene.Net.Search.Highlight
          *         to set top end of coloring scale.
          */
 
-        public float GetMaxTermWeight()
+        public float MaxTermWeight
         {
-            return maxTermWeight;
+            get { return maxTermWeight; }
         }
     }
 }

Modified: incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleFragmenter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleFragmenter.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleFragmenter.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleFragmenter.cs Wed Jul 18 19:55:17 2012
@@ -75,22 +75,13 @@ namespace Lucene.Net.Search.Highlight
             return isNewFrag;
         }
 
-        /**
-         * @return size in number of characters of each fragment
-         */
-
-        public int GetFragmentSize()
-        {
-            return fragmentSize;
-        }
-
-        /**
-         * @param size size in characters of each fragment
-         */
-
-        public void SetFragmentSize(int size)
+        /// <summary>
+        /// Gets or sets the size in number of characters of each fragment
+        /// </summary>
+        public int FragmentSize
         {
-            fragmentSize = size;
+            get { return fragmentSize; }
+            set { fragmentSize = value; }
         }
     }
 }
\ No newline at end of file

Modified: incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleHTMLFormatter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleHTMLFormatter.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleHTMLFormatter.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleHTMLFormatter.cs Wed Jul 18 19:55:17 2012
@@ -49,7 +49,7 @@ namespace Lucene.Net.Search.Highlight
 		public virtual System.String HighlightTerm(System.String originalText, TokenGroup tokenGroup)
 		{
 			System.Text.StringBuilder returnBuffer;
-			if (tokenGroup.GetTotalScore() > 0)
+			if (tokenGroup.TotalScore > 0)
 			{
 				returnBuffer = new System.Text.StringBuilder();
 				returnBuffer.Append(preTag);

Modified: incubator/lucene.net/trunk/src/contrib/Highlighter/SpanGradientFormatter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Highlighter/SpanGradientFormatter.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Highlighter/SpanGradientFormatter.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Highlighter/SpanGradientFormatter.cs Wed Jul 18 19:55:17 2012
@@ -40,9 +40,9 @@ namespace Lucene.Net.Search.Highlight
 
         public override String HighlightTerm(String originalText, TokenGroup tokenGroup)
         {
-            if (tokenGroup.GetTotalScore() == 0)
+            if (tokenGroup.TotalScore == 0)
                 return originalText;
-            float score = tokenGroup.GetTotalScore();
+            float score = tokenGroup.TotalScore;
             if (score == 0)
             {
                 return originalText;

Modified: incubator/lucene.net/trunk/src/contrib/Highlighter/TokenGroup.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Highlighter/TokenGroup.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Highlighter/TokenGroup.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Highlighter/TokenGroup.cs Wed Jul 18 19:55:17 2012
@@ -120,33 +120,25 @@ namespace Lucene.Net.Search.Highlight
         /// <summary>
         /// the end position in the original text
         /// </summary>
-        public int GetEndOffset()
+        public int EndOffset
         {
-            return endOffset;
+            get { return endOffset; }
         }
-
-        /// <summary>
-        /// The number of tokens in this group
-        /// </summary>
-        public int GetNumTokens()
-        {
-            return NumTokens;
-        }
-
+        
         /// <summary>
         /// The start position in the original text
         /// </summary>
-        public int GetStartOffset()
+        public int StartOffset
         {
-            return startOffset;
+            get { return startOffset; }
         }
 
         /// <summary>
         /// All tokens' scores summed up
         /// </summary>
-        public float GetTotalScore()
+        public float TotalScore
         {
-            return tot;
+            get { return tot; }
         }
     }
 }

Modified: incubator/lucene.net/trunk/src/contrib/Highlighter/WeightedSpanTermExtractor.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Highlighter/WeightedSpanTermExtractor.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Highlighter/WeightedSpanTermExtractor.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Highlighter/WeightedSpanTermExtractor.cs Wed Jul 18 19:55:17 2012
@@ -36,7 +36,7 @@ namespace Lucene.Net.Search.Highlight
 {
     /// <summary>
     /// Class used to extract <see cref="WeightedSpanTerm"/>s from a <see cref="Query"/> based on whether 
-    /// <see cref="Term"/>s from the <see cref="Query"/> are contained in a supplied <see cref="TokenStream"/>.
+    /// <see cref="Term"/>s from the <see cref="Query"/> are contained in a supplied <see cref="Analysis.TokenStream"/>.
     /// </summary>
     public class WeightedSpanTermExtractor
     {
@@ -609,31 +609,27 @@ namespace Lucene.Net.Search.Highlight
 
         }
 
-        public bool GetExpandMultiTermQuery()
+        public bool ExpandMultiTermQuery
         {
-            return expandMultiTermQuery;
+            set { this.expandMultiTermQuery = value; }
+            get { return expandMultiTermQuery; }
         }
 
-        public void SetExpandMultiTermQuery(bool expandMultiTermQuery)
+        public bool IsCachedTokenStream
         {
-            this.expandMultiTermQuery = expandMultiTermQuery;
+            get { return cachedTokenStream; }
         }
 
-        public bool IsCachedTokenStream()
+        public TokenStream TokenStream
         {
-            return cachedTokenStream;
-        }
-
-        public TokenStream GetTokenStream()
-        {
-            return tokenStream;
+            get { return tokenStream; }
         }
 
 
         /// <summary>
-        /// By default, <see cref="TokenStream"/>s that are not of the type
+        /// By default, <see cref="Analysis.TokenStream"/>s that are not of the type
         /// <see cref="CachingTokenFilter"/> are wrapped in a <see cref="CachingTokenFilter"/> to
-        /// <see cref="TokenStream"/> impl and you don't want it to be wrapped, set this to
+        /// <see cref="Analysis.TokenStream"/> impl and you don't want it to be wrapped, set this to
         /// false.
         /// </summary>
         public void SetWrapIfNotCachingTokenFilter(bool wrap)

Modified: incubator/lucene.net/trunk/src/contrib/Memory/MemoryIndex.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Memory/MemoryIndex.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Memory/MemoryIndex.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Memory/MemoryIndex.cs Wed Jul 18 19:55:17 2012
@@ -635,12 +635,6 @@ namespace Lucene.Net.Index.Memory
             {
                 return SortedTerms[pos].Value;
             }
-
-            public float GetBoost()
-            {
-                return Boost;
-            }
-
         }
 
 
@@ -937,7 +931,7 @@ namespace Lucene.Net.Index.Memory
                     Info info = GetInfo(fieldName);
                     int numTokens = info != null ? info.NumTokens : 0;
                     int numOverlapTokens = info != null ? info.NumOverlapTokens : 0;
-                    float boost = info != null ? info.GetBoost() : 1.0f;
+                    float boost = info != null ? info.Boost : 1.0f;
                     FieldInvertState invertState = new FieldInvertState(0, numTokens, numOverlapTokens, 0, boost);
                     float n = sim.ComputeNorm(fieldName, invertState);
                     byte norm = Similarity.EncodeNorm(n);

Modified: incubator/lucene.net/trunk/src/contrib/Queries/BooleanFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Queries/BooleanFilter.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Queries/BooleanFilter.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Queries/BooleanFilter.cs Wed Jul 18 19:55:17 2012
@@ -160,29 +160,29 @@ namespace Lucene.Net.Search
         /// <param name="filterClause">The clause to add.</param>
         public void Add(FilterClause filterClause)
         {
-            if (filterClause.GetOccur() == Occur.MUST)
+            if (filterClause.Occur == Occur.MUST)
             {
                 if (mustFilters == null)
                 {
                     mustFilters = new EquatableList<Filter>();
                 }
-                mustFilters.Add(filterClause.GetFilter());
+                mustFilters.Add(filterClause.Filter);
             }
-            if (filterClause.GetOccur() == Occur.SHOULD)
+            if (filterClause.Occur == Occur.SHOULD)
             {
                 if (shouldFilters == null)
                 {
                     shouldFilters = new EquatableList<Filter>();
                 }
-                shouldFilters.Add(filterClause.GetFilter());
+                shouldFilters.Add(filterClause.Filter);
             }
-            if (filterClause.GetOccur() == Occur.MUST_NOT)
+            if (filterClause.Occur == Occur.MUST_NOT)
             {
                 if (notFilters == null)
                 {
                     notFilters = new EquatableList<Filter>();
                 }
-                notFilters.Add(filterClause.GetFilter());
+                notFilters.Add(filterClause.Filter);
             }
         }
 

Modified: incubator/lucene.net/trunk/src/contrib/Queries/DuplicateFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Queries/DuplicateFilter.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Queries/DuplicateFilter.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Queries/DuplicateFilter.cs Wed Jul 18 19:55:17 2012
@@ -160,30 +160,18 @@ namespace Lucene.Net.Search
             return bits;
         }
 
-        public String GetFieldName()
+        public string FieldName
         {
-            return fieldName;
+            get { return fieldName; }
+            set { this.fieldName = value; }
         }
 
-
-        public void SetFieldName(String fieldName)
-        {
-            this.fieldName = fieldName;
-        }
-
-
-        public int GetKeepMode()
-        {
-            return keepMode;
-        }
-
-
-        public void SetKeepMode(int keepMode)
+        public int KeepMode
         {
-            this.keepMode = keepMode;
+            get { return keepMode; }
+            set { this.keepMode = value; }
         }
 
-
         public override bool Equals(Object obj)
         {
             if (this == obj)
@@ -196,8 +184,6 @@ namespace Lucene.Net.Search
                 (fieldName == other.fieldName || (fieldName != null && fieldName.Equals(other.fieldName)));
         }
 
-
-
         public override int GetHashCode()
         {
             int hash = 217;
@@ -207,16 +193,10 @@ namespace Lucene.Net.Search
             return hash;
         }
 
-
-        public int GetProcessingMode()
-        {
-            return processingMode;
-        }
-
-
-        public void SetProcessingMode(int processingMode)
+        public int ProcessingMode
         {
-            this.processingMode = processingMode;
+            get { return processingMode; }
+            set { this.processingMode = value; }
         }
     }
 }

Modified: incubator/lucene.net/trunk/src/contrib/Queries/FilterClause.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Queries/FilterClause.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Queries/FilterClause.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Queries/FilterClause.cs Wed Jul 18 19:55:17 2012
@@ -49,18 +49,20 @@ namespace Lucene.Net.Search
          * Returns this FilterClause's filter
          * @return A Filter object
          */
-        public Filter GetFilter()
+
+        public Filter Filter
         {
-            return filter;
+            get { return filter; }
         }
 
         /**
          * Returns this FilterClause's occur parameter
          * @return An Occur object
          */
-        public Occur GetOccur()
+
+        public Occur Occur
         {
-            return occur;
+            get { return occur; }
         }
     }
 }
\ No newline at end of file

Modified: incubator/lucene.net/trunk/src/contrib/Queries/Similar/MoreLikeThis.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Queries/Similar/MoreLikeThis.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Queries/Similar/MoreLikeThis.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Queries/Similar/MoreLikeThis.cs Wed Jul 18 19:55:17 2012
@@ -172,7 +172,7 @@ namespace Lucene.Net.Search.Similar
         public const int DEFAULT_MAX_DOC_FREQ = int.MaxValue;
 
         /// <summary> Boost terms in query based on score.</summary>
-        /// <seealso cref="IsBoost">
+        /// <seealso cref="Boost">
         /// </seealso>
         /// <seealso cref="SetBoost">
         /// </seealso>
@@ -263,20 +263,12 @@ namespace Lucene.Net.Search.Similar
         private float boostFactor = 1;
 
         /// <summary>
-        /// Returns the boost factor used when boosting terms
+        /// Gets or sets the boost factor used when boosting terms
         /// </summary>
-        /// <returns>Returns the boost factor used when boosting terms</returns>
-        public float GetBoostFactor()
+        public float BoostFactor
         {
-            return boostFactor;
-        }
-
-        /// <summary>
-        /// Sets the boost factor to use when boosting terms
-        /// </summary>
-        public void SetBoostFactor(float boostFactor)
-        {
-            this.boostFactor = boostFactor;
+            get { return boostFactor; }
+            set { this.boostFactor = value; }
         }
 
         /// <summary> Constructor requiring an IndexReader.</summary>
@@ -290,107 +282,56 @@ namespace Lucene.Net.Search.Similar
             this.similarity = sim;
         }
 
-        public Lucene.Net.Search.Similarity GetSimilarity()
+        public Similarity Similarity
         {
-            return similarity;
+            get { return similarity; }
+            set { this.similarity = value; }
         }
 
-        public void SetSimilarity(Lucene.Net.Search.Similarity similarity)
-        {
-            this.similarity = similarity;
-        }
-
-        /// <summary> Returns an analyzer that will be used to parse source doc with. The default analyzer
+        /// <summary> Gets or sets the analyzer used to parse source doc with. The default analyzer
         /// is the <see cref="DEFAULT_ANALYZER"/>.
-        /// 
+        /// <para />
+        /// An analyzer is not required for generating a query with the
+        /// <see cref="Like(int)"/> method, all other 'like' methods require an analyzer.
         /// </summary>
-        /// <returns> the analyzer that will be used to parse source doc with.
-        /// </returns>
+        /// <value> the analyzer that will be used to parse source doc with. </value>
         /// <seealso cref="DEFAULT_ANALYZER">
         /// </seealso>
-        public Analyzer GetAnalyzer()
+        public Analyzer Analyzer
         {
-            return analyzer;
+            get { return analyzer; }
+            set { this.analyzer = value; }
         }
 
-        /// <summary> Sets the analyzer to use. An analyzer is not required for generating a query with the
-        /// <see cref="Like(int)"/> method, all other 'like' methods require an analyzer.
-        /// 
-        /// </summary>
-        /// <param name="analyzer">the analyzer to use to tokenize text.
-        /// </param>
-        public void SetAnalyzer(Analyzer analyzer)
-        {
-            this.analyzer = analyzer;
-        }
-
-        /// <summary> Returns the frequency below which terms will be ignored in the source doc. The default
+        /// <summary>
+        /// Gets or sets the frequency below which terms will be ignored in the source doc. The default
         /// frequency is the <see cref="DEFAULT_MIN_TERM_FREQ"/>.
-        /// 
         /// </summary>
-        /// <returns> the frequency below which terms will be ignored in the source doc.
-        /// </returns>
-        public int GetMinTermFreq()
+        public int MinTermFreq
         {
-            return minTermFreq;
+            get { return minTermFreq; }
+            set { this.minTermFreq = value; }
         }
 
-        /// <summary> Sets the frequency below which terms will be ignored in the source doc.
-        /// 
-        /// </summary>
-        /// <param name="minTermFreq">the frequency below which terms will be ignored in the source doc.
-        /// </param>
-        public void SetMinTermFreq(int minTermFreq)
-        {
-            this.minTermFreq = minTermFreq;
-        }
-
-        /// <summary> Returns the frequency at which words will be ignored which do not occur in at least this
+        /// <summary>
+        /// Gets or sets the frequency at which words will be ignored which do not occur in at least this
         /// many docs. The default frequency is <see cref="DEFAULT_MIN_DOC_FREQ"/>.
-        /// 
         /// </summary>
-        /// <returns> the frequency at which words will be ignored which do not occur in at least this
-        /// many docs.
-        /// </returns>
-        public int GetMinDocFreq()
+        public int MinDocFreq
         {
-            return minDocFreq;
-        }
-
-        /// <summary> Sets the frequency at which words will be ignored which do not occur in at least this
-        /// many docs.
-        /// 
-        /// </summary>
-        /// <param name="minDocFreq">the frequency at which words will be ignored which do not occur in at
-        /// least this many docs.
-        /// </param>
-        public void SetMinDocFreq(int minDocFreq)
-        {
-            this.minDocFreq = minDocFreq;
+            get { return minDocFreq; }
+            set { this.minDocFreq = value; }
         }
 
         /// <summary>
-        /// Returns the maximum frequency in which words may still appear. 
+        /// Gets or sets the maximum frequency in which words may still appear. 
         /// Words that appear in more than this many docs will be ignored. The default frequency is 
         /// <see cref="DEFAULT_MAX_DOC_FREQ"/>
         /// </summary>
-        /// <returns>get the maximum frequency at which words are still allowed,  
-        /// words which occur in more docs than this are ignored.</returns>
-        public int GetMaxDocFreq()
-        {
-            return this.maxDocfreq;
-        }
-
-        /// <summary>
-        /// Set the maximum frequency in which words may still appear. Words that appear
-        /// in more than this many docs will be ignored.
-        /// </summary>
-        /// <param name="maxFreq">
-        /// the maximum count of documents that a term may appear 
-        /// in to be still considered relevant</param>
-        public void SetMaxDocFreq(int maxFreq)
+        public int MaxDocFreq
         {
-            this.maxDocfreq = maxFreq;
+            get { return this.maxDocfreq; }
+            set { this.maxDocfreq = value; }
         }
 
         /// <summary>
@@ -406,29 +347,13 @@ namespace Lucene.Net.Search.Similar
             this.maxDocfreq = maxPercentage * ir.NumDocs() / 100;
         }
 
-        /// <summary> Returns whether to boost terms in query based on "score" or not. The default is
-        /// <see cref="DEFAULT_BOOST"/>.
-        /// 
+        /// <summary> Gets or sets a boolean indicating whether to boost terms in query based 
+        /// on "score" or not. The default is <see cref="DEFAULT_BOOST"/>.
         /// </summary>
-        /// <returns> whether to boost terms in query based on "score" or not.
-        /// </returns>
-        /// <seealso cref="SetBoost">
-        /// </seealso>
-        public bool IsBoost()
+        public bool Boost
         {
-            return boost;
-        }
-
-        /// <summary> Sets whether to boost terms in query based on "score" or not.
-        /// 
-        /// </summary>
-        /// <param name="boost">true to boost terms in query based on "score", false otherwise.
-        /// </param>
-        /// <seealso cref="IsBoost">
-        /// </seealso>
-        public void SetBoost(bool boost)
-        {
-            this.boost = boost;
+            get { return boost; }
+            set { this.boost = value; }
         }
 
         /// <summary> Returns the field names that will be used when generating the 'More Like This' query.
@@ -455,46 +380,24 @@ namespace Lucene.Net.Search.Similar
             this.fieldNames = fieldNames;
         }
 
-        /// <summary> Returns the minimum word length below which words will be ignored. Set this to 0 for no
-        /// minimum word length. The default is <see cref="DEFAULT_MIN_WORD_LENGTH"/>.
-        /// 
-        /// </summary>
-        /// <returns> the minimum word length below which words will be ignored.
-        /// </returns>
-        public int GetMinWordLen()
-        {
-            return minWordLen;
-        }
-
-        /// <summary> Sets the minimum word length below which words will be ignored.
-        /// 
+        /// <summary>
+        /// Gets or sets the minimum word length below which words will be ignored. 
+        /// Set this to 0 for no minimum word length. The default is <see cref="DEFAULT_MIN_WORD_LENGTH"/>.
         /// </summary>
-        /// <param name="minWordLen">the minimum word length below which words will be ignored.
-        /// </param>
-        public void SetMinWordLen(int minWordLen)
+        public int MinWordLen
         {
-            this.minWordLen = minWordLen;
+            get { return minWordLen; }
+            set { this.minWordLen = value; }
         }
 
-        /// <summary> Returns the maximum word length above which words will be ignored. Set this to 0 for no
+        /// <summary>
+        /// Gets or sets the maximum word length above which words will be ignored. Set this to 0 for no
         /// maximum word length. The default is <see cref="DEFAULT_MAX_WORD_LENGTH"/>.
-        /// 
-        /// </summary>
-        /// <returns> the maximum word length above which words will be ignored.
-        /// </returns>
-        public int GetMaxWordLen()
-        {
-            return maxWordLen;
-        }
-
-        /// <summary> Sets the maximum word length above which words will be ignored.
-        /// 
         /// </summary>
-        /// <param name="maxWordLen">the maximum word length above which words will be ignored.
-        /// </param>
-        public void SetMaxWordLen(int maxWordLen)
+        public int MaxWordLen
         {
-            this.maxWordLen = maxWordLen;
+            get { return maxWordLen; }
+            set { this.maxWordLen = value; }
         }
 
         /// <summary> Set the set of stopwords.
@@ -524,42 +427,25 @@ namespace Lucene.Net.Search.Similar
         }
 
 
-        /// <summary> Returns the maximum number of query terms that will be included in any generated query.
+        /// <summary>
+        /// Gets or sets the maximum number of query terms that will be included in any generated query.
         /// The default is <see cref="DEFAULT_MAX_QUERY_TERMS"/>.
-        /// 
         /// </summary>
-        /// <returns> the maximum number of query terms that will be included in any generated query.
-        /// </returns>
-        public int GetMaxQueryTerms()
+        public int MaxQueryTerms
         {
-            return maxQueryTerms;
+            get { return maxQueryTerms; }
+            set { this.maxQueryTerms = value; }
         }
 
-        /// <summary> Sets the maximum number of query terms that will be included in any generated query.
-        /// 
+        /// <summary>
+        /// Gets or sets the maximum number of tokens to parse in each example doc
+        /// field that is not stored with TermVector support
         /// </summary>
-        /// <param name="maxQueryTerms">the maximum number of query terms that will be included in any
-        /// generated query.
-        /// </param>
-        public void SetMaxQueryTerms(int maxQueryTerms)
-        {
-            this.maxQueryTerms = maxQueryTerms;
-        }
-
-        /// <returns> The maximum number of tokens to parse in each example doc field that is not stored with TermVector support
-        /// </returns>
-        /// <seealso cref="DEFAULT_MAX_NUM_TOKENS_PARSED">
-        /// </seealso>
-        public int GetMaxNumTokensParsed()
-        {
-            return maxNumTokensParsed;
-        }
-
-        /// <param name="i">The maximum number of tokens to parse in each example doc field that is not stored with TermVector support
-        /// </param>
-        public void SetMaxNumTokensParsed(int i)
+        /// <seealso cref="DEFAULT_MAX_NUM_TOKENS_PARSED" />
+        public int MaxNumTokensParsed
         {
-            maxNumTokensParsed = i;
+            get { return maxNumTokensParsed; }
+            set { maxNumTokensParsed = value; }
         }
 
         /// <summary>Return a query that will return docs like the passed lucene document ID.</summary>

Modified: incubator/lucene.net/trunk/src/contrib/Queries/Similar/MoreLikeThisQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Queries/Similar/MoreLikeThisQuery.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Queries/Similar/MoreLikeThisQuery.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Queries/Similar/MoreLikeThisQuery.cs Wed Jul 18 19:55:17 2012
@@ -62,18 +62,18 @@ namespace Lucene.Net.Search.Similar
             MoreLikeThis mlt = new MoreLikeThis(reader);
 
             mlt.SetFieldNames(moreLikeFields);
-            mlt.SetAnalyzer(analyzer);
-            mlt.SetMinTermFreq(minTermFrequency);
+            mlt.Analyzer = analyzer;
+            mlt.MinTermFreq = minTermFrequency;
             if (minDocFreq >= 0)
             {
-                mlt.SetMinDocFreq(minDocFreq);
+                mlt.MinDocFreq = minDocFreq;
             }
-            mlt.SetMaxQueryTerms(maxQueryTerms);
+            mlt.MaxQueryTerms = maxQueryTerms;
             mlt.SetStopWords(stopWords);
             BooleanQuery bq = (BooleanQuery)mlt.Like( new System.IO.StringReader(likeText));
             BooleanClause[] clauses = bq.GetClauses();
             //make at least half the terms match
-            bq.SetMinimumNumberShouldMatch((int)(clauses.Length * percentTermsToMatch));
+            bq.MinimumNumberShouldMatch = (int)(clauses.Length * percentTermsToMatch);
             return bq;
         }
         /* (non-Javadoc)
@@ -84,53 +84,34 @@ namespace Lucene.Net.Search.Similar
             return "like:" + likeText;
         }
 
-        public float GetPercentTermsToMatch()
+        public float PercentTermsToMatch
         {
-            return percentTermsToMatch;
-        }
-        public void SetPercentTermsToMatch(float percentTermsToMatch)
-        {
-            this.percentTermsToMatch = percentTermsToMatch;
-        }
-
-        public  Analyzer GetAnalyzer()
-        {
-            return analyzer;
+            get { return percentTermsToMatch; }
+            set { this.percentTermsToMatch = value; }
         }
 
-        public void SetAnalyzer(Analyzer analyzer)
+        public Analyzer Analyzer
         {
-            this.analyzer = analyzer;
+            get { return analyzer; }
+            set { this.analyzer = value; }
         }
 
-        public String GetLikeText()
+        public string LikeText
         {
-            return likeText;
+            get { return likeText; }
+            set { this.likeText = value; }
         }
 
-        public void SetLikeText(String likeText)
+        public int MaxQueryTerms
         {
-            this.likeText = likeText;
+            get { return maxQueryTerms; }
+            set { this.maxQueryTerms = value; }
         }
 
-        public int GetMaxQueryTerms()
+        public int MinTermFrequency
         {
-            return maxQueryTerms;
-        }
-
-        public void SetMaxQueryTerms(int maxQueryTerms)
-        {
-            this.maxQueryTerms = maxQueryTerms;
-        }
-
-        public int GetMinTermFrequency()
-        {
-            return minTermFrequency;
-        }
-
-        public void SetMinTermFrequency(int minTermFrequency)
-        {
-            this.minTermFrequency = minTermFrequency;
+            get { return minTermFrequency; }
+            set { this.minTermFrequency = value; }
         }
 
         public String[] GetMoreLikeFields()
@@ -151,14 +132,10 @@ namespace Lucene.Net.Search.Similar
             this.stopWords = stopWords;
         }
 
-        public int GetMinDocFreq()
-        {
-            return minDocFreq;
-        }
-
-        public void SetMinDocFreq(int minDocFreq)
+        public int MinDocFreq
         {
-            this.minDocFreq = minDocFreq;
+            get { return minDocFreq; }
+            set { this.minDocFreq = value; }
         }
     }
 }

Modified: incubator/lucene.net/trunk/src/contrib/Regex/IRegexQueryCapable.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Regex/IRegexQueryCapable.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Regex/IRegexQueryCapable.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Regex/IRegexQueryCapable.cs Wed Jul 18 19:55:17 2012
@@ -23,7 +23,6 @@ namespace Lucene.Net.Search.Regex
 	/// <remarks>http://www.java2s.com/Open-Source/Java-Document/Net/lucene-connector/org/apache/lucene/search/regex/RegexQueryCapable.java.htm</remarks>
 	public interface IRegexQueryCapable
 	{
-		void SetRegexImplementation(IRegexCapabilities impl);
-		IRegexCapabilities GetRegexImplementation();
+	    IRegexCapabilities RegexImplementation { set; get; }
 	}
 }

Modified: incubator/lucene.net/trunk/src/contrib/Regex/RegexQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Regex/RegexQuery.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Regex/RegexQuery.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Regex/RegexQuery.cs Wed Jul 18 19:55:17 2012
@@ -42,18 +42,14 @@ namespace Lucene.Net.Search.Regex
 			return new RegexTermEnum(reader, Term, _regexImpl);
 		}
 
-		public void SetRegexImplementation(IRegexCapabilities impl)
-		{
-			_regexImpl = impl;
-		}
-
-		public IRegexCapabilities GetRegexImplementation()
-		{
-			return _regexImpl;
-		}
+	    public IRegexCapabilities RegexImplementation
+	    {
+	        set { _regexImpl = value; }
+	        get { return _regexImpl; }
+	    }
 
 
-        public override String ToString(String field)
+	    public override String ToString(String field)
         {
             StringBuilder buffer = new StringBuilder();
             if (!Term.Field.Equals(field))

Modified: incubator/lucene.net/trunk/src/contrib/Regex/SpanRegexQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Regex/SpanRegexQuery.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Regex/SpanRegexQuery.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Regex/SpanRegexQuery.cs Wed Jul 18 19:55:17 2012
@@ -40,12 +40,12 @@ namespace Lucene.Net.Search.Regex
 			_term = term;
 		}
 
-		public Term GetTerm()
-		{
-			return _term;
-		}
+	    public Term Term
+	    {
+	        get { return _term; }
+	    }
 
-		public override string ToString(string field)
+	    public override string ToString(string field)
 		{
 			StringBuilder sb = new StringBuilder();
 			sb.Append("SpanRegexQuery(");
@@ -58,7 +58,7 @@ namespace Lucene.Net.Search.Regex
 		public override Query Rewrite(IndexReader reader)
 		{
 			RegexQuery orig = new RegexQuery(_term);
-			orig.SetRegexImplementation(_regexImpl);
+			orig.RegexImplementation = _regexImpl;
 
 			// RegexQuery (via MultiTermQuery).Rewrite always returns a BooleanQuery
 			orig.RewriteMethod = MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE;	//@@
@@ -105,18 +105,14 @@ namespace Lucene.Net.Search.Regex
             ICollection<Term> terms = new List<Term>(){_term};
 		    return terms;
         }
-    
-		public void SetRegexImplementation(IRegexCapabilities impl)
-		{
-			_regexImpl = impl;
-		}
 
-		public IRegexCapabilities GetRegexImplementation()
-		{
-			return _regexImpl;
-		}
+	    public IRegexCapabilities RegexImplementation
+	    {
+	        set { _regexImpl = value; }
+	        get { return _regexImpl; }
+	    }
 
-		/// <summary>
+	    /// <summary>
 		/// Indicates whether the current object is equal to another object of the same type.
 		/// </summary>
 		/// <returns>
@@ -127,7 +123,7 @@ namespace Lucene.Net.Search.Regex
 		public bool Equals(SpanRegexQuery other)
 		{
 			if (other == null) return false;
-			if (this == other) return true;
+			if (ReferenceEquals(this, other)) return true;
 
 			if (!_regexImpl.Equals(other._regexImpl)) return false;
 			if (!_term.Equals(other._term)) return false;

Modified: incubator/lucene.net/trunk/src/contrib/SpellChecker/Spell/IDictionary.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/SpellChecker/Spell/IDictionary.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/SpellChecker/Spell/IDictionary.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/SpellChecker/Spell/IDictionary.cs Wed Jul 18 19:55:17 2012
@@ -25,6 +25,6 @@ namespace SpellChecker.Net.Search.Spell
         /// <summary> return all the words present in the dictionary</summary>
         /// <returns> Iterator
         /// </returns>
-        System.Collections.IEnumerator GetWordsIterator();
+        System.Collections.Generic.IEnumerator<string> GetWordsIterator();
     }
 }
\ No newline at end of file

Modified: incubator/lucene.net/trunk/src/contrib/SpellChecker/Spell/JaroWinklerDistance.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/SpellChecker/Spell/JaroWinklerDistance.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/SpellChecker/Spell/JaroWinklerDistance.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/SpellChecker/Spell/JaroWinklerDistance.cs Wed Jul 18 19:55:17 2012
@@ -114,29 +114,18 @@ namespace SpellChecker.Net.Search.Spell
                 return 0f;
             
             float j = ((m / s1.Length + m / s2.Length + (m - mtp[1]) / m)) / 3;
-            float jw = j < GetThreshold() ? j : j + Math.Min(0.1f, 1f / mtp[3]) * mtp[2] * (1 - j);
+            float jw = j < Threshold ? j : j + Math.Min(0.1f, 1f / mtp[3]) * mtp[2] * (1 - j);
             return jw;
         }
 
         /// <summary>
-        /// Sets the threshold used to deterMine when Winkler bonus should be used.
-        /// Set to a negative value to get the Jaro distance.
+        /// Gets or sets the current value of the threshold used for adding the Winkler bonus.
+        /// Set to a negative value to get the Jaro distance. The default value is 0.7.
         /// </summary>
-        /// <param name="threshold">the new value of the threshold</param>
-        public void SetThreshold(float threshold)
+        public float Threshold
         {
-            this.threshold = threshold;
+            get { return threshold; }
+            set { this.threshold = value; }
         }
-
-        /// <summary>
-        /// Returns the current value of the threshold used for adding the Winkler bonus.
-        /// The default value is 0.7.
-        /// </summary>
-        /// <returns>the current value of the threshold</returns>
-        public float GetThreshold()
-        {
-            return threshold;
-        }
-
     }
 }

Modified: incubator/lucene.net/trunk/src/contrib/SpellChecker/Spell/LuceneDictionary.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/SpellChecker/Spell/LuceneDictionary.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/SpellChecker/Spell/LuceneDictionary.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/SpellChecker/Spell/LuceneDictionary.cs Wed Jul 18 19:55:17 2012
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+using System.Collections;
 using Lucene.Net.Documents;
 
 namespace SpellChecker.Net.Search.Spell
@@ -27,7 +28,7 @@ namespace SpellChecker.Net.Search.Spell
     /// <summary> 
     /// Lucene Dictionary
     /// </summary>
-    public class LuceneDictionary : IDictionary
+    public class LuceneDictionary : IDictionary, System.Collections.Generic.IEnumerable<string>
     {
         internal IndexReader reader;
         internal System.String field;
@@ -38,18 +39,22 @@ namespace SpellChecker.Net.Search.Spell
             this.field = field;
         }
 
-        virtual public System.Collections.IEnumerator GetWordsIterator()
+        virtual public System.Collections.Generic.IEnumerator<string> GetWordsIterator()
         {
             return new LuceneIterator(this);
         }
 
-        public System.Collections.IEnumerator GetEnumerator()
+        public System.Collections.Generic.IEnumerator<string> GetEnumerator()
         {
             return GetWordsIterator();
         }
+        
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
 		
-		
-        internal sealed class LuceneIterator : System.Collections.IEnumerator
+        internal sealed class LuceneIterator : System.Collections.Generic.IEnumerator<string>
         {
             private readonly TermEnum termEnum;
             private Term actualTerm;
@@ -70,8 +75,7 @@ namespace SpellChecker.Net.Search.Spell
                 }
             }
 
-            //next()
-            public System.Object Current
+            public string Current
             {
                 get
                 {
@@ -84,8 +88,12 @@ namespace SpellChecker.Net.Search.Spell
                 }
 
             }
+
+            object IEnumerator.Current
+            {
+                get { return Current; }
+            }
 			
-            //hasNext()
             public bool MoveNext()
             {
                 hasNextCalled = true;
@@ -109,12 +117,17 @@ namespace SpellChecker.Net.Search.Spell
 
             public void Remove()
             {
-                throw new NotImplementedException();
+
             }
 
             public void Reset()
             {
-                throw new NotImplementedException();
+
+            }
+
+            public void Dispose()
+            {
+                // Nothing
             }
         }
     }

Modified: incubator/lucene.net/trunk/src/contrib/SpellChecker/Spell/PlainTextDictionary.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/SpellChecker/Spell/PlainTextDictionary.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/SpellChecker/Spell/PlainTextDictionary.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/SpellChecker/Spell/PlainTextDictionary.cs Wed Jul 18 19:55:17 2012
@@ -30,12 +30,22 @@ namespace SpellChecker.Net.Search.Spell
     /// </summary>
     /// <author>  Nicolas Maisonneuve
     /// </author>
-    public class PlainTextDictionary : IDictionary
+    public class PlainTextDictionary : IDictionary, System.Collections.Generic.IEnumerable<string>
     {
-        virtual public System.Collections.IEnumerator GetWordsIterator()
+        virtual public System.Collections.Generic.IEnumerator<string> GetWordsIterator()
         {
             return new FileIterator(this);
         }
+
+        public System.Collections.Generic.IEnumerator<string> GetEnumerator()
+        {
+            return GetWordsIterator();
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
 		
         private System.IO.StreamReader in_Renamed;
         private System.String line;
@@ -50,20 +60,23 @@ namespace SpellChecker.Net.Search.Spell
         {
             in_Renamed = new System.IO.StreamReader(new System.IO.StreamReader(dictFile, System.Text.Encoding.Default).BaseStream, new System.IO.StreamReader(dictFile, System.Text.Encoding.Default).CurrentEncoding);
         }
-		
-		
-        internal sealed class FileIterator : System.Collections.IEnumerator
+
+
+        internal sealed class FileIterator : System.Collections.Generic.IEnumerator<string>
         {
             public FileIterator(PlainTextDictionary enclosingInstance)
             {
                 InitBlock(enclosingInstance);
             }
-            private void  InitBlock(PlainTextDictionary enclosingInstance)
+
+            private void InitBlock(PlainTextDictionary enclosingInstance)
             {
                 this.enclosingInstance = enclosingInstance;
             }
+
             private PlainTextDictionary enclosingInstance;
-            public System.Object Current
+
+            public string Current
             {
                 get
                 {
@@ -74,18 +87,28 @@ namespace SpellChecker.Net.Search.Spell
                     Enclosing_Instance.has_next_called = false;
                     return Enclosing_Instance.line;
                 }
-				
             }
-            public PlainTextDictionary Enclosing_Instance
+
+            object System.Collections.IEnumerator.Current
             {
                 get
                 {
-                    return enclosingInstance;
+                    if (!Enclosing_Instance.has_next_called)
+                    {
+                        MoveNext();
+                    }
+                    Enclosing_Instance.has_next_called = false;
+                    return Enclosing_Instance.line;
                 }
-				
+
             }
-			
-			
+
+            public PlainTextDictionary Enclosing_Instance
+            {
+                get { return enclosingInstance; }
+
+            }
+
             public bool MoveNext()
             {
                 Enclosing_Instance.has_next_called = true;
@@ -99,16 +122,21 @@ namespace SpellChecker.Net.Search.Spell
                     Enclosing_Instance.line = null;
                     return false;
                 }
-                return (Enclosing_Instance.line != null)?true:false;
+                return (Enclosing_Instance.line != null) ? true : false;
+            }
+
+
+            public void Remove()
+            {
             }
-			
-			
-            public void  Remove()
+
+            public void Reset()
             {
             }
-			
-            public void  Reset()
+
+            public void Dispose()
             {
+
             }
         }
     }

Modified: incubator/lucene.net/trunk/src/core/Index/ByteSliceWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/ByteSliceWriter.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/ByteSliceWriter.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/ByteSliceWriter.cs Wed Jul 18 19:55:17 2012
@@ -20,15 +20,12 @@ using Lucene.Net.Support;
 
 namespace Lucene.Net.Index
 {
-	
 	/// <summary> Class to write byte streams into slices of shared
 	/// byte[].  This is used by DocumentsWriter to hold the
 	/// posting list for many terms in RAM.
 	/// </summary>
-	
 	public sealed class ByteSliceWriter
 	{
-		
 		private byte[] slice;
 		private int upto;
 		private ByteBlockPool pool;
@@ -88,12 +85,6 @@ namespace Lucene.Net.Index
 	        get { return upto + (offset0 & DocumentsWriter.BYTE_BLOCK_NOT_MASK); }
 	    }
 
-        [Obsolete("Use Address property instead.")]
-        public int GetAddress()
-        {
-            return Address;
-        }
-
 	    public void  WriteVInt(int i)
 		{
 			while ((i & ~ 0x7F) != 0)

Modified: incubator/lucene.net/trunk/src/core/Index/FieldsReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/FieldsReader.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/FieldsReader.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/FieldsReader.cs Wed Jul 18 19:55:17 2012
@@ -582,31 +582,35 @@ namespace Lucene.Net.Index
 		        }
 		    }
 
-		    public long GetPointer()
-			{
-				Enclosing_Instance.EnsureOpen();
-				return pointer;
-			}
-			
-			public void  SetPointer(long pointer)
-			{
-				Enclosing_Instance.EnsureOpen();
-				this.pointer = pointer;
-			}
-			
-			public int GetToRead()
-			{
-				Enclosing_Instance.EnsureOpen();
-				return toRead;
-			}
-			
-			public void  SetToRead(int toRead)
-			{
-				Enclosing_Instance.EnsureOpen();
-				this.toRead = toRead;
-			}
-			
-			public override byte[] GetBinaryValue(byte[] result)
+		    public long Pointer
+		    {
+		        get
+		        {
+		            Enclosing_Instance.EnsureOpen();
+		            return pointer;
+		        }
+		        set
+		        {
+		            Enclosing_Instance.EnsureOpen();
+		            this.pointer = value;
+		        }
+		    }
+
+		    public int ToRead
+		    {
+		        get
+		        {
+		            Enclosing_Instance.EnsureOpen();
+		            return toRead;
+		        }
+		        set
+		        {
+		            Enclosing_Instance.EnsureOpen();
+		            this.toRead = value;
+		        }
+		    }
+
+		    public override byte[] GetBinaryValue(byte[] result)
 			{
 				Enclosing_Instance.EnsureOpen();
 				

Modified: incubator/lucene.net/trunk/src/core/Index/IndexWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/IndexWriter.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/IndexWriter.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/IndexWriter.cs Wed Jul 18 19:55:17 2012
@@ -1483,36 +1483,33 @@ namespace Lucene.Net.Index
 			return maxFieldLength;
 		}
 
-	    /// Sets the termsIndexDivisor passed to any readers that
+	    /// Gets or sets the termsIndexDivisor passed to any readers that
 	    /// IndexWriter opens, for example when applying deletes
 	    /// or creating a near-real-time reader in 
 	    /// <see cref="GetReader()"/>.  Default value is 
 	    /// <see cref="IndexReader.DEFAULT_TERMS_INDEX_DIVISOR"/>.
-	    public void SetReaderTermsIndexDivisor(int value)
+	    public int ReaderTermsIndexDivisor
 	    {
-	        EnsureOpen();
-	        if (value <= 0)
+	        get
 	        {
-	            throw new System.ArgumentException("divisor must be >= 1 (got " + value + ")");
+	            EnsureOpen();
+	            return readerTermsIndexDivisor;
 	        }
-	        readerTermsIndexDivisor = value;
-	        if (infoStream != null)
+	        set
 	        {
-	            Message("setReaderTermsIndexDivisor " + readerTermsIndexDivisor);
+	            EnsureOpen();
+	            if (value <= 0)
+	            {
+	                throw new ArgumentException("divisor must be >= 1 (got " + value + ")");
+	            }
+	            readerTermsIndexDivisor = value;
+	            if (infoStream != null)
+	            {
+	                Message("setReaderTermsIndexDivisor " + readerTermsIndexDivisor);
+	            }
 	        }
 	    }
 
-	    /// Gets the termsIndexDivisor passed to any readers that
-	    /// IndexWriter opens, for example when applying deletes
-	    /// or creating a near-real-time reader in 
-	    /// <see cref="GetReader()"/>.  Default value is 
-	    /// <see cref="IndexReader.DEFAULT_TERMS_INDEX_DIVISOR"/>.
-	    public int GetReaderTermsIndexDivisor()
-	    {
-	        EnsureOpen();
-	        return readerTermsIndexDivisor;
-	    }
-
 	    /// <summary>Determines the minimal number of documents required
 		/// before the buffered in-memory documents are flushed as
 		/// a new Segment.  Large values generally gives faster

Modified: incubator/lucene.net/trunk/src/core/Index/SegmentTermDocs.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/SegmentTermDocs.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/SegmentTermDocs.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/SegmentTermDocs.cs Wed Jul 18 19:55:17 2012
@@ -56,8 +56,8 @@ namespace Lucene.Net.Index
 			{
 				this.deletedDocs = parent.deletedDocs;
 			}
-			this.skipInterval = parent.core.GetTermsReader().GetSkipInterval();
-			this.maxSkipLevels = parent.core.GetTermsReader().GetMaxSkipLevels();
+			this.skipInterval = parent.core.GetTermsReader().SkipInterval;
+			this.maxSkipLevels = parent.core.GetTermsReader().MaxSkipLevels;
 		}
 		
 		public virtual void  Seek(Term term)

Modified: incubator/lucene.net/trunk/src/core/Index/TermInfosReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/TermInfosReader.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/TermInfosReader.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/TermInfosReader.cs Wed Jul 18 19:55:17 2012
@@ -130,16 +130,16 @@ namespace Lucene.Net.Index
 				}
 			}
 		}
-		
-		public int GetSkipInterval()
-		{
-			return origEnum.skipInterval;
-		}
-		
-		public int GetMaxSkipLevels()
-		{
-			return origEnum.maxSkipLevels;
-		}
+
+        public int SkipInterval
+        {
+            get { return origEnum.skipInterval; }
+        }
+
+        public int MaxSkipLevels
+        {
+            get { return origEnum.maxSkipLevels; }
+        }
 
         public void Dispose()
         {
@@ -194,7 +194,7 @@ namespace Lucene.Net.Index
 			return hi;
 		}
 		
-		private void  SeekEnum(SegmentTermEnum enumerator, int indexOffset)
+		private void SeekEnum(SegmentTermEnum enumerator, int indexOffset)
 		{
 			enumerator.Seek(indexPointers[indexOffset], ((long)indexOffset * totalIndexInterval) - 1, indexTerms[indexOffset], indexInfos[indexOffset]);
 		}

Modified: incubator/lucene.net/trunk/src/core/Messages/MessageImpl.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Messages/MessageImpl.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Messages/MessageImpl.cs (original)
+++ incubator/lucene.net/trunk/src/core/Messages/MessageImpl.cs Wed Jul 18 19:55:17 2012
@@ -54,17 +54,17 @@ namespace Lucene.Net.Messages
 	        get { return this.key; }
 	    }
 
-	    public virtual System.String GetLocalizedMessage()
+	    public virtual string GetLocalizedMessage()
 		{
 			return GetLocalizedMessage(System.Threading.Thread.CurrentThread.CurrentCulture);
 		}
-		
-		public virtual System.String GetLocalizedMessage(System.Globalization.CultureInfo locale)
+
+        public virtual string GetLocalizedMessage(System.Globalization.CultureInfo locale)
 		{
 			return NLS.GetLocalizedMessage(Key, locale, GetArguments());
 		}
-		
-		public override System.String ToString()
+
+        public override string ToString()
 		{
 			System.Object[] args = GetArguments();
 			StringBuilder argsString = new StringBuilder();

Modified: incubator/lucene.net/trunk/src/core/QueryParser/QueryParser.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/QueryParser/QueryParser.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/QueryParser/QueryParser.cs (original)
+++ incubator/lucene.net/trunk/src/core/QueryParser/QueryParser.cs Wed Jul 18 19:55:17 2012
@@ -352,12 +352,6 @@ namespace Lucene.Net.QueryParsers
             get { return locale; }
         }
 
-        /// <summary> Returns current locale, allowing access by subclasses.</summary>
-        public virtual System.Globalization.CultureInfo GetLocale()
-        {
-            return locale;
-        }
-
         /// <summary> Sets the default date resolution used by RangeQueries for fields for which no
         /// specific date resolutions has been set. Field specific resolutions can be set
         /// with {@link #SetDateResolution(String, DateTools.Resolution)}.

Modified: incubator/lucene.net/trunk/src/core/Search/BooleanClause.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/BooleanClause.cs?rev=1363077&r1=1363076&r2=1363077&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/BooleanClause.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/BooleanClause.cs Wed Jul 18 19:55:17 2012
@@ -109,8 +109,7 @@ namespace Lucene.Net.Search
         /// clauses one or more <c>SHOULD</c> clauses must match a document 
         /// for the BooleanQuery to match.
         /// </summary>
-        /// <seealso cref="BooleanQuery.SetMinimumNumberShouldMatch">
-        /// </seealso>
+        /// <seealso cref="BooleanQuery.MinimumNumberShouldMatch" />
         public static readonly Occur SHOULD = new Occur("SHOULD");
 
         /// <summary>Use this operator for clauses that <i>must not</i> appear in the matching documents.



Mime
View raw message