You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by di...@apache.org on 2009/12/13 14:38:02 UTC
svn commit: r890060 [2/2] - in /incubator/lucene.net/trunk/C#/src:
Lucene.Net/Analysis/ Lucene.Net/Analysis/Standard/ Lucene.Net/Document/
Lucene.Net/Index/ Lucene.Net/QueryParser/ Lucene.Net/Search/
Lucene.Net/Search/Function/ Lucene.Net/Search/Spans/...
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/TermScorer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/TermScorer.cs?rev=890060&r1=890059&r2=890060&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/TermScorer.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/TermScorer.cs Sun Dec 13 13:37:58 2009
@@ -67,6 +67,7 @@
/// <deprecated> use {@link #Score(Collector)} instead.
/// </deprecated>
+ [Obsolete("use Score(Collector) instead. ")]
public override void Score(HitCollector hc)
{
Score(new HitCollectorWrapper(hc));
@@ -79,6 +80,7 @@
/// <deprecated> use {@link #Score(Collector, int, int)} instead.
/// </deprecated>
+ [Obsolete("use Score(Collector, int, int) instead.")]
protected internal override bool Score(HitCollector c, int end)
{
return Score(new HitCollectorWrapper(c), end, doc);
@@ -114,6 +116,7 @@
/// <deprecated> use {@link #DocID()} instead.
/// </deprecated>
+ [Obsolete("use DocID() instead. ")]
public override int Doc()
{
return doc;
@@ -133,6 +136,7 @@
/// </returns>
/// <deprecated> use {@link #NextDoc()} instead.
/// </deprecated>
+ [Obsolete("use NextDoc() instead.")]
public override bool Next()
{
return NextDoc() != NO_MORE_DOCS;
@@ -185,6 +189,7 @@
/// </returns>
/// <deprecated> use {@link #Advance(int)} instead.
/// </deprecated>
+ [Obsolete("use Advance(int) instead.")]
public override bool SkipTo(int target)
{
return Advance(target) != NO_MORE_DOCS;
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/TimeLimitedCollector.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/TimeLimitedCollector.cs?rev=890060&r1=890059&r2=890060&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/TimeLimitedCollector.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/TimeLimitedCollector.cs Sun Dec 13 13:37:58 2009
@@ -30,6 +30,7 @@
/// <deprecated> Use {@link TimeLimitingCollector} instead, which extends the new
/// {@link Collector}. This class will be removed in 3.0.
/// </deprecated>
+ [Obsolete("Use TimeLimitingCollector instead, which extends the new Collector. This class will be removed in 3.0.")]
public class TimeLimitedCollector:HitCollector
{
private void InitBlock()
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/TopDocCollector.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/TopDocCollector.cs?rev=890060&r1=890059&r2=890060&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/TopDocCollector.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/TopDocCollector.cs Sun Dec 13 13:37:58 2009
@@ -56,6 +56,7 @@
/// <deprecated> use TopDocCollector(hq) instead. numHits is not used by this
/// constructor. It will be removed in a future release.
/// </deprecated>
+ [Obsolete("use TopDocCollector(hq) instead. numHits is not used by this constructor. It will be removed in a future release.")]
internal TopDocCollector(int numHits, PriorityQueue hq)
{
this.hq = hq;
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/FSDirectory.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Store/FSDirectory.cs?rev=890060&r1=890059&r2=890060&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/FSDirectory.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/FSDirectory.cs Sun Dec 13 13:37:58 2009
@@ -137,6 +137,7 @@
/// with {@link #open(File)} only the deprecated <code>getDirectory</code>
/// respect this setting.
/// </deprecated>
+ [Obsolete("Use a Open(File, LockFactory) or a constructor that takes a LockFactory and supply NoLockFactory.GetNoLockFactory. This setting does not work with Open(File) only the deprecated GetDirectory respect this setting.")]
public static void SetDisableLocks(bool doDisableLocks)
{
FSDirectory.disableLocks = doDisableLocks;
@@ -150,6 +151,7 @@
/// <deprecated> Use a constructor that takes a {@link LockFactory} and
/// supply {@link NoLockFactory#getNoLockFactory}.
/// </deprecated>
+ [Obsolete("Use a constructor that takes a LockFactory and supply NoLockFactory.GetNoLockFactory.")]
public static bool GetDisableLocks()
{
return FSDirectory.disableLocks;
@@ -190,6 +192,7 @@
/// </param>
/// <returns> the FSDirectory for the named file.
/// </returns>
+ [Obsolete("Use Open(File)")]
public static FSDirectory GetDirectory(System.String path)
{
return GetDirectory(new System.IO.DirectoryInfo(path), null);
@@ -208,6 +211,7 @@
/// </param>
/// <returns> the FSDirectory for the named file.
/// </returns>
+ [Obsolete("Use Open(File, LockFactory)")]
public static FSDirectory GetDirectory(System.String path, LockFactory lockFactory)
{
return GetDirectory(new System.IO.DirectoryInfo(path), lockFactory);
@@ -223,6 +227,7 @@
/// </param>
/// <returns> the FSDirectory for the named file.
/// </returns>
+ [Obsolete("Use Open(File)")]
public static FSDirectory GetDirectory(System.IO.DirectoryInfo file)
{
return GetDirectory(file, null);
@@ -276,6 +281,7 @@
/// </param>
/// <returns> the FSDirectory for the named file.
/// </returns>
+ [Obsolete("Use Open(File, LockFactory)")]
public static FSDirectory GetDirectory(System.IO.DirectoryInfo file, LockFactory lockFactory)
{
FSDirectory dir;
@@ -326,6 +332,7 @@
/// </param>
/// <returns> the FSDirectory for the named file.
/// </returns>
+ [Obsolete("Use IndexWriter's create flag, instead, to create a new index.")]
public static FSDirectory GetDirectory(System.String path, bool create)
{
return GetDirectory(new System.IO.DirectoryInfo(path), create);
@@ -363,6 +370,7 @@
/// </param>
/// <returns> the FSDirectory for the named file.
/// </returns>
+ [Obsolete("Use IndexWriter's create flag, instead, to create a new index.")]
public static FSDirectory GetDirectory(System.IO.DirectoryInfo file, bool create)
{
FSDirectory dir = GetDirectory(file, null);
@@ -989,6 +997,7 @@
/// <deprecated> Use SimpleFSDirectory.SimpleFSIndexInput instead
/// </deprecated>
+ [Obsolete("Use SimpleFSDirectory.SimpleFSIndexInput instead ")]
public /*protected internal*/ class FSIndexInput:SimpleFSDirectory.SimpleFSIndexInput
{
@@ -1018,6 +1027,7 @@
/// <deprecated> Use SimpleFSDirectory.SimpleFSIndexOutput instead
/// </deprecated>
+ [Obsolete("Use SimpleFSDirectory.SimpleFSIndexOutput instead ")]
protected internal class FSIndexOutput:SimpleFSDirectory.SimpleFSIndexOutput
{
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMDirectory.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Store/RAMDirectory.cs?rev=890060&r1=890059&r2=890060&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMDirectory.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMDirectory.cs Sun Dec 13 13:37:58 2009
@@ -82,6 +82,7 @@
/// </seealso>
/// <deprecated> Use {@link #RAMDirectory(Directory)} instead
/// </deprecated>
+ [Obsolete("Use RAMDirectory(Directory) instead")]
public RAMDirectory(System.IO.FileInfo dir):this(FSDirectory.GetDirectory(dir), true)
{
}
@@ -96,6 +97,7 @@
/// </seealso>
/// <deprecated> Use {@link #RAMDirectory(Directory)} instead
/// </deprecated>
+ [Obsolete("Use RAMDirectory(Directory) instead")]
public RAMDirectory(System.String dir):this(FSDirectory.GetDirectory(dir), true)
{
}
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/DocIdBitSet.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Util/DocIdBitSet.cs?rev=890060&r1=890059&r2=890060&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/DocIdBitSet.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/DocIdBitSet.cs Sun Dec 13 13:37:58 2009
@@ -64,6 +64,7 @@
/// <deprecated> use {@link #DocID()} instead.
/// </deprecated>
+ [Obsolete("use DocID() instead.")]
public override int Doc()
{
System.Diagnostics.Debug.Assert(docId != - 1);
@@ -77,6 +78,7 @@
/// <deprecated> use {@link #NextDoc()} instead.
/// </deprecated>
+ [Obsolete("use NextDoc() instead.")]
public override bool Next()
{
// (docId + 1) on next line requires -1 initial value for docNr:
@@ -94,6 +96,7 @@
/// <deprecated> use {@link #Advance(int)} instead.
/// </deprecated>
+ [Obsolete("use Advance(int) instead.")]
public override bool SkipTo(int skipDocNr)
{
return Advance(skipDocNr) != NO_MORE_DOCS;
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/OpenBitSetIterator.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Util/OpenBitSetIterator.cs?rev=890060&r1=890059&r2=890060&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/OpenBitSetIterator.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/OpenBitSetIterator.cs Sun Dec 13 13:37:58 2009
@@ -118,6 +118,7 @@
/// <deprecated> use {@link #NextDoc()} instead.
/// </deprecated>
+ [Obsolete("use NextDoc() instead.")]
public override bool Next()
{
return NextDoc() != NO_MORE_DOCS;
@@ -157,6 +158,7 @@
/// <deprecated> use {@link #Advance(int)} instead.
/// </deprecated>
+ [Obsolete("use Advance(int) instead.")]
public override bool SkipTo(int target)
{
return Advance(target) != NO_MORE_DOCS;
@@ -201,6 +203,7 @@
/// <deprecated> use {@link #DocID()} instead.
/// </deprecated>
+ [Obsolete("use DocID() instead.")]
public override int Doc()
{
return curDocId;
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/PriorityQueue.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Util/PriorityQueue.cs?rev=890060&r1=890059&r2=890060&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/PriorityQueue.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/PriorityQueue.cs Sun Dec 13 13:37:58 2009
@@ -117,6 +117,7 @@
/// <deprecated> use {@link #Add(Object)} which returns the new top object,
/// saving an additional call to {@link #Top()}.
/// </deprecated>
+ [Obsolete("use Add(Object) which returns the new top object, saving an additional call to Top().")]
public void Put(System.Object element)
{
size++;
@@ -150,6 +151,7 @@
/// <deprecated> use {@link #InsertWithOverflow(Object)} instead, which
/// encourages objects reuse.
/// </deprecated>
+ [Obsolete("use InsertWithOverflow(Object) instead, which encourages objects reuse.")]
public virtual bool Insert(System.Object element)
{
return InsertWithOverflow(element) != element;
@@ -231,6 +233,7 @@
/// <deprecated> use {@link #UpdateTop()} which returns the new top element and
/// saves an additional call to {@link #Top()}.
/// </deprecated>
+ [Obsolete("use UpdateTop() which returns the new top element and saves an additional call to Top()")]
public void AdjustTop()
{
DownHeap();
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/SortedVIntList.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Util/SortedVIntList.cs?rev=890060&r1=890059&r2=890060&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/SortedVIntList.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/SortedVIntList.cs Sun Dec 13 13:37:58 2009
@@ -72,6 +72,7 @@
/// <deprecated> use {@link #DocID()} instead.
/// </deprecated>
+ [Obsolete("use DocID() instead.")]
public override int Doc()
{
return lastInt;
@@ -84,6 +85,7 @@
/// <deprecated> use {@link #NextDoc()} instead.
/// </deprecated>
+ [Obsolete("use NextDoc() instead.")]
public override bool Next()
{
return NextDoc() != NO_MORE_DOCS;
@@ -105,6 +107,7 @@
/// <deprecated> use {@link #Advance(int)} instead.
/// </deprecated>
+ [Obsolete("use Advance(int) instead.")]
public override bool SkipTo(int docNr)
{
return Advance(docNr) != NO_MORE_DOCS;
Modified: incubator/lucene.net/trunk/C#/src/Test/Search/CheckHits.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/CheckHits.cs?rev=890060&r1=890059&r2=890060&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/CheckHits.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/CheckHits.cs Sun Dec 13 13:37:58 2009
@@ -458,6 +458,7 @@
}
/// <deprecated> use {@link #Search(Query, Collector)} instead.
/// </deprecated>
+ [Obsolete("use Search(Query, Collector) instead. ")]
public override void Search(Query query, HitCollector results)
{
Search(query, new HitCollectorWrapper(results));
@@ -469,6 +470,7 @@
}
/// <deprecated> use {@link #Search(Query, Filter, Collector)} instead.
/// </deprecated>
+ [Obsolete("use Search(Query, Filter, Collector) instead. ")]
public override void Search(Query query, Filter filter, HitCollector results)
{
Search(query, filter, new HitCollectorWrapper(results));
Modified: incubator/lucene.net/trunk/C#/src/Test/Search/TestDocIdSet.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/TestDocIdSet.cs?rev=890060&r1=890059&r2=890060&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/TestDocIdSet.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/TestDocIdSet.cs Sun Dec 13 13:37:58 2009
@@ -81,6 +81,7 @@
/// <deprecated> use {@link #NextDoc()} instead.
/// </deprecated>
+ [Obsolete("use NextDoc() instead. ")]
public override bool Next()
{
return NextDoc() != NO_MORE_DOCS;
@@ -95,6 +96,7 @@
/// <deprecated> use {@link #Advance(int)} instead.
/// </deprecated>
+ [Obsolete("use Advance(int) instead. ")]
public override bool SkipTo(int target)
{
return Advance(target) != NO_MORE_DOCS;
Modified: incubator/lucene.net/trunk/C#/src/Test/Search/TestPositiveScoresOnlyCollector.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/TestPositiveScoresOnlyCollector.cs?rev=890060&r1=890059&r2=890060&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/TestPositiveScoresOnlyCollector.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/TestPositiveScoresOnlyCollector.cs Sun Dec 13 13:37:58 2009
@@ -48,6 +48,7 @@
/// <deprecated> use {@link #DocID()} instead.
/// </deprecated>
+ [Obsolete("use DocID() instead.")]
public override int Doc()
{
return idx;
@@ -60,6 +61,7 @@
/// <deprecated> use {@link #NextDoc()} instead.
/// </deprecated>
+ [Obsolete("use NextDoc() instead.")]
public override bool Next()
{
return NextDoc() != NO_MORE_DOCS;
@@ -72,6 +74,7 @@
/// <deprecated> use {@link #Advance(int)} instead.
/// </deprecated>
+ [Obsolete("use Advance(int) instead.")]
public override bool SkipTo(int target)
{
return Advance(target) != NO_MORE_DOCS;
Modified: incubator/lucene.net/trunk/C#/src/Test/Search/TestScoreCachingWrappingScorer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/TestScoreCachingWrappingScorer.cs?rev=890060&r1=890059&r2=890060&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/TestScoreCachingWrappingScorer.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/TestScoreCachingWrappingScorer.cs Sun Dec 13 13:37:58 2009
@@ -54,6 +54,7 @@
/// <deprecated> use {@link #DocID()} instead.
/// </deprecated>
+ [Obsolete("use DocID() instead.")]
public override int Doc()
{
return doc;
@@ -66,6 +67,7 @@
/// <deprecated> use {@link #NextDoc()} instead.
/// </deprecated>
+ [Obsolete("use NextDoc() instead.")]
public override bool Next()
{
return NextDoc() != NO_MORE_DOCS;
@@ -78,6 +80,7 @@
/// <deprecated> use {@link #Advance(int)} instead.
/// </deprecated>
+ [Obsolete("use Advance(int) instead.")]
public override bool SkipTo(int target)
{
return Advance(target) != NO_MORE_DOCS;