-----Original Message-----
From: busc...@apache.org [mailto:busc...@apache.org]
Sent: Tuesday, October 13, 2009 9:00 AM
To: java-comm...@lucene.apache.org
Subject: svn commit: r824611 - in
/lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/luc
ene/search/spans: FieldMaskingSpanQuery.java SpanFirstQuery.java
SpanNearQuery.java SpanNotQuery.java SpanOrQuery.java
Author: buschmi
Date: Tue Oct 13 06:59:40 2009
New Revision: 824611
URL: http://svn.apache.org/viewvc?rev=824611&view=rev
Log:
More fixes that were accidentially left out in the previous commit
Modified:
lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/luce
ne/search/spans/FieldMaskingSpanQuery.java
lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/luce
ne/search/spans/SpanFirstQuery.java
lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/luce
ne/search/spans/SpanNearQuery.java
lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/luce
ne/search/spans/SpanNotQuery.java
lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/luce
ne/search/spans/SpanOrQuery.java
Modified:
lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/luce
ne/search/spans/FieldMaskingSpanQuery.java
URL:
http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9_back_compat_t
ests/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java?re
v=824611&r1=824610&r2=824611&view=diff
==========================================================================
====
---
lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/luce
ne/search/spans/FieldMaskingSpanQuery.java (original)
+++
lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/luce
ne/search/spans/FieldMaskingSpanQuery.java Tue Oct 13 06:59:40 2009
@@ -94,11 +94,6 @@
return maskedQuery.getSpans(reader);
}
- /** @deprecated use {...@link #extractTerms(Set)} instead. */
- public Collection getTerms() {
- return maskedQuery.getTerms();
- }
-
public void extractTerms(Set terms) {
maskedQuery.extractTerms(terms);
}
Modified:
lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/luce
ne/search/spans/SpanFirstQuery.java
URL:
http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9_back_compat_t
ests/src/java/org/apache/lucene/search/spans/SpanFirstQuery.java?rev=82461
1&r1=824610&r2=824611&view=diff
==========================================================================
====
---
lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/luce
ne/search/spans/SpanFirstQuery.java (original)
+++
lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/luce
ne/search/spans/SpanFirstQuery.java Tue Oct 13 06:59:40 2009
@@ -47,12 +47,6 @@
public String getField() { return match.getField(); }
- /** Returns a collection of all terms matched by this query.
- * @deprecated use extractTerms instead
- * @see #extractTerms(Set)
- */
- public Collection getTerms() { return match.getTerms(); }
-
public String toString(String field) {
StringBuffer buffer = new StringBuffer();
buffer.append("spanFirst(");
Modified:
lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/luce
ne/search/spans/SpanNearQuery.java
URL:
http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9_back_compat_t
ests/src/java/org/apache/lucene/search/spans/SpanNearQuery.java?rev=824611
&r1=824610&r2=824611&view=diff
==========================================================================
====
---
lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/luce
ne/search/spans/SpanNearQuery.java (original)
+++
lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/luce
ne/search/spans/SpanNearQuery.java Tue Oct 13 06:59:40 2009
@@ -80,20 +80,6 @@
public String getField() { return field; }
- /** Returns a collection of all terms matched by this query.
- * @deprecated use extractTerms instead
- * @see #extractTerms(Set)
- */
- public Collection getTerms() {
- Collection terms = new ArrayList();
- Iterator i = clauses.iterator();
- while (i.hasNext()) {
- SpanQuery clause = (SpanQuery)i.next();
- terms.addAll(clause.getTerms());
- }
- return terms;
- }
-
public void extractTerms(Set terms) {
Iterator i = clauses.iterator();
while (i.hasNext()) {
Modified:
lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/luce
ne/search/spans/SpanNotQuery.java
URL:
http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9_back_compat_t
ests/src/java/org/apache/lucene/search/spans/SpanNotQuery.java?rev=824611&
r1=824610&r2=824611&view=diff
==========================================================================
====
---
lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/luce
ne/search/spans/SpanNotQuery.java (original)
+++
lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/luce
ne/search/spans/SpanNotQuery.java Tue Oct 13 06:59:40 2009
@@ -49,12 +49,6 @@
public String getField() { return include.getField(); }
- /** Returns a collection of all terms matched by this query.
- * @deprecated use extractTerms instead
- * @see #extractTerms(Set)
- */
- public Collection getTerms() { return include.getTerms(); }
-
public void extractTerms(Set terms) {
include.extractTerms(terms); }
public String toString(String field) {
Modified:
lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/luce
ne/search/spans/SpanOrQuery.java
URL:
http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9_back_compat_t
ests/src/java/org/apache/lucene/search/spans/SpanOrQuery.java?rev=824611&r
1=824610&r2=824611&view=diff
==========================================================================
====
---
lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/luce
ne/search/spans/SpanOrQuery.java (original)
+++
lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/luce
ne/search/spans/SpanOrQuery.java Tue Oct 13 06:59:40 2009
@@ -58,20 +58,6 @@
public String getField() { return field; }
- /** Returns a collection of all terms matched by this query.
- * @deprecated use extractTerms instead
- * @see #extractTerms(Set)
- */
- public Collection getTerms() {
- Collection terms = new ArrayList();
- Iterator i = clauses.iterator();
- while (i.hasNext()) {
- SpanQuery clause = (SpanQuery)i.next();
- terms.addAll(clause.getTerms());
- }
- return terms;
- }
-
public void extractTerms(Set terms) {
Iterator i = clauses.iterator();
while (i.hasNext()) {