lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccurr...@apache.org
Subject svn commit: r1353648 [1/3] - in /incubator/lucene.net/trunk: src/contrib/Analyzers/BR/ src/contrib/Analyzers/Cz/ src/contrib/Analyzers/De/ src/contrib/Analyzers/Fr/ src/contrib/Analyzers/Hunspell/ src/contrib/Analyzers/Nl/ src/contrib/Analyzers/Payload...
Date Mon, 25 Jun 2012 16:47:58 GMT
Author: ccurrens
Date: Mon Jun 25 16:47:35 2012
New Revision: 1353648

URL: http://svn.apache.org/viewvc?rev=1353648&view=rev
Log:
LUCENENET-470 - Changed Term() in TermEnum to be a property instead of a method.

Modified:
    incubator/lucene.net/trunk/src/contrib/Analyzers/BR/BrazilianStemFilter.cs
    incubator/lucene.net/trunk/src/contrib/Analyzers/Cz/CzechAnalyzer.cs
    incubator/lucene.net/trunk/src/contrib/Analyzers/De/GermanStemFilter.cs
    incubator/lucene.net/trunk/src/contrib/Analyzers/Fr/FrenchStemFilter.cs
    incubator/lucene.net/trunk/src/contrib/Analyzers/Hunspell/HunspellStemFilter.cs
    incubator/lucene.net/trunk/src/contrib/Analyzers/Nl/DutchStemFilter.cs
    incubator/lucene.net/trunk/src/contrib/Analyzers/Payloads/IdentityEncoder.cs
    incubator/lucene.net/trunk/src/contrib/Analyzers/Query/QueryAutoStopWordAnalyzer.cs
    incubator/lucene.net/trunk/src/contrib/Analyzers/Ru/RussianStemFilter.cs
    incubator/lucene.net/trunk/src/contrib/Analyzers/Shingle/ShingleAnalyzerWrapper.cs
    incubator/lucene.net/trunk/src/contrib/Analyzers/Sinks/DateRecognizerSinkFilter.cs
    incubator/lucene.net/trunk/src/contrib/Core/Index/FieldEnumerator.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/Highlighter.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/QueryScorer.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/QueryTermScorer.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleSpanFragmenter.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/TokenGroup.cs
    incubator/lucene.net/trunk/src/contrib/Highlighter/TokenSources.cs
    incubator/lucene.net/trunk/src/contrib/Memory/MemoryIndex.cs
    incubator/lucene.net/trunk/src/contrib/Memory/MemoryTermEnum.cs
    incubator/lucene.net/trunk/src/contrib/Memory/MemoryTermPositions.cs
    incubator/lucene.net/trunk/src/contrib/Queries/DuplicateFilter.cs
    incubator/lucene.net/trunk/src/contrib/Queries/FuzzyLikeThisQuery.cs
    incubator/lucene.net/trunk/src/contrib/Queries/Similar/MoreLikeThis.cs
    incubator/lucene.net/trunk/src/contrib/Queries/Similar/SimilarityQueries.cs
    incubator/lucene.net/trunk/src/contrib/Similarity/Similar/MoreLikeThis.cs
    incubator/lucene.net/trunk/src/contrib/Similarity/Similar/SimilarityQueries.cs
    incubator/lucene.net/trunk/src/contrib/SimpleFacetedSearch/FieldValuesBitSets.cs
    incubator/lucene.net/trunk/src/contrib/Snowball/Lucene.Net/Analysis/Snowball/SnowballFilter.cs
    incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Among.cs
    incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/SnowballProgram.cs
    incubator/lucene.net/trunk/src/contrib/Spatial/Util/CompatibilityExtensions.cs
    incubator/lucene.net/trunk/src/contrib/Spatial/Util/TermsEnumCompatibility.cs
    incubator/lucene.net/trunk/src/contrib/SpellChecker/Spell/LuceneDictionary.cs
    incubator/lucene.net/trunk/src/core/Analysis/PorterStemmer.cs
    incubator/lucene.net/trunk/src/core/Analysis/Standard/StandardTokenizerImpl.cs
    incubator/lucene.net/trunk/src/core/Analysis/Token.cs
    incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/ITermAttribute.cs
    incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/TermAttribute.cs
    incubator/lucene.net/trunk/src/core/Index/CheckIndex.cs
    incubator/lucene.net/trunk/src/core/Index/CompoundFileReader.cs
    incubator/lucene.net/trunk/src/core/Index/CompoundFileWriter.cs
    incubator/lucene.net/trunk/src/core/Index/DirectoryReader.cs
    incubator/lucene.net/trunk/src/core/Index/FilterIndexReader.cs
    incubator/lucene.net/trunk/src/core/Index/IndexFileDeleter.cs
    incubator/lucene.net/trunk/src/core/Index/IndexReader.cs
    incubator/lucene.net/trunk/src/core/Index/IndexWriter.cs
    incubator/lucene.net/trunk/src/core/Index/ParallelReader.cs
    incubator/lucene.net/trunk/src/core/Index/SegmentMergeInfo.cs
    incubator/lucene.net/trunk/src/core/Index/SegmentReader.cs
    incubator/lucene.net/trunk/src/core/Index/SegmentTermDocs.cs
    incubator/lucene.net/trunk/src/core/Index/SegmentTermEnum.cs
    incubator/lucene.net/trunk/src/core/Index/TermBuffer.cs
    incubator/lucene.net/trunk/src/core/Index/TermEnum.cs
    incubator/lucene.net/trunk/src/core/Index/TermInfosReader.cs
    incubator/lucene.net/trunk/src/core/Lucene.Net.csproj
    incubator/lucene.net/trunk/src/core/Messages/NLS.cs
    incubator/lucene.net/trunk/src/core/QueryParser/QueryParser.cs
    incubator/lucene.net/trunk/src/core/QueryParser/QueryParserTokenManager.cs
    incubator/lucene.net/trunk/src/core/Search/FieldCacheImpl.cs
    incubator/lucene.net/trunk/src/core/Search/FieldCacheRangeFilter.cs
    incubator/lucene.net/trunk/src/core/Search/FieldCacheTermsFilter.cs
    incubator/lucene.net/trunk/src/core/Search/FilteredTermEnum.cs
    incubator/lucene.net/trunk/src/core/Search/Function/DocValues.cs
    incubator/lucene.net/trunk/src/core/Search/FuzzyQuery.cs
    incubator/lucene.net/trunk/src/core/Search/MultiSearcher.cs
    incubator/lucene.net/trunk/src/core/Search/MultiTermQuery.cs
    incubator/lucene.net/trunk/src/core/Search/MultiTermQueryWrapperFilter.cs
    incubator/lucene.net/trunk/src/core/Search/NumericRangeQuery.cs
    incubator/lucene.net/trunk/src/core/Search/QueryTermVector.cs
    incubator/lucene.net/trunk/src/core/Store/IndexInput.cs
    incubator/lucene.net/trunk/src/core/Store/Lock.cs
    incubator/lucene.net/trunk/src/core/Store/LockStressTest.cs
    incubator/lucene.net/trunk/src/core/Store/MMapDirectory.cs
    incubator/lucene.net/trunk/src/core/Util/AttributeSource.cs
    incubator/lucene.net/trunk/src/demo/Demo.Common/HTML/HTMLParserTokenManager.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Fr/TestElision.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Payloads/DelimitedPayloadTokenFilterTest.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Payloads/NumericPayloadTokenFilterTest.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Query/QueryAutoStopWordAnalyzerTest.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Reverse/TestReverseStringFilter.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Ru/TestRussianAnalyzer.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Shingle/ShingleAnalyzerWrapperTest.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Shingle/ShingleFilterTest.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Shingle/TestShingleMatrixFilter.cs
    incubator/lucene.net/trunk/test/contrib/Analyzers/Sinks/TokenTypeSinkTokenizerTest.cs
    incubator/lucene.net/trunk/test/contrib/Core/Analysis/Ext/Analysis.Ext.Test.cs
    incubator/lucene.net/trunk/test/contrib/Highlighter/HighlighterTest.cs
    incubator/lucene.net/trunk/test/contrib/Snowball/Analysis/Snowball/TestSnowball.cs
    incubator/lucene.net/trunk/test/core/Analysis/BaseTokenStreamTestCase.cs
    incubator/lucene.net/trunk/test/core/Analysis/TestASCIIFoldingFilter.cs
    incubator/lucene.net/trunk/test/core/Analysis/TestCachingTokenFilter.cs
    incubator/lucene.net/trunk/test/core/Analysis/TestISOLatin1AccentFilter.cs
    incubator/lucene.net/trunk/test/core/Analysis/TestLengthFilter.cs
    incubator/lucene.net/trunk/test/core/Analysis/TestNumericTokenStream.cs
    incubator/lucene.net/trunk/test/core/Analysis/TestPerFieldAnalzyerWrapper.cs
    incubator/lucene.net/trunk/test/core/Analysis/TestStandardAnalyzer.cs
    incubator/lucene.net/trunk/test/core/Analysis/TestStopAnalyzer.cs
    incubator/lucene.net/trunk/test/core/Analysis/TestStopFilter.cs
    incubator/lucene.net/trunk/test/core/Analysis/TestTeeSinkTokenFilter.cs
    incubator/lucene.net/trunk/test/core/Analysis/TestToken.cs
    incubator/lucene.net/trunk/test/core/Analysis/Tokenattributes/TestTermAttributeImpl.cs
    incubator/lucene.net/trunk/test/core/Index/DocHelper.cs
    incubator/lucene.net/trunk/test/core/Index/TestAddIndexesNoOptimize.cs
    incubator/lucene.net/trunk/test/core/Index/TestDeletionPolicy.cs
    incubator/lucene.net/trunk/test/core/Index/TestDoc.cs
    incubator/lucene.net/trunk/test/core/Index/TestFieldInfos.cs
    incubator/lucene.net/trunk/test/core/Index/TestFilterIndexReader.cs
    incubator/lucene.net/trunk/test/core/Index/TestIndexReader.cs
    incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs
    incubator/lucene.net/trunk/test/core/Index/TestIndexWriterLockRelease.cs
    incubator/lucene.net/trunk/test/core/Index/TestParallelTermEnum.cs
    incubator/lucene.net/trunk/test/core/Index/TestPayloads.cs
    incubator/lucene.net/trunk/test/core/Index/TestSegmentReader.cs
    incubator/lucene.net/trunk/test/core/Index/TestSegmentTermEnum.cs
    incubator/lucene.net/trunk/test/core/Index/TestStressIndexing2.cs
    incubator/lucene.net/trunk/test/core/QueryParser/TestMultiAnalyzer.cs
    incubator/lucene.net/trunk/test/core/QueryParser/TestQueryParser.cs
    incubator/lucene.net/trunk/test/core/Search/CheckHits.cs
    incubator/lucene.net/trunk/test/core/Search/Function/TestFieldScoreQuery.cs
    incubator/lucene.net/trunk/test/core/Search/Function/TestOrdValues.cs
    incubator/lucene.net/trunk/test/core/Search/TestMultiPhraseQuery.cs
    incubator/lucene.net/trunk/test/core/Search/TestNumericRangeQuery32.cs
    incubator/lucene.net/trunk/test/core/Search/TestPhrasePrefixQuery.cs
    incubator/lucene.net/trunk/test/core/Search/TestTermVectors.cs
    incubator/lucene.net/trunk/test/core/Store/TestDirectory.cs
    incubator/lucene.net/trunk/test/core/Util/ArrayUtilTest.cs
    incubator/lucene.net/trunk/test/core/Util/LocalizedTestCase.cs
    incubator/lucene.net/trunk/test/core/Util/TestAttributeSource.cs

Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/BR/BrazilianStemFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/BR/BrazilianStemFilter.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Analyzers/BR/BrazilianStemFilter.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Analyzers/BR/BrazilianStemFilter.cs Mon Jun 25 16:47:35 2012
@@ -59,7 +59,7 @@ namespace Lucene.Net.Analysis.BR
         {
             if (input.IncrementToken())
             {
-                string term = termAtt.Term();
+                string term = termAtt.Term;
                 // Check the exclusion table.
                 if (exclusions == null || !exclusions.Contains(term))
                 {

Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Cz/CzechAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Cz/CzechAnalyzer.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Analyzers/Cz/CzechAnalyzer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Analyzers/Cz/CzechAnalyzer.cs Mon Jun 25 16:47:35 2012
@@ -166,7 +166,7 @@ public sealed class CzechAnalyzer : Anal
                 isr = new StreamReader(wordfile, encoding);
 
             stoptable = WordlistLoader.GetWordSet(isr);
-        } catch ( IOException e ) {
+        } catch ( IOException) {
           // clear any previous table (if present)
           // TODO: throw IOException
           stoptable = new HashSet<string>();

Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/De/GermanStemFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/De/GermanStemFilter.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Analyzers/De/GermanStemFilter.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Analyzers/De/GermanStemFilter.cs Mon Jun 25 16:47:35 2012
@@ -82,7 +82,7 @@ namespace Lucene.Net.Analysis.De
         {
             if (input.IncrementToken())
             {
-                String term = termAtt.Term();
+                String term = termAtt.Term;
                 // Check the exclusion table.
                 if (exclusionSet == null || !exclusionSet.Contains(term))
                 {

Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Fr/FrenchStemFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Fr/FrenchStemFilter.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Analyzers/Fr/FrenchStemFilter.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Analyzers/Fr/FrenchStemFilter.cs Mon Jun 25 16:47:35 2012
@@ -75,7 +75,7 @@ namespace Lucene.Net.Analysis.Fr
         {
             if (input.IncrementToken())
             {
-                String term = termAtt.Term();
+                String term = termAtt.Term;
 
                 // Check the exclusion table
                 if (exclusions == null || !exclusions.Contains(term))

Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Hunspell/HunspellStemFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Hunspell/HunspellStemFilter.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Analyzers/Hunspell/HunspellStemFilter.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Analyzers/Hunspell/HunspellStemFilter.cs Mon Jun 25 16:47:35 2012
@@ -65,8 +65,8 @@ namespace Lucene.Net.Analysis.Hunspell {
                 return false;
 
             var newTerms = _dedup
-                               ? _stemmer.UniqueStems(_termAtt.Term())
-                               : _stemmer.Stem(_termAtt.Term());
+                               ? _stemmer.UniqueStems(_termAtt.Term)
+                               : _stemmer.Stem(_termAtt.Term);
             foreach (var newTerm in newTerms)
                 _buffer.Enqueue(newTerm);
 

Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Nl/DutchStemFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Nl/DutchStemFilter.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Analyzers/Nl/DutchStemFilter.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Analyzers/Nl/DutchStemFilter.cs Mon Jun 25 16:47:35 2012
@@ -82,7 +82,7 @@ namespace Lucene.Net.Analysis.Nl
         {
             if (input.IncrementToken())
             {
-                String term = termAtt.Term();
+                String term = termAtt.Term;
 
                 // Check the exclusion table.
                 if (exclusions == null || !exclusions.Contains(term))

Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Payloads/IdentityEncoder.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Payloads/IdentityEncoder.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Analyzers/Payloads/IdentityEncoder.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Analyzers/Payloads/IdentityEncoder.cs Mon Jun 25 16:47:35 2012
@@ -51,7 +51,7 @@ namespace Lucene.Net.Analysis.Payloads
             {
                 result = new Payload(encoding.GetBytes(tmp));
             }
-            catch (EncoderFallbackException e)
+            catch (EncoderFallbackException)
             {
                 //should never hit this, since we get the name from the Charset
             }

Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Query/QueryAutoStopWordAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Query/QueryAutoStopWordAnalyzer.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Analyzers/Query/QueryAutoStopWordAnalyzer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Analyzers/Query/QueryAutoStopWordAnalyzer.cs Mon Jun 25 16:47:35 2012
@@ -152,7 +152,7 @@ public class QueryAutoStopWordAnalyzer :
     HashSet<String> stopWords = new HashSet<String>();
     String internedFieldName = StringHelper.Intern(fieldName);
     TermEnum te = reader.Terms(new Term(fieldName));
-    Term term = te.Term();
+    Term term = te.Term;
     while (term != null) {
       if (term.Field != internedFieldName) {
         break;
@@ -163,7 +163,7 @@ public class QueryAutoStopWordAnalyzer :
       if (!te.Next()) {
         break;
       }
-      term = te.Term();
+      term = te.Term;
     }
     stopWordsPerField.Add(fieldName, stopWords);
     
@@ -181,7 +181,7 @@ public class QueryAutoStopWordAnalyzer :
     TokenStream result;
     try {
       result = _delegate.ReusableTokenStream(fieldName, reader);
-    } catch (IOException e) {
+    } catch (IOException) {
       result = _delegate.TokenStream(fieldName, reader);
     }
     HashSet<String> stopWords = stopWordsPerField[fieldName];

Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Ru/RussianStemFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Ru/RussianStemFilter.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Analyzers/Ru/RussianStemFilter.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Analyzers/Ru/RussianStemFilter.cs Mon Jun 25 16:47:35 2012
@@ -55,7 +55,7 @@ namespace Lucene.Net.Analysis.Ru
         {
             if (input.IncrementToken())
             {
-                String term = termAtt.Term();
+                String term = termAtt.Term;
                 String s = stemmer.Stem(term);
                 if (s != null && !s.Equals(term))
                     termAtt.SetTermBuffer(s);

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=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Analyzers/Shingle/ShingleAnalyzerWrapper.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Analyzers/Shingle/ShingleAnalyzerWrapper.cs Mon Jun 25 16:47:35 2012
@@ -110,7 +110,7 @@ namespace Lucene.Net.Analysis.Shingle
             {
                 wrapped = defaultAnalyzer.ReusableTokenStream(fieldName, reader);
             }
-            catch (IOException e)
+            catch (IOException)
             {
                 wrapped = defaultAnalyzer.TokenStream(fieldName, reader);
             }

Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Sinks/DateRecognizerSinkFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Sinks/DateRecognizerSinkFilter.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Analyzers/Sinks/DateRecognizerSinkFilter.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Analyzers/Sinks/DateRecognizerSinkFilter.cs Mon Jun 25 16:47:35 2012
@@ -63,13 +63,13 @@ namespace Lucene.Net.Analysis.Sinks
             }
             try
             {
-                DateTime date = DateTime.Parse(termAtt.Term(), dateFormat);//We don't care about the date, just that we can parse it as a date
+                DateTime date = DateTime.Parse(termAtt.Term, dateFormat);//We don't care about the date, just that we can parse it as a date
                 if (date != null)
                 {
                     return true;
                 }
             }
-            catch (FormatException e)
+            catch (FormatException)
             {
 
             }

Modified: incubator/lucene.net/trunk/src/contrib/Core/Index/FieldEnumerator.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Core/Index/FieldEnumerator.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Core/Index/FieldEnumerator.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Core/Index/FieldEnumerator.cs Mon Jun 25 16:47:35 2012
@@ -255,7 +255,7 @@ namespace Lucene.Net.Index
                     }
                 }
 
-                this.currentTerm = termEnum.Term();
+                this.currentTerm = termEnum.Term;
                 if (this.currentTerm == null || (!this.currentTerm.Field.Equals(this.fieldName)))
                 {
                     return false;

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=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Highlighter/Highlighter.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Highlighter/Highlighter.cs Mon Jun 25 16:47:35 2012
@@ -201,7 +201,7 @@ namespace Lucene.Net.Search.Highlight
                         (offsetAtt.StartOffset > text.Length)
                         )
                     {
-                        throw new InvalidTokenOffsetsException("Token " + termAtt.Term()
+                        throw new InvalidTokenOffsetsException("Token " + termAtt.Term
                                                                + " exceeds length of provided text sized " + text.Length);
                     }
                     if ((tokenGroup.GetNumTokens() > 0) && (tokenGroup.IsDistinct()))

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=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Highlighter/QueryScorer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Highlighter/QueryScorer.cs Mon Jun 25 16:47:35 2012
@@ -148,7 +148,7 @@ namespace Lucene.Net.Search.Highlight
         public float GetTokenScore()
         {
             position += posIncAtt.PositionIncrement;
-            String termText = termAtt.Term();
+            String termText = termAtt.Term;
 
             WeightedSpanTerm weightedSpanTerm;
 

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=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Highlighter/QueryTermScorer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Highlighter/QueryTermScorer.cs Mon Jun 25 16:47:35 2012
@@ -137,7 +137,7 @@ namespace Lucene.Net.Search.Highlight
 
         public float GetTokenScore()
         {
-            String termText = termAtt.Term();
+            String termText = termAtt.Term;
 
             WeightedTerm queryTerm = termsToFind[termText];
             if (queryTerm == null)

Modified: incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleSpanFragmenter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleSpanFragmenter.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleSpanFragmenter.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Highlighter/SimpleSpanFragmenter.cs Mon Jun 25 16:47:35 2012
@@ -70,7 +70,7 @@ namespace Lucene.Net.Search.Highlight
                 return false;
             }
 
-            WeightedSpanTerm wSpanTerm = queryScorer.GetWeightedSpanTerm(termAtt.Term());
+            WeightedSpanTerm wSpanTerm = queryScorer.GetWeightedSpanTerm(termAtt.Term);
 
             if (wSpanTerm != null)
             {

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=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Highlighter/TokenGroup.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Highlighter/TokenGroup.cs Mon Jun 25 16:47:35 2012
@@ -80,7 +80,7 @@ namespace Lucene.Net.Search.Highlight
                     }
                 }
                 Token token = new Token(termStartOffset, termEndOffset);
-                token.SetTermBuffer(termAtt.Term());
+                token.SetTermBuffer(termAtt.Term);
                 tokens[NumTokens] = token;
                 scores[NumTokens] = score;
                 NumTokens++;

Modified: incubator/lucene.net/trunk/src/contrib/Highlighter/TokenSources.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Highlighter/TokenSources.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Highlighter/TokenSources.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Highlighter/TokenSources.cs Mon Jun 25 16:47:35 2012
@@ -59,7 +59,7 @@ namespace Lucene.Net.Search.Highlight
                 }
                 ClearAttributes();
                 Token token = tokens[currentToken++];
-                termAtt.SetTermBuffer(token.Term());
+                termAtt.SetTermBuffer(token.Term);
                 offsetAtt.SetOffset(token.StartOffset, token.EndOffset);
                 return true;
             }

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=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Memory/MemoryIndex.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Memory/MemoryIndex.cs Mon Jun 25 16:47:35 2012
@@ -301,7 +301,7 @@ namespace Lucene.Net.Index.Memory
                 stream.Reset();
                 while (stream.IncrementToken())
                 {
-                    String term = termAtt.Term();
+                    String term = termAtt.Term;
                     if (term.Length == 0) continue; // nothing to do
                     //        if (DEBUG) System.Diagnostics.Debug.WriteLine("token='" + term + "'");
                     numTokens++;

Modified: incubator/lucene.net/trunk/src/contrib/Memory/MemoryTermEnum.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Memory/MemoryTermEnum.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Memory/MemoryTermEnum.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Memory/MemoryTermEnum.cs Mon Jun 25 16:47:35 2012
@@ -61,14 +61,17 @@ namespace Lucene.Net.Index.Memory
                     return true;
                 }
 
-                public override Term Term()
+                public override Term Term
                 {
-                              if (DEBUG) System.Diagnostics.Debug.WriteLine("TermEnum.term: " + _i);
-                              if (_j >= _index.sortedFields.Length) return null;
-                              Info info = _reader.GetInfo(_j);
-                              if (_i >= info.SortedTerms.Length) return null;
-                    //          if (DEBUG) System.Diagnostics.Debug.WriteLine("TermEnum.term: " + i + ", " + info.sortedTerms[i].getKey());
-                              return CreateTerm(info, _j, info.SortedTerms[_i].Key);
+                    get
+                    {
+                        if (DEBUG) System.Diagnostics.Debug.WriteLine("TermEnum.term: " + _i);
+                        if (_j >= _index.sortedFields.Length) return null;
+                        Info info = _reader.GetInfo(_j);
+                        if (_i >= info.SortedTerms.Length) return null;
+                        //          if (DEBUG) System.Diagnostics.Debug.WriteLine("TermEnum.term: " + i + ", " + info.sortedTerms[i].getKey());
+                        return CreateTerm(info, _j, info.SortedTerms[_i].Key);
+                    }
                 }
 
                 public override int DocFreq()

Modified: incubator/lucene.net/trunk/src/contrib/Memory/MemoryTermPositions.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Memory/MemoryTermPositions.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Memory/MemoryTermPositions.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Memory/MemoryTermPositions.cs Mon Jun 25 16:47:35 2012
@@ -68,7 +68,7 @@ namespace Lucene.Net.Index.Memory
                 public void Seek(TermEnum termEnum)
                 {
                     if (DEBUG) System.Diagnostics.Debug.WriteLine(".seekEnum");
-                    Seek(termEnum.Term());
+                    Seek(termEnum.Term);
                 }
 
                 public int Doc

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=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Queries/DuplicateFilter.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Queries/DuplicateFilter.cs Mon Jun 25 16:47:35 2012
@@ -86,7 +86,7 @@ namespace Lucene.Net.Search
             TermEnum te = reader.Terms(startTerm);
             if (te != null)
             {
-                Term currTerm = te.Term();
+                Term currTerm = te.Term;
                 while ((currTerm != null) && (currTerm.Field == startTerm.Field)) //term fieldnames are interned
                 {
                     int lastDoc = -1;
@@ -111,7 +111,7 @@ namespace Lucene.Net.Search
                     {
                         break;
                     }
-                    currTerm = te.Term();
+                    currTerm = te.Term;
                 }
             }
             return bits;
@@ -125,7 +125,7 @@ namespace Lucene.Net.Search
             TermEnum te = reader.Terms(startTerm);
             if (te != null)
             {
-                Term currTerm = te.Term();
+                Term currTerm = te.Term;
 
                 while ((currTerm != null) && (currTerm.Field == startTerm.Field)) //term fieldnames are interned
                 {
@@ -154,7 +154,7 @@ namespace Lucene.Net.Search
                     {
                         break;
                     }
-                    currTerm = te.Term();
+                    currTerm = te.Term;
                 }
             }
             return bits;

Modified: incubator/lucene.net/trunk/src/contrib/Queries/FuzzyLikeThisQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Queries/FuzzyLikeThisQuery.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Queries/FuzzyLikeThisQuery.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Queries/FuzzyLikeThisQuery.cs Mon Jun 25 16:47:35 2012
@@ -198,7 +198,7 @@ namespace Lucene.Net.Search
             HashSet<string> processedTerms = new HashSet<string>();
             while (ts.IncrementToken())
             {
-                String term = termAtt.Term();
+                String term = termAtt.Term;
                 if (!processedTerms.Contains(term))
                 {
                     processedTerms.Add(term);
@@ -208,7 +208,7 @@ namespace Lucene.Net.Search
                     FuzzyTermEnum fe = new FuzzyTermEnum(reader, startTerm, f.minSimilarity, f.prefixLength);
                     TermEnum origEnum = reader.Terms(startTerm);
                     int df = 0;
-                    if (startTerm.Equals(origEnum.Term()))
+                    if (startTerm.Equals(origEnum.Term))
                     {
                         df = origEnum.DocFreq(); //store the df so all variants use same idf
                     }
@@ -216,7 +216,7 @@ namespace Lucene.Net.Search
                     int totalVariantDocFreqs = 0;
                     do
                     {
-                        Term possibleMatch = fe.Term();
+                        Term possibleMatch = fe.Term;
                         if (possibleMatch != null)
                         {
                             numVariants++;

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=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Queries/Similar/MoreLikeThis.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Queries/Similar/MoreLikeThis.cs Mon Jun 25 16:47:35 2012
@@ -900,7 +900,7 @@ namespace Lucene.Net.Search.Similar
             ITermAttribute termAtt = ts.AddAttribute<ITermAttribute>();
 			
 			while (ts.IncrementToken()) {
-				string word = termAtt.Term();
+				string word = termAtt.Term;
 				tokenCount++;
 				if(tokenCount>maxNumTokensParsed)
 				{

Modified: incubator/lucene.net/trunk/src/contrib/Queries/Similar/SimilarityQueries.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Queries/Similar/SimilarityQueries.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Queries/Similar/SimilarityQueries.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Queries/Similar/SimilarityQueries.cs Mon Jun 25 16:47:35 2012
@@ -93,7 +93,7 @@ namespace Similarity.Net
             ISet<string> already = new HashSet<string>(); // ignore dups
             while (ts.IncrementToken())
             {
-                String word = termAtt.Term();
+                String word = termAtt.Term;
                 // ignore opt stop words
                 if (stop != null && stop.Contains(word))
                     continue;

Modified: incubator/lucene.net/trunk/src/contrib/Similarity/Similar/MoreLikeThis.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Similarity/Similar/MoreLikeThis.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Similarity/Similar/MoreLikeThis.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Similarity/Similar/MoreLikeThis.cs Mon Jun 25 16:47:35 2012
@@ -830,7 +830,7 @@ namespace Similarity.Net
             var termAtt = ts.AddAttribute<ITermAttribute>();
 			
 			while (ts.IncrementToken()) {
-				String word = termAtt.Term();
+				String word = termAtt.Term;
 				tokenCount++;
 				if(tokenCount>maxNumTokensParsed)
 				{

Modified: incubator/lucene.net/trunk/src/contrib/Similarity/Similar/SimilarityQueries.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Similarity/Similar/SimilarityQueries.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Similarity/Similar/SimilarityQueries.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Similarity/Similar/SimilarityQueries.cs Mon Jun 25 16:47:35 2012
@@ -99,7 +99,7 @@ namespace Similarity.Net
             var already = new HashSet<String>(); // ignore dups
             while (ts.IncrementToken())
             {
-                String word = termAtt.Term();
+                String word = termAtt.Term;
                 // ignore opt stop words
                 if (stop != null &&
                     stop.Contains(word)) continue;

Modified: incubator/lucene.net/trunk/src/contrib/SimpleFacetedSearch/FieldValuesBitSets.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/SimpleFacetedSearch/FieldValuesBitSets.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/SimpleFacetedSearch/FieldValuesBitSets.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/SimpleFacetedSearch/FieldValuesBitSets.cs Mon Jun 25 16:47:35 2012
@@ -54,13 +54,13 @@ namespace Lucene.Net.Search
         {
             List<string> list = new List<string>();
             TermEnum te = _Reader.Terms(new Term(groupByField, ""));
-            if (te.Term().Field != groupByField) return list;
-            list.Add(te.Term().Text);
+            if (te.Term.Field != groupByField) return list;
+            list.Add(te.Term.Text);
 
             while (te.Next())
             {
-                if (te.Term().Field != groupByField) break;
-                list.Add(te.Term().Text);
+                if (te.Term.Field != groupByField) break;
+                list.Add(te.Term.Text);
             }
             return list;
         }

Modified: incubator/lucene.net/trunk/src/contrib/Snowball/Lucene.Net/Analysis/Snowball/SnowballFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Snowball/Lucene.Net/Analysis/Snowball/SnowballFilter.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Snowball/Lucene.Net/Analysis/Snowball/SnowballFilter.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Snowball/Lucene.Net/Analysis/Snowball/SnowballFilter.cs Mon Jun 25 16:47:35 2012
@@ -74,7 +74,7 @@ namespace Lucene.Net.Analysis.Snowball
 		{
             if (input.IncrementToken())
             {
-                String originalTerm = termAtt.Term();
+                String originalTerm = termAtt.Term;
                 stemmer.SetCurrent(originalTerm);
                 stemmer.Stem();
                 String finalTerm = stemmer.GetCurrent();

Modified: incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Among.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Among.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Among.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Among.cs Mon Jun 25 16:47:35 2012
@@ -37,7 +37,7 @@ namespace SF.Snowball
 				{
 					this.method = methodobject.GetType().GetMethod(methodname, System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.DeclaredOnly, null, new System.Type[0], null);
 				}
-				catch (System.MethodAccessException e)
+				catch (System.MethodAccessException)
 				{
 					// FIXME - debug message
 					this.method = null;

Modified: incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/SnowballProgram.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/SnowballProgram.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/SnowballProgram.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/SnowballProgram.cs Mon Jun 25 16:47:35 2012
@@ -301,12 +301,12 @@ namespace SF.Snowball
 						// {{Aroush}} UPGRADE_TODO: The equivalent in .NET for method 'java.lang.Object.toString' may return a different value. 'ms-help://MS.VSCC.2003/commoner/redir/redirect.htm?keyword="jlca1043_3"'
 						res = resobj.ToString().Equals("true");
 					}
-					catch (System.Reflection.TargetInvocationException e)
+					catch (System.Reflection.TargetInvocationException)
 					{
 						res = false;
 						// FIXME - debug message
 					}
-					catch (System.UnauthorizedAccessException e)
+					catch (System.UnauthorizedAccessException)
 					{
 						res = false;
 						// FIXME - debug message
@@ -391,12 +391,12 @@ namespace SF.Snowball
 						// {{Aroush}} UPGRADE_TODO: The equivalent in .NET for method 'java.lang.Object.toString' may return a different value. 'ms-help://MS.VSCC.2003/commoner/redir/redirect.htm?keyword="jlca1043_3"'
 						res = resobj.ToString().Equals("true");
 					}
-					catch (System.Reflection.TargetInvocationException e)
+					catch (System.Reflection.TargetInvocationException)
 					{
 						res = false;
 						// FIXME - debug message
 					}
-					catch (System.UnauthorizedAccessException e)
+					catch (System.UnauthorizedAccessException)
 					{
 						res = false;
 						// FIXME - debug message

Modified: incubator/lucene.net/trunk/src/contrib/Spatial/Util/CompatibilityExtensions.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Spatial/Util/CompatibilityExtensions.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Spatial/Util/CompatibilityExtensions.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Spatial/Util/CompatibilityExtensions.cs Mon Jun 25 16:47:35 2012
@@ -29,12 +29,12 @@ namespace Lucene.Net.Spatial.Util
 	{
 		public static void Append(this ITermAttribute termAtt, string str)
 		{
-			termAtt.SetTermBuffer(termAtt.Term() + str); // TODO: Not optimal, but works
+			termAtt.SetTermBuffer(termAtt.Term + str); // TODO: Not optimal, but works
 		}
 
 		public static void Append(this ITermAttribute termAtt, char ch)
 		{
-			termAtt.SetTermBuffer(termAtt.Term() + new string(new[] { ch })); // TODO: Not optimal, but works
+			termAtt.SetTermBuffer(termAtt.Term + new string(new[] { ch })); // TODO: Not optimal, but works
 		}
 
 		private static readonly ConcurrentDictionary<string, Bits> _docsWithFieldCache = new ConcurrentDictionary<string, Bits>();

Modified: incubator/lucene.net/trunk/src/contrib/Spatial/Util/TermsEnumCompatibility.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Spatial/Util/TermsEnumCompatibility.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Spatial/Util/TermsEnumCompatibility.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Spatial/Util/TermsEnumCompatibility.cs Mon Jun 25 16:47:35 2012
@@ -52,7 +52,7 @@ namespace Lucene.Net.Spatial.Util
 
 		public Term Term()
 		{
-			Term t = termEnum.Term();
+			Term t = termEnum.Term;
 			return t != null && t.Field == fieldName ? t : null;
 		}
 

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=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/SpellChecker/Spell/LuceneDictionary.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/SpellChecker/Spell/LuceneDictionary.cs Mon Jun 25 16:47:35 2012
@@ -90,7 +90,7 @@ namespace SpellChecker.Net.Search.Spell
             {
                 hasNextCalled = true;
                 
-                actualTerm = termEnum.Term();
+                actualTerm = termEnum.Term;
 
                 // if there are no words return false
                 if (actualTerm == null) return false;

Modified: incubator/lucene.net/trunk/src/core/Analysis/PorterStemmer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Analysis/PorterStemmer.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Analysis/PorterStemmer.cs (original)
+++ incubator/lucene.net/trunk/src/core/Analysis/PorterStemmer.cs Mon Jun 25 16:47:35 2012
@@ -736,7 +736,7 @@ namespace Lucene.Net.Analysis
 					
 					in_Renamed.Close();
 				}
-				catch (System.IO.IOException e)
+				catch (System.IO.IOException)
 				{
 					Console.Out.WriteLine("error reading " + args[i]);
 				}

Modified: incubator/lucene.net/trunk/src/core/Analysis/Standard/StandardTokenizerImpl.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Analysis/Standard/StandardTokenizerImpl.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Analysis/Standard/StandardTokenizerImpl.cs (original)
+++ incubator/lucene.net/trunk/src/core/Analysis/Standard/StandardTokenizerImpl.cs Mon Jun 25 16:47:35 2012
@@ -480,7 +480,7 @@ namespace Lucene.Net.Analysis.Standard
 			{
 				message = ZZ_ERROR_MSG[errorCode];
 			}
-			catch (System.IndexOutOfRangeException e)
+			catch (System.IndexOutOfRangeException)
 			{
 				message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
 			}

Modified: incubator/lucene.net/trunk/src/core/Analysis/Token.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Analysis/Token.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Analysis/Token.cs (original)
+++ incubator/lucene.net/trunk/src/core/Analysis/Token.cs Mon Jun 25 16:47:35 2012
@@ -276,21 +276,24 @@ namespace Lucene.Net.Analysis
 	    }
 
 	    /// <summary>Returns the Token's term text.
-		/// 
-		/// This method has a performance penalty
-		/// because the text is stored internally in a char[].  If
-        /// possible, use <see cref="TermBuffer()" /> and <see cref="TermLength()"/>
-        /// directly instead.  If you really need a
-		/// String, use this method, which is nothing more than
-		/// a convenience call to <b>new String(token.termBuffer(), 0, token.termLength())</b>
-		/// </summary>
-		public System.String Term()
-		{
-			InitTermBuffer();
-			return new System.String(termBuffer, 0, termLength);
-		}
-		
-		/// <summary>Copies the contents of buffer, starting at offset for
+	    /// 
+	    /// This method has a performance penalty
+	    /// because the text is stored internally in a char[].  If
+	    /// possible, use <see cref="TermBuffer()" /> and <see cref="TermLength()"/>
+	    /// directly instead.  If you really need a
+	    /// String, use this method, which is nothing more than
+	    /// a convenience call to <b>new String(token.termBuffer(), 0, token.termLength())</b>
+	    /// </summary>
+	    public string Term
+	    {
+	        get
+	        {
+	            InitTermBuffer();
+	            return new System.String(termBuffer, 0, termLength);
+	        }
+	    }
+
+	    /// <summary>Copies the contents of buffer, starting at offset for
 		/// length characters, into the termBuffer array.
 		/// </summary>
 		/// <param name="buffer">the buffer to copy</param>

Modified: incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/ITermAttribute.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/ITermAttribute.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/ITermAttribute.cs (original)
+++ incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/ITermAttribute.cs Mon Jun 25 16:47:35 2012
@@ -24,18 +24,18 @@ namespace Lucene.Net.Analysis.Tokenattri
 	/// <summary> The term text of a Token.</summary>
 	public interface ITermAttribute:IAttribute
 	{
-		/// <summary>Returns the Token's term text.
-		/// 
-		/// This method has a performance penalty
-		/// because the text is stored internally in a char[].  If
-		/// possible, use <see cref="TermBuffer()" /> and <see cref="TermLength()" />
-		/// directly instead.  If you really need a
-		/// String, use this method, which is nothing more than
-		/// a convenience call to <b>new String(token.termBuffer(), 0, token.termLength())</b>
-		/// </summary>
-		System.String Term();
-		
-		/// <summary>Copies the contents of buffer, starting at offset for
+	    /// <summary>Returns the Token's term text.
+	    /// 
+	    /// This method has a performance penalty
+	    /// because the text is stored internally in a char[].  If
+	    /// possible, use <see cref="TermBuffer()" /> and <see cref="TermLength()" />
+	    /// directly instead.  If you really need a
+	    /// String, use this method, which is nothing more than
+	    /// a convenience call to <b>new String(token.termBuffer(), 0, token.termLength())</b>
+	    /// </summary>
+	    string Term { get; }
+
+	    /// <summary>Copies the contents of buffer, starting at offset for
 		/// length characters, into the termBuffer array.
 		/// </summary>
 		/// <param name="buffer">the buffer to copy

Modified: incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/TermAttribute.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/TermAttribute.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/TermAttribute.cs (original)
+++ incubator/lucene.net/trunk/src/core/Analysis/Tokenattributes/TermAttribute.cs Mon Jun 25 16:47:35 2012
@@ -31,23 +31,26 @@ namespace Lucene.Net.Analysis.Tokenattri
 		
 		private char[] termBuffer;
 		private int termLength;
-		
-		/// <summary>Returns the Token's term text.
-		/// 
-		/// This method has a performance penalty
-		/// because the text is stored internally in a char[].  If
-		/// possible, use <see cref="TermBuffer()" /> and 
-		/// <see cref="TermLength()" /> directly instead.  If you 
-		/// really need a String, use this method, which is nothing more than
-		/// a convenience call to <b>new String(token.termBuffer(), 0, token.termLength())</b>
-		/// </summary>
-		public virtual System.String Term()
-		{
-			InitTermBuffer();
-			return new System.String(termBuffer, 0, termLength);
-		}
-		
-		/// <summary>Copies the contents of buffer, starting at offset for
+
+	    /// <summary>Returns the Token's term text.
+	    /// 
+	    /// This method has a performance penalty
+	    /// because the text is stored internally in a char[].  If
+	    /// possible, use <see cref="TermBuffer()" /> and 
+	    /// <see cref="TermLength()" /> directly instead.  If you 
+	    /// really need a String, use this method, which is nothing more than
+	    /// a convenience call to <b>new String(token.termBuffer(), 0, token.termLength())</b>
+	    /// </summary>
+	    public virtual string Term
+	    {
+	        get
+	        {
+	            InitTermBuffer();
+	            return new System.String(termBuffer, 0, termLength);
+	        }
+	    }
+
+	    /// <summary>Copies the contents of buffer, starting at offset for
 		/// length characters, into the termBuffer array.
 		/// </summary>
 		/// <param name="buffer">the buffer to copy

Modified: incubator/lucene.net/trunk/src/core/Index/CheckIndex.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/CheckIndex.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/CheckIndex.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/CheckIndex.cs Mon Jun 25 16:47:35 2012
@@ -677,7 +677,7 @@ namespace Lucene.Net.Index
 				while (termEnum.Next())
 				{
 					status.termCount++;
-					Term term = termEnum.Term();
+					Term term = termEnum.Term;
 					int docFreq = termEnum.DocFreq();
 					termPositions.Seek(term);
 					int lastDoc = - 1;

Modified: incubator/lucene.net/trunk/src/core/Index/CompoundFileReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/CompoundFileReader.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/CompoundFileReader.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/CompoundFileReader.cs Mon Jun 25 16:47:35 2012
@@ -104,7 +104,7 @@ namespace Lucene.Net.Index
 					{
 						stream.Close();
 					}
-					catch (System.IO.IOException e)
+					catch (System.IO.IOException)
 					{
 					}
 				}

Modified: incubator/lucene.net/trunk/src/core/Index/CompoundFileWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/CompoundFileWriter.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/CompoundFileWriter.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/CompoundFileWriter.cs Mon Jun 25 16:47:35 2012
@@ -221,7 +221,7 @@ namespace Lucene.Net.Index
                     {
                         os.Close();
                     }
-                    catch (System.IO.IOException e)
+                    catch (System.IO.IOException)
                     {
                     }
             }

Modified: incubator/lucene.net/trunk/src/core/Index/DirectoryReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/DirectoryReader.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/DirectoryReader.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/DirectoryReader.cs Mon Jun 25 16:47:35 2012
@@ -1250,7 +1250,7 @@ namespace Lucene.Net.Index
                     
                     SegmentMergeInfo smi = new SegmentMergeInfo(starts[i], termEnum, reader);
                     smi.ord = i;
-                    if (t == null?smi.Next():termEnum.Term() != null)
+                    if (t == null?smi.Next():termEnum.Term != null)
                         queue.Add(smi);
                     // initialize queue
                     else
@@ -1301,12 +1301,12 @@ namespace Lucene.Net.Index
                 matchingSegments[numMatchingSegments] = null;
                 return true;
             }
-            
-            public override Term Term()
+
+            public override Term Term
             {
-                return term;
+                get { return term; }
             }
-            
+
             public override int DocFreq()
             {
                 return docFreq;
@@ -1370,7 +1370,7 @@ namespace Lucene.Net.Index
             
             public virtual void  Seek(TermEnum termEnum)
             {
-                Seek(termEnum.Term());
+                Seek(termEnum.Term);
                 if (termEnum is MultiTermEnum)
                 {
                     tenum = (MultiTermEnum) termEnum;
@@ -1491,7 +1491,7 @@ namespace Lucene.Net.Index
                 if (smi != null)
                 {
                     System.Diagnostics.Debug.Assert((smi.ord == i));
-                    System.Diagnostics.Debug.Assert((smi.termEnum.Term().Equals(term)));
+                    System.Diagnostics.Debug.Assert((smi.termEnum.Term.Equals(term)));
                     result.Seek(smi.termEnum);
                 }
                 else

Modified: incubator/lucene.net/trunk/src/core/Index/FilterIndexReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/FilterIndexReader.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/FilterIndexReader.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/FilterIndexReader.cs Mon Jun 25 16:47:35 2012
@@ -144,12 +144,12 @@ namespace Lucene.Net.Index
 				return in_Renamed.Next();
 			}
 
-			public override Term Term()
-			{
-				return in_Renamed.Term();
-			}
+		    public override Term Term
+		    {
+		        get { return in_Renamed.Term; }
+		    }
 
-			public override int DocFreq()
+		    public override int DocFreq()
 			{
 				return in_Renamed.DocFreq();
 			}

Modified: incubator/lucene.net/trunk/src/core/Index/IndexFileDeleter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/IndexFileDeleter.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/IndexFileDeleter.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/IndexFileDeleter.cs Mon Jun 25 16:47:35 2012
@@ -173,7 +173,7 @@ namespace Lucene.Net.Index
                         {
                             sis.Read(directory, fileName);
                         }
-                        catch (System.IO.FileNotFoundException e)
+                        catch (System.IO.FileNotFoundException)
                         {
                             // LUCENE-948: on NFS (and maybe others), if
                             // you have writers switching back and forth
@@ -188,7 +188,7 @@ namespace Lucene.Net.Index
                             }
                             sis = null;
                         }
-                        catch (System.IO.IOException e)
+                        catch (System.IO.IOException)
                         {
                             if (SegmentInfos.GenerationFromSegmentsFileName(fileName) <= currentGen)
                             {
@@ -235,7 +235,7 @@ namespace Lucene.Net.Index
 				{
 					sis.Read(directory, segmentInfos.GetCurrentSegmentFileName());
 				}
-				catch (System.IO.IOException e)
+				catch (System.IO.IOException)
 				{
 					throw new CorruptIndexException("failed to locate current segments_N file");
 				}

Modified: incubator/lucene.net/trunk/src/core/Index/IndexReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/IndexReader.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/IndexReader.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/IndexReader.cs Mon Jun 25 16:47:35 2012
@@ -880,7 +880,7 @@ namespace Lucene.Net.Index
 		/// than all that precede it in the enumeration. Note that after
 		/// calling terms(), <see cref="TermEnum.Next()" /> must be called
 		/// on the resulting enumeration before calling other methods such as
-		/// <see cref="TermEnum.Term()" />.
+		/// <see cref="TermEnum.Term" />.
 		/// </summary>
 		/// <throws>  IOException if there is a low-level IO error </throws>
 		public abstract TermEnum Terms();

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=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/IndexWriter.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/IndexWriter.cs Mon Jun 25 16:47:35 2012
@@ -1248,7 +1248,7 @@ namespace Lucene.Net.Index
 						segmentInfos.Clear();
 						doCommit = false;
 					}
-					catch (System.IO.IOException e)
+					catch (System.IO.IOException)
 					{
 						// Likely this means it's a fresh directory
 						doCommit = true;

Modified: incubator/lucene.net/trunk/src/core/Index/ParallelReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/ParallelReader.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/ParallelReader.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/ParallelReader.cs Mon Jun 25 16:47:35 2012
@@ -568,7 +568,7 @@ namespace Lucene.Net.Index
 				{
 					field = Enclosing_Instance.fieldToReader.Keys.First();
 				}
-				catch (ArgumentOutOfRangeException e)
+				catch (ArgumentOutOfRangeException)
 				{
 					// No fields, so keep field == null, termEnum == null
 					return;
@@ -592,7 +592,7 @@ namespace Lucene.Net.Index
 					return false;
 				
 				// another term in this field?
-				if (termEnum.Next() && (System.Object) termEnum.Term().Field == (System.Object) field)
+				if (termEnum.Next() && (System.Object) termEnum.Term.Field == (System.Object) field)
 					return true; // yes, keep going
 				
 				termEnum.Close(); // close old termEnum
@@ -614,7 +614,7 @@ namespace Lucene.Net.Index
 				{
 					field = fieldIterator.Current;
 					termEnum = Enclosing_Instance.fieldToReader[field].Terms(new Term(field));
-					Term term = termEnum.Term();
+					Term term = termEnum.Term;
 					if (term != null && (System.Object) term.Field == (System.Object) field)
 						return true;
 					else
@@ -623,16 +623,19 @@ namespace Lucene.Net.Index
 				
 				return false; // no more fields
 			}
-			
-			public override Term Term()
-			{
-				if (termEnum == null)
-					return null;
-				
-				return termEnum.Term();
-			}
-			
-			public override int DocFreq()
+
+		    public override Term Term
+		    {
+		        get
+		        {
+		            if (termEnum == null)
+		                return null;
+
+		            return termEnum.Term;
+		        }
+		    }
+
+		    public override int DocFreq()
 			{
 				if (termEnum == null)
 					return 0;
@@ -707,7 +710,7 @@ namespace Lucene.Net.Index
 			
 			public virtual void  Seek(TermEnum termEnum)
 			{
-				Seek(termEnum.Term());
+				Seek(termEnum.Term);
 			}
 			
 			public virtual bool Next()

Modified: incubator/lucene.net/trunk/src/core/Index/SegmentMergeInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/SegmentMergeInfo.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/SegmentMergeInfo.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/SegmentMergeInfo.cs Mon Jun 25 16:47:35 2012
@@ -38,7 +38,7 @@ namespace Lucene.Net.Index
 			base_Renamed = b;
 			reader = r;
 			termEnum = te;
-			term = te.Term();
+			term = te.Term;
 		}
 		
 		// maps around deleted docs
@@ -81,7 +81,7 @@ namespace Lucene.Net.Index
 		{
 			if (termEnum.Next())
 			{
-				term = termEnum.Term();
+				term = termEnum.Term;
 				return true;
 			}
 			else

Modified: incubator/lucene.net/trunk/src/core/Index/SegmentReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/SegmentReader.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/SegmentReader.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/SegmentReader.cs Mon Jun 25 16:47:35 2012
@@ -1504,7 +1504,7 @@ namespace Lucene.Net.Index
 					{
 						tvReader = (TermVectorsReader) orig.Clone();
 					}
-					catch (System.Exception cnse)
+					catch (System.Exception)
 					{
 						return null;
 					}

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=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/SegmentTermDocs.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/SegmentTermDocs.cs Mon Jun 25 16:47:35 2012
@@ -76,13 +76,13 @@ namespace Lucene.Net.Index
 			{
 				// optimized case
 				SegmentTermEnum segmentTermEnum = ((SegmentTermEnum) termEnum);
-				term = segmentTermEnum.Term();
+				term = segmentTermEnum.Term;
 				ti = segmentTermEnum.TermInfo();
 			}
 			else
 			{
 				// punt case
-				term = termEnum.Term();
+				term = termEnum.Term;
 				ti = parent.core.GetTermsReader().Get(term);
 			}
 			

Modified: incubator/lucene.net/trunk/src/core/Index/SegmentTermEnum.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/SegmentTermEnum.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/SegmentTermEnum.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/SegmentTermEnum.cs Mon Jun 25 16:47:35 2012
@@ -110,7 +110,7 @@ namespace Lucene.Net.Index
 			{
 				clone = (SegmentTermEnum) base.MemberwiseClone();
 			}
-			catch (System.Exception e)
+			catch (System.Exception)
 			{
 			}
 			
@@ -187,16 +187,16 @@ namespace Lucene.Net.Index
 			}
 			return count;
 		}
-		
-		/// <summary>Returns the current Term in the enumeration.
-		/// Initially invalid, valid after next() called for the first time.
-		/// </summary>
-		public override Term Term()
-		{
-			return termBuffer.ToTerm();
-		}
-		
-		/// <summary>Returns the previous Term enumerated. Initially null.</summary>
+
+	    /// <summary>Returns the current Term in the enumeration.
+	    /// Initially invalid, valid after next() called for the first time.
+	    /// </summary>
+	    public override Term Term
+	    {
+	        get { return termBuffer.ToTerm(); }
+	    }
+
+	    /// <summary>Returns the previous Term enumerated. Initially null.</summary>
 		public /*internal*/ Term Prev()
 		{
 			return prevBuffer.ToTerm();

Modified: incubator/lucene.net/trunk/src/core/Index/TermBuffer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/TermBuffer.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/TermBuffer.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/TermBuffer.cs Mon Jun 25 16:47:35 2012
@@ -152,7 +152,7 @@ namespace Lucene.Net.Index
 			{
 				clone = (TermBuffer) base.MemberwiseClone();
 			}
-			catch (System.Exception e)
+			catch (System.Exception)
 			{
 			}
 			

Modified: incubator/lucene.net/trunk/src/core/Index/TermEnum.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/TermEnum.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/TermEnum.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/TermEnum.cs Mon Jun 25 16:47:35 2012
@@ -28,11 +28,11 @@ namespace Lucene.Net.Index
 	{
 		/// <summary>Increments the enumeration to the next element.  True if one exists.</summary>
 		public abstract bool Next();
-		
-		/// <summary>Returns the current Term in the enumeration.</summary>
-		public abstract Term Term();
-		
-		/// <summary>Returns the docFreq of the current Term in the enumeration.</summary>
+
+	    /// <summary>Returns the current Term in the enumeration.</summary>
+	    public abstract Term Term { get; }
+
+	    /// <summary>Returns the docFreq of the current Term in the enumeration.</summary>
 		public abstract int DocFreq();
 
         /// <summary>Closes the enumeration to further activity, freeing resources. </summary>

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=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/TermInfosReader.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/TermInfosReader.cs Mon Jun 25 16:47:35 2012
@@ -93,7 +93,7 @@ namespace Lucene.Net.Index
 						
 						for (int i = 0; indexEnum.Next(); i++)
 						{
-							indexTerms[i] = indexEnum.Term();
+							indexTerms[i] = indexEnum.Term;
 							indexInfos[i] = indexEnum.TermInfo();
 							indexPointers[i] = indexEnum.indexPointer;
 							
@@ -230,7 +230,7 @@ namespace Lucene.Net.Index
 			
 			// optimize sequential access: first try scanning cached enum w/o seeking
 			SegmentTermEnum enumerator = resources.termEnum;
-			if (enumerator.Term() != null && ((enumerator.Prev() != null && term.CompareTo(enumerator.Prev()) > 0) || term.CompareTo(enumerator.Term()) >= 0))
+			if (enumerator.Term != null && ((enumerator.Prev() != null && term.CompareTo(enumerator.Prev()) > 0) || term.CompareTo(enumerator.Term) >= 0))
 			{
 				int enumOffset = (int) (enumerator.position / totalIndexInterval) + 1;
 				if (indexTerms.Length == enumOffset || term.CompareTo(indexTerms[enumOffset]) < 0)
@@ -238,7 +238,7 @@ namespace Lucene.Net.Index
 					// no need to seek
 					
 					int numScans = enumerator.ScanTo(term);
-					if (enumerator.Term() != null && term.CompareTo(enumerator.Term()) == 0)
+					if (enumerator.Term != null && term.CompareTo(enumerator.Term) == 0)
 					{
 						ti = enumerator.TermInfo();
 						if (cache != null && numScans > 1)
@@ -263,7 +263,7 @@ namespace Lucene.Net.Index
 			// random-access: must seek
 			SeekEnum(enumerator, GetIndexOffset(term));
 			enumerator.ScanTo(term);
-			if (enumerator.Term() != null && term.CompareTo(enumerator.Term()) == 0)
+			if (enumerator.Term != null && term.CompareTo(enumerator.Term) == 0)
 			{
 				ti = enumerator.TermInfo();
 				if (cache != null)
@@ -298,11 +298,11 @@ namespace Lucene.Net.Index
 			SegmentTermEnum enumerator = GetThreadResources().termEnum;
 			SeekEnum(enumerator, indexOffset);
 			
-			while (term.CompareTo(enumerator.Term()) > 0 && enumerator.Next())
+			while (term.CompareTo(enumerator.Term) > 0 && enumerator.Next())
 			{
 			}
 			
-			if (term.CompareTo(enumerator.Term()) == 0)
+			if (term.CompareTo(enumerator.Term) == 0)
 				return enumerator.position;
 			else
 				return - 1;

Modified: incubator/lucene.net/trunk/src/core/Lucene.Net.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Lucene.Net.csproj?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Lucene.Net.csproj (original)
+++ incubator/lucene.net/trunk/src/core/Lucene.Net.csproj Mon Jun 25 16:47:35 2012
@@ -86,7 +86,7 @@
     <WarningLevel>4</WarningLevel>
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>blah.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

Modified: incubator/lucene.net/trunk/src/core/Messages/NLS.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Messages/NLS.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Messages/NLS.cs (original)
+++ incubator/lucene.net/trunk/src/core/Messages/NLS.cs Mon Jun 25 16:47:35 2012
@@ -120,7 +120,7 @@ namespace Lucene.Net.Messages
 				if (!bundles.ContainsKey(bundleName))
 					bundles[bundleName] = typeof(T);
 			}
-			catch (System.Exception e)
+			catch (System.Exception)
 			{
 				// ignore all errors and exceptions
 				// because this function is supposed to be called at class load time.
@@ -145,7 +145,7 @@ namespace Lucene.Net.Messages
 						if (obj != null)
 							return obj;
 					}
-					catch (System.Resources.MissingManifestResourceException e)
+					catch (System.Resources.MissingManifestResourceException)
 					{
 						// just continue it might be on the next resource bundle
 					}
@@ -194,11 +194,11 @@ namespace Lucene.Net.Messages
 				field.SetValue(null, field.Name);
 				ValidateMessage<T>(field.Name);
 			}
-			catch (System.ArgumentException e)
+			catch (System.ArgumentException)
 			{
 				// should not happen
 			}
-			catch (System.UnauthorizedAccessException e)
+			catch (System.UnauthorizedAccessException)
 			{
 				// should not happen
 			}
@@ -223,11 +223,11 @@ namespace Lucene.Net.Messages
 					}
 				}
 			}
-			catch (System.Resources.MissingManifestResourceException e)
+			catch (System.Resources.MissingManifestResourceException)
 			{
 				System.Console.Error.WriteLine("WARN: Message with key:" + key + " and locale: " + System.Threading.Thread.CurrentThread.CurrentCulture + " not found.");
 			}
-			catch (System.Exception e)
+			catch (System.Exception)
 			{
 				// ignore all other errors and exceptions
 				// since this code is just a test to see if the message is present on the

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=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/QueryParser/QueryParser.cs (original)
+++ incubator/lucene.net/trunk/src/core/QueryParser/QueryParser.cs Mon Jun 25 16:47:35 2012
@@ -508,7 +508,7 @@ namespace Lucene.Net.QueryParsers
                 source = analyzer.ReusableTokenStream(field, new StringReader(queryText));
                 source.Reset();
             }
-            catch (IOException e)
+            catch (IOException)
             {
                 source = analyzer.TokenStream(field, new StringReader(queryText));
             }
@@ -523,7 +523,7 @@ namespace Lucene.Net.QueryParsers
                 buffer.Reset();
                 success = true;
             }
-            catch (IOException e)
+            catch (IOException)
             {
                 // success==false if we hit an exception
             }
@@ -563,7 +563,7 @@ namespace Lucene.Net.QueryParsers
                         hasMoreTokens = buffer.IncrementToken();
                     }
                 }
-                catch (IOException e)
+                catch (IOException)
                 {
                     // ignore
                 }
@@ -576,7 +576,7 @@ namespace Lucene.Net.QueryParsers
                 // close original stream - all tokens buffered
                 source.Close();
             }
-            catch (IOException e)
+            catch (IOException)
             {
                 // ignore
             }
@@ -590,9 +590,9 @@ namespace Lucene.Net.QueryParsers
                 {
                     bool hasNext = buffer.IncrementToken();
                     Debug.Assert(hasNext);
-                    term = termAtt.Term();
+                    term = termAtt.Term;
                 }
-                catch (IOException e)
+                catch (IOException)
                 {
                     // safe to ignore, because we know the number of tokens
                 }
@@ -613,9 +613,9 @@ namespace Lucene.Net.QueryParsers
                             {
                                 bool hasNext = buffer.IncrementToken();
                                 Debug.Assert(hasNext);
-                                term = termAtt.Term();
+                                term = termAtt.Term;
                             }
-                            catch (IOException e)
+                            catch (IOException)
                             {
                                 // safe to ignore, because we know the number of tokens
                             }
@@ -641,13 +641,13 @@ namespace Lucene.Net.QueryParsers
                             {
                                 bool hasNext = buffer.IncrementToken();
                                 Debug.Assert(hasNext == true);
-                                term = termAtt.Term();
+                                term = termAtt.Term;
                                 if (posIncrAtt != null)
                                 {
                                     positionIncrement = posIncrAtt.PositionIncrement;
                                 }
                             }
-                            catch (IOException e)
+                            catch (IOException)
                             {
                                 // safe to ignore, because we know the number of tokens
                             }
@@ -694,13 +694,13 @@ namespace Lucene.Net.QueryParsers
                         {
                             bool hasNext = buffer.IncrementToken();
                             Debug.Assert(hasNext == true);
-                            term = termAtt.Term();
+                            term = termAtt.Term;
                             if (posIncrAtt != null)
                             {
                                 positionIncrement = posIncrAtt.PositionIncrement;
                             }
                         }
-                        catch (IOException e)
+                        catch (IOException)
                         {
                             // safe to ignore, because we know the number of tokens
                         }

Modified: incubator/lucene.net/trunk/src/core/QueryParser/QueryParserTokenManager.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/QueryParser/QueryParserTokenManager.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/QueryParser/QueryParserTokenManager.cs (original)
+++ incubator/lucene.net/trunk/src/core/QueryParser/QueryParserTokenManager.cs Mon Jun 25 16:47:35 2012
@@ -103,7 +103,7 @@ namespace Lucene.Net.QueryParsers
 			{
 				curChar = input_stream.ReadChar();
 			}
-			catch (System.IO.IOException e)
+			catch (System.IO.IOException)
 			{
 				return pos + 1;
 			}
@@ -603,7 +603,7 @@ namespace Lucene.Net.QueryParsers
 				{
 					curChar = input_stream.ReadChar();
 				}
-				catch (System.IO.IOException e)
+				catch (System.IO.IOException)
 				{
 					return curPos;
 				}
@@ -653,7 +653,7 @@ namespace Lucene.Net.QueryParsers
 			{
 				curChar = input_stream.ReadChar();
 			}
-			catch (System.IO.IOException e)
+			catch (System.IO.IOException)
 			{
 				JjStopStringLiteralDfa_1(0, active0);
 				return 1;
@@ -680,7 +680,7 @@ namespace Lucene.Net.QueryParsers
 			{
 				curChar = input_stream.ReadChar();
 			}
-			catch (System.IO.IOException e)
+			catch (System.IO.IOException)
 			{
 				return pos + 1;
 			}
@@ -845,7 +845,7 @@ namespace Lucene.Net.QueryParsers
 				{
 					curChar = input_stream.ReadChar();
 				}
-				catch (System.IO.IOException e)
+				catch (System.IO.IOException)
 				{
 					return curPos;
 				}
@@ -946,7 +946,7 @@ namespace Lucene.Net.QueryParsers
 				{
 					curChar = input_stream.ReadChar();
 				}
-				catch (System.IO.IOException e)
+				catch (System.IO.IOException)
 				{
 					return curPos;
 				}
@@ -996,7 +996,7 @@ namespace Lucene.Net.QueryParsers
 			{
 				curChar = input_stream.ReadChar();
 			}
-			catch (System.IO.IOException e)
+			catch (System.IO.IOException)
 			{
 				JjStopStringLiteralDfa_2(0, active0);
 				return 1;
@@ -1023,7 +1023,7 @@ namespace Lucene.Net.QueryParsers
 			{
 				curChar = input_stream.ReadChar();
 			}
-			catch (System.IO.IOException e)
+			catch (System.IO.IOException)
 			{
 				return pos + 1;
 			}
@@ -1188,7 +1188,7 @@ namespace Lucene.Net.QueryParsers
 				{
 					curChar = input_stream.ReadChar();
 				}
-				catch (System.IO.IOException e)
+				catch (System.IO.IOException)
 				{
 					return curPos;
 				}
@@ -1345,7 +1345,7 @@ namespace Lucene.Net.QueryParsers
 				{
 					curChar = input_stream.BeginToken();
 				}
-				catch (System.IO.IOException e)
+				catch (System.IO.IOException)
 				{
 					jjmatchedKind = 0;
 					matchedToken = JjFillToken();

Modified: incubator/lucene.net/trunk/src/core/Search/FieldCacheImpl.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/FieldCacheImpl.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/FieldCacheImpl.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/FieldCacheImpl.cs Mon Jun 25 16:47:35 2012
@@ -356,7 +356,7 @@ namespace Lucene.Net.Search
                 {
                     do 
                     {
-                        Term term = termEnum.Term();
+                        Term term = termEnum.Term;
                         if (term == null || (System.Object) term.Field != (System.Object) field)
                             break;
                         sbyte termval = parser.ParseByte(term.Text);
@@ -415,7 +415,7 @@ namespace Lucene.Net.Search
                 {
                     do 
                     {
-                        Term term = termEnum.Term();
+                        Term term = termEnum.Term;
                         if (term == null || (System.Object) term.Field != (System.Object) field)
                             break;
                         short termval = parser.ParseShort(term.Text);
@@ -481,7 +481,7 @@ namespace Lucene.Net.Search
                 {
                     do 
                     {
-                        Term term = termEnum.Term();
+                        Term term = termEnum.Term;
                         if (term == null || (System.Object) term.Field != (System.Object) field)
                             break;
                         int termval = parser.ParseInt(term.Text);
@@ -555,7 +555,7 @@ namespace Lucene.Net.Search
                 {
                     do 
                     {
-                        Term term = termEnum.Term();
+                        Term term = termEnum.Term;
                         if (term == null || (System.Object) term.Field != (System.Object) field)
                             break;
                         float termval = parser.ParseFloat(term.Text);
@@ -627,7 +627,7 @@ namespace Lucene.Net.Search
                 {
                     do 
                     {
-                        Term term = termEnum.Term();
+                        Term term = termEnum.Term;
                         if (term == null || (System.Object) term.Field != (System.Object) field)
                             break;
                         long termval = parser.ParseLong(term.Text);
@@ -699,7 +699,7 @@ namespace Lucene.Net.Search
                 {
                     do 
                     {
-                        Term term = termEnum.Term();
+                        Term term = termEnum.Term;
                         if (term == null || (System.Object) term.Field != (System.Object) field)
                             break;
                         double termval = parser.ParseDouble(term.Text);
@@ -752,7 +752,7 @@ namespace Lucene.Net.Search
                 {
                     do 
                     {
-                        Term term = termEnum.Term();
+                        Term term = termEnum.Term;
                         if (term == null || (System.Object) term.Field != (System.Object) field)
                             break;
                         System.String termval = term.Text;
@@ -805,7 +805,7 @@ namespace Lucene.Net.Search
                 {
                     do 
                     {
-                        Term term = termEnum.Term();
+                        Term term = termEnum.Term;
                         if (term == null || term.Field != field || t >= mterms.Length) break;
                         
                         // store term text

Modified: incubator/lucene.net/trunk/src/core/Search/FieldCacheRangeFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/FieldCacheRangeFilter.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/FieldCacheRangeFilter.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/FieldCacheRangeFilter.cs Mon Jun 25 16:47:35 2012
@@ -895,7 +895,7 @@ namespace Lucene.Net.Search
 						while (!Enclosing_Instance.MatchDoc(doc));
 						return doc;
 					}
-					catch (System.IndexOutOfRangeException e)
+					catch (System.IndexOutOfRangeException)
 					{
 						return doc = NO_MORE_DOCS;
 					}
@@ -912,7 +912,7 @@ namespace Lucene.Net.Search
 						}
 						return doc;
 					}
-					catch (System.IndexOutOfRangeException e)
+					catch (System.IndexOutOfRangeException)
 					{
 						return doc = NO_MORE_DOCS;
 					}

Modified: incubator/lucene.net/trunk/src/core/Search/FieldCacheTermsFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/FieldCacheTermsFilter.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/FieldCacheTermsFilter.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/FieldCacheTermsFilter.cs Mon Jun 25 16:47:35 2012
@@ -194,7 +194,7 @@ namespace Lucene.Net.Search
 						{
 						}
 					}
-					catch (System.IndexOutOfRangeException e)
+					catch (System.IndexOutOfRangeException)
 					{
 						doc = NO_MORE_DOCS;
 					}
@@ -211,7 +211,7 @@ namespace Lucene.Net.Search
 							doc++;
 						}
 					}
-					catch (System.IndexOutOfRangeException e)
+					catch (System.IndexOutOfRangeException)
 					{
 						doc = NO_MORE_DOCS;
 					}

Modified: incubator/lucene.net/trunk/src/core/Search/FilteredTermEnum.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/FilteredTermEnum.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/FilteredTermEnum.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/FilteredTermEnum.cs Mon Jun 25 16:47:35 2012
@@ -57,7 +57,7 @@ namespace Lucene.Net.Search
 		{
 			this.actualEnum = actualEnum;
 			// Find the first term that matches
-			Term term = actualEnum.Term();
+			Term term = actualEnum.Term;
 			if (term != null && TermCompare(term))
 				currentTerm = term;
 			else
@@ -87,7 +87,7 @@ namespace Lucene.Net.Search
 					return false;
 				if (actualEnum.Next())
 				{
-					Term term = actualEnum.Term();
+					Term term = actualEnum.Term;
 					if (TermCompare(term))
 					{
 						currentTerm = term;
@@ -100,16 +100,16 @@ namespace Lucene.Net.Search
             currentTerm = null;
 			return false;
 		}
-		
-		/// <summary>Returns the current Term in the enumeration.
-		/// Returns null if no Term matches or all terms have been enumerated. 
-		/// </summary>
-		public override Term Term()
-		{
-			return currentTerm;
-		}
 
-        protected override void Dispose(bool disposing)
+	    /// <summary>Returns the current Term in the enumeration.
+	    /// Returns null if no Term matches or all terms have been enumerated. 
+	    /// </summary>
+	    public override Term Term
+	    {
+	        get { return currentTerm; }
+	    }
+
+	    protected override void Dispose(bool disposing)
         {
             if (isDisposed) return;
 

Modified: incubator/lucene.net/trunk/src/core/Search/Function/DocValues.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Function/DocValues.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Function/DocValues.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Function/DocValues.cs Mon Jun 25 16:47:35 2012
@@ -138,7 +138,7 @@ namespace Lucene.Net.Search.Function
 				{
 					val = FloatVal(n);
 				}
-				catch (System.IndexOutOfRangeException e)
+				catch (System.IndexOutOfRangeException)
 				{
 					break;
 				}

Modified: incubator/lucene.net/trunk/src/core/Search/FuzzyQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/FuzzyQuery.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/FuzzyQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/FuzzyQuery.cs Mon Jun 25 16:47:35 2012
@@ -148,7 +148,7 @@ namespace Lucene.Net.Search
                 ScoreTerm st = new ScoreTerm();
 				do 
 				{
-					Term t = enumerator.Term();
+					Term t = enumerator.Term;
                     if (t == null) break;
 				    float score = enumerator.Difference();
                     //ignore uncompetetive hits



Mime
View raw message