svn commit: r1061052 - in /lucene/dev/branches/branch_3x: ./ lucene/ lucene/CHANGES.txt lucene/src/java/org/apache/lucene/search/Query.java solr/

[rm...@apache.org]

Author: rmuir
Date: Wed Jan 19 23:07:03 2011
New Revision: 1061052

URL: http://svn.apache.org/viewvc?rev=1061052&view=rev
Log:
LUCENE-2869: deprecate Query.getSimilarity

Modified:
    lucene/dev/branches/branch_3x/   (props changed)
    lucene/dev/branches/branch_3x/lucene/   (props changed)
    lucene/dev/branches/branch_3x/lucene/CHANGES.txt
    lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/Query.java
    lucene/dev/branches/branch_3x/solr/   (props changed)

Modified: lucene/dev/branches/branch_3x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/CHANGES.txt?rev=1061052&r1=1061051&r2=1061052&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/lucene/CHANGES.txt Wed Jan 19 23:07:03 2011
@@ -86,6 +86,10 @@ Changes in backwards compatibility polic
   Similarity impls to cutover to the more general computeNorm (Robert
   Muir, Mike McCandless)
 
+* LUCENE-2869: Deprecated Query.getSimilarity: instead of using
+  "runtime" subclassing/delegation, subclass the Weight instead.
+  (Robert Muir)
+
 * LUCENE-2674: A new idfExplain method was added to Similarity, that
   accepts an incoming docFreq.  If you subclass Similarity, make sure
   you also override this method on upgrade.  (Robert Muir, Mike

Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/Query.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/Query.java?rev=1061052&r1=1061051&r2=1061052&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/Query.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/Query.java Wed Jan 19 23:07:03 2011
@@ -201,7 +201,10 @@ public abstract class Query implements j
   /** Expert: Returns the Similarity implementation to be used for this query.
    * Subclasses may override this method to specify their own Similarity
    * implementation, perhaps one that delegates through that of the Searcher.
-   * By default the Searcher's Similarity implementation is returned.*/
+   * By default the Searcher's Similarity implementation is returned.
+   * @deprecated Instead of using "runtime" subclassing/delegation, subclass the Weight instead.
+   */
+  @Deprecated
   public Similarity getSimilarity(Searcher searcher) {
     return searcher.getSimilarity();
   }