lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccurr...@apache.org
Subject svn commit: r1353648 [2/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
Modified: incubator/lucene.net/trunk/src/core/Search/MultiSearcher.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/MultiSearcher.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/MultiSearcher.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/MultiSearcher.cs Mon Jun 25 16:47:35 2012
@@ -102,7 +102,7 @@ namespace Lucene.Net.Search
 				{
 					df = dfMap[term];
 				}
-				catch (KeyNotFoundException e) // C# equiv. of java code.
+				catch (KeyNotFoundException) // C# equiv. of java code.
 				{
 					throw new System.ArgumentException("df for term " + term.Text + " not available");
 				}

Modified: incubator/lucene.net/trunk/src/core/Search/MultiTermQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/MultiTermQuery.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/MultiTermQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/MultiTermQuery.cs Mon Jun 25 16:47:35 2012
@@ -126,7 +126,7 @@ namespace Lucene.Net.Search
 				{
 					do 
 					{
-						Term t = enumerator.Term();
+						Term t = enumerator.Term;
 						if (t != null)
 						{
 							TermQuery tq = new TermQuery(t); // found a match
@@ -273,7 +273,7 @@ namespace Lucene.Net.Search
 				{
 					while (true)
 					{
-						Term t = enumerator.Term();
+						Term t = enumerator.Term;
 						if (t != null)
 						{
 							pendingTerms.Add(t);

Modified: incubator/lucene.net/trunk/src/core/Search/MultiTermQueryWrapperFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/MultiTermQueryWrapperFilter.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/MultiTermQueryWrapperFilter.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/MultiTermQueryWrapperFilter.cs Mon Jun 25 16:47:35 2012
@@ -109,7 +109,7 @@ namespace Lucene.Net.Search
             try
             {
                 // if current term in enum is null, the enum is empty -> shortcut
-                if (enumerator.Term() == null)
+                if (enumerator.Term == null)
                     return DocIdSet.EMPTY_DOCIDSET;
                 // else fill into an OpenBitSet
                 OpenBitSet bitSet = new OpenBitSet(reader.MaxDoc);
@@ -121,7 +121,7 @@ namespace Lucene.Net.Search
                     int termCount = 0;
                     do
                     {
-                        Term term = enumerator.Term();
+                        Term term = enumerator.Term;
                         if (term == null)
                             break;
                         termCount++;

Modified: incubator/lucene.net/trunk/src/core/Search/NumericRangeQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/NumericRangeQuery.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/NumericRangeQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/NumericRangeQuery.cs Mon Jun 25 16:47:35 2012
@@ -524,7 +524,7 @@ namespace Lucene.Net.Search
 			        System.Diagnostics.Debug.Assert(actualEnum != null);
 			        if (actualEnum.Next())
 			        {
-			            currentTerm = actualEnum.Term();
+			            currentTerm = actualEnum.Term;
 			            if (TermCompare(currentTerm))
 			                return true;
 			        }
@@ -546,7 +546,7 @@ namespace Lucene.Net.Search
 			        rangeBounds.RemoveFirst();
 			        // create a new enum
 			        actualEnum = reader.Terms(termTemplate.CreateTerm(lowerBound));
-			        currentTerm = actualEnum.Term();
+			        currentTerm = actualEnum.Term;
 			        if (currentTerm != null && TermCompare(currentTerm))
 			            return true;
 			        // clear the current term for next iteration

Modified: incubator/lucene.net/trunk/src/core/Search/QueryTermVector.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/QueryTermVector.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/QueryTermVector.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/QueryTermVector.cs Mon Jun 25 16:47:35 2012
@@ -68,12 +68,12 @@ namespace Lucene.Net.Search
 						hasMoreTokens = stream.IncrementToken();
 						while (hasMoreTokens)
 						{
-							terms.Add(termAtt.Term());
+							terms.Add(termAtt.Term);
 							hasMoreTokens = stream.IncrementToken();
 						}
 						ProcessTerms(terms.ToArray());
 					}
-					catch (System.IO.IOException e)
+					catch (System.IO.IOException)
 					{
 					}
 				}

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

Modified: incubator/lucene.net/trunk/src/core/Store/Lock.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Store/Lock.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Store/Lock.cs (original)
+++ incubator/lucene.net/trunk/src/core/Store/Lock.cs Mon Jun 25 16:47:35 2012
@@ -100,7 +100,7 @@ namespace Lucene.Net.Store
 				{
 					System.Threading.Thread.Sleep(TimeSpan.FromMilliseconds(LOCK_POLL_INTERVAL));
 				}
-				catch (System.Threading.ThreadInterruptedException e)
+				catch (System.Threading.ThreadInterruptedException)
 				{
 				    throw;
 				}

Modified: incubator/lucene.net/trunk/src/core/Store/LockStressTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Store/LockStressTest.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Store/LockStressTest.cs (original)
+++ incubator/lucene.net/trunk/src/core/Store/LockStressTest.cs Mon Jun 25 16:47:35 2012
@@ -62,7 +62,7 @@ namespace Lucene.Net.Store
 			{
 				c = System.Type.GetType(lockFactoryClassName);
 			}
-			catch (System.Exception e)
+			catch (System.Exception)
 			{
 				throw new System.IO.IOException("unable to find LockClass " + lockFactoryClassName);
 			}
@@ -72,15 +72,15 @@ namespace Lucene.Net.Store
 			{
 				lockFactory = (LockFactory) System.Activator.CreateInstance(c);
 			}
-			catch (System.UnauthorizedAccessException e)
+			catch (System.UnauthorizedAccessException)
 			{
 				throw new System.IO.IOException("IllegalAccessException when instantiating LockClass " + lockFactoryClassName);
 			}
-			catch (System.InvalidCastException e)
+			catch (System.InvalidCastException)
 			{
 				throw new System.IO.IOException("unable to cast LockClass " + lockFactoryClassName + " instance to a LockFactory");
 			}
-			catch (System.Exception e)
+			catch (System.Exception)
 			{
 				throw new System.IO.IOException("InstantiationException when instantiating LockClass " + lockFactoryClassName);
 			}
@@ -111,7 +111,7 @@ namespace Lucene.Net.Store
 				{
 					obtained = l.Obtain(10);
 				}
-				catch (LockObtainFailedException e)
+				catch (LockObtainFailedException)
 				{
 					System.Console.Out.Write("x");
 				}

Modified: incubator/lucene.net/trunk/src/core/Store/MMapDirectory.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Store/MMapDirectory.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Store/MMapDirectory.cs (original)
+++ incubator/lucene.net/trunk/src/core/Store/MMapDirectory.cs Mon Jun 25 16:47:35 2012
@@ -241,7 +241,7 @@ namespace Lucene.Net.Store
 				{
 					return (byte) buffer.ReadByte();
 				}
-				catch (ObjectDisposedException e)
+				catch (ObjectDisposedException)
 				{
 					throw new System.IO.IOException("read past EOF");
 				}
@@ -253,7 +253,7 @@ namespace Lucene.Net.Store
 				{
 					buffer.Read(b, offset, len);
 				}
-				catch (ObjectDisposedException e)
+				catch (ObjectDisposedException)
 				{
 					throw new System.IO.IOException("read past EOF");
 				}
@@ -524,7 +524,7 @@ namespace Lucene.Net.Store
                     // Aroush-2.9}}
 					v = true;
 				}
-				catch (System.Exception e)
+				catch (System.Exception)
 				{
 					v = false;
 				}

Modified: incubator/lucene.net/trunk/src/core/Util/AttributeSource.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Util/AttributeSource.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Util/AttributeSource.cs (original)
+++ incubator/lucene.net/trunk/src/core/Util/AttributeSource.cs Mon Jun 25 16:47:35 2012
@@ -62,7 +62,7 @@ namespace Lucene.Net.Util
 					{
                         return (Attribute)System.Activator.CreateInstance(GetClassForInterface<TAttImpl>());
 					}
-					catch (System.UnauthorizedAccessException e)
+					catch (System.UnauthorizedAccessException)
                     {
                         throw new System.ArgumentException("Could not instantiate implementing class for " + typeof(TAttImpl).FullName);
 					}
@@ -86,7 +86,7 @@ namespace Lucene.Net.Util
                                 string name = attClass.FullName.Replace(attClass.Name, attClass.Name.Substring(1)) + ", " + attClass.Assembly.FullName;
 								attClassImplMap.Add(attClass, new WeakReference( clazz = System.Type.GetType(name, true))); //OK
 							}
-                            catch (System.TypeLoadException e) // was System.Exception
+                            catch (System.TypeLoadException) // was System.Exception
 							{
 								throw new System.ArgumentException("Could not find implementing class for " + attClass.FullName);
 							}

Modified: incubator/lucene.net/trunk/src/demo/Demo.Common/HTML/HTMLParserTokenManager.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/demo/Demo.Common/HTML/HTMLParserTokenManager.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/demo/Demo.Common/HTML/HTMLParserTokenManager.cs (original)
+++ incubator/lucene.net/trunk/src/demo/Demo.Common/HTML/HTMLParserTokenManager.cs Mon Jun 25 16:47:35 2012
@@ -119,7 +119,7 @@ namespace Lucene.Net.Demo.Html
 			{
 				curChar = input_stream.ReadChar();
 			}
-			catch (System.IO.IOException e)
+			catch (System.IO.IOException)
 			{
 				return pos + 1;
 			}
@@ -144,7 +144,7 @@ namespace Lucene.Net.Demo.Html
 			{
 				curChar = input_stream.ReadChar();
 			}
-			catch (System.IO.IOException e)
+			catch (System.IO.IOException)
 			{
 				JjStopStringLiteralDfa_0(0, active0);
 				return 1;
@@ -177,7 +177,7 @@ namespace Lucene.Net.Demo.Html
 			{
 				curChar = input_stream.ReadChar();
 			}
-			catch (System.IO.IOException e)
+			catch (System.IO.IOException)
 			{
 				JjStopStringLiteralDfa_0(1, active0);
 				return 2;
@@ -205,7 +205,7 @@ namespace Lucene.Net.Demo.Html
 			{
 				curChar = input_stream.ReadChar();
 			}
-			catch (System.IO.IOException e)
+			catch (System.IO.IOException)
 			{
 				JjStopStringLiteralDfa_0(2, active0);
 				return 3;
@@ -235,7 +235,7 @@ namespace Lucene.Net.Demo.Html
 			{
 				curChar = input_stream.ReadChar();
 			}
-			catch (System.IO.IOException e)
+			catch (System.IO.IOException)
 			{
 				JjStopStringLiteralDfa_0(3, active0);
 				return 4;
@@ -260,7 +260,7 @@ namespace Lucene.Net.Demo.Html
 			{
 				curChar = input_stream.ReadChar();
 			}
-			catch (System.IO.IOException e)
+			catch (System.IO.IOException)
 			{
 				JjStopStringLiteralDfa_0(4, active0);
 				return 5;
@@ -285,7 +285,7 @@ namespace Lucene.Net.Demo.Html
 			{
 				curChar = input_stream.ReadChar();
 			}
-			catch (System.IO.IOException e)
+			catch (System.IO.IOException)
 			{
 				JjStopStringLiteralDfa_0(5, active0);
 				return 6;
@@ -665,7 +665,7 @@ MatchLoop1: 
 				{
 					curChar = input_stream.ReadChar();
 				}
-				catch (System.IO.IOException e)
+				catch (System.IO.IOException)
 				{
 					return curPos;
 				}
@@ -782,7 +782,7 @@ MatchLoop1: 
 				{
 					curChar = input_stream.ReadChar();
 				}
-				catch (System.IO.IOException e)
+				catch (System.IO.IOException)
 				{
 					return curPos;
 				}
@@ -810,7 +810,7 @@ MatchLoop1: 
 			{
 				curChar = input_stream.ReadChar();
 			}
-			catch (System.IO.IOException e)
+			catch (System.IO.IOException)
 			{
 				return pos + 1;
 			}
@@ -920,7 +920,7 @@ MatchLoop1: 
 				{
 					curChar = input_stream.ReadChar();
 				}
-				catch (System.IO.IOException e)
+				catch (System.IO.IOException)
 				{
 					return curPos;
 				}
@@ -1037,7 +1037,7 @@ MatchLoop1: 
 				{
 					curChar = input_stream.ReadChar();
 				}
-				catch (System.IO.IOException e)
+				catch (System.IO.IOException)
 				{
 					return curPos;
 				}
@@ -1065,7 +1065,7 @@ MatchLoop1: 
 			{
 				curChar = input_stream.ReadChar();
 			}
-			catch (System.IO.IOException e)
+			catch (System.IO.IOException)
 			{
 				return pos + 1;
 			}
@@ -1204,7 +1204,7 @@ MatchLoop1: 
 				{
 					curChar = input_stream.ReadChar();
 				}
-				catch (System.IO.IOException e)
+				catch (System.IO.IOException)
 				{
 					return curPos;
 				}
@@ -1252,7 +1252,7 @@ MatchLoop1: 
 			{
 				curChar = input_stream.ReadChar();
 			}
-			catch (System.IO.IOException e)
+			catch (System.IO.IOException)
 			{
 				return pos + 1;
 			}
@@ -1277,7 +1277,7 @@ MatchLoop1: 
 			{
 				curChar = input_stream.ReadChar();
 			}
-			catch (System.IO.IOException e)
+			catch (System.IO.IOException)
 			{
 				JjStopStringLiteralDfa_6(0, active0);
 				return 1;
@@ -1302,7 +1302,7 @@ MatchLoop1: 
 			{
 				curChar = input_stream.ReadChar();
 			}
-			catch (System.IO.IOException e)
+			catch (System.IO.IOException)
 			{
 				JjStopStringLiteralDfa_6(1, active0);
 				return 2;
@@ -1428,7 +1428,7 @@ MatchLoop1: 
 				{
 					curChar = input_stream.ReadChar();
 				}
-				catch (System.IO.IOException e)
+				catch (System.IO.IOException)
 				{
 					return curPos;
 				}
@@ -1608,7 +1608,7 @@ MatchLoop1: 
 				{
 					curChar = input_stream.ReadChar();
 				}
-				catch (System.IO.IOException e)
+				catch (System.IO.IOException)
 				{
 					return curPos;
 				}
@@ -1636,7 +1636,7 @@ MatchLoop1: 
 			{
 				curChar = input_stream.ReadChar();
 			}
-			catch (System.IO.IOException e)
+			catch (System.IO.IOException)
 			{
 				return pos + 1;
 			}
@@ -1796,7 +1796,7 @@ MatchLoop1: 
 				{
 					curChar = input_stream.ReadChar();
 				}
-				catch (System.IO.IOException e)
+				catch (System.IO.IOException)
 				{
 					return curPos;
 				}
@@ -1883,7 +1883,7 @@ MatchLoop1: 
 				{
 					curChar = input_stream.BeginToken();
 				}
-				catch (System.IO.IOException e)
+				catch (System.IO.IOException)
 				{
 					jjmatchedKind = 0;
 					matchedToken = JjFillToken();

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/Fr/TestElision.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/Fr/TestElision.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Fr/TestElision.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Fr/TestElision.cs Mon Jun 25 16:47:35 2012
@@ -62,7 +62,7 @@ namespace Lucene.Net.Analyzers.Fr
             ITermAttribute termAtt = filter.GetAttribute<ITermAttribute>();
             while (filter.IncrementToken())
             {
-                tas.Add(termAtt.Term());
+                tas.Add(termAtt.Term);
             }
             return tas;
         }

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/Payloads/DelimitedPayloadTokenFilterTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/Payloads/DelimitedPayloadTokenFilterTest.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Payloads/DelimitedPayloadTokenFilterTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Payloads/DelimitedPayloadTokenFilterTest.cs Mon Jun 25 16:47:35 2012
@@ -122,7 +122,7 @@ namespace Lucene.Net.Analyzers.Payloads
             ITermAttribute termAtt = stream.GetAttribute<ITermAttribute>();
             IPayloadAttribute payloadAtt = stream.GetAttribute<IPayloadAttribute>();
             Assert.True(stream.IncrementToken());
-            Assert.AreEqual(expected, termAtt.Term());
+            Assert.AreEqual(expected, termAtt.Term);
             Payload payload = payloadAtt.Payload;
             if (payload != null)
             {
@@ -142,7 +142,7 @@ namespace Lucene.Net.Analyzers.Payloads
         void AssertTermEquals(String expected, TokenStream stream, ITermAttribute termAtt, IPayloadAttribute payAtt, byte[] expectPay)
         {
             Assert.True(stream.IncrementToken());
-            Assert.AreEqual(expected, termAtt.Term());
+            Assert.AreEqual(expected, termAtt.Term);
             Payload payload = payAtt.Payload;
             if (payload != null)
             {

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/Payloads/NumericPayloadTokenFilterTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/Payloads/NumericPayloadTokenFilterTest.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Payloads/NumericPayloadTokenFilterTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Payloads/NumericPayloadTokenFilterTest.cs Mon Jun 25 16:47:35 2012
@@ -47,7 +47,7 @@ namespace Lucene.Net.Analyzers.Payloads
             IPayloadAttribute payloadAtt = nptf.GetAttribute<IPayloadAttribute>();
             while (nptf.IncrementToken())
             {
-                if (termAtt.Term().Equals("dogs"))
+                if (termAtt.Term.Equals("dogs"))
                 {
                     seenDogs = true;
                     Assert.True(typeAtt.Type.Equals("D") == true, typeAtt.Type + " is not equal to " + "D");
@@ -82,7 +82,7 @@ namespace Lucene.Net.Analyzers.Payloads
             {
                 if (input.IncrementToken())
                 {
-                    if (termAtt.Term().Equals("dogs"))
+                    if (termAtt.Term.Equals("dogs"))
                         typeAtt.Type = "D";
                     return true;
                 }

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/Query/QueryAutoStopWordAnalyzerTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/Query/QueryAutoStopWordAnalyzerTest.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Query/QueryAutoStopWordAnalyzerTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Query/QueryAutoStopWordAnalyzerTest.cs Mon Jun 25 16:47:35 2012
@@ -226,7 +226,7 @@ namespace Lucene.Net.Analyzers.Query
             TokenStream ts = a.TokenStream("repetitiveField", new StringReader("this boring"));
             ITermAttribute termAtt = ts.GetAttribute<ITermAttribute>();
             Assert.True(ts.IncrementToken());
-            Assert.AreEqual("this", termAtt.Term());
+            Assert.AreEqual("this", termAtt.Term);
             Assert.False(ts.IncrementToken());
         }
     }

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/Reverse/TestReverseStringFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/Reverse/TestReverseStringFilter.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Reverse/TestReverseStringFilter.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Reverse/TestReverseStringFilter.cs Mon Jun 25 16:47:35 2012
@@ -43,15 +43,15 @@ namespace Lucene.Net.Analyzers.Reverse
             ReverseStringFilter filter = new ReverseStringFilter(stream);
             ITermAttribute text = filter.GetAttribute<ITermAttribute>();
             Assert.True(filter.IncrementToken());
-            Assert.AreEqual("oD", text.Term());
+            Assert.AreEqual("oD", text.Term);
             Assert.True(filter.IncrementToken());
-            Assert.AreEqual("evah", text.Term());
+            Assert.AreEqual("evah", text.Term);
             Assert.True(filter.IncrementToken());
-            Assert.AreEqual("a", text.Term());
+            Assert.AreEqual("a", text.Term);
             Assert.True(filter.IncrementToken());
-            Assert.AreEqual("ecin", text.Term());
+            Assert.AreEqual("ecin", text.Term);
             Assert.True(filter.IncrementToken());
-            Assert.AreEqual("yad", text.Term());
+            Assert.AreEqual("yad", text.Term);
             Assert.False(filter.IncrementToken());
         }
 
@@ -63,15 +63,15 @@ namespace Lucene.Net.Analyzers.Reverse
             ReverseStringFilter filter = new ReverseStringFilter(stream, '\u0001');
             ITermAttribute text = filter.GetAttribute<ITermAttribute>();
             Assert.True(filter.IncrementToken());
-            Assert.AreEqual("\u0001oD", text.Term());
+            Assert.AreEqual("\u0001oD", text.Term);
             Assert.True(filter.IncrementToken());
-            Assert.AreEqual("\u0001evah", text.Term());
+            Assert.AreEqual("\u0001evah", text.Term);
             Assert.True(filter.IncrementToken());
-            Assert.AreEqual("\u0001a", text.Term());
+            Assert.AreEqual("\u0001a", text.Term);
             Assert.True(filter.IncrementToken());
-            Assert.AreEqual("\u0001ecin", text.Term());
+            Assert.AreEqual("\u0001ecin", text.Term);
             Assert.True(filter.IncrementToken());
-            Assert.AreEqual("\u0001yad", text.Term());
+            Assert.AreEqual("\u0001yad", text.Term);
             Assert.False(filter.IncrementToken());
         }
 

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/Ru/TestRussianAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/Ru/TestRussianAnalyzer.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Ru/TestRussianAnalyzer.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Ru/TestRussianAnalyzer.cs Mon Jun 25 16:47:35 2012
@@ -1,4 +1,4 @@
-/*
+/*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -71,7 +71,7 @@ namespace Lucene.Net.Analyzers.Ru
                         break;
 
                     bool nextSampleToken = sample.IncrementToken();
-                    Assert.AreEqual(text.Term(), nextSampleToken == false ? null : sampleText.Term(), "Unicode");
+                    Assert.AreEqual(text.Term, nextSampleToken == false ? null : sampleText.Term, "Unicode");
                 }
             }
         }
@@ -88,9 +88,9 @@ namespace Lucene.Net.Analyzers.Ru
             try
             {
                 Assert.True(stream.IncrementToken());
-                Assert.AreEqual("text", termText.Term());
+                Assert.AreEqual("text", termText.Term);
                 Assert.True(stream.IncrementToken());
-                Assert.AreEqual("1000", termText.Term(), "RussianAnalyzer's tokenizer skips numbers from input text");
+                Assert.AreEqual("1000", termText.Term, "RussianAnalyzer's tokenizer skips numbers from input text");
                 Assert.False(stream.IncrementToken());
             }
             catch (IOException e)

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/Shingle/ShingleAnalyzerWrapperTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/Shingle/ShingleAnalyzerWrapperTest.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Shingle/ShingleAnalyzerWrapperTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Shingle/ShingleAnalyzerWrapperTest.cs Mon Jun 25 16:47:35 2012
@@ -156,7 +156,7 @@ namespace Lucene.Net.Analyzers.Shingle
             while (ts.IncrementToken())
             {
                 j += posIncrAtt.PositionIncrement;
-                var termText = termAtt.Term();
+                var termText = termAtt.Term;
                 q.Add(new Term("content", termText), j);
             }
 
@@ -184,7 +184,7 @@ namespace Lucene.Net.Analyzers.Shingle
 
             while (ts.IncrementToken())
             {
-                var termText = termAtt.Term();
+                var termText = termAtt.Term;
                 q.Add(new TermQuery(new Term("content", termText)),
                       Occur.SHOULD);
             }

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/Shingle/ShingleFilterTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/Shingle/ShingleFilterTest.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Shingle/ShingleFilterTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Shingle/ShingleFilterTest.cs Mon Jun 25 16:47:35 2012
@@ -468,8 +468,8 @@ namespace Lucene.Net.Analyzers.Shingle
             {
                 Assert.IsTrue(i < tokensToCompare.Length, "ShingleFilter outputted more tokens than expected");
 
-                String termText = termAtt.Term();
-                String goldText = tokensToCompare[i].Term();
+                String termText = termAtt.Term;
+                String goldText = tokensToCompare[i].Term;
 
                 Assert.AreEqual(goldText, termText, "Wrong termText");
                 Assert.AreEqual(tokensToCompare[i].StartOffset, offsetAtt.StartOffset,

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/Shingle/TestShingleMatrixFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/Shingle/TestShingleMatrixFilter.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Shingle/TestShingleMatrixFilter.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Shingle/TestShingleMatrixFilter.cs Mon Jun 25 16:47:35 2012
@@ -484,7 +484,7 @@ namespace Lucene.Net.Analyzers.Shingle
             var termAtt = ts.AddAttribute<ITermAttribute>();
 
             Assert.IsTrue(ts.IncrementToken());
-            Assert.AreEqual(text, termAtt.Term());
+            Assert.AreEqual(text, termAtt.Term);
         }
 
         private static void AssertNext(TokenStream ts, String text, int positionIncrement, float boost, int startOffset,
@@ -496,7 +496,7 @@ namespace Lucene.Net.Analyzers.Shingle
             var offsetAtt = ts.AddAttribute<IOffsetAttribute>();
 
             Assert.IsTrue(ts.IncrementToken());
-            Assert.AreEqual(text, termAtt.Term());
+            Assert.AreEqual(text, termAtt.Term);
             Assert.AreEqual(positionIncrement, posIncrAtt.PositionIncrement);
             Assert.AreEqual(boost,
                             payloadAtt.Payload == null
@@ -512,7 +512,7 @@ namespace Lucene.Net.Analyzers.Shingle
             var offsetAtt = ts.AddAttribute<IOffsetAttribute>();
 
             Assert.IsTrue(ts.IncrementToken());
-            Assert.AreEqual(text, termAtt.Term());
+            Assert.AreEqual(text, termAtt.Term);
             Assert.AreEqual(startOffset, offsetAtt.StartOffset);
             Assert.AreEqual(endOffset, offsetAtt.EndOffset);
         }

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/Sinks/TokenTypeSinkTokenizerTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/Sinks/TokenTypeSinkTokenizerTest.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Sinks/TokenTypeSinkTokenizerTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Sinks/TokenTypeSinkTokenizerTest.cs Mon Jun 25 16:47:35 2012
@@ -51,7 +51,7 @@ namespace Lucene.Net.Analyzers.Sinks
             ttf.Reset();
             while (ttf.IncrementToken())
             {
-                if (termAtt.Term().Equals("dogs"))
+                if (termAtt.Term.Equals("dogs"))
                 {
                     seenDogs = true;
                     Assert.True(typeAtt.Type.Equals("D") == true, typeAtt.Type + " is not equal to " + "D");
@@ -89,7 +89,7 @@ namespace Lucene.Net.Analyzers.Sinks
             {
                 if (!input.IncrementToken()) return false;
 
-                if (termAtt.Term().Equals("dogs"))
+                if (termAtt.Term.Equals("dogs"))
                 {
                     typeAtt.Type = "D";
                 }

Modified: incubator/lucene.net/trunk/test/contrib/Core/Analysis/Ext/Analysis.Ext.Test.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Core/Analysis/Ext/Analysis.Ext.Test.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Core/Analysis/Ext/Analysis.Ext.Test.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Core/Analysis/Ext/Analysis.Ext.Test.cs Mon Jun 25 16:47:35 2012
@@ -155,8 +155,8 @@ namespace Lucene.Net.Analysis.Ext
             ITermAttribute termAttribute = ts.GetAttribute<ITermAttribute>();
             while (ts.IncrementToken())
             {
-                Assert.AreEqual(expectedTokens[i++], termAttribute.Term());
-                System.Diagnostics.Debug.WriteLine(termAttribute.Term());
+                Assert.AreEqual(expectedTokens[i++], termAttribute.Term);
+                System.Diagnostics.Debug.WriteLine(termAttribute.Term);
             }
 
             QueryParser p = new QueryParser(Lucene.Net.Util.Version.LUCENE_29, "field", analyzer);

Modified: incubator/lucene.net/trunk/test/contrib/Highlighter/HighlighterTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Highlighter/HighlighterTest.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Highlighter/HighlighterTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Highlighter/HighlighterTest.cs Mon Jun 25 16:47:35 2012
@@ -1562,7 +1562,7 @@ namespace Lucene.Net.Search.Highlight.Te
                                               {
                                                   Token token = ts.iter.Current;
                                                   ts.ClearAttributes();
-                                                  ts.termAtt.SetTermBuffer(token.Term());
+                                                  ts.termAtt.SetTermBuffer(token.Term);
                                                   ts.posIncrAtt.PositionIncrement = token.PositionIncrement;
                                                   ts.offsetAtt.SetOffset(token.StartOffset, token.EndOffset);
                                                   return true;
@@ -1608,7 +1608,7 @@ namespace Lucene.Net.Search.Highlight.Te
                                               {
                                                   Token token = ts.iter.Current;
                                                   ts.ClearAttributes();
-                                                  ts.termAtt.SetTermBuffer(token.Term());
+                                                  ts.termAtt.SetTermBuffer(token.Term);
                                                   ts.posIncrAtt.PositionIncrement = (token.PositionIncrement);
                                                   ts.offsetAtt.SetOffset(token.StartOffset, token.EndOffset);
                                                   return true;
@@ -1994,11 +1994,11 @@ public void testBigramAnalyzer() {
                 }
                 //Token nextRealToken = new Token(, offsetAtt.startOffset(), offsetAtt.endOffset());
                 ClearAttributes();
-                termAtt.SetTermBuffer(realTermAtt.Term());
+                termAtt.SetTermBuffer(realTermAtt.Term);
                 offsetAtt.SetOffset(realOffsetAtt.StartOffset, realOffsetAtt.EndOffset);
                 posIncrAtt.PositionIncrement = realPosIncrAtt.PositionIncrement;
 
-                String expansions = synonyms[realTermAtt.Term()];
+                String expansions = synonyms[realTermAtt.Term];
                 if (expansions == null)
                 {
                     return true;
@@ -2007,7 +2007,7 @@ public void testBigramAnalyzer() {
                 if (st.HasMoreTokens())
                 {
                     currentRealToken = new Token(realOffsetAtt.StartOffset, realOffsetAtt.EndOffset);
-                    currentRealToken.SetTermBuffer(realTermAtt.Term());
+                    currentRealToken.SetTermBuffer(realTermAtt.Term);
                 }
 
                 return true;

Modified: incubator/lucene.net/trunk/test/contrib/Snowball/Analysis/Snowball/TestSnowball.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Snowball/Analysis/Snowball/TestSnowball.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Snowball/Analysis/Snowball/TestSnowball.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Snowball/Analysis/Snowball/TestSnowball.cs Mon Jun 25 16:47:35 2012
@@ -99,7 +99,7 @@ namespace Lucene.Net.Analysis.Snowball
 
             filter.IncrementToken();
 
-            Assert.AreEqual("accent", termAtt.Term());
+            Assert.AreEqual("accent", termAtt.Term);
             Assert.AreEqual(2, offsetAtt.StartOffset);
             Assert.AreEqual(7, offsetAtt.EndOffset);
             Assert.AreEqual("wrd", typeAtt.Type);
@@ -116,7 +116,7 @@ namespace Lucene.Net.Analysis.Snowball
             var tokenStream = analyzer.TokenStream("fieldName", input);
             var termAttr = tokenStream.AddAttribute<ITermAttribute>();
             Assert.That(tokenStream.IncrementToken(), Is.True);
-            Assert.That(termAttr.Term(), Is.EqualTo("terv"));
+            Assert.That(termAttr.Term, Is.EqualTo("terv"));
         }
 
         private sealed class TestTokenStream : TokenStream

Modified: incubator/lucene.net/trunk/test/core/Analysis/BaseTokenStreamTestCase.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/BaseTokenStreamTestCase.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/BaseTokenStreamTestCase.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/BaseTokenStreamTestCase.cs Mon Jun 25 16:47:35 2012
@@ -123,7 +123,7 @@ namespace Lucene.Net.Test.Analysis
                 Assert.IsTrue(ts.IncrementToken(), "token " + i + " does not exist");
                 Assert.IsTrue(checkClearAtt.GetAndResetClearCalled(), "clearAttributes() was not called correctly in TokenStream chain");
 
-                Assert.AreEqual(output[i], termAtt.Term(), "term " + i);
+                Assert.AreEqual(output[i], termAtt.Term, "term " + i);
                 if (startOffsets != null)
                     Assert.AreEqual(startOffsets[i], offsetAtt.StartOffset, "startOffset " + i);
                 if (endOffsets != null)

Modified: incubator/lucene.net/trunk/test/core/Analysis/TestASCIIFoldingFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestASCIIFoldingFilter.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestASCIIFoldingFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestASCIIFoldingFilter.cs Mon Jun 25 16:47:35 2012
@@ -1,4 +1,4 @@
-/* 
+/* 
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -1914,7 +1914,7 @@ namespace Lucene.Net.Analysis
 		internal virtual void  AssertTermEquals(System.String expected, TokenStream stream, ITermAttribute termAtt)
 		{
 			Assert.IsTrue(stream.IncrementToken());
-			Assert.AreEqual(expected, termAtt.Term());
+			Assert.AreEqual(expected, termAtt.Term);
 		}
 	}
 }
\ No newline at end of file

Modified: incubator/lucene.net/trunk/test/core/Analysis/TestCachingTokenFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestCachingTokenFilter.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestCachingTokenFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestCachingTokenFilter.cs Mon Jun 25 16:47:35 2012
@@ -136,7 +136,7 @@ namespace Lucene.Net.Analysis
 			while (stream.IncrementToken())
 			{
 				Assert.IsTrue(count < tokens.Length);
-				Assert.AreEqual(tokens[count], termAtt.Term());
+				Assert.AreEqual(tokens[count], termAtt.Term);
 				count++;
 			}
 			

Modified: incubator/lucene.net/trunk/test/core/Analysis/TestISOLatin1AccentFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestISOLatin1AccentFilter.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestISOLatin1AccentFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestISOLatin1AccentFilter.cs Mon Jun 25 16:47:35 2012
@@ -1,4 +1,4 @@
-/* 
+/* 
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -113,7 +113,7 @@ namespace Lucene.Net.Analysis
 		internal virtual void  AssertTermEquals(System.String expected, TokenStream stream, ITermAttribute termAtt)
 		{
 			Assert.IsTrue(stream.IncrementToken());
-			Assert.AreEqual(expected, termAtt.Term());
+			Assert.AreEqual(expected, termAtt.Term);
 		}
 	}
 }
\ No newline at end of file

Modified: incubator/lucene.net/trunk/test/core/Analysis/TestLengthFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestLengthFilter.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestLengthFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestLengthFilter.cs Mon Jun 25 16:47:35 2012
@@ -35,11 +35,11 @@ namespace Lucene.Net.Analysis
             ITermAttribute termAtt = filter.GetAttribute<ITermAttribute>();
 			
 			Assert.IsTrue(filter.IncrementToken());
-			Assert.AreEqual("short", termAtt.Term());
+			Assert.AreEqual("short", termAtt.Term);
 			Assert.IsTrue(filter.IncrementToken());
-			Assert.AreEqual("ab", termAtt.Term());
+			Assert.AreEqual("ab", termAtt.Term);
 			Assert.IsTrue(filter.IncrementToken());
-			Assert.AreEqual("foo", termAtt.Term());
+			Assert.AreEqual("foo", termAtt.Term);
 			Assert.IsFalse(filter.IncrementToken());
 		}
 	}

Modified: incubator/lucene.net/trunk/test/core/Analysis/TestNumericTokenStream.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestNumericTokenStream.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestNumericTokenStream.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestNumericTokenStream.cs Mon Jun 25 16:47:35 2012
@@ -41,7 +41,7 @@ namespace Lucene.Net.Analysis
 			for (int shift = 0; shift < 64; shift += NumericUtils.PRECISION_STEP_DEFAULT)
 			{
 				Assert.IsTrue(stream.IncrementToken(), "New token is available");
-				Assert.AreEqual(NumericUtils.LongToPrefixCoded(lvalue, shift), termAtt.Term(), "Term is correctly encoded");
+				Assert.AreEqual(NumericUtils.LongToPrefixCoded(lvalue, shift), termAtt.Term, "Term is correctly encoded");
 				Assert.AreEqual((shift == 0)?NumericTokenStream.TOKEN_TYPE_FULL_PREC:NumericTokenStream.TOKEN_TYPE_LOWER_PREC, typeAtt.Type, "Type correct");
 			}
 			Assert.IsFalse(stream.IncrementToken(), "No more tokens available");
@@ -57,7 +57,7 @@ namespace Lucene.Net.Analysis
 			for (int shift = 0; shift < 32; shift += NumericUtils.PRECISION_STEP_DEFAULT)
 			{
 				Assert.IsTrue(stream.IncrementToken(), "New token is available");
-				Assert.AreEqual(NumericUtils.IntToPrefixCoded(ivalue, shift), termAtt.Term(), "Term is correctly encoded");
+				Assert.AreEqual(NumericUtils.IntToPrefixCoded(ivalue, shift), termAtt.Term, "Term is correctly encoded");
 				Assert.AreEqual((shift == 0)?NumericTokenStream.TOKEN_TYPE_FULL_PREC:NumericTokenStream.TOKEN_TYPE_LOWER_PREC, typeAtt.Type, "Type correct");
 			}
 			Assert.IsFalse(stream.IncrementToken(), "No more tokens available");

Modified: incubator/lucene.net/trunk/test/core/Analysis/TestPerFieldAnalzyerWrapper.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestPerFieldAnalzyerWrapper.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestPerFieldAnalzyerWrapper.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestPerFieldAnalzyerWrapper.cs Mon Jun 25 16:47:35 2012
@@ -37,12 +37,12 @@ namespace Lucene.Net.Analysis
             ITermAttribute termAtt = tokenStream.GetAttribute<ITermAttribute>();
 			
 			Assert.IsTrue(tokenStream.IncrementToken());
-			Assert.AreEqual("Qwerty", termAtt.Term(), "WhitespaceAnalyzer does not lowercase");
+			Assert.AreEqual("Qwerty", termAtt.Term, "WhitespaceAnalyzer does not lowercase");
 			
 			tokenStream = analyzer.TokenStream("special", new System.IO.StringReader(text));
             termAtt = tokenStream.GetAttribute<ITermAttribute>();
 			Assert.IsTrue(tokenStream.IncrementToken());
-			Assert.AreEqual("qwerty", termAtt.Term(), "SimpleAnalyzer lowercases");
+			Assert.AreEqual("qwerty", termAtt.Term, "SimpleAnalyzer lowercases");
 		}
 	}
 }
\ No newline at end of file

Modified: incubator/lucene.net/trunk/test/core/Analysis/TestStandardAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestStandardAnalyzer.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestStandardAnalyzer.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestStandardAnalyzer.cs Mon Jun 25 16:47:35 2012
@@ -126,7 +126,7 @@ namespace Lucene.Net.Analysis
                 StandardAnalyzer analyzer = new StandardAnalyzer(Version.LUCENE_CURRENT);
 				AssertAnalyzesTo(analyzer, "www.nutch.org.", new System.String[]{"www.nutch.org"}, new System.String[]{"<HOST>"});
 			}
-			catch (System.NullReferenceException e)
+			catch (System.NullReferenceException)
 			{
 				Assert.IsTrue(false, "Should not throw an NPE and it did");
 			}

Modified: incubator/lucene.net/trunk/test/core/Analysis/TestStopAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestStopAnalyzer.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestStopAnalyzer.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestStopAnalyzer.cs Mon Jun 25 16:47:35 2012
@@ -58,7 +58,7 @@ namespace Lucene.Net.Analysis
 			
 			while (stream.IncrementToken())
 			{
-				Assert.IsFalse(inValidTokens.Contains(termAtt.Term()));
+				Assert.IsFalse(inValidTokens.Contains(termAtt.Term));
 			}
 		}
 		
@@ -78,7 +78,7 @@ namespace Lucene.Net.Analysis
 			
 			while (stream.IncrementToken())
 			{
-				System.String text = termAtt.Term();
+				System.String text = termAtt.Term;
 				Assert.IsFalse(stopWordsSet.Contains(text));
                 Assert.AreEqual(1, posIncrAtt.PositionIncrement); // in 2.4 stop tokenizer does not apply increments.
 			}
@@ -102,7 +102,7 @@ namespace Lucene.Net.Analysis
 
             while (stream.IncrementToken())
             {
-                string text = termAtt.Term();
+                string text = termAtt.Term;
                 Assert.IsFalse(stopWordsSet.Contains(text));
                 Assert.AreEqual(expectedIncr[i++], posIncrAtt.PositionIncrement);
             }

Modified: incubator/lucene.net/trunk/test/core/Analysis/TestStopFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestStopFilter.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestStopFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestStopFilter.cs Mon Jun 25 16:47:35 2012
@@ -41,9 +41,9 @@ namespace Lucene.Net.Analysis
 			TokenStream stream = new StopFilter(false, new WhitespaceTokenizer(reader), stopWords, false);
             ITermAttribute termAtt = (ITermAttribute)stream.GetAttribute<ITermAttribute>();
 			Assert.IsTrue(stream.IncrementToken());
-			Assert.AreEqual("Now", termAtt.Term());
+			Assert.AreEqual("Now", termAtt.Term);
 			Assert.IsTrue(stream.IncrementToken());
-			Assert.AreEqual("The", termAtt.Term());
+			Assert.AreEqual("The", termAtt.Term);
 			Assert.IsFalse(stream.IncrementToken());
 		}
 		
@@ -55,7 +55,7 @@ namespace Lucene.Net.Analysis
 			TokenStream stream = new StopFilter(false, new WhitespaceTokenizer(reader), stopWords, true);
             ITermAttribute termAtt = stream.GetAttribute<ITermAttribute>();
 			Assert.IsTrue(stream.IncrementToken());
-			Assert.AreEqual("Now", termAtt.Term());
+			Assert.AreEqual("Now", termAtt.Term);
 			Assert.IsFalse(stream.IncrementToken());
 		}
 		
@@ -68,9 +68,9 @@ namespace Lucene.Net.Analysis
 			TokenStream stream = new StopFilter(false, new WhitespaceTokenizer(reader), stopSet);
             ITermAttribute termAtt = stream.GetAttribute<ITermAttribute>();
 			Assert.IsTrue(stream.IncrementToken());
-			Assert.AreEqual("Now", termAtt.Term());
+			Assert.AreEqual("Now", termAtt.Term);
 			Assert.IsTrue(stream.IncrementToken());
-			Assert.AreEqual("The", termAtt.Term());
+			Assert.AreEqual("The", termAtt.Term);
 			Assert.IsFalse(stream.IncrementToken());
 		}
 		
@@ -140,7 +140,7 @@ namespace Lucene.Net.Analysis
 				Assert.IsTrue(stpf.IncrementToken());
 				Log("Token " + i + ": " + stpf);
 				System.String w = English.IntToEnglish(i).Trim();
-				Assert.AreEqual(w, termAtt.Term(), "expecting token " + i + " to be " + w);
+				Assert.AreEqual(w, termAtt.Term, "expecting token " + i + " to be " + w);
 				Assert.AreEqual(enableIcrements?(i == 0?1:3):1, posIncrAtt.PositionIncrement, "all but first token must have position increment of 3");
 			}
 			Assert.IsFalse(stpf.IncrementToken());

Modified: incubator/lucene.net/trunk/test/core/Analysis/TestTeeSinkTokenFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestTeeSinkTokenFilter.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestTeeSinkTokenFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestTeeSinkTokenFilter.cs Mon Jun 25 16:47:35 2012
@@ -38,7 +38,7 @@ namespace Lucene.Net.Analysis
             public override bool Accept(AttributeSource a)
             {
                 ITermAttribute termAtt = a.GetAttribute<ITermAttribute>();
-                return termAtt.Term().ToUpper().Equals("The".ToUpper());
+                return termAtt.Term.ToUpper().Equals("The".ToUpper());
             }
         }
         public class AnonymousClassSinkFilter1 : TeeSinkTokenFilter.SinkFilter
@@ -46,7 +46,7 @@ namespace Lucene.Net.Analysis
             public override bool Accept(AttributeSource a)
             {
                 ITermAttribute termAtt = a.GetAttribute<ITermAttribute>();
-                return termAtt.Term().ToUpper().Equals("Dogs".ToUpper());
+                return termAtt.Term.ToUpper().Equals("Dogs".ToUpper());
             }
         }
         protected internal System.Text.StringBuilder buffer1;

Modified: incubator/lucene.net/trunk/test/core/Analysis/TestToken.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestToken.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestToken.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestToken.cs Mon Jun 25 16:47:35 2012
@@ -47,26 +47,26 @@ namespace Lucene.Net.Analysis
 			t.SetTermBuffer(content, 0, content.Length);
 			char[] buf = t.TermBuffer();
 			Assert.AreNotEqual(t.TermBuffer(), content);
-			Assert.AreEqual("hello", t.Term());
+			Assert.AreEqual("hello", t.Term);
 			Assert.AreEqual("word", t.Type);
 			Assert.AreEqual(0, t.Flags);
 			
 			t = new Token(6, 22);
 			t.SetTermBuffer(content, 0, content.Length);
-			Assert.AreEqual("hello", t.Term());
+			Assert.AreEqual("hello", t.Term);
 			Assert.AreEqual("(hello,6,22)", t.ToString());
 			Assert.AreEqual("word", t.Type);
 			Assert.AreEqual(0, t.Flags);
 			
 			t = new Token(6, 22, 7);
 			t.SetTermBuffer(content, 0, content.Length);
-			Assert.AreEqual("hello", t.Term());
+			Assert.AreEqual("hello", t.Term);
 			Assert.AreEqual("(hello,6,22)", t.ToString());
 			Assert.AreEqual(7, t.Flags);
 			
 			t = new Token(6, 22, "junk");
 			t.SetTermBuffer(content, 0, content.Length);
-			Assert.AreEqual("hello", t.Term());
+			Assert.AreEqual("hello", t.Term);
 			Assert.AreEqual("(hello,6,22,type=junk)", t.ToString());
 			Assert.AreEqual(0, t.Flags);
 		}
@@ -81,7 +81,7 @@ namespace Lucene.Net.Analysis
 			{
 				t.ResizeTermBuffer(i);
 				Assert.IsTrue(i <= t.TermBuffer().Length);
-				Assert.AreEqual("hello", t.Term());
+				Assert.AreEqual("hello", t.Term);
 			}
 		}
 		
@@ -95,7 +95,7 @@ namespace Lucene.Net.Analysis
 				char[] content = buf.ToString().ToCharArray();
 				t.SetTermBuffer(content, 0, content.Length);
 				Assert.AreEqual(buf.Length, t.TermLength());
-				Assert.AreEqual(buf.ToString(), t.Term());
+				Assert.AreEqual(buf.ToString(), t.Term);
 				buf.Append(buf.ToString());
 			}
 			Assert.AreEqual(1048576, t.TermLength());
@@ -109,7 +109,7 @@ namespace Lucene.Net.Analysis
 				System.String content = buf.ToString();
 				t.SetTermBuffer(content, 0, content.Length);
 				Assert.AreEqual(content.Length, t.TermLength());
-				Assert.AreEqual(content, t.Term());
+				Assert.AreEqual(content, t.Term);
 				buf.Append(content);
 			}
 			Assert.AreEqual(1048576, t.TermLength());
@@ -123,7 +123,7 @@ namespace Lucene.Net.Analysis
 				System.String content = buf.ToString();
 				t.SetTermBuffer(content);
 				Assert.AreEqual(content.Length, t.TermLength());
-				Assert.AreEqual(content, t.Term());
+				Assert.AreEqual(content, t.Term);
 				buf.Append(content);
 			}
 			Assert.AreEqual(1048576, t.TermLength());
@@ -137,7 +137,7 @@ namespace Lucene.Net.Analysis
 				System.String content = buf.ToString();
 				t.SetTermBuffer(content);
 				Assert.AreEqual(content.Length, t.TermLength());
-				Assert.AreEqual(content, t.Term());
+				Assert.AreEqual(content, t.Term);
 				buf.Append("a");
 			}
 			Assert.AreEqual(20000, t.TermLength());
@@ -151,7 +151,7 @@ namespace Lucene.Net.Analysis
 				System.String content = buf.ToString();
 				t.SetTermBuffer(content);
 				Assert.AreEqual(content.Length, t.TermLength());
-				Assert.AreEqual(content, t.Term());
+				Assert.AreEqual(content, t.Term);
 				buf.Append("a");
 			}
 			Assert.AreEqual(20000, t.TermLength());
@@ -192,16 +192,16 @@ namespace Lucene.Net.Analysis
 		{
 			Token t = new Token("hello", 0, 5);
 			Assert.AreEqual(t.TermLength(), 5);
-			Assert.AreEqual(t.Term(), "hello");
+			Assert.AreEqual(t.Term, "hello");
 			t.SetTermBuffer("hello2");
 			Assert.AreEqual(t.TermLength(), 6);
-			Assert.AreEqual(t.Term(), "hello2");
+			Assert.AreEqual(t.Term, "hello2");
 			t.SetTermBuffer("hello3".ToCharArray(), 0, 6);
-			Assert.AreEqual(t.Term(), "hello3");
+			Assert.AreEqual(t.Term, "hello3");
 			
 			char[] buffer = t.TermBuffer();
 			buffer[1] = 'o';
-			Assert.AreEqual(t.Term(), "hollo3");
+			Assert.AreEqual(t.Term, "hollo3");
 		}
 		
         [Test]
@@ -212,7 +212,7 @@ namespace Lucene.Net.Analysis
 			t.SetTermBuffer(content, 0, 5);
 			char[] buf = t.TermBuffer();
 			Token copy = (Token) TestSimpleAttributeImpls.AssertCloneIsEqual(t);
-			Assert.AreEqual(t.Term(), copy.Term());
+			Assert.AreEqual(t.Term, copy.Term);
             Assert.AreNotSame(buf, copy.TermBuffer());
 			
 			Payload pl = new Payload(new byte[]{1, 2, 3, 4});
@@ -227,15 +227,15 @@ namespace Lucene.Net.Analysis
 		{
 			Token t = new Token();
 			Token copy = (Token) TestSimpleAttributeImpls.AssertCopyIsEqual(t);
-			Assert.AreEqual("", t.Term());
-			Assert.AreEqual("", copy.Term());
+			Assert.AreEqual("", t.Term);
+			Assert.AreEqual("", copy.Term);
 			
 			t = new Token(0, 5);
 			char[] content = "hello".ToCharArray();
 			t.SetTermBuffer(content, 0, 5);
 			char[] buf = t.TermBuffer();
 			copy = (Token) TestSimpleAttributeImpls.AssertCopyIsEqual(t);
-			Assert.AreEqual(t.Term(), copy.Term());
+			Assert.AreEqual(t.Term, copy.Term);
 			Assert.AreNotSame(buf, copy.TermBuffer());
 			
 			Payload pl = new Payload(new byte[]{1, 2, 3, 4});

Modified: incubator/lucene.net/trunk/test/core/Analysis/Tokenattributes/TestTermAttributeImpl.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/Tokenattributes/TestTermAttributeImpl.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/Tokenattributes/TestTermAttributeImpl.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/Tokenattributes/TestTermAttributeImpl.cs Mon Jun 25 16:47:35 2012
@@ -42,7 +42,7 @@ namespace Lucene.Net.Analysis.Tokenattri
 			{
 				t.ResizeTermBuffer(i);
 				Assert.IsTrue(i <= t.TermBuffer().Length);
-				Assert.AreEqual("hello", t.Term());
+				Assert.AreEqual("hello", t.Term);
 			}
 		}
 		
@@ -56,7 +56,7 @@ namespace Lucene.Net.Analysis.Tokenattri
 				char[] content = buf.ToString().ToCharArray();
 				t.SetTermBuffer(content, 0, content.Length);
 				Assert.AreEqual(buf.Length, t.TermLength());
-				Assert.AreEqual(buf.ToString(), t.Term());
+				Assert.AreEqual(buf.ToString(), t.Term);
 				buf.Append(buf.ToString());
 			}
 			Assert.AreEqual(1048576, t.TermLength());
@@ -70,7 +70,7 @@ namespace Lucene.Net.Analysis.Tokenattri
 				System.String content = buf.ToString();
 				t.SetTermBuffer(content, 0, content.Length);
 				Assert.AreEqual(content.Length, t.TermLength());
-				Assert.AreEqual(content, t.Term());
+				Assert.AreEqual(content, t.Term);
 				buf.Append(content);
 			}
 			Assert.AreEqual(1048576, t.TermLength());
@@ -84,7 +84,7 @@ namespace Lucene.Net.Analysis.Tokenattri
 				System.String content = buf.ToString();
 				t.SetTermBuffer(content);
 				Assert.AreEqual(content.Length, t.TermLength());
-				Assert.AreEqual(content, t.Term());
+				Assert.AreEqual(content, t.Term);
 				buf.Append(content);
 			}
 			Assert.AreEqual(1048576, t.TermLength());
@@ -98,7 +98,7 @@ namespace Lucene.Net.Analysis.Tokenattri
 				System.String content = buf.ToString();
 				t.SetTermBuffer(content);
 				Assert.AreEqual(content.Length, t.TermLength());
-				Assert.AreEqual(content, t.Term());
+				Assert.AreEqual(content, t.Term);
 				buf.Append("a");
 			}
 			Assert.AreEqual(20000, t.TermLength());
@@ -112,7 +112,7 @@ namespace Lucene.Net.Analysis.Tokenattri
 				System.String content = buf.ToString();
 				t.SetTermBuffer(content);
 				Assert.AreEqual(content.Length, t.TermLength());
-				Assert.AreEqual(content, t.Term());
+				Assert.AreEqual(content, t.Term);
 				buf.Append("a");
 			}
 			Assert.AreEqual(20000, t.TermLength());
@@ -137,18 +137,18 @@ namespace Lucene.Net.Analysis.Tokenattri
 			TermAttribute t = new TermAttribute();
 			t.SetTermBuffer("hello");
 			Assert.AreEqual(t.TermLength(), 5);
-			Assert.AreEqual(t.Term(), "hello");
+			Assert.AreEqual(t.Term, "hello");
 			t.SetTermBuffer("hello2");
 			Assert.AreEqual(t.TermLength(), 6);
-			Assert.AreEqual(t.Term(), "hello2");
+			Assert.AreEqual(t.Term, "hello2");
 			t.SetTermBuffer("hello3".ToCharArray(), 0, 6);
-			Assert.AreEqual(t.Term(), "hello3");
+			Assert.AreEqual(t.Term, "hello3");
 			
 			// Make sure if we get the buffer and change a character
 			// that term() reflects the change
 			char[] buffer = t.TermBuffer();
 			buffer[1] = 'o';
-			Assert.AreEqual(t.Term(), "hollo3");
+			Assert.AreEqual(t.Term, "hollo3");
 		}
 		
         [Test]
@@ -159,7 +159,7 @@ namespace Lucene.Net.Analysis.Tokenattri
 			t.SetTermBuffer(content, 0, 5);
 			char[] buf = t.TermBuffer();
 			TermAttribute copy = (TermAttribute) TestSimpleAttributeImpls.AssertCloneIsEqual(t);
-			Assert.AreEqual(t.Term(), copy.Term());
+			Assert.AreEqual(t.Term, copy.Term);
 			Assert.AreNotSame(buf, copy.TermBuffer());
 		}
 		
@@ -185,15 +185,15 @@ namespace Lucene.Net.Analysis.Tokenattri
 		{
 			TermAttribute t = new TermAttribute();
 			TermAttribute copy = (TermAttribute) TestSimpleAttributeImpls.AssertCopyIsEqual(t);
-			Assert.AreEqual("", t.Term());
-			Assert.AreEqual("", copy.Term());
+			Assert.AreEqual("", t.Term);
+			Assert.AreEqual("", copy.Term);
 			
 			t = new TermAttribute();
 			char[] content = "hello".ToCharArray();
 			t.SetTermBuffer(content, 0, 5);
 			char[] buf = t.TermBuffer();
 			copy = (TermAttribute) TestSimpleAttributeImpls.AssertCopyIsEqual(t);
-			Assert.AreEqual(t.Term(), copy.Term());
+			Assert.AreEqual(t.Term, copy.Term);
 			Assert.AreNotSame(buf, copy.TermBuffer());
 		}
 	}

Modified: incubator/lucene.net/trunk/test/core/Index/DocHelper.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/DocHelper.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/DocHelper.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/DocHelper.cs Mon Jun 25 16:47:35 2012
@@ -206,7 +206,7 @@ namespace Lucene.Net.Index
 				{
 					LAZY_FIELD_BINARY_BYTES = System.Text.Encoding.UTF8.GetBytes("These are some binary field bytes");
 				}
-				catch (System.IO.IOException e)
+				catch (System.IO.IOException)
 				{
 				}
 				lazyFieldBinary = new Field(LAZY_FIELD_BINARY_KEY, LAZY_FIELD_BINARY_BYTES, Field.Store.YES);

Modified: incubator/lucene.net/trunk/test/core/Index/TestAddIndexesNoOptimize.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestAddIndexesNoOptimize.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestAddIndexesNoOptimize.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestAddIndexesNoOptimize.cs Mon Jun 25 16:47:35 2012
@@ -285,7 +285,7 @@ namespace Lucene.Net.Index
 				writer.AddIndexesNoOptimize(new Directory[]{aux, dir});
 				Assert.IsTrue(false);
 			}
-			catch (System.ArgumentException e)
+			catch (System.ArgumentException)
 			{
                 Assert.AreEqual(100, writer.MaxDoc());
 			}

Modified: incubator/lucene.net/trunk/test/core/Index/TestDeletionPolicy.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestDeletionPolicy.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestDeletionPolicy.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestDeletionPolicy.cs Mon Jun 25 16:47:35 2012
@@ -334,7 +334,7 @@ namespace Lucene.Net.Index
 					long modTime = dir.FileModified(fileName);
 					Assert.IsTrue(lastDeleteTime - modTime <= (SECONDS * 1000), "commit point was older than " + SECONDS + " seconds (" + (lastDeleteTime - modTime) + " msec) but did not get deleted");
 				}
-				catch (System.IO.IOException e)
+				catch (System.IO.IOException)
 				{
 					// OK
 					break;

Modified: incubator/lucene.net/trunk/test/core/Index/TestDoc.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestDoc.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestDoc.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestDoc.cs Mon Jun 25 16:47:35 2012
@@ -234,10 +234,10 @@ namespace Lucene.Net.Index
 			TermEnum tis = reader.Terms();
 			while (tis.Next())
 			{
-				out_Renamed.Write(tis.Term());
+				out_Renamed.Write(tis.Term);
 				out_Renamed.WriteLine(" DF=" + tis.DocFreq());
 				
-				TermPositions positions = reader.TermPositions(tis.Term());
+				TermPositions positions = reader.TermPositions(tis.Term);
 				try
 				{
 					while (positions.Next())

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

Modified: incubator/lucene.net/trunk/test/core/Index/TestFilterIndexReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestFilterIndexReader.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestFilterIndexReader.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestFilterIndexReader.cs Mon Jun 25 16:47:35 2012
@@ -48,7 +48,7 @@ namespace Lucene.Net.Index
 				{
 					while (in_Renamed.Next())
 					{
-						if (in_Renamed.Term().Text.IndexOf('e') != - 1)
+						if (in_Renamed.Term.Text.IndexOf('e') != - 1)
 							return true;
 					}
 					return false;
@@ -128,7 +128,7 @@ namespace Lucene.Net.Index
 			TermEnum terms = reader.Terms();
 			while (terms.Next())
 			{
-				Assert.IsTrue(terms.Term().Text.IndexOf('e') != - 1);
+				Assert.IsTrue(terms.Term.Text.IndexOf('e') != - 1);
 			}
 			terms.Close();
 			

Modified: incubator/lucene.net/trunk/test/core/Index/TestIndexReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestIndexReader.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestIndexReader.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestIndexReader.cs Mon Jun 25 16:47:35 2012
@@ -1485,17 +1485,17 @@ namespace Lucene.Net.Index
 			while (enum1.Next())
 			{
 				Assert.IsTrue(enum2.Next());
-				Assert.AreEqual(enum1.Term(), enum2.Term(), "Different term in dictionary.");
-				tp1.Seek(enum1.Term());
-				tp2.Seek(enum1.Term());
+				Assert.AreEqual(enum1.Term, enum2.Term, "Different term in dictionary.");
+				tp1.Seek(enum1.Term);
+				tp2.Seek(enum1.Term);
 				while (tp1.Next())
 				{
 					Assert.IsTrue(tp2.Next());
-					Assert.AreEqual(tp1.Doc, tp2.Doc, "Different doc id in postinglist of term " + enum1.Term() + ".");
-					Assert.AreEqual(tp1.Freq, tp2.Freq, "Different term frequence in postinglist of term " + enum1.Term() + ".");
+					Assert.AreEqual(tp1.Doc, tp2.Doc, "Different doc id in postinglist of term " + enum1.Term + ".");
+					Assert.AreEqual(tp1.Freq, tp2.Freq, "Different term frequence in postinglist of term " + enum1.Term + ".");
 					for (int i = 0; i < tp1.Freq; i++)
 					{
-						Assert.AreEqual(tp1.NextPosition(), tp2.NextPosition(), "Different positions in postinglist of term " + enum1.Term() + ".");
+						Assert.AreEqual(tp1.NextPosition(), tp2.NextPosition(), "Different positions in postinglist of term " + enum1.Term + ".");
 					}
 				}
 			}

Modified: incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs Mon Jun 25 16:47:35 2012
@@ -292,12 +292,12 @@ namespace Lucene.Net.Index
                         {
                             finalWriter.AddDocument(doc);
                         }
-                        catch (AlreadyClosedException e)
+                        catch (AlreadyClosedException)
                         {
                             done = true;
                             break;
                         }
-                        catch (System.NullReferenceException e)
+                        catch (System.NullReferenceException)
                         {
                             done = true;
                             break;

Modified: incubator/lucene.net/trunk/test/core/Index/TestIndexWriterLockRelease.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestIndexWriterLockRelease.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestIndexWriterLockRelease.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestIndexWriterLockRelease.cs Mon Jun 25 16:47:35 2012
@@ -132,7 +132,7 @@ namespace Lucene.Net.Index
             {
                 im = new IndexWriter(dir, new Lucene.Net.Analysis.Standard.StandardAnalyzer(Util.Version.LUCENE_CURRENT), false, IndexWriter.MaxFieldLength.LIMITED);
             }
-            catch (System.IO.FileNotFoundException e)
+            catch (System.IO.FileNotFoundException)
             {
                 try
                 {

Modified: incubator/lucene.net/trunk/test/core/Index/TestParallelTermEnum.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestParallelTermEnum.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestParallelTermEnum.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestParallelTermEnum.cs Mon Jun 25 16:47:35 2012
@@ -87,98 +87,98 @@ namespace Lucene.Net.Index
 			
 			TermEnum te = pr.Terms();
 			Assert.IsTrue(te.Next());
-			Assert.AreEqual("field1:brown", te.Term().ToString());
-			td.Seek(te.Term());
+			Assert.AreEqual("field1:brown", te.Term.ToString());
+			td.Seek(te.Term);
 			Assert.IsTrue(td.Next());
 			Assert.AreEqual(0, td.Doc);
 			Assert.IsFalse(td.Next());
 			Assert.IsTrue(te.Next());
-			Assert.AreEqual("field1:fox", te.Term().ToString());
-			td.Seek(te.Term());
+			Assert.AreEqual("field1:fox", te.Term.ToString());
+			td.Seek(te.Term);
 			Assert.IsTrue(td.Next());
 			Assert.AreEqual(0, td.Doc);
 			Assert.IsFalse(td.Next());
 			Assert.IsTrue(te.Next());
-			Assert.AreEqual("field1:jumps", te.Term().ToString());
-			td.Seek(te.Term());
+			Assert.AreEqual("field1:jumps", te.Term.ToString());
+			td.Seek(te.Term);
 			Assert.IsTrue(td.Next());
 			Assert.AreEqual(0, td.Doc);
 			Assert.IsFalse(td.Next());
 			Assert.IsTrue(te.Next());
-			Assert.AreEqual("field1:quick", te.Term().ToString());
-			td.Seek(te.Term());
+			Assert.AreEqual("field1:quick", te.Term.ToString());
+			td.Seek(te.Term);
 			Assert.IsTrue(td.Next());
 			Assert.AreEqual(0, td.Doc);
 			Assert.IsFalse(td.Next());
 			Assert.IsTrue(te.Next());
-			Assert.AreEqual("field1:the", te.Term().ToString());
-			td.Seek(te.Term());
+			Assert.AreEqual("field1:the", te.Term.ToString());
+			td.Seek(te.Term);
 			Assert.IsTrue(td.Next());
 			Assert.AreEqual(0, td.Doc);
 			Assert.IsFalse(td.Next());
 			Assert.IsTrue(te.Next());
-			Assert.AreEqual("field2:brown", te.Term().ToString());
-			td.Seek(te.Term());
+			Assert.AreEqual("field2:brown", te.Term.ToString());
+			td.Seek(te.Term);
 			Assert.IsTrue(td.Next());
 			Assert.AreEqual(0, td.Doc);
 			Assert.IsFalse(td.Next());
 			Assert.IsTrue(te.Next());
-			Assert.AreEqual("field2:fox", te.Term().ToString());
-			td.Seek(te.Term());
+			Assert.AreEqual("field2:fox", te.Term.ToString());
+			td.Seek(te.Term);
 			Assert.IsTrue(td.Next());
 			Assert.AreEqual(0, td.Doc);
 			Assert.IsFalse(td.Next());
 			Assert.IsTrue(te.Next());
-			Assert.AreEqual("field2:jumps", te.Term().ToString());
-			td.Seek(te.Term());
+			Assert.AreEqual("field2:jumps", te.Term.ToString());
+			td.Seek(te.Term);
 			Assert.IsTrue(td.Next());
 			Assert.AreEqual(0, td.Doc);
 			Assert.IsFalse(td.Next());
 			Assert.IsTrue(te.Next());
-			Assert.AreEqual("field2:quick", te.Term().ToString());
-			td.Seek(te.Term());
+			Assert.AreEqual("field2:quick", te.Term.ToString());
+			td.Seek(te.Term);
 			Assert.IsTrue(td.Next());
 			Assert.AreEqual(0, td.Doc);
 			Assert.IsFalse(td.Next());
 			Assert.IsTrue(te.Next());
-			Assert.AreEqual("field2:the", te.Term().ToString());
-			td.Seek(te.Term());
+			Assert.AreEqual("field2:the", te.Term.ToString());
+			td.Seek(te.Term);
 			Assert.IsTrue(td.Next());
 			Assert.AreEqual(0, td.Doc);
 			Assert.IsFalse(td.Next());
 			Assert.IsTrue(te.Next());
-			Assert.AreEqual("field3:dog", te.Term().ToString());
-			td.Seek(te.Term());
+			Assert.AreEqual("field3:dog", te.Term.ToString());
+			td.Seek(te.Term);
 			Assert.IsTrue(td.Next());
 			Assert.AreEqual(0, td.Doc);
 			Assert.IsFalse(td.Next());
 			Assert.IsTrue(te.Next());
-			Assert.AreEqual("field3:fox", te.Term().ToString());
-			td.Seek(te.Term());
+			Assert.AreEqual("field3:fox", te.Term.ToString());
+			td.Seek(te.Term);
 			Assert.IsTrue(td.Next());
 			Assert.AreEqual(0, td.Doc);
 			Assert.IsFalse(td.Next());
 			Assert.IsTrue(te.Next());
-			Assert.AreEqual("field3:jumps", te.Term().ToString());
-			td.Seek(te.Term());
+			Assert.AreEqual("field3:jumps", te.Term.ToString());
+			td.Seek(te.Term);
 			Assert.IsTrue(td.Next());
 			Assert.AreEqual(0, td.Doc);
 			Assert.IsFalse(td.Next());
 			Assert.IsTrue(te.Next());
-			Assert.AreEqual("field3:lazy", te.Term().ToString());
-			td.Seek(te.Term());
+			Assert.AreEqual("field3:lazy", te.Term.ToString());
+			td.Seek(te.Term);
 			Assert.IsTrue(td.Next());
 			Assert.AreEqual(0, td.Doc);
 			Assert.IsFalse(td.Next());
 			Assert.IsTrue(te.Next());
-			Assert.AreEqual("field3:over", te.Term().ToString());
-			td.Seek(te.Term());
+			Assert.AreEqual("field3:over", te.Term.ToString());
+			td.Seek(te.Term);
 			Assert.IsTrue(td.Next());
 			Assert.AreEqual(0, td.Doc);
 			Assert.IsFalse(td.Next());
 			Assert.IsTrue(te.Next());
-			Assert.AreEqual("field3:the", te.Term().ToString());
-			td.Seek(te.Term());
+			Assert.AreEqual("field3:the", te.Term.ToString());
+			td.Seek(te.Term);
 			Assert.IsTrue(td.Next());
 			Assert.AreEqual(0, td.Doc);
 			Assert.IsFalse(td.Next());

Modified: incubator/lucene.net/trunk/test/core/Index/TestPayloads.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestPayloads.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestPayloads.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestPayloads.cs Mon Jun 25 16:47:35 2012
@@ -549,14 +549,14 @@ namespace Lucene.Net.Index
 			TermEnum terms = reader.Terms();
 			while (terms.Next())
 			{
-				TermPositions tp = reader.TermPositions(terms.Term());
+				TermPositions tp = reader.TermPositions(terms.Term);
 				while (tp.Next())
 				{
 					int freq = tp.Freq;
 					for (int i = 0; i < freq; i++)
 					{
 						tp.NextPosition();
-						Assert.AreEqual(pool.BytesToString(tp.GetPayload(new byte[5], 0)), terms.Term().Text);
+						Assert.AreEqual(pool.BytesToString(tp.GetPayload(new byte[5], 0)), terms.Term.Text);
 					}
 				}
 				tp.Close();

Modified: incubator/lucene.net/trunk/test/core/Index/TestSegmentReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestSegmentReader.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestSegmentReader.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestSegmentReader.cs Mon Jun 25 16:47:35 2012
@@ -142,7 +142,7 @@ namespace Lucene.Net.Index
 			Assert.IsTrue(terms != null);
 			while (terms.Next() == true)
 			{
-				Term term = terms.Term();
+				Term term = terms.Term;
 				Assert.IsTrue(term != null);
 				//System.out.println("Term: " + term);
 				System.String fieldValue = (System.String) DocHelper.nameValues[term.Field];

Modified: incubator/lucene.net/trunk/test/core/Index/TestSegmentTermEnum.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestSegmentTermEnum.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestSegmentTermEnum.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestSegmentTermEnum.cs Mon Jun 25 16:47:35 2012
@@ -76,10 +76,10 @@ namespace Lucene.Net.Index
 			SegmentReader reader = SegmentReader.GetOnlySegmentReader(dir);
 			SegmentTermEnum termEnum = (SegmentTermEnum) reader.Terms();
 			Assert.IsTrue(termEnum.Next());
-			Assert.AreEqual("aaa", termEnum.Term().Text);
+			Assert.AreEqual("aaa", termEnum.Term.Text);
 			Assert.IsTrue(termEnum.Next());
 			Assert.AreEqual("aaa", termEnum.Prev().Text);
-			Assert.AreEqual("bbb", termEnum.Term().Text);
+			Assert.AreEqual("bbb", termEnum.Term.Text);
 			Assert.IsFalse(termEnum.Next());
 			Assert.AreEqual("bbb", termEnum.Prev().Text);
 		}
@@ -94,12 +94,12 @@ namespace Lucene.Net.Index
 			// go to the first term (aaa)
 			termEnum.Next();
 			// assert that term is 'aaa'
-			Assert.AreEqual("aaa", termEnum.Term().Text);
+			Assert.AreEqual("aaa", termEnum.Term.Text);
 			Assert.AreEqual(200, termEnum.DocFreq());
 			// go to the second term (bbb)
 			termEnum.Next();
 			// assert that term is 'bbb'
-			Assert.AreEqual("bbb", termEnum.Term().Text);
+			Assert.AreEqual("bbb", termEnum.Term.Text);
 			Assert.AreEqual(100, termEnum.DocFreq());
 			
 			termEnum.Close();
@@ -108,12 +108,12 @@ namespace Lucene.Net.Index
 			// create enumeration of terms after term 'aaa', including 'aaa'
 			termEnum = reader.Terms(new Term("content", "aaa"));
 			// assert that term is 'aaa'
-			Assert.AreEqual("aaa", termEnum.Term().Text);
+			Assert.AreEqual("aaa", termEnum.Term.Text);
 			Assert.AreEqual(200, termEnum.DocFreq());
 			// go to term 'bbb'
 			termEnum.Next();
 			// assert that term is 'bbb'
-			Assert.AreEqual("bbb", termEnum.Term().Text);
+			Assert.AreEqual("bbb", termEnum.Term.Text);
 			Assert.AreEqual(100, termEnum.DocFreq());
 			
 			termEnum.Close();

Modified: incubator/lucene.net/trunk/test/core/Index/TestStressIndexing2.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestStressIndexing2.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestStressIndexing2.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestStressIndexing2.cs Mon Jun 25 16:47:35 2012
@@ -331,7 +331,7 @@ namespace Lucene.Net.Index
 			TermEnum termEnum = r1.Terms(new Term(idField, ""));
 			do 
 			{
-				Term term = termEnum.Term();
+				Term term = termEnum.Term;
 				if (term == null || (System.Object) term.Field != (System.Object) idField)
 					break;
 				
@@ -415,7 +415,7 @@ namespace Lucene.Net.Index
 				for (; ; )
 				{
 					len1 = 0;
-					term1 = termEnum1.Term();
+					term1 = termEnum1.Term;
 					if (term1 == null)
 						break;
 					termDocs1.Seek(termEnum1);
@@ -437,7 +437,7 @@ namespace Lucene.Net.Index
 				for (; ; )
 				{
 					len2 = 0;
-					term2 = termEnum2.Term();
+					term2 = termEnum2.Term;
 					if (term2 == null)
 						break;
 					termDocs2.Seek(termEnum2);

Modified: incubator/lucene.net/trunk/test/core/QueryParser/TestMultiAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/QueryParser/TestMultiAnalyzer.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/QueryParser/TestMultiAnalyzer.cs (original)
+++ incubator/lucene.net/trunk/test/core/QueryParser/TestMultiAnalyzer.cs Mon Jun 25 16:47:35 2012
@@ -206,7 +206,7 @@ namespace Lucene.Net.QueryParsers
 					prevType = typeAtt.Type;
 					prevStartOffset = offsetAtt.StartOffset;
 					prevEndOffset = offsetAtt.EndOffset;
-					System.String text = termAtt.Term();
+					System.String text = termAtt.Term;
 					if (text.Equals("triplemulti"))
 					{
 						Lucene.Net.QueryParsers.TestMultiAnalyzer.multiToken = 2;
@@ -288,11 +288,11 @@ namespace Lucene.Net.QueryParsers
 			{
 				while (input.IncrementToken())
 				{
-					if (termAtt.Term().Equals("the"))
+					if (termAtt.Term.Equals("the"))
 					{
 						// stopword, do nothing
 					}
-					else if (termAtt.Term().Equals("quick"))
+					else if (termAtt.Term.Equals("quick"))
 					{
 						posIncrAtt.PositionIncrement = 2;
 						return true;

Modified: incubator/lucene.net/trunk/test/core/QueryParser/TestQueryParser.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/QueryParser/TestQueryParser.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/QueryParser/TestQueryParser.cs (original)
+++ incubator/lucene.net/trunk/test/core/QueryParser/TestQueryParser.cs Mon Jun 25 16:47:35 2012
@@ -157,7 +157,7 @@ namespace Lucene.Net.QueryParsers
 				else
 					while (input.IncrementToken())
 					{
-						if (termAtt.Term().Equals("phrase"))
+						if (termAtt.Term.Equals("phrase"))
 						{
 							inPhrase = true;
 							savedStart = offsetAtt.StartOffset;
@@ -166,7 +166,7 @@ namespace Lucene.Net.QueryParsers
 							offsetAtt.SetOffset(savedStart, savedEnd);
 							return true;
 						}
-						else if (!termAtt.Term().Equals("stop"))
+						else if (!termAtt.Term.Equals("stop"))
 							return true;
 					}
 				return false;

Modified: incubator/lucene.net/trunk/test/core/Search/CheckHits.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/CheckHits.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/CheckHits.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/CheckHits.cs Mon Jun 25 16:47:35 2012
@@ -387,7 +387,7 @@ namespace Lucene.Net.Search
 									maxTimesOthers = true;
 								}
 							}
-							catch (System.FormatException e)
+							catch (System.FormatException)
 							{
 							}
 						}

Modified: incubator/lucene.net/trunk/test/core/Search/Function/TestFieldScoreQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/Function/TestFieldScoreQuery.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Function/TestFieldScoreQuery.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Function/TestFieldScoreQuery.cs Mon Jun 25 16:47:35 2012
@@ -226,7 +226,7 @@ namespace Lucene.Net.Search.Function
                             Assert.AreSame(innerArray[j], q.valSrc.GetValues(reader).InnerArray, "field values should be cached and reused!");
 						}
 					}
-					catch (System.NotSupportedException e)
+					catch (System.NotSupportedException)
 					{
 						if (!warned)
 						{
@@ -251,7 +251,7 @@ namespace Lucene.Net.Search.Function
                     Log("compare: " + innerArray + " to " + q2.valSrc.GetValues(reader).InnerArray);
                     Assert.AreNotSame(innerArray, q2.valSrc.GetValues(reader).InnerArray, "cached field values should not be reused if reader as changed!");
 				}
-				catch (System.NotSupportedException e)
+				catch (System.NotSupportedException)
 				{
 					if (!warned)
 					{

Modified: incubator/lucene.net/trunk/test/core/Search/Function/TestOrdValues.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/Function/TestOrdValues.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Function/TestOrdValues.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Function/TestOrdValues.cs Mon Jun 25 16:47:35 2012
@@ -203,7 +203,7 @@ namespace Lucene.Net.Search.Function
 						}
 					}
 				}
-				catch (System.NotSupportedException e)
+				catch (System.NotSupportedException)
 				{
 					if (!warned)
 					{
@@ -241,7 +241,7 @@ namespace Lucene.Net.Search.Function
                     Log("compare (should differ): " + innerArray + " to " + q2.valSrc.GetValues(reader).InnerArray);
                     Assert.AreNotSame(innerArray, q2.valSrc.GetValues(reader).InnerArray, "different values shuold be loaded for a different field!");
 				}
-				catch (System.NotSupportedException e)
+				catch (System.NotSupportedException)
 				{
 					if (!warned)
 					{
@@ -274,7 +274,7 @@ namespace Lucene.Net.Search.Function
                     Log("compare (should differ): " + innerArray + " to " + q2.valSrc.GetValues(reader).InnerArray);
                     Assert.AreNotSame(innerArray, q2.valSrc.GetValues(reader).InnerArray, "cached field values should not be reused if reader as changed!");
 				}
-				catch (System.NotSupportedException e)
+				catch (System.NotSupportedException)
 				{
 					if (!warned)
 					{

Modified: incubator/lucene.net/trunk/test/core/Search/TestMultiPhraseQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestMultiPhraseQuery.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestMultiPhraseQuery.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestMultiPhraseQuery.cs Mon Jun 25 16:47:35 2012
@@ -70,9 +70,9 @@ namespace Lucene.Net.Search
 			TermEnum te = ir.Terms(new Term("body", prefix));
 			do 
 			{
-				if (te.Term().Text.StartsWith(prefix))
+				if (te.Term.Text.StartsWith(prefix))
 				{
-					termsWithPrefix.Add(te.Term());
+					termsWithPrefix.Add(te.Term);
 				}
 			}
 			while (te.Next());
@@ -95,9 +95,9 @@ namespace Lucene.Net.Search
 			te = ir.Terms(new Term("body", prefix));
 			do 
 			{
-				if (te.Term().Text.StartsWith(prefix))
+				if (te.Term.Text.StartsWith(prefix))
 				{
-					termsWithPrefix.Add(te.Term());
+					termsWithPrefix.Add(te.Term);
 				}
 			}
 			while (te.Next());

Modified: incubator/lucene.net/trunk/test/core/Search/TestNumericRangeQuery32.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestNumericRangeQuery32.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestNumericRangeQuery32.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestNumericRangeQuery32.cs Mon Jun 25 16:47:35 2012
@@ -509,7 +509,7 @@ namespace Lucene.Net.Search
                 int count = 0;
                 do
                 {
-                    Term t = termEnum.Term();
+                    Term t = termEnum.Term;
                     if (t != null)
                     {
                         int val = NumericUtils.PrefixCodedToInt(t.Text);

Modified: incubator/lucene.net/trunk/test/core/Search/TestPhrasePrefixQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestPhrasePrefixQuery.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestPhrasePrefixQuery.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestPhrasePrefixQuery.cs Mon Jun 25 16:47:35 2012
@@ -81,9 +81,9 @@ namespace Lucene.Net.Search
 			TermEnum te = ir.Terms(new Term("body", prefix + "*"));
 			do 
 			{
-				if (te.Term().Text.StartsWith(prefix))
+				if (te.Term.Text.StartsWith(prefix))
 				{
-					termsWithPrefix.Add(te.Term());
+					termsWithPrefix.Add(te.Term);
 				}
 			}
 			while (te.Next());

Modified: incubator/lucene.net/trunk/test/core/Search/TestTermVectors.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestTermVectors.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestTermVectors.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestTermVectors.cs Mon Jun 25 16:47:35 2012
@@ -95,7 +95,7 @@ namespace Lucene.Net.Search
 					Assert.IsTrue(vector.Length == 1);
 				}
 			}
-			catch (System.IO.IOException e)
+			catch (System.IO.IOException)
 			{
 				Assert.IsTrue(false);
 			}
@@ -201,7 +201,7 @@ namespace Lucene.Net.Search
 					}
 				}
 			}
-			catch (System.IO.IOException e)
+			catch (System.IO.IOException)
 			{
 				Assert.IsTrue(false);
 			}
@@ -225,7 +225,7 @@ namespace Lucene.Net.Search
 					//Assert.IsTrue();
 				}
 			}
-			catch (System.IO.IOException e)
+			catch (System.IO.IOException)
 			{
 				Assert.IsTrue(false);
 			}
@@ -279,7 +279,7 @@ namespace Lucene.Net.Search
 				Similarity sim = knownSearcher.Similarity;
 				while (termEnum.Next() == true)
 				{
-					Term term = termEnum.Term();
+					Term term = termEnum.Term;
 					//System.out.println("Term: " + term);
 					termDocs.Seek(term);
 					while (termDocs.Next())

Modified: incubator/lucene.net/trunk/test/core/Store/TestDirectory.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Store/TestDirectory.cs?rev=1353648&r1=1353647&r2=1353648&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Store/TestDirectory.cs (original)
+++ incubator/lucene.net/trunk/test/core/Store/TestDirectory.cs Mon Jun 25 16:47:35 2012
@@ -105,7 +105,7 @@ namespace Lucene.Net.Store
 					{
 						Assert.IsFalse(lock2.Obtain(1));
 					}
-					catch (LockObtainFailedException e)
+					catch (LockObtainFailedException)
 					{
 						// OK
 					}



Mime
View raw message