lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccurr...@apache.org
Subject svn commit: r1299911 [6/14] - in /incubator/lucene.net/trunk: src/core/ src/core/Analysis/ src/core/Analysis/Standard/ src/core/Analysis/Tokenattributes/ src/core/Document/ src/core/Index/ src/core/Messages/ src/core/QueryParser/ src/core/Search/ src/c...
Date Mon, 12 Mar 2012 22:29:37 GMT
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=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/FieldCacheTermsFilter.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/FieldCacheTermsFilter.cs Mon Mar 12 22:29:26 2012
@@ -104,15 +104,15 @@ namespace Lucene.Net.Search
 			this.field = field;
 			this.terms = terms;
 		}
-		
-		public virtual FieldCache GetFieldCache()
-		{
-			return Lucene.Net.Search.FieldCache_Fields.DEFAULT;
-		}
-		
-		public override DocIdSet GetDocIdSet(IndexReader reader)
+
+	    public virtual FieldCache FieldCache
+	    {
+	        get { return Lucene.Net.Search.FieldCache_Fields.DEFAULT; }
+	    }
+
+	    public override DocIdSet GetDocIdSet(IndexReader reader)
 		{
-			return new FieldCacheTermsFilterDocIdSet(this, GetFieldCache().GetStringIndex(reader, field));
+			return new FieldCacheTermsFilterDocIdSet(this, FieldCache.GetStringIndex(reader, field));
 		}
 		
 		protected internal class FieldCacheTermsFilterDocIdSet:DocIdSet
@@ -154,13 +154,13 @@ namespace Lucene.Net.Search
 				return new FieldCacheTermsFilterDocIdSetIterator(this);
 			}
 
-			/// <summary>This DocIdSet implementation is cacheable. </summary>
-			public override bool IsCacheable()
-			{
-				return true;
-			}
-			
-			protected internal class FieldCacheTermsFilterDocIdSetIterator:DocIdSetIterator
+		    /// <summary>This DocIdSet implementation is cacheable. </summary>
+		    public override bool IsCacheable
+		    {
+		        get { return true; }
+		    }
+
+		    protected internal class FieldCacheTermsFilterDocIdSetIterator:DocIdSetIterator
 			{
 				public FieldCacheTermsFilterDocIdSetIterator(FieldCacheTermsFilterDocIdSet enclosingInstance)
 				{

Modified: incubator/lucene.net/trunk/src/core/Search/FieldComparator.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/FieldComparator.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/FieldComparator.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/FieldComparator.cs Mon Mar 12 22:29:26 2012
@@ -161,16 +161,16 @@ namespace Lucene.Net.Search
             // can be overridden by those that need it.
         }
 
-        /// <summary> Return the actual value in the slot.
-        /// 
-        /// </summary>
-        /// <param name="slot">the value
-        /// </param>
-        /// <returns> value in this slot upgraded to Comparable
-        /// </returns>
-        public abstract System.IComparable Value(int slot);
+	    /// <summary> Return the actual value in the slot.
+	    /// 
+	    /// </summary>
+	    /// <param name="slot">the value
+	    /// </param>
+	    /// <returns> value in this slot upgraded to Comparable
+	    /// </returns>
+	    public abstract IComparable this[int slot] { get; }
 
-		/// <summary>Parses field's values as byte (using <see cref="FieldCache.GetBytes(Lucene.Net.Index.IndexReader,string)" />
+	    /// <summary>Parses field's values as byte (using <see cref="FieldCache.GetBytes(Lucene.Net.Index.IndexReader,string)" />
 		/// and sorts by ascending value 
 		/// </summary>
 		public sealed class ByteComparator:FieldComparator
@@ -212,11 +212,11 @@ namespace Lucene.Net.Search
 			{
 				this.bottom = values[bottom];
 			}
-			
-			public override System.IComparable Value(int slot)
-			{
-				return (sbyte) values[slot];
-			}
+
+		    public override IComparable this[int slot]
+		    {
+		        get { return (sbyte) values[slot]; }
+		    }
 		}
 		
 		/// <summary>Sorts by ascending docID </summary>
@@ -260,11 +260,11 @@ namespace Lucene.Net.Search
 			{
 				this.bottom = docIDs[bottom];
 			}
-			
-			public override System.IComparable Value(int slot)
-			{
-				return (System.Int32) docIDs[slot];
-			}
+
+		    public override IComparable this[int slot]
+		    {
+		        get { return (System.Int32) docIDs[slot]; }
+		    }
 		}
 		
 		/// <summary>Parses field's values as double (using <see cref="FieldCache.GetDoubles(Lucene.Net.Index.IndexReader,string)" />
@@ -334,11 +334,11 @@ namespace Lucene.Net.Search
 			{
 				this.bottom = values[bottom];
 			}
-			
-			public override System.IComparable Value(int slot)
-			{
-				return (double) values[slot];
-			}
+
+		    public override IComparable this[int slot]
+		    {
+		        get { return (double) values[slot]; }
+		    }
 		}
 		
 		/// <summary>Parses field's values as float (using <see cref="FieldCache.GetFloats(Lucene.Net.Index.IndexReader,string)" />
@@ -412,11 +412,11 @@ namespace Lucene.Net.Search
 			{
 				this.bottom = values[bottom];
 			}
-			
-			public override System.IComparable Value(int slot)
-			{
-				return (float) values[slot];
-			}
+
+		    public override IComparable this[int slot]
+		    {
+		        get { return (float) values[slot]; }
+		    }
 		}
 		
 		/// <summary>Parses field's values as int (using <see cref="FieldCache.GetInts(Lucene.Net.Index.IndexReader,string)" />
@@ -494,11 +494,11 @@ namespace Lucene.Net.Search
 			{
 				this.bottom = values[bottom];
 			}
-			
-			public override System.IComparable Value(int slot)
-			{
-				return (System.Int32) values[slot];
-			}
+
+		    public override IComparable this[int slot]
+		    {
+		        get { return (System.Int32) values[slot]; }
+		    }
 		}
 		
 		/// <summary>Parses field's values as long (using <see cref="FieldCache.GetLongs(Lucene.Net.Index.IndexReader,string)" />
@@ -572,11 +572,11 @@ namespace Lucene.Net.Search
 			{
 				this.bottom = values[bottom];
 			}
-			
-			public override System.IComparable Value(int slot)
-			{
-				return (long) values[slot];
-			}
+
+		    public override IComparable this[int slot]
+		    {
+		        get { return (long) values[slot]; }
+		    }
 		}
 		
 		/// <summary>Sorts by descending relevance.  NOTE: if you are
@@ -630,11 +630,11 @@ namespace Lucene.Net.Search
 				// score() will not incur score computation over and over again.
 				this.scorer = new ScoreCachingWrappingScorer(scorer);
 			}
-			
-			public override System.IComparable Value(int slot)
-			{
-				return (float) scores[slot];
-			}
+
+		    public override IComparable this[int slot]
+		    {
+		        get { return (float) scores[slot]; }
+		    }
 		}
 		
 		/// <summary>Parses field's values as short (using <see cref="FieldCache.GetShorts(IndexReader, string)" />)
@@ -679,11 +679,11 @@ namespace Lucene.Net.Search
 			{
 				this.bottom = values[bottom];
 			}
-			
-			public override System.IComparable Value(int slot)
-			{
-				return (short) values[slot];
-			}
+
+		    public override IComparable this[int slot]
+		    {
+		        get { return (short) values[slot]; }
+		    }
 		}
 		
 		/// <summary>Sorts by a field's value using the Collator for a
@@ -756,15 +756,15 @@ namespace Lucene.Net.Search
 			{
 				this.bottom = values[bottom];
 			}
-			
-			public override System.IComparable Value(int slot)
-			{
-				return values[slot];
-			}
+
+		    public override IComparable this[int slot]
+		    {
+		        get { return values[slot]; }
+		    }
 		}
 		
 		/// <summary>Sorts by field's natural String sort order, using
-		/// ordinals.  This is functionally equivalent to <see cref="StringValComparator" />
+		/// ordinals.  This is functionally equivalent to <see cref="FieldComparator.StringValComparator" />
 		///, but it first resolves the string
 		/// to their relative ordinal positions (using the index
 		/// returned by <see cref="FieldCache.GetStringIndex" />), and
@@ -930,26 +930,26 @@ namespace Lucene.Net.Search
 				System.Diagnostics.Debug.Assert(bottomOrd < lookup.Length);
 				bottomValue = values[bottom];
 			}
-			
-			public override System.IComparable Value(int slot)
-			{
-				return values[slot];
-			}
-			
-			public System.String[] GetValues()
-			{
-				return values;
-			}
-			
-			public int GetBottomSlot()
-			{
-				return bottomSlot;
-			}
-			
-			public System.String GetField()
-			{
-				return field;
-			}
+
+		    public override IComparable this[int slot]
+		    {
+		        get { return values[slot]; }
+		    }
+
+		    public string[] Values
+		    {
+		        get { return values; }
+		    }
+
+		    public int BottomSlot
+		    {
+		        get { return bottomSlot; }
+		    }
+
+		    public string Field
+		    {
+		        get { return field; }
+		    }
 		}
 		
 		/// <summary>Sorts by field's natural String sort order.  All
@@ -1023,11 +1023,11 @@ namespace Lucene.Net.Search
 			{
 				this.bottom = values[bottom];
 			}
-			
-			public override System.IComparable Value(int slot)
-			{
-				return values[slot];
-			}
+
+		    public override IComparable this[int slot]
+		    {
+		        get { return values[slot]; }
+		    }
 		}
 		
 		protected internal static int BinarySearch(System.String[] a, System.String key)

Modified: incubator/lucene.net/trunk/src/core/Search/FieldDocSortedHitQueue.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/FieldDocSortedHitQueue.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/FieldDocSortedHitQueue.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/FieldDocSortedHitQueue.cs Mon Mar 12 22:29:26 2012
@@ -81,7 +81,7 @@ namespace Lucene.Net.Search
 			System.Globalization.CompareInfo[] ret = new System.Globalization.CompareInfo[fields.Length];
 			for (int i = 0; i < fields.Length; ++i)
 			{
-				System.Globalization.CultureInfo locale = fields[i].GetLocale();
+				System.Globalization.CultureInfo locale = fields[i].Locale;
 				if (locale != null)
 					ret[i] = locale.CompareInfo;
 			}
@@ -99,7 +99,7 @@ namespace Lucene.Net.Search
 			int c = 0;
 			for (int i = 0; i < n && c == 0; ++i)
 			{
-				int type = fields[i].GetType();
+				int type = fields[i].Type;
 				if(type == SortField.STRING)
 				{
 				    string s1 = (string) docA.fields[i];
@@ -115,7 +115,7 @@ namespace Lucene.Net.Search
                     {
                         c = 1;
                     }
-                    else if (fields[i].GetLocale() == null)
+                    else if (fields[i].Locale == null)
                     {
                         c = s1.CompareTo(s2);
                     }
@@ -132,7 +132,7 @@ namespace Lucene.Net.Search
                         c = -c;
                     }
                 }
-				if (fields[i].GetReverse())
+				if (fields[i].Reverse)
 				{
 					c = - c;
 				}
@@ -140,7 +140,7 @@ namespace Lucene.Net.Search
 			
 			// avoid random sort order that could lead to duplicates (bug #31241):
 			if (c == 0)
-				return docA.doc > docB.doc;
+				return docA.Doc > docB.Doc;
 			
 			return c > 0;
 		}

Modified: incubator/lucene.net/trunk/src/core/Search/FieldValueHitQueue.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/FieldValueHitQueue.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/FieldValueHitQueue.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/FieldValueHitQueue.cs Mon Mar 12 22:29:26 2012
@@ -96,7 +96,7 @@ namespace Lucene.Net.Search
 				}
 				
 				// avoid random sort order that could lead to duplicates (bug #31241):
-                return hitA.doc > hitB.doc;
+                return hitA.Doc > hitB.Doc;
 			}
 		}
 		
@@ -138,7 +138,7 @@ namespace Lucene.Net.Search
 				}
 				
 				// avoid random sort order that could lead to duplicates (bug #31241):
-                return hitA.doc > hitB.doc;
+                return hitA.Doc > hitB.Doc;
 			}
 		}
 		
@@ -223,10 +223,10 @@ namespace Lucene.Net.Search
 			System.IComparable[] fields = new System.IComparable[n];
 			for (int i = 0; i < n; ++i)
 			{
-				fields[i] = comparators[i].Value(entry.slot);
+				fields[i] = comparators[i][entry.slot];
 			}
 			//if (maxscore > 1.0f) doc.score /= maxscore;   // normalize scores
-			return new FieldDoc(entry.doc, entry.score, fields);
+			return new FieldDoc(entry.Doc, entry.Score, fields);
 		}
 		
 		/// <summary>Returns the SortFields being used by this hit queue. </summary>

Modified: incubator/lucene.net/trunk/src/core/Search/FilterManager.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/FilterManager.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/FilterManager.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/FilterManager.cs Mon Mar 12 22:29:26 2012
@@ -52,20 +52,19 @@ namespace Lucene.Net.Search
 		protected internal long cleanSleepTime;
 		/// <summary>Cache cleaner that runs in a separate thread </summary>
 		protected internal FilterCleaner _filterCleaner;
-		
-		public static FilterManager GetInstance()
-		{
-			lock (typeof(Lucene.Net.Search.FilterManager))
-			{
-				if (manager == null)
-				{
-					manager = new FilterManager();
-				}
-				return manager;
-			}
-		}
-		
-		/// <summary> Sets up the FilterManager singleton.</summary>
+
+	    public static FilterManager Instance
+	    {
+	        get
+	        {
+	            lock (typeof (Lucene.Net.Search.FilterManager))
+	            {
+	                return manager ?? (manager = new FilterManager());
+	            }
+	        }
+	    }
+
+	    /// <summary> Sets up the FilterManager singleton.</summary>
 		protected internal FilterManager()
 		{
 			cache = new HashMap<int, FilterItem>();

Modified: incubator/lucene.net/trunk/src/core/Search/FilteredDocIdSet.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/FilteredDocIdSet.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/FilteredDocIdSet.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/FilteredDocIdSet.cs Mon Mar 12 22:29:26 2012
@@ -79,14 +79,14 @@ namespace Lucene.Net.Search
 		{
 			_innerSet = innerSet;
 		}
-		
-		/// <summary>This DocIdSet implementation is cacheable if the inner set is cacheable. </summary>
-		public override bool IsCacheable()
-		{
-			return _innerSet.IsCacheable();
-		}
-		
-		/// <summary> Validation method to determine whether a docid should be in the result set.</summary>
+
+	    /// <summary>This DocIdSet implementation is cacheable if the inner set is cacheable. </summary>
+	    public override bool IsCacheable
+	    {
+	        get { return _innerSet.IsCacheable; }
+	    }
+
+	    /// <summary> Validation method to determine whether a docid should be in the result set.</summary>
 		/// <param name="docid">docid to be tested
 		/// </param>
 		/// <returns> true if input docid should be in the result set, false otherwise.

Modified: incubator/lucene.net/trunk/src/core/Search/FilteredQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/FilteredQuery.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/FilteredQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/FilteredQuery.cs Mon Mar 12 22:29:26 2012
@@ -105,7 +105,7 @@ namespace Lucene.Net.Search
 				
 				public override float Score()
 				{
-					return Enclosing_Instance.Enclosing_Instance.GetBoost() * scorer.Score();
+					return Enclosing_Instance.Enclosing_Instance.Boost * scorer.Score();
 				}
 			}
 			private void  InitBlock(Lucene.Net.Search.Weight weight, Lucene.Net.Search.Similarity similarity, FilteredQuery enclosingInstance)
@@ -128,27 +128,30 @@ namespace Lucene.Net.Search
 			private float value_Renamed;
 			
 			// pass these methods through to enclosed query's weight
-			public override float GetValue()
-			{
-				return value_Renamed;
-			}
-			public override float SumOfSquaredWeights()
-			{
-				return weight.SumOfSquaredWeights() * Enclosing_Instance.GetBoost() * Enclosing_Instance.GetBoost();
-			}
-			public override void  Normalize(float v)
+
+		    public override float Value
+		    {
+		        get { return value_Renamed; }
+		    }
+
+		    public override float SumOfSquaredWeights
+		    {
+		        get { return weight.SumOfSquaredWeights*Enclosing_Instance.Boost*Enclosing_Instance.Boost; }
+		    }
+
+		    public override void  Normalize(float v)
 			{
 				weight.Normalize(v);
-				value_Renamed = weight.GetValue() * Enclosing_Instance.GetBoost();
+				value_Renamed = weight.Value * Enclosing_Instance.Boost;
 			}
 			public override Explanation Explain(IndexReader ir, int i)
 			{
 				Explanation inner = weight.Explain(ir, i);
-				if (Enclosing_Instance.GetBoost() != 1)
+				if (Enclosing_Instance.Boost != 1)
 				{
 					Explanation preBoost = inner;
-					inner = new Explanation(inner.Value * Enclosing_Instance.GetBoost(), "product of:");
-					inner.AddDetail(new Explanation(Enclosing_Instance.GetBoost(), "boost"));
+					inner = new Explanation(inner.Value * Enclosing_Instance.Boost, "product of:");
+					inner.AddDetail(new Explanation(Enclosing_Instance.Boost, "boost"));
 					inner.AddDetail(preBoost);
 				}
 				Filter f = Enclosing_Instance.filter;
@@ -171,12 +174,13 @@ namespace Lucene.Net.Search
 			}
 			
 			// return this query
-			public override Query GetQuery()
-			{
-				return Enclosing_Instance;
-			}
-			
-			// return a filtering scorer
+
+		    public override Query Query
+		    {
+		        get { return Enclosing_Instance; }
+		    }
+
+		    // return a filtering scorer
 			public override Scorer Scorer(IndexReader indexReader, bool scoreDocsInOrder, bool topScorer)
 			{
 				Scorer scorer = weight.Scorer(indexReader, true, false);
@@ -240,21 +244,21 @@ namespace Lucene.Net.Search
 				return this;
 			}
 		}
-		
-		public virtual Query GetQuery()
-		{
-			return query;
-		}
-		
-		public virtual Filter GetFilter()
-		{
-			return filter;
-		}
-		
-		// inherit javadoc
+
+	    public virtual Query Query
+	    {
+	        get { return query; }
+	    }
+
+	    public virtual Filter Filter
+	    {
+	        get { return filter; }
+	    }
+
+	    // inherit javadoc
 		public override void  ExtractTerms(System.Collections.Generic.ISet<Term> terms)
 		{
-			GetQuery().ExtractTerms(terms);
+			Query.ExtractTerms(terms);
 		}
 		
 		/// <summary>Prints a user-readable version of this query. </summary>
@@ -265,7 +269,7 @@ namespace Lucene.Net.Search
 			buffer.Append(query.ToString(s));
 			buffer.Append(")->");
 			buffer.Append(filter);
-			buffer.Append(ToStringUtils.Boost(GetBoost()));
+			buffer.Append(ToStringUtils.Boost(Boost));
 			return buffer.ToString();
 		}
 		
@@ -275,7 +279,7 @@ namespace Lucene.Net.Search
 			if (o is FilteredQuery)
 			{
 				FilteredQuery fq = (FilteredQuery) o;
-				return (query.Equals(fq.query) && filter.Equals(fq.filter) && GetBoost() == fq.GetBoost());
+				return (query.Equals(fq.query) && filter.Equals(fq.filter) && Boost == fq.Boost);
 			}
 			return false;
 		}
@@ -283,7 +287,7 @@ namespace Lucene.Net.Search
 		/// <summary>Returns a hash code value for this object. </summary>
 		public override int GetHashCode()
 		{
-			return query.GetHashCode() ^ filter.GetHashCode() + System.Convert.ToInt32(GetBoost());
+			return query.GetHashCode() ^ filter.GetHashCode() + System.Convert.ToInt32(Boost);
 		}
 	}
 }
\ No newline at end of file

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=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/FilteredTermEnum.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/FilteredTermEnum.cs Mon Mar 12 22:29:26 2012
@@ -40,7 +40,7 @@ namespace Lucene.Net.Search
 		}
 		
 		/// <summary>Equality compare on the term </summary>
-		public /*protected internal*/ abstract bool TermCompare(Term term);
+		protected internal abstract bool TermCompare(Term term);
 		
 		/// <summary>Equality measure on the term </summary>
 		public abstract float Difference();

Modified: incubator/lucene.net/trunk/src/core/Search/Function/ByteFieldSource.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Function/ByteFieldSource.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Function/ByteFieldSource.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Function/ByteFieldSource.cs Mon Mar 12 22:29:26 2012
@@ -87,10 +87,11 @@ namespace Lucene.Net.Search.Function
 				return Enclosing_Instance.Description() + '=' + IntVal(doc);
 			}
 			/*(non-Javadoc) <see cref="Lucene.Net.Search.Function.DocValues.getInnerArray() */
-			public /*internal*/ override System.Object GetInnerArray()
-			{
-				return arr;
-			}
+
+            protected internal override object InnerArray
+		    {
+		        get { return arr; }
+		    }
 		}
 		private Lucene.Net.Search.ByteParser parser;
 		

Modified: incubator/lucene.net/trunk/src/core/Search/Function/CustomScoreQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Function/CustomScoreQuery.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Function/CustomScoreQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Function/CustomScoreQuery.cs Mon Mar 12 22:29:26 2012
@@ -147,7 +147,7 @@ namespace Lucene.Net.Search.Function
 			}
 			sb.Append(")");
 			sb.Append(strict?" STRICT":"");
-			return sb.ToString() + ToStringUtils.Boost(GetBoost());
+			return sb.ToString() + ToStringUtils.Boost(Boost);
 		}
 		
 		/// <summary>Returns true if <c>o</c> is equal to this. </summary>
@@ -158,7 +158,7 @@ namespace Lucene.Net.Search.Function
 				return false;
 			}
 			CustomScoreQuery other = (CustomScoreQuery) o;
-            if (this.GetBoost() != other.GetBoost() ||
+            if (this.Boost != other.Boost ||
                 !this.subQuery.Equals(other.subQuery) ||
                 this.strict != other.strict ||
                 this.valSrcQueries.Length != other.valSrcQueries.Length)
@@ -180,7 +180,7 @@ namespace Lucene.Net.Search.Function
 				valSrcHash += valSrcQueries[i].GetHashCode();
 			}
             return (GetType().GetHashCode() + subQuery.GetHashCode() + valSrcHash) ^
-                BitConverter.ToInt32(BitConverter.GetBytes(GetBoost()), 0) ^ (strict ? 1234 : 4321);
+                BitConverter.ToInt32(BitConverter.GetBytes(Boost), 0) ^ (strict ? 1234 : 4321);
 
 		}
 
@@ -357,40 +357,47 @@ namespace Lucene.Net.Search.Function
 			}
 			
 			/*(non-Javadoc) <see cref="Lucene.Net.Search.Weight.getQuery() */
-			public override Query GetQuery()
-			{
-				return Enclosing_Instance;
-			}
-			
-			/*(non-Javadoc) <see cref="Lucene.Net.Search.Weight.getValue() */
-			public override float GetValue()
-			{
-				return Enclosing_Instance.GetBoost();
-			}
-			
-			/*(non-Javadoc) <see cref="Lucene.Net.Search.Weight.sumOfSquaredWeights() */
-			public override float SumOfSquaredWeights()
-			{
-				float sum = subQueryWeight.SumOfSquaredWeights();
-				for (int i = 0; i < valSrcWeights.Length; i++)
-				{
-					if (qStrict)
-					{
-						valSrcWeights[i].SumOfSquaredWeights(); // do not include ValueSource part in the query normalization
-					}
-					else
-					{
-						sum += valSrcWeights[i].SumOfSquaredWeights();
-					}
-				}
-				sum *= Enclosing_Instance.GetBoost() * Enclosing_Instance.GetBoost(); // boost each sub-weight
-				return sum;
-			}
-			
-			/*(non-Javadoc) <see cref="Lucene.Net.Search.Weight.normalize(float) */
+
+		    public override Query Query
+		    {
+		        get { return Enclosing_Instance; }
+		    }
+
+		    /*(non-Javadoc) <see cref="Lucene.Net.Search.Weight.getValue() */
+
+		    public override float Value
+		    {
+		        get { return Enclosing_Instance.Boost; }
+		    }
+
+		    /*(non-Javadoc) <see cref="Lucene.Net.Search.Weight.sumOfSquaredWeights() */
+
+		    public override float SumOfSquaredWeights
+		    {
+		        get
+		        {
+		            float sum = subQueryWeight.SumOfSquaredWeights;
+		            for (int i = 0; i < valSrcWeights.Length; i++)
+		            {
+		                if (qStrict)
+		                {
+		                    var sumsq = valSrcWeights[i].SumOfSquaredWeights;
+		                        // do not include ValueSource part in the query normalization
+		                }
+		                else
+		                {
+		                    sum += valSrcWeights[i].SumOfSquaredWeights;
+		                }
+		            }
+		            sum *= Enclosing_Instance.Boost*Enclosing_Instance.Boost; // boost each sub-weight
+		            return sum;
+		        }
+		    }
+
+		    /*(non-Javadoc) <see cref="Lucene.Net.Search.Weight.normalize(float) */
 			public override void  Normalize(float norm)
 			{
-				norm *= Enclosing_Instance.GetBoost(); // incorporate boost
+				norm *= Enclosing_Instance.Boost; // incorporate boost
 				subQueryWeight.Normalize(norm);
 				for (int i = 0; i < valSrcWeights.Length; i++)
 				{
@@ -445,17 +452,17 @@ namespace Lucene.Net.Search.Function
                     valSrcExpls[i] = valSrcWeights[i].Explain(reader, doc);
 				}
                 Explanation customExp = Enclosing_Instance.GetCustomScoreProvider(reader).CustomExplain(doc, subQueryExpl, valSrcExpls);
-				float sc = GetValue() * customExp.Value;
+				float sc = Value * customExp.Value;
 				Explanation res = new ComplexExplanation(true, sc, Enclosing_Instance.ToString() + ", product of:");
 				res.AddDetail(customExp);
-				res.AddDetail(new Explanation(GetValue(), "queryBoost")); // actually using the q boost as q weight (== weight value)
+				res.AddDetail(new Explanation(Value, "queryBoost")); // actually using the q boost as q weight (== weight value)
 				return res;
 			}
-			
-			public override bool ScoresDocsOutOfOrder()
-			{
-				return false;
-			}
+
+		    public override bool ScoresDocsOutOfOrder
+		    {
+		        get { return false; }
+		    }
 		}
 		
 		
@@ -488,7 +495,7 @@ namespace Lucene.Net.Search.Function
 			internal CustomScorer(CustomScoreQuery enclosingInstance, Similarity similarity, IndexReader reader, CustomWeight w, Scorer subQueryScorer, Scorer[] valSrcScorers):base(similarity)
 			{
 				InitBlock(enclosingInstance);
-				this.qWeight = w.GetValue();
+				this.qWeight = w.Value;
 				this.subQueryScorer = subQueryScorer;
 				this.valSrcScorers = valSrcScorers;
 				this.reader = reader;

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=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Function/DocValues.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Function/DocValues.cs Mon Mar 12 22:29:26 2012
@@ -100,24 +100,24 @@ namespace Lucene.Net.Search.Function
 		{
 			return new Explanation(FloatVal(doc), ToString(doc));
 		}
-		
-		/// <summary> Expert: for test purposes only, return the inner array of values, or null if not applicable.
-		/// <p/>
-		/// Allows tests to verify that loaded values are:
-		/// <list type="bullet">
-		/// <item>indeed cached/reused.</item>
-		/// <item>stored in the expected size/type (byte/short/int/float).</item>
-		/// </list>
-		/// Note: implementations of DocValues must override this method for 
-		/// these test elements to be tested, Otherwise the test would not fail, just 
-		/// print a warning.
-		/// </summary>
-		public /*internal*/ virtual System.Object GetInnerArray()
-		{
-			throw new System.NotSupportedException("this optional method is for test purposes only");
-		}
-		
-		// --- some simple statistics on values
+
+	    /// <summary> Expert: for test purposes only, return the inner array of values, or null if not applicable.
+	    /// <p/>
+	    /// Allows tests to verify that loaded values are:
+	    /// <list type="bullet">
+	    /// <item>indeed cached/reused.</item>
+	    /// <item>stored in the expected size/type (byte/short/int/float).</item>
+	    /// </list>
+	    /// Note: implementations of DocValues must override this method for 
+	    /// these test elements to be tested, Otherwise the test would not fail, just 
+	    /// print a warning.
+	    /// </summary>
+	    protected internal virtual object InnerArray
+	    {
+	        get { throw new System.NotSupportedException("this optional method is for test purposes only"); }
+	    }
+
+	    // --- some simple statistics on values
 		private float minVal = System.Single.NaN;
 		private float maxVal = System.Single.NaN;
 		private float avgVal = System.Single.NaN;
@@ -162,7 +162,8 @@ namespace Lucene.Net.Search.Function
 		/// <returns> the minimum of all values or <c>Float.NaN</c> if this
 		/// DocValues instance does not contain any value.
 		/// </returns>
-		public virtual float GetMinValue()
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate")]
+        public virtual float GetMinValue()
 		{
 			Compute();
 			return minVal;
@@ -177,7 +178,8 @@ namespace Lucene.Net.Search.Function
 		/// </summary>
 		/// <returns> the maximum of all values or <c>Float.NaN</c> if this
 		/// DocValues instance does not contain any value.
-		/// </returns>
+        /// </returns>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate")]
 		public virtual float GetMaxValue()
 		{
 			Compute();
@@ -193,7 +195,8 @@ namespace Lucene.Net.Search.Function
 		/// </summary>
 		/// <returns> the average of all values or <c>Float.NaN</c> if this
 		/// DocValues instance does not contain any value
-		/// </returns>
+        /// </returns>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate")]
 		public virtual float GetAverageValue()
 		{
 			Compute();

Modified: incubator/lucene.net/trunk/src/core/Search/Function/FloatFieldSource.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Function/FloatFieldSource.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Function/FloatFieldSource.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Function/FloatFieldSource.cs Mon Mar 12 22:29:26 2012
@@ -82,10 +82,11 @@ namespace Lucene.Net.Search.Function
 				return Enclosing_Instance.Description() + '=' + arr[doc];
 			}
 			/*(non-Javadoc) <see cref="Lucene.Net.Search.Function.DocValues.getInnerArray() */
-			public /*internal*/ override System.Object GetInnerArray()
-			{
-				return arr;
-			}
+
+            protected internal override object InnerArray
+		    {
+		        get { return arr; }
+		    }
 		}
 		private Lucene.Net.Search.FloatParser parser;
 		

Modified: incubator/lucene.net/trunk/src/core/Search/Function/IntFieldSource.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Function/IntFieldSource.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Function/IntFieldSource.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Function/IntFieldSource.cs Mon Mar 12 22:29:26 2012
@@ -87,10 +87,11 @@ namespace Lucene.Net.Search.Function
 				return Enclosing_Instance.Description() + '=' + IntVal(doc);
 			}
 			/*(non-Javadoc) <see cref="Lucene.Net.Search.Function.DocValues.getInnerArray() */
-			public /*internal*/ override System.Object GetInnerArray()
-			{
-				return arr;
-			}
+
+            protected internal override object InnerArray
+		    {
+		        get { return arr; }
+		    }
 		}
 		private Lucene.Net.Search.IntParser parser;
 		

Modified: incubator/lucene.net/trunk/src/core/Search/Function/OrdFieldSource.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Function/OrdFieldSource.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Function/OrdFieldSource.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Function/OrdFieldSource.cs Mon Mar 12 22:29:26 2012
@@ -93,10 +93,11 @@ namespace Lucene.Net.Search.Function
 				return Enclosing_Instance.Description() + '=' + IntVal(doc);
 			}
 			/*(non-Javadoc) <see cref="Lucene.Net.Search.Function.DocValues.getInnerArray() */
-			public /*internal*/ override System.Object GetInnerArray()
-			{
-				return arr;
-			}
+
+            protected internal override object InnerArray
+		    {
+		        get { return arr; }
+		    }
 		}
 		protected internal System.String field;
 		

Modified: incubator/lucene.net/trunk/src/core/Search/Function/ReverseOrdFieldSource.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Function/ReverseOrdFieldSource.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Function/ReverseOrdFieldSource.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Function/ReverseOrdFieldSource.cs Mon Mar 12 22:29:26 2012
@@ -101,10 +101,11 @@ namespace Lucene.Net.Search.Function
 				return Enclosing_Instance.Description() + '=' + StrVal(doc);
 			}
 			/*(non-Javadoc) <see cref="Lucene.Net.Search.Function.DocValues.getInnerArray() */
-			public /*internal*/ override System.Object GetInnerArray()
-			{
-				return arr;
-			}
+
+            protected internal override object InnerArray
+		    {
+		        get { return arr; }
+		    }
 		}
 		public System.String field;
 		

Modified: incubator/lucene.net/trunk/src/core/Search/Function/ShortFieldSource.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Function/ShortFieldSource.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Function/ShortFieldSource.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Function/ShortFieldSource.cs Mon Mar 12 22:29:26 2012
@@ -87,10 +87,11 @@ namespace Lucene.Net.Search.Function
 				return Enclosing_Instance.Description() + '=' + IntVal(doc);
 			}
 			/*(non-Javadoc) <see cref="Lucene.Net.Search.Function.DocValues.getInnerArray() */
-			public /*internal*/ override System.Object GetInnerArray()
-			{
-				return arr;
-			}
+
+            protected internal override object InnerArray
+		    {
+		        get { return arr; }
+		    }
 		}
 		private Lucene.Net.Search.ShortParser parser;
 		

Modified: incubator/lucene.net/trunk/src/core/Search/Function/ValueSourceQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Function/ValueSourceQuery.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Function/ValueSourceQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Function/ValueSourceQuery.cs Mon Mar 12 22:29:26 2012
@@ -92,25 +92,31 @@ namespace Lucene.Net.Search.Function
 			}
 			
 			/*(non-Javadoc) <see cref="Lucene.Net.Search.Weight.getQuery() */
-			public override Query GetQuery()
-			{
-				return Enclosing_Instance;
-			}
-			
-			/*(non-Javadoc) <see cref="Lucene.Net.Search.Weight.getValue() */
-			public override float GetValue()
-			{
-				return queryWeight;
-			}
-			
-			/*(non-Javadoc) <see cref="Lucene.Net.Search.Weight.sumOfSquaredWeights() */
-			public override float SumOfSquaredWeights()
-			{
-				queryWeight = Enclosing_Instance.GetBoost();
-				return queryWeight * queryWeight;
-			}
-			
-			/*(non-Javadoc) <see cref="Lucene.Net.Search.Weight.normalize(float) */
+
+		    public override Query Query
+		    {
+		        get { return Enclosing_Instance; }
+		    }
+
+		    /*(non-Javadoc) <see cref="Lucene.Net.Search.Weight.getValue() */
+
+		    public override float Value
+		    {
+		        get { return queryWeight; }
+		    }
+
+		    /*(non-Javadoc) <see cref="Lucene.Net.Search.Weight.sumOfSquaredWeights() */
+
+		    public override float SumOfSquaredWeights
+		    {
+		        get
+		        {
+		            queryWeight = Enclosing_Instance.Boost;
+		            return queryWeight*queryWeight;
+		        }
+		    }
+
+		    /*(non-Javadoc) <see cref="Lucene.Net.Search.Weight.normalize(float) */
 			public override void  Normalize(float norm)
 			{
 				this.queryNorm = norm;
@@ -131,7 +137,7 @@ namespace Lucene.Net.Search.Function
                 Explanation result = new ComplexExplanation(true, sc, enclosingInstance.ToString() + ", product of:")
 			    ;
                 result.AddDetail(vals.Explain(doc));
-			    result.AddDetail(new Explanation(enclosingInstance.GetBoost(), "boost"));
+			    result.AddDetail(new Explanation(enclosingInstance.Boost, "boost"));
 			    result.AddDetail(new Explanation(queryNorm, "queryNorm"));
 			    return result;
 			}
@@ -169,7 +175,7 @@ namespace Lucene.Net.Search.Function
             {
                 InitBlock(enclosingInstance);
                 this.weight = w;
-                this.qWeight = w.GetValue();
+                this.qWeight = w.Value;
                 // this is when/where the values are first created.
                 vals = Enclosing_Instance.valSrc.GetValues(reader);
                 termDocs = reader.TermDocs(null);
@@ -204,7 +210,7 @@ namespace Lucene.Net.Search.Function
 		
 		public override System.String ToString(System.String field)
 		{
-			return valSrc.ToString() + ToStringUtils.Boost(GetBoost());
+			return valSrc.ToString() + ToStringUtils.Boost(Boost);
 		}
 		
 		/// <summary>Returns true if <c>o</c> is equal to this. </summary>
@@ -215,13 +221,13 @@ namespace Lucene.Net.Search.Function
 				return false;
 			}
 			ValueSourceQuery other = (ValueSourceQuery) o;
-			return this.GetBoost() == other.GetBoost() && this.valSrc.Equals(other.valSrc);
+			return this.Boost == other.Boost && this.valSrc.Equals(other.valSrc);
 		}
 		
 		/// <summary>Returns a hash code value for this object. </summary>
 		public override int GetHashCode()
 		{
-			return (GetType().GetHashCode() + valSrc.GetHashCode()) ^ BitConverter.ToInt32(BitConverter.GetBytes(GetBoost()), 0);
+			return (GetType().GetHashCode() + valSrc.GetHashCode()) ^ BitConverter.ToInt32(BitConverter.GetBytes(Boost), 0);
         }
 
 		override public System.Object Clone()

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=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/FuzzyQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/FuzzyQuery.cs Mon Mar 12 22:29:26 2012
@@ -18,6 +18,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Lucene.Net.Index;
 using Lucene.Net.Support;
 using Lucene.Net.Util;
 using IndexReader = Lucene.Net.Index.IndexReader;
@@ -89,50 +90,49 @@ namespace Lucene.Net.Search
 			rewriteMethod = SCORING_BOOLEAN_QUERY_REWRITE;
 		}
 
-        /// <summary> Calls <see cref="FuzzyQuery(Term, float)">FuzzyQuery(term, minimumSimilarity, 0)</see>.</summary>
+        /// <summary> Calls <see cref="FuzzyQuery(Index.Term, float)">FuzzyQuery(term, minimumSimilarity, 0)</see>.</summary>
 		public FuzzyQuery(Term term, float minimumSimilarity):this(term, minimumSimilarity, defaultPrefixLength)
 		{
 		}
 
-        /// <summary> Calls <see cref="FuzzyQuery(Term, float)">FuzzyQuery(term, 0.5f, 0)</see>.</summary>
+        /// <summary> Calls <see cref="FuzzyQuery(Index.Term, float)">FuzzyQuery(term, 0.5f, 0)</see>.</summary>
 		public FuzzyQuery(Term term):this(term, defaultMinSimilarity, defaultPrefixLength)
 		{
 		}
-		
-		/// <summary> Returns the minimum similarity that is required for this query to match.</summary>
-		/// <returns> float value between 0.0 and 1.0
-		/// </returns>
-		public virtual float GetMinSimilarity()
-		{
-			return minimumSimilarity;
-		}
-		
-		/// <summary> Returns the non-fuzzy prefix length. This is the number of characters at the start
-		/// of a term that must be identical (not fuzzy) to the query term if the query
-		/// is to match that term. 
-		/// </summary>
-		public virtual int GetPrefixLength()
-		{
-			return prefixLength;
-		}
-		
-		public /*protected internal*/ override FilteredTermEnum GetEnum(IndexReader reader)
-		{
-			return new FuzzyTermEnum(reader, GetTerm(), minimumSimilarity, prefixLength);
-		}
-		
-		/// <summary> Returns the pattern term.</summary>
-		public Term GetTerm()
-		{
-			return term;
-		}
-		
-		public override void  SetRewriteMethod(RewriteMethod method)
-		{
-			throw new System.NotSupportedException("FuzzyQuery cannot change rewrite method");
-		}
-		
-		public override Query Rewrite(IndexReader reader)
+
+	    /// <summary> Returns the minimum similarity that is required for this query to match.</summary>
+	    /// <value> float value between 0.0 and 1.0 </value>
+	    public virtual float MinSimilarity
+	    {
+	        get { return minimumSimilarity; }
+	    }
+
+	    /// <summary> Returns the non-fuzzy prefix length. This is the number of characters at the start
+	    /// of a term that must be identical (not fuzzy) to the query term if the query
+	    /// is to match that term. 
+	    /// </summary>
+	    public virtual int PrefixLength
+	    {
+	        get { return prefixLength; }
+	    }
+
+	    protected internal override FilteredTermEnum GetEnum(IndexReader reader)
+		{
+			return new FuzzyTermEnum(reader, Term, minimumSimilarity, prefixLength);
+		}
+
+	    /// <summary> Returns the pattern term.</summary>
+	    public Term Term
+	    {
+	        get { return term; }
+	    }
+
+	    public override RewriteMethod QueryRewriteMethod
+	    {
+	        set { throw new System.NotSupportedException("FuzzyQuery cannot change rewrite method"); }
+	    }
+
+	    public override Query Rewrite(IndexReader reader)
 		{
 			if (!termLongEnough)
 			{
@@ -185,7 +185,7 @@ namespace Lucene.Net.Search
 			foreach(ScoreTerm st in stQueue.Keys)
 			{
 				TermQuery tq = new TermQuery(st.term); // found a match
-				tq.SetBoost(GetBoost() * st.score); // set the boost
+				tq.Boost = Boost * st.score; // set the boost
 				query.Add(tq, BooleanClause.Occur.SHOULD); // add to query
 			}
 			
@@ -203,7 +203,7 @@ namespace Lucene.Net.Search
 			buffer.Append(term.Text());
 			buffer.Append('~');
 			buffer.Append(Single.ToString(minimumSimilarity));
-			buffer.Append(ToStringUtils.Boost(GetBoost()));
+			buffer.Append(ToStringUtils.Boost(Boost));
 			return buffer.ToString();
 		}
 		

Modified: incubator/lucene.net/trunk/src/core/Search/FuzzyTermEnum.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/FuzzyTermEnum.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/FuzzyTermEnum.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/FuzzyTermEnum.cs Mon Mar 12 22:29:26 2012
@@ -135,7 +135,7 @@ namespace Lucene.Net.Search
 		/// <summary> The termCompare method in FuzzyTermEnum uses Levenshtein distance to 
 		/// calculate the distance between the given term and the comparing term. 
 		/// </summary>
-		public /*protected internal*/ override bool TermCompare(Term term)
+		protected internal override bool TermCompare(Term term)
 		{
 			if ((System.Object) field == (System.Object) term.Field() && term.Text().StartsWith(prefix))
 			{

Modified: incubator/lucene.net/trunk/src/core/Search/HitQueue.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/HitQueue.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/HitQueue.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/HitQueue.cs Mon Mar 12 22:29:26 2012
@@ -72,20 +72,24 @@ namespace Lucene.Net.Search
 		}
 		
 		// Returns null if prePopulate is false.
-        protected internal override ScoreDoc GetSentinelObject()
-		{
-			// Always set the doc Id to MAX_VALUE so that it won't be favored by
-			// lessThan. This generally should not happen since if score is not NEG_INF,
-			// TopScoreDocCollector will always add the object to the queue.
-			return !prePopulate?null:new ScoreDoc(System.Int32.MaxValue, System.Single.NegativeInfinity);
-		}
 
-        public override bool LessThan(ScoreDoc hitA, ScoreDoc hitB)
+	    protected internal override ScoreDoc SentinelObject
+	    {
+	        get
+	        {
+	            // Always set the doc Id to MAX_VALUE so that it won't be favored by
+	            // lessThan. This generally should not happen since if score is not NEG_INF,
+	            // TopScoreDocCollector will always add the object to the queue.
+	            return !prePopulate ? null : new ScoreDoc(System.Int32.MaxValue, System.Single.NegativeInfinity);
+	        }
+	    }
+
+	    public override bool LessThan(ScoreDoc hitA, ScoreDoc hitB)
 		{
-			if (hitA.score == hitB.score)
-				return hitA.doc > hitB.doc;
+			if (hitA.Score == hitB.Score)
+				return hitA.Doc > hitB.Doc;
 			else
-				return hitA.score < hitB.score;
+				return hitA.Score < hitB.Score;
 		}
 	}
 }
\ No newline at end of file

Modified: incubator/lucene.net/trunk/src/core/Search/IndexSearcher.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/IndexSearcher.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/IndexSearcher.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/IndexSearcher.cs Mon Mar 12 22:29:26 2012
@@ -17,6 +17,7 @@
 
 using System;
 using System.Linq;
+using Lucene.Net.Index;
 using Document = Lucene.Net.Documents.Document;
 using FieldSelector = Lucene.Net.Documents.FieldSelector;
 using CorruptIndexException = Lucene.Net.Index.CorruptIndexException;
@@ -121,7 +122,7 @@ namespace Lucene.Net.Search
 			for (int i = 0; i < subReaders.Length; i++)
 			{
 				docStarts[i] = maxDoc;
-				maxDoc += subReaders[i].MaxDoc();
+				maxDoc += subReaders[i].MaxDoc;
 			}
 		}
 		
@@ -129,14 +130,14 @@ namespace Lucene.Net.Search
 		{
 			ReaderUtil.GatherSubReaders(allSubReaders, r);
 		}
-		
-		/// <summary>Return the <see cref="IndexReader" /> this searches. </summary>
-		public virtual IndexReader GetIndexReader()
-		{
-			return reader;
-		}
-		
-        protected override void Dispose(bool disposing)
+
+	    /// <summary>Return the <see cref="Index.IndexReader" /> this searches. </summary>
+	    public virtual IndexReader IndexReader
+	    {
+	        get { return reader; }
+	    }
+
+	    protected override void Dispose(bool disposing)
         {
             if (isDisposed) return;
 
@@ -170,7 +171,7 @@ namespace Lucene.Net.Search
 		// inherit javadoc
 		public override int MaxDoc()
 		{
-			return reader.MaxDoc();
+			return reader.MaxDoc;
 		}
 		
 		// inherit javadoc
@@ -181,9 +182,9 @@ namespace Lucene.Net.Search
 			{
 				throw new System.ArgumentException("nDocs must be > 0");
 			}
-            nDocs = Math.Min(nDocs, reader.MaxDoc());
+            nDocs = Math.Min(nDocs, reader.MaxDoc);
 
-			TopScoreDocCollector collector = TopScoreDocCollector.create(nDocs, !weight.ScoresDocsOutOfOrder());
+			TopScoreDocCollector collector = TopScoreDocCollector.create(nDocs, !weight.ScoresDocsOutOfOrder);
 			Search(weight, filter, collector);
 			return collector.TopDocs();
 		}
@@ -205,9 +206,9 @@ namespace Lucene.Net.Search
 		/// </summary>
 		public virtual TopFieldDocs Search(Weight weight, Filter filter, int nDocs, Sort sort, bool fillFields)
 		{
-            nDocs = Math.Min(nDocs, reader.MaxDoc());
+            nDocs = Math.Min(nDocs, reader.MaxDoc);
 
-			TopFieldCollector collector2 = TopFieldCollector.create(sort, nDocs, fillFields, fieldSortDoTrackScores, fieldSortDoMaxScore, !weight.ScoresDocsOutOfOrder());
+			TopFieldCollector collector2 = TopFieldCollector.create(sort, nDocs, fillFields, fieldSortDoTrackScores, fieldSortDoMaxScore, !weight.ScoresDocsOutOfOrder);
 			Search(weight, filter, collector2);
 			return (TopFieldDocs) collector2.TopDocs();
 		}

Modified: incubator/lucene.net/trunk/src/core/Search/MatchAllDocsQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/MatchAllDocsQuery.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/MatchAllDocsQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/MatchAllDocsQuery.cs Mon Mar 12 22:29:26 2012
@@ -68,7 +68,7 @@ namespace Lucene.Net.Search
 			{
 				InitBlock(enclosingInstance);
 				this.termDocs = reader.TermDocs(null);
-				score = w.GetValue();
+				score = w.Value;
 				this.norms = norms;
 			}
 			
@@ -116,31 +116,34 @@ namespace Lucene.Net.Search
 			public MatchAllDocsWeight(MatchAllDocsQuery enclosingInstance, Searcher searcher)
 			{
 				InitBlock(enclosingInstance);
-				this.similarity = searcher.GetSimilarity();
+				this.similarity = searcher.Similarity;
 			}
 			
 			public override System.String ToString()
 			{
 				return "weight(" + Enclosing_Instance + ")";
 			}
-			
-			public override Query GetQuery()
-			{
-				return Enclosing_Instance;
-			}
-			
-			public override float GetValue()
-			{
-				return queryWeight;
-			}
-			
-			public override float SumOfSquaredWeights()
-			{
-				queryWeight = Enclosing_Instance.GetBoost();
-				return queryWeight * queryWeight;
-			}
-			
-			public override void  Normalize(float queryNorm)
+
+		    public override Query Query
+		    {
+		        get { return Enclosing_Instance; }
+		    }
+
+		    public override float Value
+		    {
+		        get { return queryWeight; }
+		    }
+
+		    public override float SumOfSquaredWeights
+		    {
+		        get
+		        {
+		            queryWeight = Enclosing_Instance.Boost;
+		            return queryWeight*queryWeight;
+		        }
+		    }
+
+		    public override void  Normalize(float queryNorm)
 			{
 				this.queryNorm = queryNorm;
 				queryWeight *= this.queryNorm;
@@ -154,10 +157,10 @@ namespace Lucene.Net.Search
 			public override Explanation Explain(IndexReader reader, int doc)
 			{
 				// explain query weight
-				Explanation queryExpl = new ComplexExplanation(true, GetValue(), "MatchAllDocsQuery, product of:");
-				if (Enclosing_Instance.GetBoost() != 1.0f)
+				Explanation queryExpl = new ComplexExplanation(true, Value, "MatchAllDocsQuery, product of:");
+				if (Enclosing_Instance.Boost != 1.0f)
 				{
-					queryExpl.AddDetail(new Explanation(Enclosing_Instance.GetBoost(), "boost"));
+					queryExpl.AddDetail(new Explanation(Enclosing_Instance.Boost, "boost"));
 				}
 				queryExpl.AddDetail(new Explanation(queryNorm, "queryNorm"));
 				
@@ -178,7 +181,7 @@ namespace Lucene.Net.Search
 		{
 			System.Text.StringBuilder buffer = new System.Text.StringBuilder();
 			buffer.Append("*:*");
-			buffer.Append(ToStringUtils.Boost(GetBoost()));
+			buffer.Append(ToStringUtils.Boost(Boost));
 			return buffer.ToString();
 		}
 		
@@ -187,12 +190,12 @@ namespace Lucene.Net.Search
 			if (!(o is MatchAllDocsQuery))
 				return false;
 			MatchAllDocsQuery other = (MatchAllDocsQuery) o;
-			return this.GetBoost() == other.GetBoost();
+			return this.Boost == other.Boost;
 		}
 		
 		public override int GetHashCode()
 		{
-			return BitConverter.ToInt32(BitConverter.GetBytes(GetBoost()), 0) ^ 0x1AA71190;
+			return BitConverter.ToInt32(BitConverter.GetBytes(Boost), 0) ^ 0x1AA71190;
 		}
 	}
 }
\ No newline at end of file

Modified: incubator/lucene.net/trunk/src/core/Search/MultiPhraseQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/MultiPhraseQuery.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/MultiPhraseQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/MultiPhraseQuery.cs Mon Mar 12 22:29:26 2012
@@ -44,24 +44,17 @@ namespace Lucene.Net.Search
         private System.Collections.Generic.List<int> positions = new System.Collections.Generic.List<int>();
 		
 		private int slop = 0;
-		
-		/// <summary>Sets the phrase slop for this query.</summary>
-		/// <seealso cref="PhraseQuery.SetSlop(int)">
-		/// </seealso>
-		public virtual void  SetSlop(int s)
-		{
-			slop = s;
-		}
-		
-		/// <summary>Sets the phrase slop for this query.</summary>
-		/// <seealso cref="PhraseQuery.GetSlop()">
-		/// </seealso>
-		public virtual int GetSlop()
-		{
-			return slop;
-		}
-		
-		/// <summary>Add a single term at the next position in the phrase.</summary>
+
+	    /// <summary>Gets or sets the phrase slop for this query.</summary>
+	    /// <seealso cref="PhraseQuery.SetSlop(int)">
+	    /// </seealso>
+	    public virtual int Slop
+	    {
+	        get { return slop; }
+	        set { slop = value; }
+	    }
+
+	    /// <summary>Add a single term at the next position in the phrase.</summary>
 		/// <seealso cref="PhraseQuery.Add(Term)">
 		/// </seealso>
 		public virtual void  Add(Term term)
@@ -174,23 +167,27 @@ namespace Lucene.Net.Search
                     }
                 }
 			}
-			
-			public override Query GetQuery()
-			{
-				return Enclosing_Instance;
-			}
-			public override float GetValue()
-			{
-				return value_Renamed;
-			}
-			
-			public override float SumOfSquaredWeights()
-			{
-				queryWeight = idf * Enclosing_Instance.GetBoost(); // compute query weight
-				return queryWeight * queryWeight; // square it
-			}
-			
-			public override void  Normalize(float queryNorm)
+
+		    public override Query Query
+		    {
+		        get { return Enclosing_Instance; }
+		    }
+
+		    public override float Value
+		    {
+		        get { return value_Renamed; }
+		    }
+
+		    public override float SumOfSquaredWeights
+		    {
+		        get
+		        {
+		            queryWeight = idf*Enclosing_Instance.Boost; // compute query weight
+		            return queryWeight*queryWeight; // square it
+		        }
+		    }
+
+		    public override void  Normalize(float queryNorm)
 			{
 				this.queryNorm = queryNorm;
 				queryWeight *= queryNorm; // normalize query weight
@@ -229,16 +226,16 @@ namespace Lucene.Net.Search
 			public override Explanation Explain(IndexReader reader, int doc)
 			{
 				ComplexExplanation result = new ComplexExplanation();
-				result.Description = "weight(" + GetQuery() + " in " + doc + "), product of:";
+				result.Description = "weight(" + Query + " in " + doc + "), product of:";
 				
-				Explanation idfExpl = new Explanation(idf, "idf(" + GetQuery() + ")");
+				Explanation idfExpl = new Explanation(idf, "idf(" + Query + ")");
 				
 				// explain query weight
 				Explanation queryExpl = new Explanation();
-				queryExpl.Description = "queryWeight(" + GetQuery() + "), product of:";
+				queryExpl.Description = "queryWeight(" + Query + "), product of:";
 				
-				Explanation boostExpl = new Explanation(Enclosing_Instance.GetBoost(), "boost");
-				if (Enclosing_Instance.GetBoost() != 1.0f)
+				Explanation boostExpl = new Explanation(Enclosing_Instance.Boost, "boost");
+				if (Enclosing_Instance.Boost != 1.0f)
 					queryExpl.AddDetail(boostExpl);
 				
 				queryExpl.AddDetail(idfExpl);
@@ -252,7 +249,7 @@ namespace Lucene.Net.Search
 				
 				// explain field weight
 				ComplexExplanation fieldExpl = new ComplexExplanation();
-				fieldExpl.Description = "fieldWeight(" + GetQuery() + " in " + doc + "), product of:";
+				fieldExpl.Description = "fieldWeight(" + Query + " in " + doc + "), product of:";
 
                 PhraseScorer scorer = (PhraseScorer)Scorer(reader, true, false);
 				if (scorer == null)
@@ -302,7 +299,7 @@ namespace Lucene.Net.Search
 				{
 					boq.Add(new TermQuery(terms[i]), BooleanClause.Occur.SHOULD);
 				}
-				boq.SetBoost(GetBoost());
+				boq.Boost = Boost;
 				return boq;
 			}
 			else
@@ -365,7 +362,7 @@ namespace Lucene.Net.Search
 				buffer.Append(slop);
 			}
 			
-			buffer.Append(ToStringUtils.Boost(GetBoost()));
+			buffer.Append(ToStringUtils.Boost(Boost));
 			
 			return buffer.ToString();
 		}
@@ -377,7 +374,7 @@ namespace Lucene.Net.Search
 			if (!(o is MultiPhraseQuery))
 				return false;
 			MultiPhraseQuery other = (MultiPhraseQuery) o;
-            bool eq = this.GetBoost() == other.GetBoost() && this.slop == other.slop;
+            bool eq = this.Boost == other.Boost && this.slop == other.slop;
             if(!eq)
             {
                 return false;
@@ -422,7 +419,7 @@ namespace Lucene.Net.Search
             {
                 posHash += pos.GetHashCode();
             }
-			return BitConverter.ToInt32(BitConverter.GetBytes(GetBoost()), 0) ^ slop ^ TermArraysHashCode() ^ posHash ^ 0x4AC65113;
+			return BitConverter.ToInt32(BitConverter.GetBytes(Boost), 0) ^ slop ^ TermArraysHashCode() ^ posHash ^ 0x4AC65113;
 		}
 		
 		// Breakout calculation of the termArrays hashcode

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=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/MultiSearcher.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/MultiSearcher.cs Mon Mar 12 22:29:26 2012
@@ -90,7 +90,7 @@ namespace Lucene.Net.Search
 			{
 				this.dfMap = dfMap;
 				this.maxDoc = maxDoc;
-				SetSimilarity(similarity);
+				Similarity = similarity;
 			}
 			
 			public override int DocFreq(Term term)
@@ -274,7 +274,7 @@ namespace Lucene.Net.Search
 			// put docs in array
 				scoreDocs2[i] = hq.Pop();
 			
-			float maxScore = (totalHits == 0)?System.Single.NegativeInfinity:scoreDocs2[0].score;
+			float maxScore = (totalHits == 0)?System.Single.NegativeInfinity:scoreDocs2[0].Score;
 			
 			return new TopDocs(totalHits, scoreDocs2, maxScore);
 		}
@@ -293,7 +293,7 @@ namespace Lucene.Net.Search
 			    TopFieldDocs docs = MultiSearcherCallableWithSort(new object(), searchables[i], weight, filter, n, hq, sort,
 			                                          i, starts);
 			    totalHits += docs.TotalHits;
-				maxScore = System.Math.Max(maxScore, docs.GetMaxScore());
+				maxScore = System.Math.Max(maxScore, docs.MaxScore);
 			}
 			
 			ScoreDoc[] scoreDocs2 = new ScoreDoc[hq.Size()];
@@ -378,7 +378,7 @@ namespace Lucene.Net.Search
 			
 			// step4
 			int numDocs = MaxDoc();
-			CachedDfSource cacheSim = new CachedDfSource(dfMap, numDocs, GetSimilarity());
+			CachedDfSource cacheSim = new CachedDfSource(dfMap, numDocs, Similarity);
 			
 			return rewrittenQuery.Weight(cacheSim);
 		}
@@ -391,7 +391,7 @@ namespace Lucene.Net.Search
                     for(int j = 0; j < scoreDocs.Length; j++) // merge scoreDocs into hq
                     {
                         ScoreDoc scoreDoc = scoreDocs[j];
-                        scoreDoc.doc += starts[i]; //convert doc
+                        scoreDoc.Doc += starts[i]; //convert doc
                         //it would be so nice if we had a thread-safe insert
                         lock (theLock)
                         {
@@ -411,7 +411,7 @@ namespace Lucene.Net.Search
                                                     // 'relative' doc Ids, that belong to two different searchables.
                                                     for (int j = 0; j < docs.fields.Length; j++)
                                                     {
-                                                        if (docs.fields[j].GetType() == SortField.DOC)
+                                                        if (docs.fields[j].Type == SortField.DOC)
                                                         {
                                                             // iterate over the score docs and change their fields value
                                                             for (int j2 = 0; j2 < docs.ScoreDocs.Length; j2++)
@@ -432,7 +432,7 @@ namespace Lucene.Net.Search
                                                     for (int j = 0; j < scoreDocs.Length; j++) // merge scoreDocs into hq
                                                     {
                                                         FieldDoc fieldDoc = (FieldDoc) scoreDocs[j];
-                                                        fieldDoc.doc += starts[i]; //convert doc
+                                                        fieldDoc.Doc += starts[i]; //convert doc
                                                         //it would be so nice if we had a thread-safe insert
                                                         lock (theLock)
                                                         {

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=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/MultiTermQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/MultiTermQuery.cs Mon Mar 12 22:29:26 2012
@@ -60,17 +60,17 @@ namespace Lucene.Net.Search
 		[Serializable]
 		public class AnonymousClassConstantScoreAutoRewrite:ConstantScoreAutoRewrite
 		{
-			public override void  SetTermCountCutoff(int count)
-			{
-				throw new System.NotSupportedException("Please create a private instance");
-			}
-			
-			public override void  SetDocCountPercent(double percent)
-			{
-				throw new System.NotSupportedException("Please create a private instance");
-			}
-			
-			// Make sure we are still a singleton even after deserializing
+		    public override int TermCountCutoff
+		    {
+		        set { throw new System.NotSupportedException("Please create a private instance"); }
+		    }
+
+		    public override double DocCountPercent
+		    {
+		        set { throw new System.NotSupportedException("Please create a private instance"); }
+		    }
+
+		    // Make sure we are still a singleton even after deserializing
 			protected internal virtual System.Object ReadResolve()
 			{
 				return Lucene.Net.Search.MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT;
@@ -93,7 +93,7 @@ namespace Lucene.Net.Search
 			public override Query Rewrite(IndexReader reader, MultiTermQuery query)
 			{
 				Query result = new ConstantScoreQuery(new MultiTermQueryWrapperFilter<MultiTermQuery>(query));
-				result.SetBoost(query.GetBoost());
+				result.Boost = query.Boost;
 				return result;
 			}
 			
@@ -137,7 +137,7 @@ namespace Lucene.Net.Search
 						if (t != null)
 						{
 							TermQuery tq = new TermQuery(t); // found a match
-							tq.SetBoost(query.GetBoost() * enumerator.Difference()); // set the boost
+							tq.Boost = query.Boost * enumerator.Difference(); // set the boost
 							result.Add(tq, BooleanClause.Occur.SHOULD); // add to query
 							count++;
 						}
@@ -183,7 +183,7 @@ namespace Lucene.Net.Search
 			{
 				// strip the scores off
 				Query result = new ConstantScoreQuery(new QueryWrapperFilter(base.Rewrite(reader, query)));
-				result.SetBoost(query.GetBoost());
+				result.Boost = query.Boost;
 				return result;
 			}
 			
@@ -241,50 +241,37 @@ namespace Lucene.Net.Search
 			
 			private int termCountCutoff;
 			private double docCountPercent;
-			
-			/// <summary>If the number of terms in this query is equal to or
-			/// larger than this setting then <see cref="CONSTANT_SCORE_FILTER_REWRITE" />
-			/// is used. 
-			/// </summary>
-			public virtual void  SetTermCountCutoff(int count)
-			{
-				termCountCutoff = count;
-			}
-			
-			/// <seealso cref="SetTermCountCutoff">
-			/// </seealso>
-			public virtual int GetTermCountCutoff()
-			{
-				return termCountCutoff;
-			}
-			
-			/// <summary>If the number of documents to be visited in the
-			/// postings exceeds this specified percentage of the
-			/// maxDoc() for the index, then <see cref="CONSTANT_SCORE_FILTER_REWRITE" />
-			/// is used.
-			/// </summary>
-			/// <param name="percent">0.0 to 100.0 
-			/// </param>
-			public virtual void  SetDocCountPercent(double percent)
-			{
-				docCountPercent = percent;
-			}
-			
-			/// <seealso cref="SetDocCountPercent">
-			/// </seealso>
-			public virtual double GetDocCountPercent()
-			{
-				return docCountPercent;
-			}
-			
-			public override Query Rewrite(IndexReader reader, MultiTermQuery query)
+
+		    /// <summary>If the number of terms in this query is equal to or
+		    /// larger than this setting then <see cref="CONSTANT_SCORE_FILTER_REWRITE" />
+		    /// is used. 
+		    /// </summary>
+		    public virtual int TermCountCutoff
+		    {
+		        get { return termCountCutoff; }
+		        set { termCountCutoff = value; }
+		    }
+
+		    /// <summary>If the number of documents to be visited in the
+		    /// postings exceeds this specified percentage of the
+		    /// maxDoc() for the index, then <see cref="CONSTANT_SCORE_FILTER_REWRITE" />
+		    /// is used.
+		    /// </summary>
+		    /// <value> 0.0 to 100.0 </value>
+		    public virtual double DocCountPercent
+		    {
+		        get { return docCountPercent; }
+		        set { docCountPercent = value; }
+		    }
+
+		    public override Query Rewrite(IndexReader reader, MultiTermQuery query)
 			{
 				// Get the enum and start visiting terms.  If we
 				// exhaust the enum before hitting either of the
 				// cutoffs, we use ConstantBooleanQueryRewrite; else,
 				// ConstantFilterRewrite:
 				ICollection<Term> pendingTerms = new List<Term>();
-				int docCountCutoff = (int) ((docCountPercent / 100.0) * reader.MaxDoc());
+				int docCountCutoff = (int) ((docCountPercent / 100.0) * reader.MaxDoc);
 				int termCountLimit = System.Math.Min(BooleanQuery.GetMaxClauseCount(), termCountCutoff);
 				int docVisitCount = 0;
 				
@@ -308,7 +295,7 @@ namespace Lucene.Net.Search
 						{
 							// Too many terms -- make a filter.
 							Query result = new ConstantScoreQuery(new MultiTermQueryWrapperFilter<MultiTermQuery>(query));
-							result.SetBoost(query.GetBoost());
+							result.Boost = query.Boost;
 							return result;
 						}
 						else if (!enumerator.Next())
@@ -324,7 +311,7 @@ namespace Lucene.Net.Search
 							}
 							// Strip scores
 							Query result = new ConstantScoreQuery(new QueryWrapperFilter(bq));
-							result.SetBoost(query.GetBoost());
+							result.Boost = query.Boost;
 							query.IncTotalNumberOfTerms(pendingTerms.Count);
 							return result;
 						}
@@ -389,32 +376,32 @@ namespace Lucene.Net.Search
 		}
 		
 		/// <summary>Construct the enumeration to be used, expanding the pattern term. </summary>
-		public /*protected internal*/ abstract FilteredTermEnum GetEnum(IndexReader reader);
-		
-		/// <summary> Expert: Return the number of unique terms visited during execution of the query.
-		/// If there are many of them, you may consider using another query type
-		/// or optimize your total term count in index.
-		/// <p/>This method is not thread safe, be sure to only call it when no query is running!
-		/// If you re-use the same query instance for another
-		/// search, be sure to first reset the term counter
-		/// with <see cref="ClearTotalNumberOfTerms" />.
-		/// <p/>On optimized indexes / no MultiReaders, you get the correct number of
-		/// unique terms for the whole index. Use this number to compare different queries.
-		/// For non-optimized indexes this number can also be achived in
-		/// non-constant-score mode. In constant-score mode you get the total number of
-		/// terms seeked for all segments / sub-readers.
-		/// </summary>
-		/// <seealso cref="ClearTotalNumberOfTerms">
-		/// </seealso>
-		public virtual int GetTotalNumberOfTerms()
-		{
-			return numberOfTerms;
-		}
-		
-		/// <summary> Expert: Resets the counting of unique terms.
+		protected internal abstract FilteredTermEnum GetEnum(IndexReader reader);
+
+	    /// <summary> Expert: Return the number of unique terms visited during execution of the query.
+	    /// If there are many of them, you may consider using another query type
+	    /// or optimize your total term count in index.
+	    /// <p/>This method is not thread safe, be sure to only call it when no query is running!
+	    /// If you re-use the same query instance for another
+	    /// search, be sure to first reset the term counter
+	    /// with <see cref="ClearTotalNumberOfTerms" />.
+	    /// <p/>On optimized indexes / no MultiReaders, you get the correct number of
+	    /// unique terms for the whole index. Use this number to compare different queries.
+	    /// For non-optimized indexes this number can also be achived in
+	    /// non-constant-score mode. In constant-score mode you get the total number of
+	    /// terms seeked for all segments / sub-readers.
+	    /// </summary>
+	    /// <seealso cref="ClearTotalNumberOfTerms">
+	    /// </seealso>
+	    public virtual int TotalNumberOfTerms
+	    {
+	        get { return numberOfTerms; }
+	    }
+
+	    /// <summary> Expert: Resets the counting of unique terms.
 		/// Do this before executing the query/filter.
 		/// </summary>
-		/// <seealso cref="GetTotalNumberOfTerms">
+		/// <seealso cref="TotalNumberOfTerms">
 		/// </seealso>
 		public virtual void  ClearTotalNumberOfTerms()
 		{
@@ -431,28 +418,22 @@ namespace Lucene.Net.Search
 			return rewriteMethod.Rewrite(reader, this);
 		}
 		
-		/// <seealso cref="SetRewriteMethod">
-		/// </seealso>
-		public virtual RewriteMethod GetRewriteMethod()
-		{
-			return rewriteMethod;
-		}
-		
-		/// <summary> Sets the rewrite method to be used when executing the
-		/// query.  You can use one of the four core methods, or
-		/// implement your own subclass of <see cref="RewriteMethod" />. 
-		/// </summary>
-		public virtual void  SetRewriteMethod(RewriteMethod method)
-		{
-			rewriteMethod = method;
-		}
-		
-		//@Override
+	    /// <summary> Sets the rewrite method to be used when executing the
+	    /// query.  You can use one of the four core methods, or
+	    /// implement your own subclass of <see cref="RewriteMethod" />. 
+	    /// </summary>
+	    public virtual RewriteMethod QueryRewriteMethod
+	    {
+            get { return rewriteMethod; }
+	        set { rewriteMethod = value; }
+	    }
+
+	    //@Override
 		public override int GetHashCode()
 		{
 			int prime = 31;
 			int result = 1;
-			result = prime * result + System.Convert.ToInt32(GetBoost());
+			result = prime * result + System.Convert.ToInt32(Boost);
 			result = prime * result;
 			result += rewriteMethod.GetHashCode();
 			return result;
@@ -468,7 +449,7 @@ namespace Lucene.Net.Search
 			if (GetType() != obj.GetType())
 				return false;
 			MultiTermQuery other = (MultiTermQuery) obj;
-			if (System.Convert.ToInt32(GetBoost()) != System.Convert.ToInt32(other.GetBoost()))
+			if (System.Convert.ToInt32(Boost) != System.Convert.ToInt32(other.Boost))
 				return false;
 			if (!rewriteMethod.Equals(other.rewriteMethod))
 			{

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=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/MultiTermQueryWrapperFilter.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/MultiTermQueryWrapperFilter.cs Mon Mar 12 22:29:26 2012
@@ -77,23 +77,23 @@ namespace Lucene.Net.Search
 		{
 			return query.GetHashCode();
 		}
-		
-		/// <summary> Expert: Return the number of unique terms visited during execution of the filter.
-		/// If there are many of them, you may consider using another filter type
-		/// or optimize your total term count in index.
-		/// <p/>This method is not thread safe, be sure to only call it when no filter is running!
-		/// If you re-use the same filter instance for another
-		/// search, be sure to first reset the term counter
-		/// with <see cref="ClearTotalNumberOfTerms" />.
-		/// </summary>
-		/// <seealso cref="ClearTotalNumberOfTerms">
-		/// </seealso>
-		public virtual int GetTotalNumberOfTerms()
-		{
-			return query.GetTotalNumberOfTerms();
-		}
-		
-		/// <summary> Expert: Resets the counting of unique terms.
+
+	    /// <summary> Expert: Return the number of unique terms visited during execution of the filter.
+	    /// If there are many of them, you may consider using another filter type
+	    /// or optimize your total term count in index.
+	    /// <p/>This method is not thread safe, be sure to only call it when no filter is running!
+	    /// If you re-use the same filter instance for another
+	    /// search, be sure to first reset the term counter
+	    /// with <see cref="ClearTotalNumberOfTerms" />.
+	    /// </summary>
+	    /// <seealso cref="ClearTotalNumberOfTerms">
+	    /// </seealso>
+	    public virtual int TotalNumberOfTerms
+	    {
+	        get { return query.TotalNumberOfTerms; }
+	    }
+
+	    /// <summary> Expert: Resets the counting of unique terms.
 		/// Do this before executing the filter.
 		/// </summary>
 		/// <seealso cref="GetTotalNumberOfTerms">
@@ -112,7 +112,7 @@ namespace Lucene.Net.Search
                 if (enumerator.Term() == null)
                     return DocIdSet.EMPTY_DOCIDSET;
                 // else fill into an OpenBitSet
-                OpenBitSet bitSet = new OpenBitSet(reader.MaxDoc());
+                OpenBitSet bitSet = new OpenBitSet(reader.MaxDoc);
                 int[] docs = new int[32];
                 int[] freqs = new int[32];
                 TermDocs termDocs = reader.TermDocs();

Modified: incubator/lucene.net/trunk/src/core/Search/NumericRangeFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/NumericRangeFilter.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/NumericRangeFilter.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/NumericRangeFilter.cs Mon Mar 12 22:29:26 2012
@@ -62,35 +62,35 @@ namespace Lucene.Net.Search
         }
 
         /// <summary>Returns the field name for this filter </summary>
-		public System.String GetField()
-		{
-			return query.GetField();
-		}
-		
-		/// <summary>Returns <c>true</c> if the lower endpoint is inclusive </summary>
-		public bool IncludesMin()
-		{
-			return query.IncludesMin();
-		}
-		
-		/// <summary>Returns <c>true</c> if the upper endpoint is inclusive </summary>
-		public bool IncludesMax()
-		{
-			return query.IncludesMax();
-		}
-		
-		/// <summary>Returns the lower value of this range filter </summary>
-		public T? GetMin()
-		{
-			return query.GetMin();
-		}
-		
-		/// <summary>Returns the upper value of this range filter </summary>
-		public T? GetMax()
-		{
-			return query.GetMax();
-		}
-	}
+        public string Field
+        {
+            get { return query.Field; }
+        }
+
+        /// <summary>Returns <c>true</c> if the lower endpoint is inclusive </summary>
+        public bool IncludesMin
+        {
+            get { return query.IncludesMin; }
+        }
+
+        /// <summary>Returns <c>true</c> if the upper endpoint is inclusive </summary>
+        public bool IncludesMax
+        {
+            get { return query.IncludesMax; }
+        }
+
+        /// <summary>Returns the lower value of this range filter </summary>
+        public T? Min
+        {
+            get { return query.Min; }
+        }
+
+        /// <summary>Returns the upper value of this range filter </summary>
+        public T? Max
+        {
+            get { return query.Max; }
+        }
+    }
 
     public static class NumericRangeFilter
     {

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=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/NumericRangeQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/NumericRangeQuery.cs Mon Mar 12 22:29:26 2012
@@ -178,11 +178,11 @@ namespace Lucene.Net.Search
 			{
 				
 				case 64: 
-					SetRewriteMethod((precisionStep > 6)?CONSTANT_SCORE_FILTER_REWRITE:CONSTANT_SCORE_AUTO_REWRITE_DEFAULT);
+					QueryRewriteMethod = (precisionStep > 6)?CONSTANT_SCORE_FILTER_REWRITE:CONSTANT_SCORE_AUTO_REWRITE_DEFAULT;
 					break;
 				
 				case 32: 
-					SetRewriteMethod((precisionStep > 8)?CONSTANT_SCORE_FILTER_REWRITE:CONSTANT_SCORE_AUTO_REWRITE_DEFAULT);
+					QueryRewriteMethod = (precisionStep > 8)?CONSTANT_SCORE_FILTER_REWRITE:CONSTANT_SCORE_AUTO_REWRITE_DEFAULT;
 					break;
 				
 				default: 
@@ -194,53 +194,53 @@ namespace Lucene.Net.Search
 			// shortcut if upper bound == lower bound
 			if (min != null && min.Equals(max))
 			{
-				SetRewriteMethod(CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE);
+				QueryRewriteMethod = CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE;
 			}
 		}
 		
 		//@Override
-		public /*protected internal*/ override FilteredTermEnum GetEnum(IndexReader reader)
+		protected internal override FilteredTermEnum GetEnum(IndexReader reader)
 		{
 			return new NumericRangeTermEnum(this, reader);
 		}
-		
-		/// <summary>Returns the field name for this query </summary>
-		public System.String GetField()
-		{
-			return field;
-		}
-		
-		/// <summary>Returns <c>true</c> if the lower endpoint is inclusive </summary>
-		public bool IncludesMin()
-		{
-			return minInclusive;
-		}
-		
-		/// <summary>Returns <c>true</c> if the upper endpoint is inclusive </summary>
-		public bool IncludesMax()
-		{
-			return maxInclusive;
-		}
-		
-		/// <summary>Returns the lower value of this range query </summary>
-		public T? GetMin()
-		{
-			return min;
-		}
-		
-		/// <summary>Returns the upper value of this range query </summary>
-		public T? GetMax()
-		{
-			return max;
-		}
-		
-		//@Override
+
+	    /// <summary>Returns the field name for this query </summary>
+	    public string Field
+	    {
+	        get { return field; }
+	    }
+
+	    /// <summary>Returns <c>true</c> if the lower endpoint is inclusive </summary>
+	    public bool IncludesMin
+	    {
+	        get { return minInclusive; }
+	    }
+
+	    /// <summary>Returns <c>true</c> if the upper endpoint is inclusive </summary>
+	    public bool IncludesMax
+	    {
+	        get { return maxInclusive; }
+	    }
+
+	    /// <summary>Returns the lower value of this range query </summary>
+	    public T? Min
+	    {
+	        get { return min; }
+	    }
+
+	    /// <summary>Returns the upper value of this range query </summary>
+	    public T? Max
+	    {
+	        get { return max; }
+	    }
+
+	    //@Override
 		public override System.String ToString(System.String field)
 		{
 			System.Text.StringBuilder sb = new System.Text.StringBuilder();
 			if (!this.field.Equals(field))
 				sb.Append(this.field).Append(':');
-            return sb.Append(minInclusive ? '[' : '{').Append((min == null) ? "*" : min.ToString()).Append(" TO ").Append((max == null) ? "*" : max.ToString()).Append(maxInclusive ? ']' : '}').Append(ToStringUtils.Boost(GetBoost())).ToString();
+            return sb.Append(minInclusive ? '[' : '{').Append((min == null) ? "*" : min.ToString()).Append(" TO ").Append((max == null) ? "*" : max.ToString()).Append(maxInclusive ? ']' : '}').Append(ToStringUtils.Boost(Boost)).ToString();
         }
 		
 		//@Override
@@ -512,7 +512,7 @@ namespace Lucene.Net.Search
 			/// and forwards to the next sub-range.
 			/// </summary>
 			//@Override
-			public /*protected internal*/ override bool TermCompare(Term term)
+			protected internal override bool TermCompare(Term term)
 			{
 				return (term.Field() == Enclosing_Instance.field && String.CompareOrdinal(term.Text(), currentUpperBound) <= 0);
 			}

Modified: incubator/lucene.net/trunk/src/core/Search/ParallelMultiSearcher.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/ParallelMultiSearcher.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/ParallelMultiSearcher.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/ParallelMultiSearcher.cs Mon Mar 12 22:29:26 2012
@@ -126,7 +126,7 @@ namespace Lucene.Net.Search
             foreach(TopDocs topDocs in tasks.Select(x => x.Result))
             {
                 totalHits += topDocs.TotalHits;
-                maxScore = Math.Max(maxScore, topDocs.GetMaxScore());
+                maxScore = Math.Max(maxScore, topDocs.MaxScore);
             }
 
             ScoreDoc[] scoreDocs = new ScoreDoc[hq.Size()];
@@ -163,7 +163,7 @@ namespace Lucene.Net.Search
             foreach (TopFieldDocs topFieldDocs in tasks.Select(x => x.Result))
             {
                 totalHits += topFieldDocs.TotalHits;
-                maxScore = Math.Max(maxScore, topFieldDocs.GetMaxScore());
+                maxScore = Math.Max(maxScore, topFieldDocs.MaxScore);
             }
             ScoreDoc[] scoreDocs = new ScoreDoc[hq.Size()];
             for (int i = hq.Size() - 1; i >= 0; i--)

Modified: incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadNearQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadNearQuery.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadNearQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadNearQuery.cs Mon Mar 12 22:29:26 2012
@@ -60,7 +60,7 @@ namespace Lucene.Net.Search.Payloads
 		
 		public PayloadNearQuery(SpanQuery[] clauses, int slop, bool inOrder, PayloadFunction function):base(clauses, slop, inOrder)
 		{
-			fieldName = clauses[0].GetField(); // all clauses must have same field
+			fieldName = clauses[0].Field; // all clauses must have same field
 			this.function = function;
 		}
 		
@@ -79,7 +79,7 @@ namespace Lucene.Net.Search.Payloads
 				newClauses[i] = clauses[i];
 			}
 			PayloadNearQuery boostingNearQuery = new PayloadNearQuery(newClauses, slop, inOrder);
-			boostingNearQuery.SetBoost(GetBoost());
+			boostingNearQuery.Boost = Boost;
 			return boostingNearQuery;
 		}
 		
@@ -102,7 +102,7 @@ namespace Lucene.Net.Search.Payloads
 			buffer.Append(", ");
 			buffer.Append(inOrder);
 			buffer.Append(")");
-			buffer.Append(ToStringUtils.Boost(GetBoost()));
+			buffer.Append(ToStringUtils.Boost(Boost));
 			return buffer.ToString();
 		}
 		
@@ -166,7 +166,7 @@ namespace Lucene.Net.Search.Payloads
 
 			public override Scorer Scorer(IndexReader reader, bool scoreDocsInOrder, bool topScorer)
 			{
-				return new PayloadNearSpanScorer(enclosingInstance, query.GetSpans(reader), this, similarity, reader.Norms(query.GetField()));
+				return new PayloadNearSpanScorer(enclosingInstance, query.GetSpans(reader), this, similarity, reader.Norms(query.Field));
 			}
 		}
 		
@@ -175,7 +175,7 @@ namespace Lucene.Net.Search.Payloads
 			private void  InitBlock(PayloadNearQuery enclosingInstance)
 			{
 				this.enclosingInstance = enclosingInstance;
-				similarity = GetSimilarity();
+				similarity = Similarity;
 			}
 			private PayloadNearQuery enclosingInstance;
 			public PayloadNearQuery Enclosing_Instance
@@ -205,17 +205,17 @@ namespace Lucene.Net.Search.Payloads
 				{
 					if (subSpans[i] is NearSpansOrdered)
 					{
-						if (((NearSpansOrdered) subSpans[i]).IsPayloadAvailable())
+						if (((NearSpansOrdered) subSpans[i]).IsPayloadAvailable)
 						{
-							ProcessPayloads(((NearSpansOrdered) subSpans[i]).GetPayload(), subSpans[i].Start(), subSpans[i].End());
+							ProcessPayloads(((NearSpansOrdered) subSpans[i]).Payload, subSpans[i].Start(), subSpans[i].End());
 						}
 						GetPayloads(((NearSpansOrdered) subSpans[i]).GetSubSpans());
 					}
 					else if (subSpans[i] is NearSpansUnordered)
 					{
-						if (((NearSpansUnordered) subSpans[i]).IsPayloadAvailable())
+						if (((NearSpansUnordered) subSpans[i]).IsPayloadAvailable)
 						{
-							ProcessPayloads(((NearSpansUnordered) subSpans[i]).GetPayload(), subSpans[i].Start(), subSpans[i].End());
+							ProcessPayloads(((NearSpansUnordered) subSpans[i]).Payload, subSpans[i].Start(), subSpans[i].End());
 						}
 						GetPayloads(((NearSpansUnordered) subSpans[i]).GetSubSpans());
 					}

Modified: incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadSpanUtil.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadSpanUtil.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadSpanUtil.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadSpanUtil.cs Mon Mar 12 22:29:26 2012
@@ -96,7 +96,7 @@ namespace Lucene.Net.Search.Payloads
 					clauses[i] = new SpanTermQuery(phraseQueryTerms[i]);
 				}
 				
-				int slop = ((PhraseQuery) query).GetSlop();
+				int slop = ((PhraseQuery) query).Slop;
 				bool inorder = false;
 				
 				if (slop == 0)
@@ -105,13 +105,13 @@ namespace Lucene.Net.Search.Payloads
 				}
 				
 				SpanNearQuery sp = new SpanNearQuery(clauses, slop, inorder);
-				sp.SetBoost(query.GetBoost());
+				sp.Boost = query.Boost;
 				GetPayloads(payloads, sp);
 			}
 			else if (query is TermQuery)
 			{
-				SpanTermQuery stq = new SpanTermQuery(((TermQuery) query).GetTerm());
-				stq.SetBoost(query.GetBoost());
+				SpanTermQuery stq = new SpanTermQuery(((TermQuery) query).Term);
+				stq.Boost = query.Boost;
 				GetPayloads(payloads, stq);
 			}
 			else if (query is SpanQuery)
@@ -120,7 +120,7 @@ namespace Lucene.Net.Search.Payloads
 			}
 			else if (query is FilteredQuery)
 			{
-				QueryToSpanQuery(((FilteredQuery) query).GetQuery(), payloads);
+				QueryToSpanQuery(((FilteredQuery) query).Query, payloads);
 			}
 			else if (query is DisjunctionMaxQuery)
 			{
@@ -181,11 +181,11 @@ namespace Lucene.Net.Search.Payloads
 						}
 					}
 					
-					int slop = mpq.GetSlop();
+					int slop = mpq.Slop;
 					bool inorder = (slop == 0);
 					
 					SpanNearQuery sp = new SpanNearQuery(clauses, slop + positionGaps, inorder);
-					sp.SetBoost(query.GetBoost());
+					sp.Boost = query.Boost;
 					GetPayloads(payloads, sp);
 				}
 			}
@@ -197,9 +197,9 @@ namespace Lucene.Net.Search.Payloads
 			
 			while (spans.Next() == true)
 			{
-				if (spans.IsPayloadAvailable())
+				if (spans.IsPayloadAvailable)
 				{
-                    ICollection<byte[]> payload = spans.GetPayload();
+                    ICollection<byte[]> payload = spans.Payload;
                     foreach (byte[] bytes in payload)
                     {
                         payloads.Add(bytes);



Mime
View raw message