lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccurr...@apache.org
Subject svn commit: r1310635 [5/8] - in /incubator/lucene.net/trunk: build/vs2010/contrib/ build/vs2010/test/ src/contrib/FastVectorHighlighter/ src/contrib/Highlighter/ src/contrib/Memory/ src/contrib/Memory/Properties/ src/contrib/Queries/ src/contrib/Querie...
Date Fri, 06 Apr 2012 23:37:54 GMT
Modified: incubator/lucene.net/trunk/src/core/Index/TermVectorOffsetInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/TermVectorOffsetInfo.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/TermVectorOffsetInfo.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/TermVectorOffsetInfo.cs Fri Apr  6 23:37:48 2012
@@ -27,17 +27,21 @@ namespace Lucene.Net.Index
 	/// original content).
 	/// </summary>
 	[Serializable]
-	public class TermVectorOffsetInfo
+	public struct TermVectorOffsetInfo : IEquatable<TermVectorOffsetInfo>
 	{
 		/// <summary> Convenience declaration when creating a <see cref="Lucene.Net.Index.TermPositionVector" /> that stores only position information.</summary>
 		[NonSerialized]
 		public static readonly TermVectorOffsetInfo[] EMPTY_OFFSET_INFO = new TermVectorOffsetInfo[0];
+        
+		[NonSerialized]
+        public static readonly TermVectorOffsetInfo Null = new TermVectorOffsetInfo(int.MinValue, int.MinValue);
+
 		private int startOffset;
 		private int endOffset;
 		
-		public TermVectorOffsetInfo()
-		{
-		}
+        //public TermVectorOffsetInfo()
+        //{
+        //}
 		
 		public TermVectorOffsetInfo(int startOffset, int endOffset)
 		{
@@ -47,7 +51,7 @@ namespace Lucene.Net.Index
 
 	    /// <summary> The accessor for the ending offset for the term</summary>
 	    /// <value> The offset </value>
-	    public virtual int EndOffset
+	    public int EndOffset
 	    {
 	        get { return endOffset; }
 	        set { this.endOffset = value; }
@@ -57,40 +61,74 @@ namespace Lucene.Net.Index
 	    /// 
 	    /// </summary>
 	    /// <value> The offset </value>
-	    public virtual int StartOffset
+	    public int StartOffset
 	    {
 	        get { return startOffset; }
 	        set { this.startOffset = value; }
 	    }
 
-	    /// <summary> Two TermVectorOffsetInfos are equals if both the start and end offsets are the same</summary>
-		/// <param name="o">The comparison Object
-		/// </param>
-		/// <returns> true if both <see cref="GetStartOffset()" /> and <see cref="GetEndOffset()" /> are the same for both objects.
-		/// </returns>
-		public  override bool Equals(System.Object o)
-		{
-			if (this == o)
-				return true;
-			if (!(o is TermVectorOffsetInfo))
-				return false;
+        ///// <summary> Two TermVectorOffsetInfos are equals if both the start and end offsets are the same</summary>
+        ///// <param name="o">The comparison Object
+        ///// </param>
+        ///// <returns> true if both <see cref="GetStartOffset()" /> and <see cref="GetEndOffset()" /> are the same for both objects.
+        ///// </returns>
+        //public  override bool Equals(System.Object o)
+        //{
+        //    if (this == o)
+        //        return true;
+        //    if (!(o is TermVectorOffsetInfo))
+        //        return false;
 			
-			TermVectorOffsetInfo termVectorOffsetInfo = (TermVectorOffsetInfo) o;
+        //    TermVectorOffsetInfo termVectorOffsetInfo = (TermVectorOffsetInfo) o;
 			
-			if (endOffset != termVectorOffsetInfo.endOffset)
-				return false;
-			if (startOffset != termVectorOffsetInfo.startOffset)
-				return false;
+        //    if (endOffset != termVectorOffsetInfo.endOffset)
+        //        return false;
+        //    if (startOffset != termVectorOffsetInfo.startOffset)
+        //        return false;
 			
-			return true;
-		}
+        //    return true;
+        //}
 		
-		public override int GetHashCode()
-		{
-			int result;
-			result = startOffset;
-			result = 29 * result + endOffset;
-			return result;
-		}
+        //public override int GetHashCode()
+        //{
+        //    int result;
+        //    result = startOffset;
+        //    result = 29 * result + endOffset;
+        //    return result;
+        //}
+
+
+	    public bool Equals(TermVectorOffsetInfo other)
+	    {
+	        return startOffset == other.startOffset && endOffset == other.endOffset;
+	    }
+
+	    public override bool Equals(object obj)
+	    {
+	        if (ReferenceEquals(null, obj))
+	        {
+	            return EndOffset == int.MinValue && StartOffset == int.MinValue;
+	        }
+	        if (obj.GetType() != typeof (TermVectorOffsetInfo)) return false;
+	        return Equals((TermVectorOffsetInfo) obj);
+	    }
+
+	    public override int GetHashCode()
+	    {
+	        unchecked
+	        {
+	            return (startOffset*397) ^ endOffset;
+	        }
+	    }
+
+	    public static bool operator ==(TermVectorOffsetInfo left, object right)
+	    {
+	        return left.Equals(right);
+	    }
+
+        public static bool operator !=(TermVectorOffsetInfo left, object right)
+	    {
+	        return !left.Equals(right);
+	    }
 	}
 }
\ No newline at end of file

Modified: incubator/lucene.net/trunk/src/core/QueryParser/MultiFieldQueryParser.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/QueryParser/MultiFieldQueryParser.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/QueryParser/MultiFieldQueryParser.cs (original)
+++ incubator/lucene.net/trunk/src/core/QueryParser/MultiFieldQueryParser.cs Fri Apr  6 23:37:48 2012
@@ -17,6 +17,7 @@
 
 using System;
 using System.Collections.Generic;
+using Lucene.Net.Search;
 using Analyzer = Lucene.Net.Analysis.Analyzer;
 using BooleanClause = Lucene.Net.Search.BooleanClause;
 using BooleanQuery = Lucene.Net.Search.BooleanQuery;
@@ -127,7 +128,7 @@ namespace Lucene.Net.QueryParsers
                             q.Boost = boost;
                         }
                         ApplySlop(q, slop);
-                        clauses.Add(new BooleanClause(q, BooleanClause.Occur.SHOULD));
+                        clauses.Add(new BooleanClause(q, Occur.SHOULD));
                     }
                 }
                 if (clauses.Count == 0)
@@ -166,7 +167,7 @@ namespace Lucene.Net.QueryParsers
                 IList<BooleanClause> clauses = new List<BooleanClause>();
                 for (int i = 0; i < fields.Length; i++)
                 {
-                    clauses.Add(new BooleanClause(GetFuzzyQuery(fields[i], termStr, minSimilarity), BooleanClause.Occur.SHOULD));
+                    clauses.Add(new BooleanClause(GetFuzzyQuery(fields[i], termStr, minSimilarity), Occur.SHOULD));
                 }
                 return GetBooleanQuery(clauses, true);
             }
@@ -180,7 +181,7 @@ namespace Lucene.Net.QueryParsers
                 IList<BooleanClause> clauses = new List<BooleanClause>();
                 for (int i = 0; i < fields.Length; i++)
                 {
-                    clauses.Add(new BooleanClause(GetPrefixQuery(fields[i], termStr), BooleanClause.Occur.SHOULD));
+                    clauses.Add(new BooleanClause(GetPrefixQuery(fields[i], termStr), Occur.SHOULD));
                 }
                 return GetBooleanQuery(clauses, true);
             }
@@ -194,7 +195,7 @@ namespace Lucene.Net.QueryParsers
                 IList<BooleanClause> clauses = new List<BooleanClause>();
                 for (int i = 0; i < fields.Length; i++)
                 {
-                    clauses.Add(new BooleanClause(GetWildcardQuery(fields[i], termStr), BooleanClause.Occur.SHOULD));
+                    clauses.Add(new BooleanClause(GetWildcardQuery(fields[i], termStr), Occur.SHOULD));
                 }
                 return GetBooleanQuery(clauses, true);
             }
@@ -209,7 +210,7 @@ namespace Lucene.Net.QueryParsers
                 IList<BooleanClause> clauses = new List<BooleanClause>();
                 for (int i = 0; i < fields.Length; i++)
                 {
-                    clauses.Add(new BooleanClause(GetRangeQuery(fields[i], part1, part2, inclusive), BooleanClause.Occur.SHOULD));
+                    clauses.Add(new BooleanClause(GetRangeQuery(fields[i], part1, part2, inclusive), Occur.SHOULD));
                 }
                 return GetBooleanQuery(clauses, true);
             }
@@ -252,7 +253,7 @@ namespace Lucene.Net.QueryParsers
                 Query q = qp.Parse(queries[i]);
                 if (q != null && (!(q is BooleanQuery) || ((BooleanQuery)q).GetClauses().Length > 0))
                 {
-                    bQuery.Add(q, BooleanClause.Occur.SHOULD);
+                    bQuery.Add(q, Occur.SHOULD);
                 }
             }
             return bQuery;
@@ -295,7 +296,7 @@ namespace Lucene.Net.QueryParsers
         /// <summary>             if the length of the fields array differs from the length of
         /// the flags array
         /// </summary>
-        public static Query Parse(Version matchVersion, System.String query, System.String[] fields, BooleanClause.Occur[] flags, Analyzer analyzer)
+        public static Query Parse(Version matchVersion, System.String query, System.String[] fields, Occur[] flags, Analyzer analyzer)
         {
             if (fields.Length != flags.Length)
                 throw new System.ArgumentException("fields.length != flags.length");
@@ -349,7 +350,7 @@ namespace Lucene.Net.QueryParsers
         /// <throws>  IllegalArgumentException </throws>
         /// <summary>             if the length of the queries, fields, and flags array differ
         /// </summary>
-        public static Query Parse(Version matchVersion, System.String[] queries, System.String[] fields, BooleanClause.Occur[] flags, Analyzer analyzer)
+        public static Query Parse(Version matchVersion, System.String[] queries, System.String[] fields, Occur[] flags, Analyzer analyzer)
         {
             if (!(queries.Length == fields.Length && queries.Length == flags.Length))
                 throw new System.ArgumentException("queries, fields, and flags array have have different length");

Modified: incubator/lucene.net/trunk/src/core/QueryParser/QueryParser.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/QueryParser/QueryParser.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/QueryParser/QueryParser.cs (original)
+++ incubator/lucene.net/trunk/src/core/QueryParser/QueryParser.cs Fri Apr  6 23:37:48 2012
@@ -26,6 +26,7 @@ using System.Globalization;
 using System.IO;
 using System.Text;
 using Lucene.Net.Analysis;
+using Lucene.Net.Search;
 using Lucene.Net.Support;
 using Lucene.Net.Util;
 using Analyzer = Lucene.Net.Analysis.Analyzer;
@@ -446,8 +447,8 @@ namespace Lucene.Net.QueryParsers
             if (clauses.Count > 0 && conj == CONJ_AND)
             {
                 BooleanClause c = clauses[clauses.Count - 1];
-                if (!c.Prohibited)
-                    c.SetOccur(BooleanClause.Occur.MUST);
+                if (!c.IsProhibited)
+                    c.Occur = Occur.MUST;
             }
 
             if (clauses.Count > 0 && operator_Renamed == AND_OPERATOR && conj == CONJ_OR)
@@ -457,8 +458,8 @@ namespace Lucene.Net.QueryParsers
                 // notice if the input is a OR b, first term is parsed as required; without
                 // this modification a OR b would parsed as +a OR b
                 BooleanClause c = clauses[clauses.Count - 1];
-                if (!c.Prohibited)
-                    c.SetOccur(BooleanClause.Occur.SHOULD);
+                if (!c.IsProhibited)
+                    c.Occur = Occur.SHOULD;
             }
 
             // We might have been passed a null query; the term might have been
@@ -485,11 +486,11 @@ namespace Lucene.Net.QueryParsers
                 required = (!prohibited && conj != CONJ_OR);
             }
             if (required && !prohibited)
-                clauses.Add(NewBooleanClause(q, BooleanClause.Occur.MUST));
+                clauses.Add(NewBooleanClause(q, Occur.MUST));
             else if (!required && !prohibited)
-                clauses.Add(NewBooleanClause(q, BooleanClause.Occur.SHOULD));
+                clauses.Add(NewBooleanClause(q, Occur.SHOULD));
             else if (!required && prohibited)
-                clauses.Add(NewBooleanClause(q, BooleanClause.Occur.MUST_NOT));
+                clauses.Add(NewBooleanClause(q, Occur.MUST_NOT));
             else
                 throw new SystemException("Clause cannot be both required and prohibited");
         }
@@ -622,7 +623,7 @@ namespace Lucene.Net.QueryParsers
 
                             Query currentQuery = NewTermQuery(
                                 new Term(field, term));
-                            q.Add(currentQuery, BooleanClause.Occur.SHOULD);
+                            q.Add(currentQuery, Occur.SHOULD);
                         }
                         return q;
                     }
@@ -827,7 +828,7 @@ namespace Lucene.Net.QueryParsers
         /// </param>
         /// <returns> new BooleanClause instance
         /// </returns>
-        protected internal virtual BooleanClause NewBooleanClause(Query q, BooleanClause.Occur occur)
+        protected internal virtual BooleanClause NewBooleanClause(Query q, Occur occur)
         {
             return new BooleanClause(q, occur);
         }

Modified: incubator/lucene.net/trunk/src/core/Search/BooleanClause.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/BooleanClause.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/BooleanClause.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/BooleanClause.cs Fri Apr  6 23:37:48 2012
@@ -26,43 +26,7 @@ namespace Lucene.Net.Search
 	[Serializable]
 	public class BooleanClause
     {
-        /// <summary>Specifies how clauses are to occur in matching documents. </summary>
-        [Serializable]
-        public sealed class Occur : Parameter
-        {
-            internal Occur(System.String name)
-                : base(name)
-            {
-            }
-
-            public override System.String ToString()
-            {
-                if (this == MUST)
-                    return "+";
-                if (this == MUST_NOT)
-                    return "-";
-                return "";
-            }
-
-            /// <summary>Use this operator for clauses that <i>must</i> appear in the matching documents. </summary>
-            public static readonly Occur MUST = new Occur("MUST");
-            /// <summary>Use this operator for clauses that <i>should</i> appear in the 
-            /// matching documents. For a BooleanQuery with no <c>MUST</c> 
-            /// clauses one or more <c>SHOULD</c> clauses must match a document 
-            /// for the BooleanQuery to match.
-            /// </summary>
-            /// <seealso cref="BooleanQuery.SetMinimumNumberShouldMatch">
-            /// </seealso>
-            public static readonly Occur SHOULD = new Occur("SHOULD");
-            /// <summary>Use this operator for clauses that <i>must not</i> appear in the matching documents.
-            /// Note that it is not possible to search for queries that only consist
-            /// of a <c>MUST_NOT</c> clause. 
-            /// </summary>
-            public static readonly Occur MUST_NOT = new Occur("MUST_NOT");
-        }
-		
-		private Occur occur;
-		
+	    private Occur occur;
 		
 		/// <summary>Constructs a BooleanClause.</summary>
 		public BooleanClause(Query query, Occur occur)
@@ -71,62 +35,33 @@ namespace Lucene.Net.Search
 			this.occur = occur;
 		}
 
-		public virtual Occur GetOccur()
-		{
-			return occur;
-		}
-		
-		public virtual void  SetOccur(Occur occur)
-		{
-			this.occur = occur;
-		}
+	    public virtual Occur Occur
+	    {
+	        get { return occur; }
+	        set { this.occur = value; }
+	    }
 
 	    private Query _query;
 
 	    /// <summary>The query whose matching documents are combined by the boolean query.</summary>
-        public virtual Query Query
+	    public virtual Query Query
 	    {
 	        get { return _query; }
-	        set { _query = value; }
+	        set { this._query = value; }
 	    }
 
-	    [Obsolete("Use Query property instead")]
-		public virtual Query GetQuery()
-		{
-			return Query;
-		}
-
-        [Obsolete("Use Query property instead")]
-		public virtual void SetQuery(Query query)
-		{
-			this.Query = query;
-		}
-		
-	    public virtual bool Prohibited
+	    public virtual bool IsProhibited
 	    {
-            get { return Occur.MUST_NOT.Equals(occur); }
+	        get { return Occur.MUST_NOT.Equals(occur); }
 	    }
 
-        [Obsolete("Use Prohibited property instead")]
-		public virtual bool IsProhibited()
-		{
-		    return Prohibited;
-		}
-		
-	    public virtual bool Required
+	    public virtual bool IsRequired
 	    {
-            get { return Occur.MUST.Equals(occur); }
+	        get { return Occur.MUST.Equals(occur); }
 	    }
 
-        [Obsolete("Use Required property instead")]
-		public virtual bool IsRequired()
-		{
-		    return Required;
-		}
-		
-		
-		
-		/// <summary>Returns true if <c>o</c> is equal to this. </summary>
+
+	    /// <summary>Returns true if <c>o</c> is equal to this. </summary>
 		public  override bool Equals(System.Object o)
 		{
 			if (o == null || !(o is BooleanClause))
@@ -144,7 +79,44 @@ namespace Lucene.Net.Search
 		
 		public override System.String ToString()
 		{
-			return occur.ToString() + Query.ToString();
+			return occur.ToString() + Query;
 		}
 	}
+
+    /// <summary>Specifies how clauses are to occur in matching documents. </summary>
+    [Serializable]
+    public sealed class Occur : Parameter
+    {
+        internal Occur(System.String name)
+            : base(name)
+        {
+        }
+
+        public override System.String ToString()
+        {
+            if (this == MUST)
+                return "+";
+            if (this == MUST_NOT)
+                return "-";
+            return "";
+        }
+
+        /// <summary>Use this operator for clauses that <i>must</i> appear in the matching documents. </summary>
+        public static readonly Occur MUST = new Occur("MUST");
+
+        /// <summary>Use this operator for clauses that <i>should</i> appear in the 
+        /// matching documents. For a BooleanQuery with no <c>MUST</c> 
+        /// clauses one or more <c>SHOULD</c> clauses must match a document 
+        /// for the BooleanQuery to match.
+        /// </summary>
+        /// <seealso cref="BooleanQuery.SetMinimumNumberShouldMatch">
+        /// </seealso>
+        public static readonly Occur SHOULD = new Occur("SHOULD");
+
+        /// <summary>Use this operator for clauses that <i>must not</i> appear in the matching documents.
+        /// Note that it is not possible to search for queries that only consist
+        /// of a <c>MUST_NOT</c> clause. 
+        /// </summary>
+        public static readonly Occur MUST_NOT = new Occur("MUST_NOT");
+    }
 }
\ No newline at end of file

Modified: incubator/lucene.net/trunk/src/core/Search/BooleanQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/BooleanQuery.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/BooleanQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/BooleanQuery.cs Fri Apr  6 23:37:48 2012
@@ -21,7 +21,7 @@ using Lucene.Net.Index;
 using Lucene.Net.Support;
 using IndexReader = Lucene.Net.Index.IndexReader;
 using ToStringUtils = Lucene.Net.Util.ToStringUtils;
-using Occur = Lucene.Net.Search.BooleanClause.Occur;
+using Occur = Lucene.Net.Search.Occur;
 
 namespace Lucene.Net.Search
 {
@@ -197,7 +197,7 @@ namespace Lucene.Net.Search
 		/// <throws>  TooManyClauses if the new number of clauses exceeds the maximum clause number </throws>
 		/// <seealso cref="GetMaxClauseCount()">
 		/// </seealso>
-		public virtual void  Add(Query query, BooleanClause.Occur occur)
+		public virtual void  Add(Query query, Occur occur)
 		{
 			Add(new BooleanClause(query, occur));
 		}
@@ -303,7 +303,7 @@ namespace Lucene.Net.Search
 		        {
 		            // call sumOfSquaredWeights for all clauses in case of side effects
 		            float s = weights[i].GetSumOfSquaredWeights(); // sum sub weights
-		            if (!Enclosing_Instance.clauses[i].Prohibited)
+                    if (!Enclosing_Instance.clauses[i].IsProhibited)
 		                // only add to sum for non-prohibited clauses
 		                sum += s;
 		        }
@@ -345,11 +345,11 @@ namespace Lucene.Net.Search
 						continue;
 					}
 					Explanation e = w.Explain(reader, doc);
-                    if (!c.Prohibited)
+                    if (!c.IsProhibited)
 						maxCoord++;
 					if (e.IsMatch())
 					{
-                        if (!c.Prohibited)
+                        if (!c.IsProhibited)
 						{
 							sumExpl.AddDetail(e);
 							sum += e.Value;
@@ -362,10 +362,10 @@ namespace Lucene.Net.Search
 							sumExpl.AddDetail(r);
 							fail = true;
 						}
-						if (c.GetOccur() == Occur.SHOULD)
+						if (c.Occur == Occur.SHOULD)
 							shouldMatchCount++;
 					}
-                    else if (c.Required)
+                    else if (c.IsRequired)
 					{
                         Explanation r = new Explanation(0.0f, "no match on required clause (" + c.Query.ToString() + ")");
 						r.AddDetail(e);
@@ -421,16 +421,16 @@ namespace Lucene.Net.Search
 					Scorer subScorer = w.Scorer(reader, true, false);
 					if (subScorer == null)
 					{
-                        if (c.Required)
+                        if (c.IsRequired)
 						{
 							return null;
 						}
 					}
-                    else if (c.Required)
+                    else if (c.IsRequired)
 					{
 						required.Add(subScorer);
 					}
-                    else if (c.Prohibited)
+                    else if (c.IsProhibited)
 					{
 						prohibited.Add(subScorer);
 					}
@@ -468,11 +468,11 @@ namespace Lucene.Net.Search
 		        int numProhibited = 0;
 		        foreach (BooleanClause c in Enclosing_Instance.clauses)
 		        {
-		            if (c.Required)
+                    if (c.IsRequired)
 		            {
 		                return false; // BS2 (in-order) will be used by scorer()
 		            }
-		            else if (c.Prohibited)
+                    else if (c.IsProhibited)
 		            {
 		                ++numProhibited;
 		            }
@@ -500,7 +500,7 @@ namespace Lucene.Net.Search
 			{
 				// optimize 1-clause queries
 				BooleanClause c = clauses[0];
-                if (!c.Prohibited)
+                if (!c.IsProhibited)
 				{
 					// just return clause
 
@@ -529,7 +529,7 @@ namespace Lucene.Net.Search
 					// clause rewrote: must clone
 					if (clone == null)
 						clone = (BooleanQuery) this.Clone();
-					clone.clauses[i] = new BooleanClause(query, c.GetOccur());
+					clone.clauses[i] = new BooleanClause(query, c.Occur);
 				}
 			}
 			if (clone != null)
@@ -569,9 +569,9 @@ namespace Lucene.Net.Search
 			for (int i = 0; i < clauses.Count; i++)
 			{
 				BooleanClause c = clauses[i];
-                if (c.Prohibited)
+                if (c.IsProhibited)
 					buffer.Append("-");
-                else if (c.Required)
+                else if (c.IsRequired)
 					buffer.Append("+");
 
                 Query subQuery = c.Query;

Modified: incubator/lucene.net/trunk/src/core/Search/FieldCacheRangeFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/FieldCacheRangeFilter.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/FieldCacheRangeFilter.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/FieldCacheRangeFilter.cs Fri Apr  6 23:37:48 2012
@@ -16,6 +16,7 @@
  */
 
 using System;
+using Lucene.Net.Index;
 using Lucene.Net.Support;
 using NumericField = Lucene.Net.Documents.NumericField;
 using IndexReader = Lucene.Net.Index.IndexReader;

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/FilteredTermEnum.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/FilteredTermEnum.cs Fri Apr  6 23:37:48 2012
@@ -30,7 +30,7 @@ namespace Lucene.Net.Search
 	public abstract class FilteredTermEnum:TermEnum
 	{
 		/// <summary>the current term </summary>
-		protected internal Term currentTerm = null;
+        protected internal Term currentTerm = null;
 		
 		/// <summary>the delegate enum - to set this member use <see cref="SetEnum" /> </summary>
 		protected internal TermEnum actualEnum = null;
@@ -80,7 +80,7 @@ namespace Lucene.Net.Search
 		{
 			if (actualEnum == null)
 				return false; // the actual enumerator is not initialized!
-			currentTerm = null;
+            currentTerm = null;
 			while (currentTerm == null)
 			{
 				if (EndEnum())
@@ -97,7 +97,7 @@ namespace Lucene.Net.Search
 				else
 					return false;
 			}
-			currentTerm = null;
+            currentTerm = null;
 			return false;
 		}
 		

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/FuzzyQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/FuzzyQuery.cs Fri Apr  6 23:37:48 2012
@@ -186,7 +186,7 @@ namespace Lucene.Net.Search
 			{
 				TermQuery tq = new TermQuery(st.term); // found a match
 				tq.Boost = Boost * st.score; // set the boost
-				query.Add(tq, BooleanClause.Occur.SHOULD); // add to query
+				query.Add(tq, Occur.SHOULD); // add to query
 			}
 			
 			return query;

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/FuzzyTermEnum.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/FuzzyTermEnum.cs Fri Apr  6 23:37:48 2012
@@ -41,8 +41,8 @@ namespace Lucene.Net.Search
 		private bool endEnum = false;
 
 	    private bool isDisposed;
-		
-		private Term searchTerm = null;
+
+        private Term searchTerm = null;
 		private System.String field;
 		private System.String text;
 		private System.String prefix;

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/MultiPhraseQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/MultiPhraseQuery.cs Fri Apr  6 23:37:48 2012
@@ -295,7 +295,7 @@ namespace Lucene.Net.Search
 				BooleanQuery boq = new BooleanQuery(true);
 				for (int i = 0; i < terms.Length; i++)
 				{
-					boq.Add(new TermQuery(terms[i]), BooleanClause.Occur.SHOULD);
+					boq.Add(new TermQuery(terms[i]), Occur.SHOULD);
 				}
 				boq.Boost = Boost;
 				return boq;

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/MultiTermQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/MultiTermQuery.cs Fri Apr  6 23:37:48 2012
@@ -138,7 +138,7 @@ namespace Lucene.Net.Search
 						{
 							TermQuery tq = new TermQuery(t); // found a match
 							tq.Boost = query.Boost * enumerator.Difference(); // set the boost
-							result.Add(tq, BooleanClause.Occur.SHOULD); // add to query
+							result.Add(tq, Occur.SHOULD); // add to query
 							count++;
 						}
 					}
@@ -160,7 +160,7 @@ namespace Lucene.Net.Search
 		}
 		
 		/// <summary>A rewrite method that first translates each term into
-		/// <see cref="BooleanClause.Occur.SHOULD" /> clause in a
+		/// <see cref="Occur.SHOULD" /> clause in a
 		/// BooleanQuery, and keeps the scores as computed by the
 		/// query.  Note that typically such scores are
 		/// meaningless to the user, and require non-trivial CPU
@@ -307,7 +307,7 @@ namespace Lucene.Net.Search
 							foreach(Term term in pendingTerms)
 							{
 								TermQuery tq = new TermQuery(term);
-								bq.Add(tq, BooleanClause.Occur.SHOULD);
+								bq.Add(tq, Occur.SHOULD);
 							}
 							// Strip scores
 							Query result = new ConstantScoreQuery(new QueryWrapperFilter(bq));

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/NumericRangeQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/NumericRangeQuery.cs Fri Apr  6 23:37:48 2012
@@ -156,7 +156,6 @@ namespace Lucene.Net.Search
 	public sealed class NumericRangeQuery<T> : MultiTermQuery
         where T : struct, IComparable<T> // best equiv constraint for java's number class
 	{
-		
 		internal NumericRangeQuery(System.String field, int precisionStep, int valSize, T? min, T? max, bool minInclusive, bool maxInclusive)
 		{
 			System.Diagnostics.Debug.Assert((valSize == 32 || valSize == 64));
@@ -535,7 +534,7 @@ namespace Lucene.Net.Search
 			    }
 			    // if all above fails, we go forward to the next enum,
 			    // if one is available
-			    currentTerm = null;
+                currentTerm = null;
 			    while (rangeBounds.Count >= 2)
 			    {
 			        // close the current enum and read next bounds
@@ -554,7 +553,7 @@ namespace Lucene.Net.Search
 			        if (currentTerm != null && TermCompare(currentTerm))
 			            return true;
 			        // clear the current term for next iteration
-			        currentTerm = null;
+                    currentTerm = null;
 			    }
 
 			    // no more sub-range enums available

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadSpanUtil.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadSpanUtil.cs Fri Apr  6 23:37:48 2012
@@ -81,7 +81,7 @@ namespace Lucene.Net.Search.Payloads
 				
 				for (int i = 0; i < queryClauses.Length; i++)
 				{
-                    if (!queryClauses[i].Prohibited)
+                    if (!queryClauses[i].IsProhibited)
 					{
 						QueryToSpanQuery(queryClauses[i].Query, payloads);
 					}

Modified: incubator/lucene.net/trunk/src/core/Search/Query.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Query.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Query.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Query.cs Fri Apr  6 23:37:48 2012
@@ -141,7 +141,7 @@ namespace Lucene.Net.Search
 					clauses = bq.GetClauses();
 					for (int j = 0; splittable && j < clauses.Length; j++)
 					{
-						splittable = (clauses[j].GetOccur() == BooleanClause.Occur.SHOULD);
+						splittable = (clauses[j].Occur == Occur.SHOULD);
 					}
 				}
 				if (splittable)
@@ -164,7 +164,7 @@ namespace Lucene.Net.Search
 			BooleanQuery result = new BooleanQuery(true);
             foreach (Query key in uniques)
             {
-                result.Add(key, BooleanClause.Occur.SHOULD);
+                result.Add(key, Occur.SHOULD);
             }
 			return result;
 		}

Modified: incubator/lucene.net/trunk/src/core/Search/WildcardQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/WildcardQuery.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/WildcardQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/WildcardQuery.cs Fri Apr  6 23:37:48 2012
@@ -79,7 +79,7 @@ namespace Lucene.Net.Search
             if (_termIsPrefix)
             {
                 MultiTermQuery rewritten =
-                    new PrefixQuery(term.CreateTerm(term.text.Substring(0, term.text.IndexOf('*'))));
+                    new PrefixQuery(term.CreateTerm(term.Text.Substring(0, term.Text.IndexOf('*'))));
                 rewritten.Boost = Boost;
                 rewritten.QueryRewriteMethod = QueryRewriteMethod;
                 return rewritten;

Modified: incubator/lucene.net/trunk/src/core/Support/HashMap.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Support/HashMap.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Support/HashMap.cs (original)
+++ incubator/lucene.net/trunk/src/core/Support/HashMap.cs Fri Apr  6 23:37:48 2012
@@ -157,7 +157,11 @@ namespace Lucene.Net.Support
 
         void ICollection<KeyValuePair<TKey, TValue>>.CopyTo(KeyValuePair<TKey, TValue>[] array, int arrayIndex)
         {
-            throw new NotImplementedException("implement as needed");
+            ((ICollection<KeyValuePair<TKey, TValue>>) _dict).CopyTo(array, arrayIndex);
+            if(!_isValueType && _hasNullValue)
+            {
+                array[array.Length - 1] = new KeyValuePair<TKey, TValue>(default(TKey), _nullValue);
+            }
         }
 
         public bool Remove(KeyValuePair<TKey, TValue> item)

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/AR/TestArabicAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/AR/TestArabicAnalyzer.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/AR/TestArabicAnalyzer.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/AR/TestArabicAnalyzer.cs Fri Apr  6 23:37:48 2012
@@ -21,6 +21,7 @@ using System.Collections;
 
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Tokenattributes;
+using Lucene.Net.Test.Analysis;
 using Lucene.Net.Util;
 using NUnit.Framework;
 using Version = Lucene.Net.Util.Version;

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/AR/TestArabicNormalizationFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/AR/TestArabicNormalizationFilter.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/AR/TestArabicNormalizationFilter.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/AR/TestArabicNormalizationFilter.cs Fri Apr  6 23:37:48 2012
@@ -21,6 +21,7 @@ using System.Collections;
 
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Tokenattributes;
+using Lucene.Net.Test.Analysis;
 using Lucene.Net.Util;
 using NUnit.Framework;
 

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/AR/TestArabicStemFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/AR/TestArabicStemFilter.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/AR/TestArabicStemFilter.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/AR/TestArabicStemFilter.cs Fri Apr  6 23:37:48 2012
@@ -21,6 +21,7 @@ using System.Collections;
 
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Tokenattributes;
+using Lucene.Net.Test.Analysis;
 using Lucene.Net.Util;
 
 using NUnit.Framework;

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/Br/TestBrazilianStemmer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/Br/TestBrazilianStemmer.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Br/TestBrazilianStemmer.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Br/TestBrazilianStemmer.cs Fri Apr  6 23:37:48 2012
@@ -25,6 +25,7 @@ using System.Linq;
 using System.Text;
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.BR;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 using Version = Lucene.Net.Util.Version;
 

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/Cjk/TestCJKTokenizer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/Cjk/TestCJKTokenizer.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Cjk/TestCJKTokenizer.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Cjk/TestCJKTokenizer.cs Fri Apr  6 23:37:48 2012
@@ -25,6 +25,7 @@ using System.Linq;
 using System.Text;
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.CJK;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 using Version = Lucene.Net.Util.Version;
 

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/Cn/TestChineseTokenizer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/Cn/TestChineseTokenizer.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Cn/TestChineseTokenizer.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Cn/TestChineseTokenizer.cs Fri Apr  6 23:37:48 2012
@@ -27,6 +27,7 @@ using System.Text;
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Cn;
 using Lucene.Net.Analysis.Tokenattributes;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analyzers.Cn

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/Cz/TestCzechAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/Cz/TestCzechAnalyzer.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Cz/TestCzechAnalyzer.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Cz/TestCzechAnalyzer.cs Fri Apr  6 23:37:48 2012
@@ -26,6 +26,7 @@ using System.Linq;
 using System.Text;
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Cz;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 using Version = Lucene.Net.Util.Version;
 

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/De/TestGermanStemFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/De/TestGermanStemFilter.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/De/TestGermanStemFilter.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/De/TestGermanStemFilter.cs Fri Apr  6 23:37:48 2012
@@ -24,6 +24,7 @@ using System.IO;
 using System.Text;
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.De;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 using Version=Lucene.Net.Util.Version;
 

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/El/GreekAnalyzerTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/El/GreekAnalyzerTest.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/El/GreekAnalyzerTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/El/GreekAnalyzerTest.cs Fri Apr  6 23:37:48 2012
@@ -24,6 +24,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Lucene.Net.Analysis;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 using Version=Lucene.Net.Util.Version;
 

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/Fa/TestPersianAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/Fa/TestPersianAnalyzer.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Fa/TestPersianAnalyzer.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Fa/TestPersianAnalyzer.cs Fri Apr  6 23:37:48 2012
@@ -24,6 +24,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Lucene.Net.Analysis;
+using Lucene.Net.Test.Analysis;
 using Version = Lucene.Net.Util.Version;
 
 namespace Lucene.Net.Analyzers.Fa

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/Fa/TestPersianNormalizationFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/Fa/TestPersianNormalizationFilter.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Fa/TestPersianNormalizationFilter.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Fa/TestPersianNormalizationFilter.cs Fri Apr  6 23:37:48 2012
@@ -26,6 +26,7 @@ using System.Linq;
 using System.Text;
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.AR;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analyzers.Fa

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Fr/TestElision.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Fr/TestElision.cs Fri Apr  6 23:37:48 2012
@@ -28,6 +28,7 @@ using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.Tokenattributes;
 using Lucene.Net.Index;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 using Version=Lucene.Net.Util.Version;
 

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/Fr/TestFrenchAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/Fr/TestFrenchAnalyzer.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Fr/TestFrenchAnalyzer.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Fr/TestFrenchAnalyzer.cs Fri Apr  6 23:37:48 2012
@@ -25,6 +25,7 @@ using System.Linq;
 using System.Text;
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Fr;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 using Version = Lucene.Net.Util.Version;
 

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/Miscellaneous/PatternAnalyzerTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/Miscellaneous/PatternAnalyzerTest.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Miscellaneous/PatternAnalyzerTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Miscellaneous/PatternAnalyzerTest.cs Fri Apr  6 23:37:48 2012
@@ -25,6 +25,7 @@ using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using Lucene.Net.Analysis;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 using Version = Lucene.Net.Util.Version;
 

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/Miscellaneous/TestPrefixAndSuffixAwareTokenFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/Miscellaneous/TestPrefixAndSuffixAwareTokenFilter.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Miscellaneous/TestPrefixAndSuffixAwareTokenFilter.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Miscellaneous/TestPrefixAndSuffixAwareTokenFilter.cs Fri Apr  6 23:37:48 2012
@@ -18,6 +18,7 @@
 using System;
 using System.IO;
 using Lucene.Net.Analysis;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analyzers.Miscellaneous

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/Miscellaneous/TestPrefixAwareTokenFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/Miscellaneous/TestPrefixAwareTokenFilter.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Miscellaneous/TestPrefixAwareTokenFilter.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Miscellaneous/TestPrefixAwareTokenFilter.cs Fri Apr  6 23:37:48 2012
@@ -18,6 +18,7 @@
 using System;
 using System.IO;
 using Lucene.Net.Analysis;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analyzers.Miscellaneous

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestEdgeNGramTokenFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestEdgeNGramTokenFilter.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestEdgeNGramTokenFilter.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestEdgeNGramTokenFilter.cs Fri Apr  6 23:37:48 2012
@@ -26,6 +26,7 @@ using System.Linq;
 using System.Text;
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.NGram;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analyzers.Miscellaneous

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestEdgeNGramTokenizer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestEdgeNGramTokenizer.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestEdgeNGramTokenizer.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestEdgeNGramTokenizer.cs Fri Apr  6 23:37:48 2012
@@ -26,6 +26,7 @@ using System.Linq;
 using System.Text;
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.NGram;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analyzers.Miscellaneous

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestNGramTokenFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestNGramTokenFilter.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestNGramTokenFilter.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestNGramTokenFilter.cs Fri Apr  6 23:37:48 2012
@@ -21,6 +21,7 @@ using System.Collections;
 
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Tokenattributes;
+using Lucene.Net.Test.Analysis;
 using Lucene.Net.Util;
 using NUnit.Framework;
 

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestNGramTokenizer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestNGramTokenizer.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestNGramTokenizer.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestNGramTokenizer.cs Fri Apr  6 23:37:48 2012
@@ -21,6 +21,7 @@ using System.Collections;
 
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Tokenattributes;
+using Lucene.Net.Test.Analysis;
 using Lucene.Net.Util;
 using NUnit.Framework;
 

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/Nl/TestDutchStemmer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/Nl/TestDutchStemmer.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Nl/TestDutchStemmer.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Nl/TestDutchStemmer.cs Fri Apr  6 23:37:48 2012
@@ -26,6 +26,7 @@ using System.Linq;
 using System.Text;
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Nl;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 using Version = Lucene.Net.Util.Version;
 

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Payloads/NumericPayloadTokenFilterTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Payloads/NumericPayloadTokenFilterTest.cs Fri Apr  6 23:37:48 2012
@@ -26,6 +26,7 @@ using System.Linq;
 using System.Text;
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Tokenattributes;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analyzers.Payloads

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/Payloads/TokenOffsetPayloadTokenFilterTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/Payloads/TokenOffsetPayloadTokenFilterTest.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Payloads/TokenOffsetPayloadTokenFilterTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Payloads/TokenOffsetPayloadTokenFilterTest.cs Fri Apr  6 23:37:48 2012
@@ -27,6 +27,7 @@ using System.Text;
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Tokenattributes;
 using Lucene.Net.Index;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analyzers.Payloads

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/Payloads/TypeAsPayloadTokenFilterTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/Payloads/TypeAsPayloadTokenFilterTest.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Payloads/TypeAsPayloadTokenFilterTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Payloads/TypeAsPayloadTokenFilterTest.cs Fri Apr  6 23:37:48 2012
@@ -26,6 +26,7 @@ using System.Linq;
 using System.Text;
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Tokenattributes;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analyzers.Payloads

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/Position/PositionFilterTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/Position/PositionFilterTest.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Position/PositionFilterTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Position/PositionFilterTest.cs Fri Apr  6 23:37:48 2012
@@ -27,6 +27,7 @@ using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Position;
 using Lucene.Net.Analysis.Tokenattributes;
 using Lucene.Net.Analyzers.Shingle;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analyzers.Position

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Query/QueryAutoStopWordAnalyzerTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Query/QueryAutoStopWordAnalyzerTest.cs Fri Apr  6 23:37:48 2012
@@ -32,6 +32,7 @@ using Lucene.Net.Index;
 using Lucene.Net.QueryParsers;
 using Lucene.Net.Search;
 using Lucene.Net.Store;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 using Version=Lucene.Net.Util.Version;
 

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Reverse/TestReverseStringFilter.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Reverse/TestReverseStringFilter.cs Fri Apr  6 23:37:48 2012
@@ -27,6 +27,7 @@ using System.Text;
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Reverse;
 using Lucene.Net.Analysis.Tokenattributes;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analyzers.Reverse

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Ru/TestRussianAnalyzer.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Ru/TestRussianAnalyzer.cs Fri Apr  6 23:37:48 2012
@@ -27,6 +27,7 @@ using System.Text;
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Ru;
 using Lucene.Net.Analysis.Tokenattributes;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 using Version=Lucene.Net.Util.Version;
 

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Shingle/ShingleAnalyzerWrapperTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Shingle/ShingleAnalyzerWrapperTest.cs Fri Apr  6 23:37:48 2012
@@ -24,6 +24,7 @@ using Lucene.Net.Index;
 using Lucene.Net.QueryParsers;
 using Lucene.Net.Search;
 using Lucene.Net.Store;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 using Directory = Lucene.Net.Store.Directory;
 
@@ -184,7 +185,7 @@ namespace Lucene.Net.Analyzers.Shingle
             {
                 var termText = termAtt.Term();
                 q.Add(new TermQuery(new Term("content", termText)),
-                      BooleanClause.Occur.SHOULD);
+                      Occur.SHOULD);
             }
 
             var hits = Searcher.Search(q, null, 1000).ScoreDocs;

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Shingle/ShingleFilterTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Shingle/ShingleFilterTest.cs Fri Apr  6 23:37:48 2012
@@ -19,6 +19,7 @@ using System;
 using System.IO;
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Tokenattributes;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analyzers.Shingle

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Shingle/TestShingleMatrixFilter.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Shingle/TestShingleMatrixFilter.cs Fri Apr  6 23:37:48 2012
@@ -25,6 +25,7 @@ using Lucene.Net.Analysis.Shingle.Matrix
 using Lucene.Net.Analysis.Tokenattributes;
 using Lucene.Net.Analyzers.Miscellaneous;
 using Lucene.Net.Analyzers.Payloads;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 using FlagsAttribute = Lucene.Net.Analysis.Tokenattributes.FlagsAttribute;
 

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/Sinks/DateRecognizerSinkTokenizerTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/Sinks/DateRecognizerSinkTokenizerTest.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Sinks/DateRecognizerSinkTokenizerTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Sinks/DateRecognizerSinkTokenizerTest.cs Fri Apr  6 23:37:48 2012
@@ -26,6 +26,7 @@ using System.Linq;
 using System.Text;
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Sinks;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analyzers.Sinks

Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/Sinks/TokenRangeSinkTokenizerTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/Sinks/TokenRangeSinkTokenizerTest.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Sinks/TokenRangeSinkTokenizerTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Sinks/TokenRangeSinkTokenizerTest.cs Fri Apr  6 23:37:48 2012
@@ -26,6 +26,7 @@ using System.Linq;
 using System.Text;
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Sinks;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analyzers.Sinks

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=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Sinks/TokenTypeSinkTokenizerTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Sinks/TokenTypeSinkTokenizerTest.cs Fri Apr  6 23:37:48 2012
@@ -27,6 +27,7 @@ using System.Text;
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Sinks;
 using Lucene.Net.Analysis.Tokenattributes;
+using Lucene.Net.Test.Analysis;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analyzers.Sinks

Modified: incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/FieldPhraseListTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/FieldPhraseListTest.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/FieldPhraseListTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/FieldPhraseListTest.cs Fri Apr  6 23:37:48 2012
@@ -149,8 +149,8 @@ namespace Lucene.Net.Search.Vectorhighli
             Make1d1fIndex("d a b c d");
 
             BooleanQuery query = new BooleanQuery();
-            query.Add(PqF("a", "b"), Lucene.Net.Search.BooleanClause.Occur.SHOULD);
-            query.Add(PqF("b", "c"), Lucene.Net.Search.BooleanClause.Occur.SHOULD);
+            query.Add(PqF("a", "b"), Occur.SHOULD);
+            query.Add(PqF("b", "c"), Occur.SHOULD);
             FieldQuery fq = new FieldQuery(query, true, true);
             FieldTermStack stack = new FieldTermStack(reader, 0, F, fq);
             FieldPhraseList fpl = new FieldPhraseList(stack, fq);
@@ -176,8 +176,8 @@ namespace Lucene.Net.Search.Vectorhighli
             Make1d1fIndex("d a b d c a b c");
 
             BooleanQuery query = new BooleanQuery();
-            query.Add(PqF("a", "b"), Lucene.Net.Search.BooleanClause.Occur.SHOULD);
-            query.Add(PqF("a", "b", "c"), Lucene.Net.Search.BooleanClause.Occur.SHOULD);
+            query.Add(PqF("a", "b"), Occur.SHOULD);
+            query.Add(PqF("a", "b", "c"), Occur.SHOULD);
             FieldQuery fq = new FieldQuery(query, true, true);
             FieldTermStack stack = new FieldTermStack(reader, 0, F, fq);
             FieldPhraseList fpl = new FieldPhraseList(stack, fq);

Modified: incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/FieldQueryTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/FieldQueryTest.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/FieldQueryTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/FieldQueryTest.cs Fri Apr  6 23:37:48 2012
@@ -20,7 +20,7 @@ using System.Collections.Generic;
 using System.Text;
 
 using Lucene.Net.Search;
-using Occur = Lucene.Net.Search.BooleanClause.Occur;
+using Occur = Lucene.Net.Search.Occur;
 
 using QueryPhraseMap = Lucene.Net.Search.Vectorhighlight.FieldQuery.QueryPhraseMap;
 using TermInfo = Lucene.Net.Search.Vectorhighlight.FieldTermStack.TermInfo;

Modified: incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/FieldTermStackTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/FieldTermStackTest.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/FieldTermStackTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/FieldTermStackTest.cs Fri Apr  6 23:37:48 2012
@@ -52,8 +52,8 @@ namespace Lucene.Net.Search.Vectorhighli
             MakeIndex();
 
             BooleanQuery query = new BooleanQuery();
-            query.Add(Tq("b"), Lucene.Net.Search.BooleanClause.Occur.SHOULD);
-            query.Add(Tq("c"), Lucene.Net.Search.BooleanClause.Occur.SHOULD);
+            query.Add(Tq("b"), Occur.SHOULD);
+            query.Add(Tq("c"), Occur.SHOULD);
             FieldQuery fq = new FieldQuery(query, true, true);
             FieldTermStack stack = new FieldTermStack(reader, 0, F, fq);
             Assert.AreEqual(8, stack.termList.Count);
@@ -114,8 +114,8 @@ namespace Lucene.Net.Search.Vectorhighli
             makeIndexB();
 
             BooleanQuery query = new BooleanQuery();
-            query.Add(Tq("bc"), Lucene.Net.Search.BooleanClause.Occur.SHOULD);
-            query.Add(Tq("ef"), Lucene.Net.Search.BooleanClause.Occur.SHOULD);
+            query.Add(Tq("bc"), Occur.SHOULD);
+            query.Add(Tq("ef"), Occur.SHOULD);
             FieldQuery fq = new FieldQuery(query, true, true);
             FieldTermStack stack = new FieldTermStack(reader, 0, F, fq);
             Assert.AreEqual(3, stack.termList.Count);

Modified: incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/IndexTimeSynonymTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/IndexTimeSynonymTest.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/IndexTimeSynonymTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/IndexTimeSynonymTest.cs Fri Apr  6 23:37:48 2012
@@ -52,8 +52,8 @@ namespace Lucene.Net.Search.Vectorhighli
             MakeIndex1w();
 
             BooleanQuery bq = new BooleanQuery();
-            bq.Add(Tq("Mac"), Lucene.Net.Search.BooleanClause.Occur.SHOULD);
-            bq.Add(Tq("MacBook"), Lucene.Net.Search.BooleanClause.Occur.SHOULD);
+            bq.Add(Tq("Mac"), Occur.SHOULD);
+            bq.Add(Tq("MacBook"), Occur.SHOULD);
             FieldQuery fq = new FieldQuery(bq, true, true);
             FieldTermStack stack = new FieldTermStack(reader, 0, F, fq);
             Assert.AreEqual(2, stack.termList.Count);
@@ -104,8 +104,8 @@ namespace Lucene.Net.Search.Vectorhighli
             MakeIndex1w2w();
 
             BooleanQuery bq = new BooleanQuery();
-            bq.Add(Tq("pc"), Lucene.Net.Search.BooleanClause.Occur.SHOULD);
-            bq.Add(PqF("personal", "computer"), Lucene.Net.Search.BooleanClause.Occur.SHOULD);
+            bq.Add(Tq("pc"), Occur.SHOULD);
+            bq.Add(PqF("personal", "computer"), Occur.SHOULD);
             FieldQuery fq = new FieldQuery(bq, true, true);
             FieldTermStack stack = new FieldTermStack(reader, 0, F, fq);
             Assert.AreEqual(3, stack.termList.Count);
@@ -157,8 +157,8 @@ namespace Lucene.Net.Search.Vectorhighli
             MakeIndex2w1w();
 
             BooleanQuery bq = new BooleanQuery();
-            bq.Add(Tq("pc"), Lucene.Net.Search.BooleanClause.Occur.SHOULD);
-            bq.Add(PqF("personal", "computer"), Lucene.Net.Search.BooleanClause.Occur.SHOULD);
+            bq.Add(Tq("pc"), Occur.SHOULD);
+            bq.Add(PqF("personal", "computer"), Occur.SHOULD);
             FieldQuery fq = new FieldQuery(bq, true, true);
             FieldTermStack stack = new FieldTermStack(reader, 0, F, fq);
             Assert.AreEqual(3, stack.termList.Count);
@@ -204,8 +204,8 @@ namespace Lucene.Net.Search.Vectorhighli
             MakeIndex1w2w();
 
             BooleanQuery bq = new BooleanQuery();
-            bq.Add(Tq("pc"), Lucene.Net.Search.BooleanClause.Occur.SHOULD);
-            bq.Add(PqF("personal", "computer"), Lucene.Net.Search.BooleanClause.Occur.SHOULD);
+            bq.Add(Tq("pc"), Occur.SHOULD);
+            bq.Add(PqF("personal", "computer"), Occur.SHOULD);
             FieldQuery fq = new FieldQuery(bq, true, true);
             FieldTermStack stack = new FieldTermStack(reader, 0, F, fq);
             FieldPhraseList fpl = new FieldPhraseList(stack, fq);
@@ -263,8 +263,8 @@ namespace Lucene.Net.Search.Vectorhighli
             MakeIndex2w1w();
 
             BooleanQuery bq = new BooleanQuery();
-            bq.Add(Tq("pc"), Lucene.Net.Search.BooleanClause.Occur.SHOULD);
-            bq.Add(PqF("personal", "computer"), Lucene.Net.Search.BooleanClause.Occur.SHOULD);
+            bq.Add(Tq("pc"), Occur.SHOULD);
+            bq.Add(PqF("personal", "computer"), Occur.SHOULD);
             FieldQuery fq = new FieldQuery(bq, true, true);
             FieldTermStack stack = new FieldTermStack(reader, 0, F, fq);
             FieldPhraseList fpl = new FieldPhraseList(stack, fq);

Modified: incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/Support.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/Support.cs?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/Support.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/Support.cs Fri Apr  6 23:37:48 2012
@@ -21,7 +21,14 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
 using System.Text;
+using Lucene.Net.Analysis.Standard;
+using Lucene.Net.QueryParsers;
+using Lucene.Net.Store;
+using NUnit.Framework;
+using Version = Lucene.Net.Util.Version;
 
 namespace Lucene.Net.Search.Vectorhighlight
 {

Modified: incubator/lucene.net/trunk/test/contrib/Highlighter/Contrib.Highlighter.Test.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Highlighter/Contrib.Highlighter.Test.csproj?rev=1310635&r1=1310634&r2=1310635&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Highlighter/Contrib.Highlighter.Test.csproj (original)
+++ incubator/lucene.net/trunk/test/contrib/Highlighter/Contrib.Highlighter.Test.csproj Fri Apr  6 23:37:48 2012
@@ -19,7 +19,6 @@
  under the License.
 
 -->
-
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
@@ -117,6 +116,7 @@
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
+    <Reference Include="System.XML" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs">
@@ -125,16 +125,25 @@
     <Compile Include="HighlighterTest.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Tokenizer.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\contrib\Highlighter\Contrib.Highlighter.csproj">
       <Project>{901D5415-383C-4AA6-A256-879558841BEA}</Project>
       <Name>Contrib.Highlighter</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\src\contrib\Regex\Contrib.Regex.csproj">
+      <Project>{a26bd3b7-df90-43b4-99e2-6a617cde1579}</Project>
+      <Name>Contrib.Regex</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\src\core\Lucene.Net.csproj">
-      <Project>{5D4AD9BE-1FFB-41AB-9943-25737971BF57}</Project>
+      <Project>{5d4ad9be-1ffb-41ab-9943-25737971bf57}</Project>
       <Name>Lucene.Net</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\core\Lucene.Net.Test.csproj">
+      <Project>{aaf68bcf-f781-45fc-98b3-2b9cee411e01}</Project>
+      <Name>Lucene.Net.Test</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.0">



Mime
View raw message