From c607f48fefc677188847a1b1e8d9676c156cd330 Mon Sep 17 00:00:00 2001
From: Michael Busch <buschmi@apache.org>
Date: Tue, 11 Dec 2007 23:38:01 +0000
Subject: [PATCH] Revert Lucene-944

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@603415 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                   | 21 ++++++++-----------
 .../apache/lucene/search/BooleanQuery.java    | 14 +++++++++++++
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index a4dffb9ba6a..f14385371b9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -38,20 +38,17 @@ API Changes
     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)
- 
- 3. LUCENE-963: Add setters to Field to allow for re-using a single
+ 2. LUCENE-963: Add setters to Field to allow for re-using a single
     Field instance during indexing.  This is a sizable performance
     gain, especially for small documents.  (Mike McCandless)
 
- 4. LUCENE-969: Add new APIs to Token, TokenStream and Analyzer to
+ 3. LUCENE-969: Add new APIs to Token, TokenStream and Analyzer to
     permit re-using of Token and TokenStream instances during
     indexing.  Changed Token to use a char[] as the store for the
     termText instead of String.  This gives faster tokenization
     performance (~10-15%).  (Mike McCandless)
 
- 5. LUCENE-847: Factored MergePolicy, which determines which merges
+ 4. LUCENE-847: Factored MergePolicy, which determines which merges
     should take place and when, as well as MergeScheduler, which
     determines when the selected merges should actually run, out of
     IndexWriter.  The default merge policy is now
@@ -59,27 +56,27 @@ API Changes
     scheduler is now ConcurrentMergeScheduler (see
     LUCENE-870). (Steven Parkes via Mike McCandless)
 
- 6. LUCENE-1052: Add IndexReader.setTermInfosIndexDivisor(int) method
+ 5. LUCENE-1052: Add IndexReader.setTermInfosIndexDivisor(int) method
     that allows you to reduce memory usage of the termInfos by further
     sub-sampling (over the termIndexInterval that was used during
     indexing) which terms are loaded into memory.  (Chuck Williams,
     Doug Cutting via Mike McCandless)
     
- 7. LUCENE-743: Add IndexReader.reopen() method that re-opens an
+ 6. LUCENE-743: Add IndexReader.reopen() method that re-opens an
     existing IndexReader (see New features -> 9.) (Michael Busch)
 
- 8. LUCENE-1062: Add setData(byte[] data), 
+ 7. LUCENE-1062: Add setData(byte[] data), 
     setData(byte[] data, int offset, int length), getData(), getOffset()
     and clone() methods to o.a.l.index.Payload. Also add the field name 
     as arg to Similarity.scorePayload(). (Michael Busch)
 
- 9. LUCENE-982: Add IndexWriter.optimize(int maxNumSegments) method to
+ 8. LUCENE-982: Add IndexWriter.optimize(int maxNumSegments) method to
     "partially optimize" an index down to maxNumSegments segments.
     (Mike McCandless)
 
- 10. LUCENE-1080: Changed Token.DEFAULT_TYPE to be public.
+ 9. LUCENE-1080: Changed Token.DEFAULT_TYPE to be public.
 
- 11. LUCENE-1064: Changed TopDocs constructor to be public. 
+10. LUCENE-1064: Changed TopDocs constructor to be public. 
      (Shai Erera via Michael Busch)
 
     
diff --git a/src/java/org/apache/lucene/search/BooleanQuery.java b/src/java/org/apache/lucene/search/BooleanQuery.java
index 3332734dba0..3d5a89b05a8 100644
--- a/src/java/org/apache/lucene/search/BooleanQuery.java
+++ b/src/java/org/apache/lucene/search/BooleanQuery.java
@@ -343,6 +343,20 @@ public class BooleanQuery extends Query {
   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);