You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by pn...@apache.org on 2012/04/28 00:37:43 UTC

svn commit: r1331615 - in /incubator/lucene.net/trunk: src/core/Analysis/Standard/ src/core/Index/ src/core/Search/ src/core/Search/Function/ test/core/Index/ test/core/Search/

Author: pnasser
Date: Fri Apr 27 22:37:43 2012
New Revision: 1331615

URL: http://svn.apache.org/viewvc?rev=1331615&view=rev
Log:
LUCENENET-487 - Removing several obsolete methods

Modified:
    incubator/lucene.net/trunk/src/core/Analysis/Standard/StandardTokenizer.cs
    incubator/lucene.net/trunk/src/core/Index/IndexReader.cs
    incubator/lucene.net/trunk/src/core/Search/FieldCache.cs
    incubator/lucene.net/trunk/src/core/Search/Function/CustomScoreQuery.cs
    incubator/lucene.net/trunk/src/core/Search/IndexSearcher.cs
    incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs
    incubator/lucene.net/trunk/test/core/Search/TestFieldCacheRangeFilter.cs

Modified: incubator/lucene.net/trunk/src/core/Analysis/Standard/StandardTokenizer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Analysis/Standard/StandardTokenizer.cs?rev=1331615&r1=1331614&r2=1331615&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Analysis/Standard/StandardTokenizer.cs (original)
+++ incubator/lucene.net/trunk/src/core/Analysis/Standard/StandardTokenizer.cs Fri Apr 27 22:37:43 2012
@@ -218,22 +218,7 @@ namespace Lucene.Net.Analysis.Standard
 			scanner.Reset(reader);
 		}
 		
-		/// <summary> Prior to https://issues.apache.org/jira/browse/LUCENE-1068, StandardTokenizer mischaracterized as acronyms tokens like www.abc.com
-		/// when they should have been labeled as hosts instead.
-		/// </summary>
-		/// <returns> true if StandardTokenizer now returns these tokens as Hosts, otherwise false
-		/// 
-		/// </returns>
-		/// <deprecated> Remove in 3.X and make true the only valid value
-		/// </deprecated>
-        [Obsolete("Remove in 3.X and make true the only valid value")]
-		public bool IsReplaceInvalidAcronym()
-		{
-			return replaceInvalidAcronym;
-		}
-		
-
-        /// <summary>
+		/// <summary>
 		/// Remove in 3.X and make true the only valid value
 		/// See https://issues.apache.org/jira/browse/LUCENE-1068
         /// </summary>

Modified: incubator/lucene.net/trunk/src/core/Index/IndexReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/IndexReader.cs?rev=1331615&r1=1331614&r2=1331615&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/IndexReader.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/IndexReader.cs Fri Apr 27 22:37:43 2012
@@ -204,18 +204,6 @@ namespace Lucene.Net.Index
 		        throw new AlreadyClosedException("this IndexReader is closed");
 		    }
 		}
-
-        /// <summary>Returns a IndexReader reading the index in the given
-        /// Directory, with ReadOnly=true
-        /// </summary>
-        /// <param name="directory">the index directory</param>
-        /// <exception cref="CorruptIndexException">CorruptIndexException if the index is corrupt</exception>
-        /// <exception cref="System.IO.IOException">IOException if there is a low-level IO error</exception>
-        [Obsolete("Use Open(Directory, bool) instead. This method will be removed in the 3.0 release.")]
-		public static IndexReader Open(Directory directory)
-		{
-			return Open(directory, null, null, true, DEFAULT_TERMS_INDEX_DIVISOR);
-		}
 		
 		/// <summary>Returns an IndexReader reading the index in the given
 		/// Directory.  You should pass readOnly=true, since it

Modified: incubator/lucene.net/trunk/src/core/Search/FieldCache.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/FieldCache.cs?rev=1331615&r1=1331614&r2=1331615&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/FieldCache.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/FieldCache.cs Fri Apr 27 22:37:43 2012
@@ -371,7 +371,8 @@ namespace Lucene.Net.Search
 			return typeof(FieldCache).FullName + ".NUMERIC_UTILS_DOUBLE_PARSER";
 		}
 	}
-	public interface FieldCache
+
+    public interface FieldCache
 	{
 		
 		/// <summary>Checks the internal cache for an appropriate entry, and if none is

Modified: incubator/lucene.net/trunk/src/core/Search/Function/CustomScoreQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Function/CustomScoreQuery.cs?rev=1331615&r1=1331614&r2=1331615&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Function/CustomScoreQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Function/CustomScoreQuery.cs Fri Apr 27 22:37:43 2012
@@ -275,7 +275,7 @@ namespace Lucene.Net.Search.Function
         /// Please override <see cref="GetCustomScoreProvider(IndexReader)" /> and return a subclass
         /// of <see cref="CustomScoreProvider" /> for the given <see cref="IndexReader" />.
 		/// </summary>
-        [Obsolete("Will be removed in Lucene 3.1.")]
+        [Obsolete("Will be removed in Lucene 3.1")]
 		public virtual Explanation CustomExplain(int doc, Explanation subQueryExpl, Explanation[] valSrcExpls)
 		{
 			if (valSrcExpls.Length == 1)

Modified: incubator/lucene.net/trunk/src/core/Search/IndexSearcher.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/IndexSearcher.cs?rev=1331615&r1=1331614&r2=1331615&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/IndexSearcher.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/IndexSearcher.cs Fri Apr 27 22:37:43 2012
@@ -60,7 +60,7 @@ namespace Lucene.Net.Search
 		/// <throws>CorruptIndexException if the index is corrupt</throws>
 		/// <throws>IOException if there is a low-level IO error</throws>
         public IndexSearcher(Directory path)
-            : this(IndexReader.Open(path), true)
+            : this(IndexReader.Open(path, true), true)
 		{
 		}
 		

Modified: incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs?rev=1331615&r1=1331614&r2=1331615&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs Fri Apr 27 22:37:43 2012
@@ -5533,7 +5533,7 @@ namespace Lucene.Net.Index
                 try
                 {
                     Document doc = new Document();
-                    IndexReader r = IndexReader.Open(dir);
+                    IndexReader r = IndexReader.Open(dir, true);
                     Field f = new Field("f", "", Field.Store.NO, Field.Index.NOT_ANALYZED);
                     doc.Add(f);
                     int count = 0;

Modified: incubator/lucene.net/trunk/test/core/Search/TestFieldCacheRangeFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestFieldCacheRangeFilter.cs?rev=1331615&r1=1331614&r2=1331615&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestFieldCacheRangeFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestFieldCacheRangeFilter.cs Fri Apr 27 22:37:43 2012
@@ -566,7 +566,7 @@ namespace Lucene.Net.Search
     writer.DeleteDocuments(new Term("id","0"));
     writer.Close();
 
-    IndexReader reader = IndexReader.Open(dir);
+    IndexReader reader = IndexReader.Open(dir, true);
     IndexSearcher Search = new IndexSearcher(reader);
     Assert.True(reader.HasDeletions);