Mailing-List: contact java-commits-help@lucene.apache.org; run by ezmlm
Precedence: bulk
Reply-To: java-dev@lucene.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r555717 - in /lucene/java/trunk: CHANGES.txt
 src/java/org/apache/lucene/search/BooleanQuery.java
Date: Thu, 12 Jul 2007 18:41:41 -0000
To: java-commits@lucene.apache.org
From: buschmi@apache.org
Message-Id: <20070712184141.B36081A981A@eris.apache.org>

Author: buschmi
Date: Thu Jul 12 11:41:40 2007
New Revision: 555717

URL: http://svn.apache.org/viewvc?view=rev&rev=555717
Log:
LUCENE-944: Remove deprecated methods setUseScorer14() and getUseScorer14() from BooleanQuery. 

Modified:
    lucene/java/trunk/CHANGES.txt
    lucene/java/trunk/src/java/org/apache/lucene/search/BooleanQuery.java

Modified: lucene/java/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/trunk/CHANGES.txt?view=diff&rev=555717&r1=555716&r2=555717
==============================================================================
--- lucene/java/trunk/CHANGES.txt (original)
+++ lucene/java/trunk/CHANGES.txt Thu Jul 12 11:41:40 2007
@@ -14,6 +14,9 @@
     that allow one to set a char[] plus offset and length to specify a
     token (to avoid creating a new String() for each Token).  (Mike
     McCandless)
+
+ 2. LUCENE-944: Remove deprecated methods setUseScorer14() and
+    getUseScorer14() from BooleanQuery. (Paul Elschot via Michael Busch)
  
 Bug fixes
 

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/BooleanQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/BooleanQuery.java?view=diff&rev=555717&r1=555716&r2=555717
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/BooleanQuery.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/BooleanQuery.java Thu Jul 12 11:41:40 2007
@@ -119,7 +119,7 @@
    * <p>
    * By default no optional clauses are neccessary for a match
    * (unless there are no required clauses).  If this method is used,
-   * then the specified numebr of clauses is required.
+   * then the specified number of clauses is required.
    * </p>
    * <p>
    * Use of this method is totally independant of specifying that
@@ -127,12 +127,12 @@
    * only be compared against the number of matching optional clauses.
    * </p>
    * <p>
-   * EXPERT NOTE: Using this method will force the use of BooleanWeight2,
-   * regardless of wether setUseScorer14(true) has been called.
+   * EXPERT NOTE: Using this method may force collecting docs in order,
+   * regardless of wether setAllowDocsOutOfOrder(true) has been called.
    * </p>
    *
    * @param min the number of optional clauses that must match
-   * @see #setUseScorer14
+   * @see #setAllowDocsOutOfOrder
    */
   public void setMinimumNumberShouldMatch(int min) {
     this.minNrShouldMatch = min;
@@ -318,10 +318,10 @@
    * {@link HitCollector#collect(int,float)} might be
    * invoked first for docid N and only later for docid N-1.
    * Being static, this setting is system wide.
-   * If docs out of order are allowed scoring might be faster
-   * for certain queries (disjunction queries with less than
-   * 32 prohibited terms). This setting has no effect for 
-   * other queries.
+   * If collecting docs out of order is allowed, scoring might be faster
+   * for certain queries, for example disjunction queries with
+   * less than 32 prohibited clauses.
+   * This setting has no effect for other queries.
    */
   public static void setAllowDocsOutOfOrder(boolean allow) {
     allowDocsOutOfOrder = allow;
@@ -334,20 +334,6 @@
   public static boolean getAllowDocsOutOfOrder() {
     return allowDocsOutOfOrder;
   }  
-
-  /**
-   * @deprecated Use {@link #setAllowDocsOutOfOrder(boolean)} instead.
-   */
-  public static void setUseScorer14(boolean use14) {
-    setAllowDocsOutOfOrder(use14);
-  }
-  
-  /**
-   * @deprecated Use {@link #getAllowDocsOutOfOrder()} instead.
-   */
-  public static boolean getUseScorer14() {
-    return getAllowDocsOutOfOrder();
-  }
 
   protected Weight createWeight(Searcher searcher) throws IOException {
     return new BooleanWeight(searcher);