lucene-lucene-net-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [Lucene.Net] svn commit: r1097403 - in /incubator/lucene.net/branches/Lucene.Net_2_9_4g: src/core/Index/ src/core/Search/Spans/ src/core/Store/ test/core/Index/ test/core/Search/Spans/
Date Thu, 28 Apr 2011 10:30:13 GMT
Author: digy
Date: Thu Apr 28 10:30:12 2011
New Revision: 1097403

URL: http://svn.apache.org/viewvc?rev=1097403&view=rev
Log:
[LUCENENET-412]

Modified:
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/ByteBlockPool.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/DirectoryReader.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/DocumentsWriter.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/IndexReader.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/FieldMaskingSpanQuery.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanFirstQuery.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanNearQuery.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanNotQuery.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanOrQuery.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanQuery.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanTermQuery.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Store/RAMFile.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestByteSlices.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestDeletionPolicy.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestIndexReader.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestTransactionRollback.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Spans/JustCompileSearchSpans.cs

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/ByteBlockPool.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/ByteBlockPool.cs?rev=1097403&r1=1097402&r2=1097403&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/ByteBlockPool.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/ByteBlockPool.cs Thu Apr
28 10:30:12 2011
@@ -48,7 +48,7 @@ namespace Lucene.Net.Index
 		public /*internal*/ abstract class Allocator
 		{
 			public /*internal*/ abstract void  RecycleByteBlocks(byte[][] blocks, int start, int end);
-            public /*internal*/ abstract void RecycleByteBlocks(System.Collections.ArrayList
blocks);
+            public /*internal*/ abstract void RecycleByteBlocks(IList<byte[]> blocks);
 			public /*internal*/ abstract byte[] GetByteBlock(bool trackAllocations);
 		}
 		

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/DirectoryReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/DirectoryReader.cs?rev=1097403&r1=1097402&r2=1097403&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/DirectoryReader.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/DirectoryReader.cs Thu
Apr 28 10:30:12 2011
@@ -1121,11 +1121,11 @@ namespace Lucene.Net.Index
 		
 		/// <seealso cref="Lucene.Net.Index.IndexReader.listCommits">
 		/// </seealso>
-		public static new System.Collections.ICollection ListCommits(Directory dir)
+		public static new IList<IndexCommit> ListCommits(Directory dir)
 		{
 			System.String[] files = dir.ListAll();
-			
-			System.Collections.ArrayList commits = new System.Collections.ArrayList();
+
+            List<IndexCommit> commits = new List<IndexCommit>();
 			
 			SegmentInfos latest = new SegmentInfos();
 			latest.Read(dir);

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/DocumentsWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/DocumentsWriter.cs?rev=1097403&r1=1097402&r2=1097403&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/DocumentsWriter.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/DocumentsWriter.cs Thu
Apr 28 10:30:12 2011
@@ -1620,7 +1620,7 @@ namespace Lucene.Net.Index
 			}
 
             int blockSize;
-			internal System.Collections.ArrayList freeByteBlocks = new System.Collections.ArrayList();
+            internal List<byte[]> freeByteBlocks = new List<byte[]>();
             
 			/* Allocate another byte[] from the shared pool */
 			public /*internal*/ override byte[] GetByteBlock(bool trackAllocations)
@@ -1671,7 +1671,7 @@ namespace Lucene.Net.Index
 				}
 			}
 
-            public /*internal*/ override void RecycleByteBlocks(System.Collections.ArrayList
blocks)
+            public /*internal*/ override void RecycleByteBlocks(IList<byte[]> blocks)
             {
                 lock (Enclosing_Instance)
                 {

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/IndexReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/IndexReader.cs?rev=1097403&r1=1097402&r2=1097403&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/IndexReader.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Index/IndexReader.cs Thu Apr
28 10:30:12 2011
@@ -1749,7 +1749,7 @@ namespace Lucene.Net.Index
 		/// progress while this method is running, that commit
 		/// may or may not be returned array.  
 		/// </summary>
-		public static System.Collections.ICollection ListCommits(Directory dir)
+		public static IList<IndexCommit> ListCommits(Directory dir)
 		{
 			return DirectoryReader.ListCommits(dir);
 		}

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/FieldMaskingSpanQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/FieldMaskingSpanQuery.cs?rev=1097403&r1=1097402&r2=1097403&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/FieldMaskingSpanQuery.cs
(original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/FieldMaskingSpanQuery.cs
Thu Apr 28 10:30:12 2011
@@ -16,6 +16,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 
 using IndexReader = Lucene.Net.Index.IndexReader;
 using ToStringUtils = Lucene.Net.Util.ToStringUtils;
@@ -101,7 +102,7 @@ namespace Lucene.Net.Search.Spans
 		/// <deprecated> use {@link #ExtractTerms(Set)} instead. 
 		/// </deprecated>
         [Obsolete("use ExtractTerms(Hashtable) instead.")]
-		public override System.Collections.ICollection GetTerms()
+        public override IList<Lucene.Net.Index.Term> GetTerms()
 		{
 			return maskedQuery.GetTerms();
 		}

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanFirstQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanFirstQuery.cs?rev=1097403&r1=1097402&r2=1097403&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanFirstQuery.cs
(original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanFirstQuery.cs
Thu Apr 28 10:30:12 2011
@@ -142,7 +142,7 @@ namespace Lucene.Net.Search.Spans
 		/// <seealso cref="ExtractTerms(Set)">
 		/// </seealso>
         [Obsolete("use ExtractTerms instead")]
-		public override System.Collections.ICollection GetTerms()
+        public override IList<Lucene.Net.Index.Term> GetTerms()
 		{
 			return match.GetTerms();
 		}

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanNearQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanNearQuery.cs?rev=1097403&r1=1097402&r2=1097403&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanNearQuery.cs
(original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanNearQuery.cs
Thu Apr 28 10:30:12 2011
@@ -16,6 +16,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 
 using IndexReader = Lucene.Net.Index.IndexReader;
 using ToStringUtils = Lucene.Net.Util.ToStringUtils;
@@ -31,7 +32,7 @@ namespace Lucene.Net.Search.Spans
 	[Serializable]
 	public class SpanNearQuery:SpanQuery, System.ICloneable
 	{
-		protected internal System.Collections.ArrayList clauses;
+        protected internal List<SpanQuery> clauses;
 		protected internal int slop;
 		protected internal bool inOrder;
 		
@@ -51,7 +52,7 @@ namespace Lucene.Net.Search.Spans
 		{
 			
 			// copy clauses array into an ArrayList
-			this.clauses = new System.Collections.ArrayList(clauses.Length);
+            this.clauses = new List<SpanQuery>(clauses.Length);
 			for (int i = 0; i < clauses.Length; i++)
 			{
 				SpanQuery clause = clauses[i];
@@ -74,7 +75,7 @@ namespace Lucene.Net.Search.Spans
 		/// <summary>Return the clauses whose spans are matched. </summary>
 		public virtual SpanQuery[] GetClauses()
 		{
-			return (SpanQuery[]) clauses.ToArray(typeof(SpanQuery));
+			return clauses.ToArray();
 		}
 		
 		/// <summary>Return the maximum number of intervening unmatched positions permitted.</summary>
@@ -100,9 +101,9 @@ namespace Lucene.Net.Search.Spans
 		/// <seealso cref="ExtractTerms(Set)">
 		/// </seealso>
         [Obsolete("use ExtractTerms instead")]
-		public override System.Collections.ICollection GetTerms()
+        public override IList<Lucene.Net.Index.Term> GetTerms()
 		{
-			System.Collections.ArrayList terms = new System.Collections.ArrayList();
+            List<Lucene.Net.Index.Term> terms = new List<Index.Term>();
 			System.Collections.IEnumerator i = clauses.GetEnumerator();
 			while (i.MoveNext())
 			{

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanNotQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanNotQuery.cs?rev=1097403&r1=1097402&r2=1097403&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanNotQuery.cs
(original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanNotQuery.cs
Thu Apr 28 10:30:12 2011
@@ -181,7 +181,7 @@ namespace Lucene.Net.Search.Spans
 		/// <seealso cref="ExtractTerms(Set)">
 		/// </seealso>
         [Obsolete("use ExtractTerms instead")]
-		public override System.Collections.ICollection GetTerms()
+		public override IList<Lucene.Net.Index.Term> GetTerms()
 		{
 			return include.GetTerms();
 		}

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanOrQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanOrQuery.cs?rev=1097403&r1=1097402&r2=1097403&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanOrQuery.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanOrQuery.cs Thu
Apr 28 10:30:12 2011
@@ -56,15 +56,15 @@ namespace Lucene.Net.Search.Spans
 			private bool InitSpanQueue(int target)
 			{
 				queue = new SpanQueue(enclosingInstance, Enclosing_Instance.clauses.Count);
-				System.Collections.IEnumerator i = Enclosing_Instance.clauses.GetEnumerator();
-				while (i.MoveNext())
-				{
-					Spans spans = ((SpanQuery) i.Current).GetSpans(reader);
-					if (((target == - 1) && spans.Next()) || ((target != - 1) && spans.SkipTo(target)))
-					{
-						queue.Put(spans);
-					}
-				}
+                foreach (SpanQuery i in Enclosing_Instance.clauses)
+                {
+                    Spans spans = i.GetSpans(reader);
+                    if (((target == -1) && spans.Next()) || ((target != -1) &&
spans.SkipTo(target)))
+                    {
+                        queue.Put(spans);
+                    }
+                }
+
 				return queue.Size() != 0;
 			}
 			
@@ -204,15 +204,13 @@ namespace Lucene.Net.Search.Spans
 		/// <seealso cref="ExtractTerms(Set)">
 		/// </seealso>
         [Obsolete("use ExtractTerms instead")]
-		public override System.Collections.ICollection GetTerms()
+		public override IList<Lucene.Net.Index.Term> GetTerms()
 		{
-			System.Collections.ArrayList terms = new System.Collections.ArrayList();
-			System.Collections.IEnumerator i = clauses.GetEnumerator();
-			while (i.MoveNext())
-			{
-				SpanQuery clause = (SpanQuery) i.Current;
-				terms.AddRange(clause.GetTerms());
-			}
+            List<Lucene.Net.Index.Term> terms = new List<Index.Term>();
+            foreach (SpanQuery clause in clauses)
+            {
+                terms.AddRange(clause.GetTerms());
+            }
 			return terms;
 		}
 		

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanQuery.cs?rev=1097403&r1=1097402&r2=1097403&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanQuery.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanQuery.cs Thu
Apr 28 10:30:12 2011
@@ -16,6 +16,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 
 using IndexReader = Lucene.Net.Index.IndexReader;
 using Query = Lucene.Net.Search.Query;
@@ -43,7 +44,7 @@ namespace Lucene.Net.Search.Spans
 		/// <seealso cref="Query.ExtractTerms(Set)">
 		/// </seealso>
         [Obsolete("use ExtractTerms instead")]
-		public abstract System.Collections.ICollection GetTerms();
+		public abstract IList<Lucene.Net.Index.Term> GetTerms();
 		
 		public override Weight CreateWeight(Searcher searcher)
 		{

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanTermQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanTermQuery.cs?rev=1097403&r1=1097402&r2=1097403&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanTermQuery.cs
(original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Spans/SpanTermQuery.cs
Thu Apr 28 10:30:12 2011
@@ -16,6 +16,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 
 using IndexReader = Lucene.Net.Index.IndexReader;
 using Term = Lucene.Net.Index.Term;
@@ -53,9 +54,9 @@ namespace Lucene.Net.Search.Spans
 		/// <seealso cref="ExtractTerms(Set)">
 		/// </seealso>
         [Obsolete("use extractTerms instead")]
-		public override System.Collections.ICollection GetTerms()
+        public override IList<Lucene.Net.Index.Term> GetTerms()
 		{
-			System.Collections.ArrayList terms = new System.Collections.ArrayList();
+            List<Lucene.Net.Index.Term> terms = new List<Term>();
 			terms.Add(term);
 			return terms;
 		}

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Store/RAMFile.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Store/RAMFile.cs?rev=1097403&r1=1097402&r2=1097403&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Store/RAMFile.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Store/RAMFile.cs Thu Apr 28 10:30:12
2011
@@ -16,6 +16,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 
 namespace Lucene.Net.Store
 {
@@ -25,8 +26,8 @@ namespace Lucene.Net.Store
 	{
 		
 		private const long serialVersionUID = 1L;
-		
-		protected System.Collections.ArrayList buffers = new System.Collections.ArrayList();
+
+        protected List<byte[]> buffers = new List<byte[]>();
 		internal long length;
 		internal RAMDirectory directory;
 		internal long sizeInBytes; 

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestByteSlices.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestByteSlices.cs?rev=1097403&r1=1097402&r2=1097403&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestByteSlices.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestByteSlices.cs Thu
Apr 28 10:30:12 2011
@@ -16,6 +16,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 
 using NUnit.Framework;
 
@@ -32,7 +33,7 @@ namespace Lucene.Net.Index
 
         private class ByteBlockAllocator : ByteBlockPool.Allocator
         {
-            internal System.Collections.ArrayList freeByteBlocks = new System.Collections.ArrayList();
+            internal List<byte[]> freeByteBlocks = new List<byte[]>();
 
             /* Allocate another byte[] from the shared pool */
             public /*internal*/ override byte[] GetByteBlock(bool trackAllocations)
@@ -45,10 +46,10 @@ namespace Lucene.Net.Index
                         b = new byte[DocumentsWriter.BYTE_BLOCK_SIZE_ForNUnit];
                     else
                     {
-                        System.Object tempObject;
+                        byte[] tempObject;
                         tempObject = freeByteBlocks[size - 1];
                         freeByteBlocks.RemoveAt(size - 1);
-                        b = (byte[])tempObject;
+                        b = tempObject;
                     }
                     return b;
                 }
@@ -64,13 +65,13 @@ namespace Lucene.Net.Index
                 }
             }
 
-            public override void RecycleByteBlocks(System.Collections.ArrayList blocks)
+            public override void RecycleByteBlocks(IList<byte[]> blocks)
             {
                 lock (this)
                 {
                     int size = blocks.Count;
                     for (int i = 0; i < size; i++)
-                        freeByteBlocks.Add((byte[])blocks[i]);
+                        freeByteBlocks.Add(blocks[i]);
                 }
             }
         }

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestDeletionPolicy.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestDeletionPolicy.cs?rev=1097403&r1=1097402&r2=1097403&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestDeletionPolicy.cs
(original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestDeletionPolicy.cs
Thu Apr 28 10:30:12 2011
@@ -16,6 +16,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 
 using NUnit.Framework;
 
@@ -392,7 +393,7 @@ namespace Lucene.Net.Index
 					Assert.AreEqual(2, policy.numOnCommit);
 				
 				// Test listCommits
-				System.Collections.ICollection commits = IndexReader.ListCommits(dir);
+                IList<IndexCommit> commits = IndexReader.ListCommits(dir);
 				if (!autoCommit)
 				// 1 from opening writer + 2 from closing writer
 					Assert.AreEqual(3, commits.Count);
@@ -462,7 +463,7 @@ namespace Lucene.Net.Index
 			}
 			writer.Close();
 			
-			System.Collections.ICollection commits = IndexReader.ListCommits(dir);
+			IList<IndexCommit> commits = IndexReader.ListCommits(dir);
 			Assert.AreEqual(6, commits.Count);
 			IndexCommit lastCommit = null;
 			System.Collections.IEnumerator it = commits.GetEnumerator();

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestIndexReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestIndexReader.cs?rev=1097403&r1=1097402&r2=1097403&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestIndexReader.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestIndexReader.cs Thu
Apr 28 10:30:12 2011
@@ -1886,7 +1886,7 @@ namespace Lucene.Net.Index
 			writer.AddDocument(CreateDocument("a"));
 			writer.Close();
 			
-			System.Collections.ICollection commits = IndexReader.ListCommits(dir);
+			IList<IndexCommit> commits = IndexReader.ListCommits(dir);
 			System.Collections.IEnumerator it = commits.GetEnumerator();
 			while (it.MoveNext())
 			{

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestTransactionRollback.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestTransactionRollback.cs?rev=1097403&r1=1097402&r2=1097403&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestTransactionRollback.cs
(original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestTransactionRollback.cs
Thu Apr 28 10:30:12 2011
@@ -16,6 +16,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 
 using NUnit.Framework;
 
@@ -51,7 +52,7 @@ namespace Lucene.Net.Index
 			// System.out.println("Attempting to rollback to "+id);
 			System.String ids = "-" + id;
 			IndexCommit last = null;
-			System.Collections.ICollection commits = IndexReader.ListCommits(dir);
+			IList<IndexCommit> commits = IndexReader.ListCommits(dir);
 			for (System.Collections.IEnumerator iterator = commits.GetEnumerator(); iterator.MoveNext();
)
 			{
 				IndexCommit commit = (IndexCommit) iterator.Current;

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Spans/JustCompileSearchSpans.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Spans/JustCompileSearchSpans.cs?rev=1097403&r1=1097402&r2=1097403&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Spans/JustCompileSearchSpans.cs
(original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Spans/JustCompileSearchSpans.cs
Thu Apr 28 10:30:12 2011
@@ -16,6 +16,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 
 using NUnit.Framework;
 
@@ -93,7 +94,7 @@ namespace Lucene.Net.Search.Spans
 			/// <deprecated> delete in 3.0. 
 			/// </deprecated>
             [Obsolete("delete in 3.0")]
-			public override System.Collections.ICollection GetTerms()
+            public override IList<Lucene.Net.Index.Term> GetTerms()
 			{
 				throw new System.NotSupportedException(Lucene.Net.Search.Spans.JustCompileSearchSpans.UNSUPPORTED_MSG);
 			}



Mime
View raw message