You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by ma...@apache.org on 2009/11/09 05:02:02 UTC
svn commit: r833968 [5/10] - in /lucene/java/branches/flex_1458: ./ contrib/
contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/
contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/
contrib/analyzers/common/src/java/org/apache/...
Modified: lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java (original)
+++ lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java Mon Nov 9 04:01:50 2009
@@ -58,6 +58,7 @@
/**
* @return always true.
*/
+ @Override
public boolean isOptimized() {
return true;
}
@@ -68,10 +69,12 @@
*
* @return output from {@link InstantiatedIndex#getVersion()} in associated instantiated index.
*/
+ @Override
public long getVersion() {
return index.getVersion();
}
+ @Override
public Directory directory() {
throw new UnsupportedOperationException();
}
@@ -93,6 +96,7 @@
* @throws IOException if there is a low-level IO error
* @throws UnsupportedOperationException unless overridden in subclass
*/
+ @Override
public boolean isCurrent() throws IOException {
return true;
}
@@ -115,22 +119,27 @@
}
}
+ @Override
public int numDocs() {
return getIndex().getDocumentsByNumber().length - index.getDeletedDocuments().size() - deletedDocuments.size();
}
+ @Override
public int maxDoc() {
return getIndex().getDocumentsByNumber().length;
}
+ @Override
public boolean isDeleted(int n) {
return getIndex().getDeletedDocuments().contains(n) || deletedDocumentNumbers.contains(n);
}
+ @Override
public boolean hasDeletions() {
return getIndex().getDeletedDocuments().size() > 0 || deletedDocumentNumbers.size() > 0;
}
+ @Override
protected void doDelete(int docNum) throws IOException {
if (!getIndex().getDeletedDocuments().contains(docNum)) {
if (deletedDocumentNumbers.add(docNum)) {
@@ -139,11 +148,13 @@
}
}
+ @Override
protected void doUndeleteAll() throws IOException {
deletedDocumentNumbers.clear();
deletedDocuments.clear();
}
+ @Override
protected void doCommit(Map commitUserData) throws IOException {
// todo: read/write lock
@@ -177,11 +188,13 @@
// todo unlock read/writelock
}
+ @Override
protected void doClose() throws IOException {
// ignored
// todo perhaps release all associated instances?
}
+ @Override
public Collection getFieldNames(FieldOption fieldOption) {
Set<String> fieldSet = new HashSet<String>();
for (FieldSetting fi : index.getFieldSettings().values()) {
@@ -245,6 +258,7 @@
* @see org.apache.lucene.document.SetBasedFieldSelector
* @see org.apache.lucene.document.LoadFirstFieldSelector
*/
+ @Override
public Document document(int n, FieldSelector fieldSelector) throws CorruptIndexException, IOException {
return document(n);
}
@@ -270,6 +284,7 @@
* @throws IOException if there is a low-level IO error
*/
+ @Override
public Document document(int n) throws IOException {
return isDeleted(n) ? null : getIndex().getDocumentsByNumber()[n].getDocument();
}
@@ -278,6 +293,7 @@
* never ever touch these values. it is the true values, unless norms have
* been touched.
*/
+ @Override
public byte[] norms(String field) throws IOException {
byte[] norms = getIndex().getNormsByFieldNameAndDocumentNumber().get(field);
if (norms == null) {
@@ -295,6 +311,7 @@
return norms;
}
+ @Override
public void norms(String field, byte[] bytes, int offset) throws IOException {
byte[] norms = getIndex().getNormsByFieldNameAndDocumentNumber().get(field);
if (norms == null) {
@@ -303,6 +320,7 @@
System.arraycopy(norms, 0, bytes, offset, norms.length);
}
+ @Override
protected void doSetNorm(int doc, String field, byte value) throws IOException {
if (updatedNormsByFieldNameAndDocumentNumber == null) {
updatedNormsByFieldNameAndDocumentNumber = new HashMap<String,List<NormUpdate>>(getIndex().getNormsByFieldNameAndDocumentNumber().size());
@@ -315,6 +333,7 @@
list.add(new NormUpdate(doc, value));
}
+ @Override
public int docFreq(Term t) throws IOException {
InstantiatedTerm term = getIndex().findTerm(t);
if (term == null) {
@@ -324,10 +343,12 @@
}
}
+ @Override
public TermEnum terms() throws IOException {
return new InstantiatedTermEnum(this);
}
+ @Override
public TermEnum terms(Term t) throws IOException {
InstantiatedTerm it = getIndex().findTerm(t);
if (it != null) {
@@ -341,14 +362,17 @@
}
}
+ @Override
public TermDocs termDocs() throws IOException {
return new InstantiatedTermDocs(this);
}
+ @Override
public TermPositions termPositions() throws IOException {
return new InstantiatedTermPositions(this);
}
+ @Override
public TermFreqVector[] getTermFreqVectors(int docNumber) throws IOException {
InstantiatedDocument doc = getIndex().getDocumentsByNumber()[docNumber];
if (doc.getVectorSpace() == null) {
@@ -362,6 +386,7 @@
return ret;
}
+ @Override
public TermFreqVector getTermFreqVector(int docNumber, String field) throws IOException {
InstantiatedDocument doc = getIndex().getDocumentsByNumber()[docNumber];
if (doc.getVectorSpace() == null || doc.getVectorSpace().get(field) == null) {
@@ -371,6 +396,7 @@
}
}
+ @Override
public void getTermFreqVector(int docNumber, String field, TermVectorMapper mapper) throws IOException {
InstantiatedDocument doc = getIndex().getDocumentsByNumber()[docNumber];
if (doc.getVectorSpace() != null && doc.getVectorSpace().get(field) == null) {
@@ -382,6 +408,7 @@
}
}
+ @Override
public void getTermFreqVector(int docNumber, TermVectorMapper mapper) throws IOException {
InstantiatedDocument doc = getIndex().getDocumentsByNumber()[docNumber];
for (Map.Entry<String,List<InstantiatedTermDocumentInformation>> e : doc.getVectorSpace().entrySet()) {
Modified: lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTerm.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTerm.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTerm.java (original)
+++ lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTerm.java Mon Nov 9 04:01:50 2009
@@ -235,6 +235,7 @@
return term.text();
}
+ @Override
public String toString() {
return term.toString();
}
Modified: lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermEnum.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermEnum.java (original)
+++ lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermEnum.java Mon Nov 9 04:01:50 2009
@@ -47,6 +47,7 @@
/**
* Increments the enumeration to the next element. True if one exists.
*/
+ @Override
public boolean next() {
if (reader.getIndex().getOrderedTerms().length <= nextTermIndex) {
return false;
@@ -60,6 +61,7 @@
/**
* Returns the current Term in the enumeration.
*/
+ @Override
public Term term() {
return term == null ? null : term.getTerm();
}
@@ -67,6 +69,7 @@
/**
* Returns the docFreq of the current Term in the enumeration.
*/
+ @Override
public int docFreq() {
return term.getAssociatedDocuments().length;
}
@@ -74,6 +77,7 @@
/**
* Closes the enumeration to further activity, freeing resources.
*/
+ @Override
public void close() {
}
Modified: lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermFreqVector.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermFreqVector.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermFreqVector.java (original)
+++ lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermFreqVector.java Mon Nov 9 04:01:50 2009
@@ -57,6 +57,7 @@
return field;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append('{');
Modified: lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java (original)
+++ lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java Mon Nov 9 04:01:50 2009
@@ -179,6 +179,7 @@
final AttributeImpl reusableToken = (AttributeImpl) addAttribute(TermAttribute.class);
Iterator<Token> it = tokens.iterator();
+ @Override
public final boolean incrementToken() throws IOException {
if (!it.hasNext()) {
return false;
@@ -188,6 +189,7 @@
return true;
}
+ @Override
public void reset() throws IOException {
it = tokens.iterator();
}
Modified: lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestRealTime.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestRealTime.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestRealTime.java (original)
+++ lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestRealTime.java Mon Nov 9 04:01:50 2009
@@ -64,9 +64,13 @@
public static class Collector extends org.apache.lucene.search.Collector {
private int hits = 0;
+ @Override
public void setScorer(Scorer scorer) {}
+ @Override
public void setNextReader(IndexReader reader, int docBase) {}
+ @Override
public boolean acceptsDocsOutOfOrder() { return true; }
+ @Override
public void collect(int doc) {
hits++;
}
Modified: lucene/java/branches/flex_1458/contrib/lucli/src/java/lucli/LuceneMethods.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/lucli/src/java/lucli/LuceneMethods.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/lucli/src/java/lucli/LuceneMethods.java (original)
+++ lucene/java/branches/flex_1458/contrib/lucli/src/java/lucli/LuceneMethods.java Mon Nov 9 04:01:50 2009
@@ -228,12 +228,16 @@
final static class CountingCollector extends Collector {
public int numHits = 0;
+ @Override
public void setScorer(Scorer scorer) throws IOException {}
+ @Override
public void collect(int doc) throws IOException {
numHits++;
}
+ @Override
public void setNextReader(IndexReader reader, int docBase) {}
+ @Override
public boolean acceptsDocsOutOfOrder() {
return true;
}
Modified: lucene/java/branches/flex_1458/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (original)
+++ lucene/java/branches/flex_1458/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java Mon Nov 9 04:01:50 2009
@@ -19,6 +19,7 @@
import java.io.IOException;
import java.io.Serializable;
+import java.io.StringReader;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -256,13 +257,9 @@
if (analyzer == null)
throw new IllegalArgumentException("analyzer must not be null");
- TokenStream stream;
- if (analyzer instanceof PatternAnalyzer) {
- stream = ((PatternAnalyzer) analyzer).tokenStream(fieldName, text);
- } else {
- stream = analyzer.tokenStream(fieldName,
- new PatternAnalyzer.FastStringReader(text));
- }
+ TokenStream stream = analyzer.tokenStream(fieldName,
+ new StringReader(text));
+
addField(fieldName, stream);
}
@@ -288,6 +285,7 @@
private TermAttribute termAtt = addAttribute(TermAttribute.class);
private OffsetAttribute offsetAtt = addAttribute(OffsetAttribute.class);
+ @Override
public boolean incrementToken() {
if (!iter.hasNext()) return false;
@@ -426,18 +424,22 @@
searcher.search(query, new Collector() {
private Scorer scorer;
+ @Override
public void collect(int doc) throws IOException {
scores[0] = scorer.score();
}
+ @Override
public void setScorer(Scorer scorer) throws IOException {
this.scorer = scorer;
}
+ @Override
public boolean acceptsDocsOutOfOrder() {
return true;
}
+ @Override
public void setNextReader(IndexReader reader, int docBase) { }
});
float score = scores[0];
@@ -525,6 +527,7 @@
*
* @return the string representation
*/
+ @Override
public String toString() {
StringBuilder result = new StringBuilder(256);
sortFields();
@@ -738,9 +741,6 @@
super(); // avoid as much superclass baggage as possible
}
- // lucene >= 1.9 or lucene-1.4.3 with patch removing "final" in superclass
- protected void finalize() {}
-
private Info getInfo(String fieldName) {
return fields.get(fieldName);
}
@@ -753,6 +753,7 @@
return null;
}
+ @Override
public int docFreq(Term term) {
Info info = getInfo(term.field());
int freq = 0;
@@ -963,11 +964,13 @@
return memoryFields;
}
+ @Override
public TermEnum terms() {
if (DEBUG) System.err.println("MemoryIndexReader.terms()");
return terms(MATCH_ALL_TERM);
}
+ @Override
public TermEnum terms(Term term) {
if (DEBUG) System.err.println("MemoryIndexReader.terms: " + term);
@@ -1006,6 +1009,7 @@
private int i = ix; // index into info.sortedTerms
private int j = jx; // index into sortedFields
+ @Override
public boolean next() {
if (DEBUG) System.err.println("TermEnum.next");
if (j >= sortedFields.length) return false;
@@ -1020,6 +1024,7 @@
return true;
}
+ @Override
public Term term() {
if (DEBUG) System.err.println("TermEnum.term: " + i);
if (j >= sortedFields.length) return null;
@@ -1029,6 +1034,7 @@
return createTerm(info, j, info.sortedTerms[i].getKey());
}
+ @Override
public int docFreq() {
if (DEBUG) System.err.println("TermEnum.docFreq");
if (j >= sortedFields.length) return 0;
@@ -1037,6 +1043,7 @@
return numPositions(info.getPositions(i));
}
+ @Override
public void close() {
if (DEBUG) System.err.println("TermEnum.close");
}
@@ -1057,6 +1064,7 @@
};
}
+ @Override
public TermPositions termPositions() {
if (DEBUG) System.err.println("MemoryIndexReader.termPositions");
@@ -1152,11 +1160,13 @@
};
}
+ @Override
public TermDocs termDocs() {
if (DEBUG) System.err.println("MemoryIndexReader.termDocs");
return termPositions();
}
+ @Override
public TermFreqVector[] getTermFreqVectors(int docNumber) {
if (DEBUG) System.err.println("MemoryIndexReader.getTermFreqVectors");
TermFreqVector[] vectors = new TermFreqVector[fields.size()];
@@ -1168,6 +1178,7 @@
return vectors;
}
+ @Override
public void getTermFreqVector(int docNumber, TermVectorMapper mapper) throws IOException
{
if (DEBUG) System.err.println("MemoryIndexReader.getTermFreqVectors");
@@ -1179,6 +1190,7 @@
}
}
+ @Override
public void getTermFreqVector(int docNumber, String field, TermVectorMapper mapper) throws IOException
{
if (DEBUG) System.err.println("MemoryIndexReader.getTermFreqVector");
@@ -1206,6 +1218,7 @@
}
}
+ @Override
public TermFreqVector getTermFreqVector(int docNumber, final String fieldName) {
if (DEBUG) System.err.println("MemoryIndexReader.getTermFreqVector");
final Info info = getInfo(fieldName);
@@ -1292,6 +1305,7 @@
private String cachedFieldName;
private Similarity cachedSimilarity;
+ @Override
public byte[] norms(String fieldName) {
byte[] norms = cachedNorms;
Similarity sim = getSimilarity();
@@ -1314,64 +1328,77 @@
return norms;
}
+ @Override
public void norms(String fieldName, byte[] bytes, int offset) {
if (DEBUG) System.err.println("MemoryIndexReader.norms*: " + fieldName);
byte[] norms = norms(fieldName);
System.arraycopy(norms, 0, bytes, offset, norms.length);
}
+ @Override
protected void doSetNorm(int doc, String fieldName, byte value) {
throw new UnsupportedOperationException();
}
+ @Override
public int numDocs() {
if (DEBUG) System.err.println("MemoryIndexReader.numDocs");
return fields.size() > 0 ? 1 : 0;
}
+ @Override
public int maxDoc() {
if (DEBUG) System.err.println("MemoryIndexReader.maxDoc");
return 1;
}
+ @Override
public Document document(int n) {
if (DEBUG) System.err.println("MemoryIndexReader.document");
return new Document(); // there are no stored fields
}
//When we convert to JDK 1.5 make this Set<String>
+ @Override
public Document document(int n, FieldSelector fieldSelector) throws IOException {
if (DEBUG) System.err.println("MemoryIndexReader.document");
return new Document(); // there are no stored fields
}
+ @Override
public boolean isDeleted(int n) {
if (DEBUG) System.err.println("MemoryIndexReader.isDeleted");
return false;
}
+ @Override
public boolean hasDeletions() {
if (DEBUG) System.err.println("MemoryIndexReader.hasDeletions");
return false;
}
+ @Override
protected void doDelete(int docNum) {
throw new UnsupportedOperationException();
}
+ @Override
protected void doUndeleteAll() {
throw new UnsupportedOperationException();
}
+ @Override
protected void doCommit(Map<String,String> commitUserData) {
if (DEBUG) System.err.println("MemoryIndexReader.doCommit");
}
+ @Override
protected void doClose() {
if (DEBUG) System.err.println("MemoryIndexReader.doClose");
}
// lucene >= 1.9 (remove this method for lucene-1.4.3)
+ @Override
public Collection<String> getFieldNames(FieldOption fieldOption) {
if (DEBUG) System.err.println("MemoryIndexReader.getFieldNamesOption");
if (fieldOption == FieldOption.UNINDEXED)
@@ -1411,20 +1438,8 @@
* Object header of any heap allocated Java object.
* ptr to class, info for monitor, gc, hash, etc.
*/
-// private static final int OBJECT_HEADER = 2*4; // even on 64 bit VMs?
private static final int OBJECT_HEADER = 2*PTR;
- /**
- * Modern VMs tend to trade space for time, allocating memory on word
- * boundaries. For example, on a 64 bit VM, the variables of a class with
- * one 32 bit integer and one Java char really consume 8 bytes instead of 6
- * bytes. 2 bytes are spent on padding. Similary, on a 64 bit VM a
- * java.lang.Integer consumes OBJECT_HEADER + 8 bytes rather than
- * OBJECT_HEADER + 4 bytes.
- */
- private static final boolean IS_WORD_ALIGNED_VM = true;
-
-
private VM() {} // not instantiable
// assumes n > 0
@@ -1433,10 +1448,7 @@
// 1..8 --> 1*PTR
// 9..16 --> 2*PTR
private static int sizeOf(int n) {
- return IS_WORD_ALIGNED_VM ?
-// ((n-1)/PTR + 1) * PTR : // slow version
- (((n-1) >> LOG_PTR) + 1) << LOG_PTR : // fast version
- n;
+ return (((n-1) >> LOG_PTR) + 1) << LOG_PTR;
}
public static int sizeOfObject(int n) {
Modified: lucene/java/branches/flex_1458/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (original)
+++ lucene/java/branches/flex_1458/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java Mon Nov 9 04:01:50 2009
@@ -215,6 +215,7 @@
/* all files will be open relative to this */
public String fileDir;
+ @Override
protected void setUp() throws Exception {
super.setUp();
fileDir = System.getProperty("lucene.common.dir", null);
@@ -279,7 +280,6 @@
new SimpleAnalyzer(),
new StopAnalyzer(Version.LUCENE_CURRENT),
new StandardAnalyzer(org.apache.lucene.util.Version.LUCENE_CURRENT),
- PatternAnalyzer.DEFAULT_ANALYZER,
// new WhitespaceAnalyzer(),
// new PatternAnalyzer(PatternAnalyzer.NON_WORD_PATTERN, false, null),
// new PatternAnalyzer(PatternAnalyzer.NON_WORD_PATTERN, true, stopWords),
@@ -430,18 +430,22 @@
searcher.search(query, new Collector() {
private Scorer scorer;
+ @Override
public void collect(int doc) throws IOException {
scores[0] = scorer.score();
}
+ @Override
public void setScorer(Scorer scorer) throws IOException {
this.scorer = scorer;
}
+ @Override
public boolean acceptsDocsOutOfOrder() {
return true;
}
+ @Override
public void setNextReader(IndexReader reader, int docBase) { }
});
float score = scores[0];
Modified: lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java (original)
+++ lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java Mon Nov 9 04:01:50 2009
@@ -55,6 +55,7 @@
}
}
+ @Override
protected long size(SegmentInfo info) throws IOException {
long byteSize = info.sizeInBytes();
float delRatio = (info.docCount <= 0 ? 0.0f : ((float)info.getDelCount() / (float)info.docCount));
Modified: lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/index/TermVectorAccessor.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/index/TermVectorAccessor.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/index/TermVectorAccessor.java (original)
+++ lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/index/TermVectorAccessor.java Mon Nov 9 04:01:50 2009
@@ -149,25 +149,30 @@
private TermVectorMapper decorated;
+ @Override
public boolean isIgnoringPositions() {
return decorated.isIgnoringPositions();
}
+ @Override
public boolean isIgnoringOffsets() {
return decorated.isIgnoringOffsets();
}
private boolean termVectorStored = false;
+ @Override
public void setExpectations(String field, int numTerms, boolean storeOffsets, boolean storePositions) {
decorated.setExpectations(field, numTerms, storeOffsets, storePositions);
termVectorStored = true;
}
+ @Override
public void map(String term, int frequency, TermVectorOffsetInfo[] offsets, int[] positions) {
decorated.map(term, frequency, offsets, positions);
}
+ @Override
public void setDocumentNumber(int documentNumber) {
decorated.setDocumentNumber(documentNumber);
}
Modified: lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/misc/ChainedFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/misc/ChainedFilter.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/misc/ChainedFilter.java (original)
+++ lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/misc/ChainedFilter.java Mon Nov 9 04:01:50 2009
@@ -96,6 +96,7 @@
/**
* {@link Filter#getDocIdSet}.
*/
+ @Override
public DocIdSet getDocIdSet(IndexReader reader) throws IOException
{
int[] index = new int[1]; // use array as reference to modifiable int;
@@ -199,6 +200,7 @@
return finalResult(result, reader.maxDoc());
}
+ @Override
public String toString()
{
StringBuilder sb = new StringBuilder();
Modified: lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java (original)
+++ lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java Mon Nov 9 04:01:50 2009
@@ -116,6 +116,7 @@
TermInfoQueue(int size) {
initialize(size);
}
+ @Override
protected final boolean lessThan(TermInfo termInfoA, TermInfo termInfoB) {
return termInfoA.docFreq < termInfoB.docFreq;
}
Modified: lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/misc/SweetSpotSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/misc/SweetSpotSimilarity.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/misc/SweetSpotSimilarity.java (original)
+++ lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/misc/SweetSpotSimilarity.java Mon Nov 9 04:01:50 2009
@@ -134,6 +134,7 @@
* numTokens does not count overlap tokens if
* discountOverlaps is true by default or true for this
* specific field. */
+ @Override
public float computeNorm(String fieldName, FieldInvertState state) {
final int numTokens;
boolean overlaps = discountOverlaps;
@@ -166,6 +167,7 @@
*
* @see #setLengthNormFactors
*/
+ @Override
public float lengthNorm(String fieldName, int numTerms) {
int l = ln_min;
int h = ln_max;
@@ -199,6 +201,7 @@
*
* @see #baselineTf
*/
+ @Override
public float tf(int freq) {
return baselineTf(freq);
}
Modified: lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java (original)
+++ lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java Mon Nov 9 04:01:50 2009
@@ -74,6 +74,7 @@
* @return Resulting {@link Query} built for the term
* @throws ParseException
*/
+ @Override
protected Query getWildcardQuery(String field, String termStr) throws ParseException {
List<String> tlist = new ArrayList<String>();
List<String> wlist = new ArrayList<String>();
@@ -184,6 +185,7 @@
* @return Resulting {@link Query} built for the term
* @throws ParseException
*/
+ @Override
protected Query getPrefixQuery(String field, String termStr) throws ParseException {
// get Analyzer from superclass and tokenize the term
TokenStream source = getAnalyzer().tokenStream(field, new StringReader(termStr));
@@ -230,6 +232,7 @@
* @return Resulting {@link Query} built for the term
* @exception ParseException
*/
+ @Override
protected Query getFuzzyQuery(String field, String termStr, float minSimilarity)
throws ParseException {
// get Analyzer from superclass and tokenize the term
@@ -265,6 +268,7 @@
* Overrides super class, by passing terms through analyzer.
* @exception ParseException
*/
+ @Override
protected Query getRangeQuery(String field, String part1, String part2, boolean inclusive)
throws ParseException {
// get Analyzer from superclass and tokenize the terms
Modified: lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java (original)
+++ lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java Mon Nov 9 04:01:50 2009
@@ -72,6 +72,7 @@
super(matchVersion, f, a);
}
+ @Override
protected Query getFieldQuery(String field, String queryText, int slop) {
ComplexPhraseQuery cpq = new ComplexPhraseQuery(field, queryText, slop);
complexPhrases.add(cpq); // add to list of phrases to be parsed once
@@ -80,6 +81,7 @@
return cpq;
}
+ @Override
public Query parse(String query) throws ParseException {
if (isPass2ResolvingPhrases) {
MultiTermQuery.RewriteMethod oldMethod = getMultiTermRewriteMethod();
@@ -126,6 +128,7 @@
// unfortunately need
// to throw a runtime exception here if a term for another field is embedded
// in phrase query
+ @Override
protected Query newTermQuery(Term term) {
if (isPass2ResolvingPhrases) {
try {
@@ -147,6 +150,7 @@
}
}
+ @Override
protected Query getWildcardQuery(String field, String termStr)
throws ParseException {
if (isPass2ResolvingPhrases) {
@@ -155,6 +159,7 @@
return super.getWildcardQuery(field, termStr);
}
+ @Override
protected Query getRangeQuery(String field, String part1, String part2,
boolean inclusive) throws ParseException {
if (isPass2ResolvingPhrases) {
@@ -163,6 +168,7 @@
return super.getRangeQuery(field, part1, part2, inclusive);
}
+ @Override
protected Query newRangeQuery(String field, String part1, String part2,
boolean inclusive) {
if (isPass2ResolvingPhrases) {
@@ -176,6 +182,7 @@
return super.newRangeQuery(field, part1, part2, inclusive);
}
+ @Override
protected Query getFuzzyQuery(String field, String termStr,
float minSimilarity) throws ParseException {
if (isPass2ResolvingPhrases) {
@@ -218,6 +225,7 @@
contents = qp.parse(phrasedQueryStringContents);
}
+ @Override
public Query rewrite(IndexReader reader) throws IOException {
// ArrayList spanClauses = new ArrayList();
if (contents instanceof TermQuery) {
@@ -348,10 +356,12 @@
}
}
+ @Override
public String toString(String field) {
return "\"" + phrasedQueryStringContents + "\"";
}
+ @Override
public int hashCode() {
final int prime = 31;
int result = 1;
@@ -364,6 +374,7 @@
return result;
}
+ @Override
public boolean equals(Object obj) {
if (this == obj)
return true;
Modified: lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java (original)
+++ lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java Mon Nov 9 04:01:50 2009
@@ -53,11 +53,13 @@
/** inverts the normal notion of lengthNorm */
public static Similarity s = new DefaultSimilarity() {
+ @Override
public float lengthNorm(String fieldName, int numTokens) {
return numTokens;
}
};
+ @Override
public void setUp() throws Exception {
IndexWriter writer = new IndexWriter(store, new SimpleAnalyzer(), true, MaxFieldLength.UNLIMITED);
@@ -125,15 +127,19 @@
private int docBase = 0;
private Scorer scorer;
+ @Override
public final void collect(int doc) throws IOException {
scores[doc + docBase] = scorer.score();
}
+ @Override
public void setNextReader(IndexReader reader, int docBase) {
this.docBase = docBase;
}
+ @Override
public void setScorer(Scorer scorer) throws IOException {
this.scorer = scorer;
}
+ @Override
public boolean acceptsDocsOutOfOrder() {
return true;
}
@@ -156,15 +162,19 @@
searcher.search(new TermQuery(new Term("field", "word")), new Collector() {
private int docBase = 0;
private Scorer scorer;
+ @Override
public final void collect(int doc) throws IOException {
scores[doc + docBase] = scorer.score();
}
+ @Override
public void setNextReader(IndexReader reader, int docBase) {
this.docBase = docBase;
}
+ @Override
public void setScorer(Scorer scorer) throws IOException {
this.scorer = scorer;
}
+ @Override
public boolean acceptsDocsOutOfOrder() {
return true;
}
@@ -204,15 +214,19 @@
searcher.search(new TermQuery(new Term("untokfield", "20061212")), new Collector() {
private int docBase = 0;
private Scorer scorer;
+ @Override
public final void collect(int doc) throws IOException {
scores[doc + docBase] = scorer.score();
}
+ @Override
public void setNextReader(IndexReader reader, int docBase) {
this.docBase = docBase;
}
+ @Override
public void setScorer(Scorer scorer) throws IOException {
this.scorer = scorer;
}
+ @Override
public boolean acceptsDocsOutOfOrder() {
return true;
}
Modified: lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java (original)
+++ lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java Mon Nov 9 04:01:50 2009
@@ -29,6 +29,7 @@
IndexReader input;
int NUM_DOCS = 11;
+ @Override
public void setUp() throws Exception {
RAMDirectory dir = new RAMDirectory();
IndexWriter w = new IndexWriter(dir, new WhitespaceAnalyzer(), true,
Modified: lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/misc/ChainedFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/misc/ChainedFilterTest.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/misc/ChainedFilterTest.java (original)
+++ lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/misc/ChainedFilterTest.java Mon Nov 9 04:01:50 2009
@@ -54,6 +54,7 @@
private QueryWrapperFilter bobFilter;
private QueryWrapperFilter sueFilter;
+ @Override
public void setUp() throws Exception {
directory = new RAMDirectory();
IndexWriter writer =
Modified: lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/misc/SweetSpotSimilarityTest.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/misc/SweetSpotSimilarityTest.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/misc/SweetSpotSimilarityTest.java (original)
+++ lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/misc/SweetSpotSimilarityTest.java Mon Nov 9 04:01:50 2009
@@ -182,6 +182,7 @@
public void testHyperbolicSweetSpot() {
SweetSpotSimilarity ss = new SweetSpotSimilarity() {
+ @Override
public float tf(int freq) {
return hyperbolicTf(freq);
}
Modified: lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java (original)
+++ lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java Mon Nov 9 04:01:50 2009
@@ -56,11 +56,13 @@
/** inverts the normal notion of lengthNorm */
public static Similarity s = new DefaultSimilarity() {
+ @Override
public float lengthNorm(String fieldName, int numTokens) {
return numTokens;
}
};
+ @Override
public void setUp() throws Exception {
IndexWriter writer = new IndexWriter(store, new SimpleAnalyzer(), true, MaxFieldLength.UNLIMITED);
@@ -132,15 +134,19 @@
searcher.search(new TermQuery(new Term("field", "word")), new Collector() {
private int docBase = 0;
private Scorer scorer;
+ @Override
public final void collect(int doc) throws IOException {
scores[doc + docBase] = scorer.score();
}
+ @Override
public void setNextReader(IndexReader reader, int docBase) {
this.docBase = docBase;
}
+ @Override
public void setScorer(Scorer scorer) throws IOException {
this.scorer = scorer;
}
+ @Override
public boolean acceptsDocsOutOfOrder() {
return true;
}
@@ -157,6 +163,7 @@
// override the norms to be inverted
Similarity s = new DefaultSimilarity() {
+ @Override
public float lengthNorm(String fieldName, int numTokens) {
return numTokens;
}
@@ -169,15 +176,19 @@
searcher.search(new TermQuery(new Term("field", "word")), new Collector() {
private int docBase = 0;
private Scorer scorer;
+ @Override
public final void collect(int doc) throws IOException {
scores[doc + docBase] = scorer.score();
}
+ @Override
public void setNextReader(IndexReader reader, int docBase) {
this.docBase = docBase;
}
+ @Override
public void setScorer(Scorer scorer) throws IOException {
this.scorer = scorer;
}
+ @Override
public boolean acceptsDocsOutOfOrder() {
return true;
}
Modified: lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/queryParser/analyzing/TestAnalyzingQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/queryParser/analyzing/TestAnalyzingQueryParser.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/queryParser/analyzing/TestAnalyzingQueryParser.java (original)
+++ lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/queryParser/analyzing/TestAnalyzingQueryParser.java Mon Nov 9 04:01:50 2009
@@ -46,6 +46,7 @@
private String[] fuzzyInput;
private String[] fuzzyExpected;
+ @Override
public void setUp() {
wildcardInput = new String[] { "übersetzung über*ung",
"Mötley Cr\u00fce Mötl?* Crü?", "Renée Zellweger Ren?? Zellw?ger" };
@@ -109,6 +110,7 @@
public ASCIIAnalyzer() {
}
+ @Override
public TokenStream tokenStream(String fieldName, Reader reader) {
TokenStream result = new StandardTokenizer(Version.LUCENE_CURRENT, reader);
result = new StandardFilter(result);
Modified: lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java (original)
+++ lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java Mon Nov 9 04:01:50 2009
@@ -111,6 +111,7 @@
}
+ @Override
protected void setUp() throws Exception {
RAMDirectory rd = new RAMDirectory();
IndexWriter w = new IndexWriter(rd, analyzer, MaxFieldLength.UNLIMITED);
@@ -126,6 +127,7 @@
searcher = new IndexSearcher(rd, true);
}
+ @Override
protected void tearDown() throws Exception {
searcher.close();
}
Modified: lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java (original)
+++ lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java Mon Nov 9 04:01:50 2009
@@ -71,6 +71,7 @@
TermAttribute termAtt = addAttribute(TermAttribute.class);
OffsetAttribute offsetAtt = addAttribute(OffsetAttribute.class);
+ @Override
public boolean incrementToken() throws IOException {
if (inPhrase) {
inPhrase = false;
@@ -95,6 +96,7 @@
public static class QPTestAnalyzer extends Analyzer {
/** Filters LowerCaseTokenizer with StopFilter. */
+ @Override
public final TokenStream tokenStream(String fieldName, Reader reader) {
return new QPTestFilter(new LowerCaseTokenizer(reader));
}
@@ -105,10 +107,12 @@
super(f, a);
}
+ @Override
protected Query getFuzzyQuery(String field, String termStr, float minSimilarity) throws ParseException {
throw new ParseException("Fuzzy queries not allowed");
}
+ @Override
protected Query getWildcardQuery(String field, String termStr) throws ParseException {
throw new ParseException("Wildcard queries not allowed");
}
@@ -116,6 +120,7 @@
private int originalMaxClauses;
+ @Override
public void setUp() throws Exception {
super.setUp();
originalMaxClauses = BooleanQuery.getMaxClauseCount();
@@ -593,6 +598,7 @@
}
+ @Override
public void tearDown() {
BooleanQuery.setMaxClauseCount(originalMaxClauses);
}
Modified: lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/BooleanFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/BooleanFilter.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/BooleanFilter.java (original)
+++ lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/BooleanFilter.java Mon Nov 9 04:01:50 2009
@@ -52,6 +52,7 @@
* Returns the a DocIdSetIterator representing the Boolean composition
* of the filters that have been added.
*/
+ @Override
public DocIdSet getDocIdSet(IndexReader reader) throws IOException
{
OpenBitSetDISI res = null;
@@ -156,6 +157,7 @@
((filters1 != null) && filters1.equals(filters2));
}
+ @Override
public boolean equals(Object obj)
{
if (this == obj)
@@ -170,6 +172,7 @@
&& equalFilters(shouldFilters, other.shouldFilters);
}
+ @Override
public int hashCode()
{
int hash=7;
@@ -180,6 +183,7 @@
}
/** Prints a user-readable version of this query. */
+ @Override
public String toString()
{
StringBuilder buffer = new StringBuilder();
Modified: lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/BoostingQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/BoostingQuery.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/BoostingQuery.java (original)
+++ lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/BoostingQuery.java Mon Nov 9 04:01:50 2009
@@ -53,12 +53,15 @@
this.context.setBoost(0.0f); // ignore context-only matches
}
+ @Override
public Query rewrite(IndexReader reader) throws IOException {
BooleanQuery result = new BooleanQuery() {
+ @Override
public Similarity getSimilarity(Searcher searcher) {
return new DefaultSimilarity() {
+ @Override
public float coord(int overlap, int max) {
switch (overlap) {
@@ -83,6 +86,7 @@
return result;
}
+ @Override
public int hashCode() {
final int prime = 31;
int result = 1;
@@ -92,6 +96,7 @@
return result;
}
+ @Override
public boolean equals(Object obj) {
if (this == obj)
return true;
@@ -115,6 +120,7 @@
return true;
}
+ @Override
public String toString(String field) {
return match.toString(field) + "/" + context.toString(field);
}
Modified: lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/DuplicateFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/DuplicateFilter.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/DuplicateFilter.java (original)
+++ lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/DuplicateFilter.java Mon Nov 9 04:01:50 2009
@@ -70,6 +70,7 @@
this.processingMode = processingMode;
}
+ @Override
public DocIdSet getDocIdSet(IndexReader reader) throws IOException
{
if(processingMode==PM_FAST_INVALIDATION)
@@ -186,6 +187,7 @@
}
+ @Override
public boolean equals(Object obj)
{
if(this == obj)
@@ -200,6 +202,7 @@
+ @Override
public int hashCode()
{
int hash = 217;
Modified: lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/FuzzyLikeThisQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/FuzzyLikeThisQuery.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/FuzzyLikeThisQuery.java (original)
+++ lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/FuzzyLikeThisQuery.java Mon Nov 9 04:01:50 2009
@@ -59,6 +59,7 @@
boolean ignoreTF=false;
private int maxNumTerms;
+ @Override
public int hashCode() {
final int prime = 31;
int result = 1;
@@ -70,6 +71,7 @@
return result;
}
+ @Override
public boolean equals(Object obj) {
if (this == obj)
return true;
@@ -122,6 +124,7 @@
this.queryString = queryString;
}
+ @Override
public int hashCode() {
final int prime = 31;
int result = 1;
@@ -134,6 +137,7 @@
return result;
}
+ @Override
public boolean equals(Object obj) {
if (this == obj)
return true;
@@ -239,6 +243,7 @@
}
}
+ @Override
public Query rewrite(IndexReader reader) throws IOException
{
if(rewrittenQuery!=null)
@@ -329,6 +334,7 @@
/* (non-Javadoc)
* @see org.apache.lucene.util.PriorityQueue#lessThan(java.lang.Object, java.lang.Object)
*/
+ @Override
protected boolean lessThan(ScoreTerm termA, ScoreTerm termB) {
if (termA.score== termB.score)
return termA.term.compareTo(termB.term) > 0;
@@ -347,11 +353,13 @@
super(t);
this.ignoreTF=ignoreTF;
}
+ @Override
public Similarity getSimilarity(Searcher searcher)
{
Similarity result = super.getSimilarity(searcher);
result = new SimilarityDelegator(result) {
+ @Override
public float tf(float freq)
{
if(ignoreTF)
@@ -360,6 +368,7 @@
}
return super.tf(freq);
}
+ @Override
public float idf(int docFreq, int numDocs)
{
//IDF is already factored into individual term boosts
@@ -375,6 +384,7 @@
/* (non-Javadoc)
* @see org.apache.lucene.search.Query#toString(java.lang.String)
*/
+ @Override
public String toString(String field)
{
return null;
Modified: lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/TermsFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/TermsFilter.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/TermsFilter.java (original)
+++ lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/TermsFilter.java Mon Nov 9 04:01:50 2009
@@ -52,6 +52,7 @@
/* (non-Javadoc)
* @see org.apache.lucene.search.Filter#getDocIdSet(org.apache.lucene.index.IndexReader)
*/
+ @Override
public DocIdSet getDocIdSet(IndexReader reader) throws IOException
{
OpenBitSet result=new OpenBitSet(reader.maxDoc());
@@ -75,6 +76,7 @@
return result;
}
+ @Override
public boolean equals(Object obj)
{
if(this == obj)
@@ -86,6 +88,7 @@
(terms != null && terms.equals(test.terms)));
}
+ @Override
public int hashCode()
{
int hash=9;
Modified: lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThis.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThis.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThis.java (original)
+++ lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThis.java Mon Nov 9 04:01:50 2009
@@ -1015,6 +1015,7 @@
initialize(s);
}
+ @Override
protected boolean lessThan(Object[] aa, Object[] bb) {
Float fa = (Float) aa[2];
Float fb = (Float) bb[2];
Modified: lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThisQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThisQuery.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThisQuery.java (original)
+++ lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThisQuery.java Mon Nov 9 04:01:50 2009
@@ -60,6 +60,7 @@
this.analyzer=analyzer;
}
+ @Override
public Query rewrite(IndexReader reader) throws IOException
{
MoreLikeThis mlt=new MoreLikeThis(reader);
@@ -82,6 +83,7 @@
/* (non-Javadoc)
* @see org.apache.lucene.search.Query#toString(java.lang.String)
*/
+ @Override
public String toString(String field)
{
return "like:"+likeText;
Modified: lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java (original)
+++ lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java Mon Nov 9 04:01:50 2009
@@ -34,6 +34,7 @@
private RAMDirectory directory;
private IndexReader reader;
+ @Override
protected void setUp() throws Exception
{
directory = new RAMDirectory();
Modified: lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java (original)
+++ lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java Mon Nov 9 04:01:50 2009
@@ -39,6 +39,7 @@
TermQuery tq=new TermQuery(new Term("text","lucene"));
private IndexSearcher searcher;
+ @Override
protected void setUp() throws Exception
{
directory = new RAMDirectory();
@@ -60,6 +61,7 @@
}
+ @Override
protected void tearDown() throws Exception
{
reader.close();
Modified: lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/FuzzyLikeThisQueryTest.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/FuzzyLikeThisQueryTest.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/FuzzyLikeThisQueryTest.java (original)
+++ lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/FuzzyLikeThisQueryTest.java Mon Nov 9 04:01:50 2009
@@ -37,6 +37,7 @@
private IndexSearcher searcher;
private Analyzer analyzer=new WhitespaceAnalyzer();
+ @Override
protected void setUp() throws Exception
{
directory = new RAMDirectory();
Modified: lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java (original)
+++ lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java Mon Nov 9 04:01:50 2009
@@ -41,6 +41,7 @@
private IndexReader reader;
private IndexSearcher searcher;
+ @Override
protected void setUp() throws Exception {
directory = new RAMDirectory();
IndexWriter writer = new IndexWriter(directory, new StandardAnalyzer(org.apache.lucene.util.Version.LUCENE_CURRENT),
@@ -56,6 +57,7 @@
}
+ @Override
protected void tearDown() throws Exception {
reader.close();
searcher.close();
Modified: lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/QueryNodeException.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/QueryNodeException.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/QueryNodeException.java (original)
+++ lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/QueryNodeException.java Mon Nov 9 04:01:50 2009
@@ -68,10 +68,12 @@
return this.message;
}
+ @Override
public String getMessage() {
return getLocalizedMessage();
}
+ @Override
public String getLocalizedMessage() {
return getLocalizedMessage(Locale.getDefault());
}
@@ -80,6 +82,7 @@
return this.message.getLocalizedMessage(locale);
}
+ @Override
public String toString() {
return this.message.getKey() + ": " + getLocalizedMessage();
}
Modified: lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/config/FieldConfig.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/config/FieldConfig.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/config/FieldConfig.java (original)
+++ lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/config/FieldConfig.java Mon Nov 9 04:01:50 2009
@@ -57,6 +57,7 @@
return this.fieldName;
}
+ @Override
public String toString(){
return "<fieldconfig name=\"" + this.fieldName + "\" attributes=\"" + super.toString() + "\"/>";
}
Modified: lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/AndQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/AndQueryNode.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/AndQueryNode.java (original)
+++ lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/AndQueryNode.java Mon Nov 9 04:01:50 2009
@@ -41,6 +41,7 @@
}
}
+ @Override
public String toString() {
if (getChildren() == null || getChildren().size() == 0)
return "<boolean operation='and'/>";
@@ -55,6 +56,7 @@
return sb.toString();
}
+ @Override
public CharSequence toQueryString(EscapeQuerySyntax escapeSyntaxParser) {
if (getChildren() == null || getChildren().size() == 0)
return "";
Modified: lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/AnyQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/AnyQueryNode.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/AnyQueryNode.java (original)
+++ lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/AnyQueryNode.java Mon Nov 9 04:01:50 2009
@@ -95,6 +95,7 @@
this.field = field;
}
+ @Override
public QueryNode cloneTree() throws CloneNotSupportedException {
AnyQueryNode clone = (AnyQueryNode) super.cloneTree();
@@ -104,6 +105,7 @@
return clone;
}
+ @Override
public String toString() {
if (getChildren() == null || getChildren().size() == 0)
return "<any field='" + this.field + "' matchelements="
@@ -119,6 +121,7 @@
return sb.toString();
}
+ @Override
public CharSequence toQueryString(EscapeQuerySyntax escapeSyntaxParser) {
String anySTR = "ANY " + this.minimumMatchingmElements;
Modified: lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/BooleanQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/BooleanQueryNode.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/BooleanQueryNode.java (original)
+++ lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/BooleanQueryNode.java Mon Nov 9 04:01:50 2009
@@ -40,6 +40,7 @@
set(clauses);
}
+ @Override
public String toString() {
if (getChildren() == null || getChildren().size() == 0)
return "<boolean operation='default'/>";
@@ -72,6 +73,7 @@
return "( " + sb.toString() + " )";
}
+ @Override
public QueryNode cloneTree() throws CloneNotSupportedException {
BooleanQueryNode clone = (BooleanQueryNode) super.cloneTree();
Modified: lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/BoostQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/BoostQueryNode.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/BoostQueryNode.java (original)
+++ lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/BoostQueryNode.java Mon Nov 9 04:01:50 2009
@@ -99,6 +99,7 @@
}
+ @Override
public String toString() {
return "<boost value='" + getValueString() + "'>" + "\n"
+ getChild().toString() + "\n</boost>";
@@ -111,6 +112,7 @@
+ getValueString();
}
+ @Override
public QueryNode cloneTree() throws CloneNotSupportedException {
BoostQueryNode clone = (BoostQueryNode) super.cloneTree();
Modified: lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/DeletedQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/DeletedQueryNode.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/DeletedQueryNode.java (original)
+++ lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/DeletedQueryNode.java Mon Nov 9 04:01:50 2009
@@ -37,10 +37,12 @@
return "[DELETEDCHILD]";
}
+ @Override
public String toString() {
return "<deleted/>";
}
+ @Override
public QueryNode cloneTree() throws CloneNotSupportedException {
DeletedQueryNode clone = (DeletedQueryNode) super.cloneTree();
Modified: lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/FieldQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/FieldQueryNode.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/FieldQueryNode.java (original)
+++ lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/FieldQueryNode.java Mon Nov 9 04:01:50 2009
@@ -91,6 +91,7 @@
}
}
+ @Override
public String toString() {
return "<field start='" + this.begin + "' end='" + this.end + "' field='"
+ this.field + "' text='" + this.text + "'/>";
Modified: lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/FuzzyQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/FuzzyQueryNode.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/FuzzyQueryNode.java (original)
+++ lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/FuzzyQueryNode.java Mon Nov 9 04:01:50 2009
@@ -64,6 +64,7 @@
return this.prefixLength;
}
+ @Override
public CharSequence toQueryString(EscapeQuerySyntax escaper) {
if (isDefaultField(this.field)) {
return getTermEscaped(escaper) + "~" + this.similarity;
@@ -72,6 +73,7 @@
}
}
+ @Override
public String toString() {
return "<fuzzy field='" + this.field + "' similarity='" + this.similarity
+ "' term='" + this.text + "'/>";
@@ -81,6 +83,7 @@
this.similarity = similarity;
}
+ @Override
public FuzzyQueryNode cloneTree() throws CloneNotSupportedException {
FuzzyQueryNode clone = (FuzzyQueryNode) super.cloneTree();
Modified: lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/GroupQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/GroupQueryNode.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/GroupQueryNode.java (original)
+++ lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/GroupQueryNode.java Mon Nov 9 04:01:50 2009
@@ -54,6 +54,7 @@
return getChildren().get(0);
}
+ @Override
public String toString() {
return "<group>" + "\n" + getChild().toString() + "\n</group>";
}
@@ -65,6 +66,7 @@
return "( " + getChild().toQueryString(escapeSyntaxParser) + " )";
}
+ @Override
public QueryNode cloneTree() throws CloneNotSupportedException {
GroupQueryNode clone = (GroupQueryNode) super.cloneTree();
Modified: lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/MatchAllDocsQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/MatchAllDocsQueryNode.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/MatchAllDocsQueryNode.java (original)
+++ lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/MatchAllDocsQueryNode.java Mon Nov 9 04:01:50 2009
@@ -31,6 +31,7 @@
// empty constructor
}
+ @Override
public String toString() {
return "<matchAllDocs field='*' term='*'>";
}
@@ -39,6 +40,7 @@
return "*:*";
}
+ @Override
public MatchAllDocsQueryNode cloneTree() throws CloneNotSupportedException {
MatchAllDocsQueryNode clone = (MatchAllDocsQueryNode) super.cloneTree();
Modified: lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/MatchNoDocsQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/MatchNoDocsQueryNode.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/MatchNoDocsQueryNode.java (original)
+++ lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/MatchNoDocsQueryNode.java Mon Nov 9 04:01:50 2009
@@ -30,6 +30,7 @@
// empty constructor
}
+ @Override
public String toString() {
return "<matchNoDocsQueryNode/>";
}
Modified: lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ModifierQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ModifierQueryNode.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ModifierQueryNode.java (original)
+++ lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ModifierQueryNode.java Mon Nov 9 04:01:50 2009
@@ -41,6 +41,7 @@
public enum Modifier {
MOD_NONE, MOD_NOT, MOD_REQ;
+ @Override
public String toString() {
switch (this) {
case MOD_NONE:
@@ -111,6 +112,7 @@
return this.modifier;
}
+ @Override
public String toString() {
return "<modifier operation='" + this.modifier.toString() + "'>" + "\n"
+ getChild().toString() + "\n</modifier>";
@@ -137,6 +139,7 @@
}
}
+ @Override
public QueryNode cloneTree() throws CloneNotSupportedException {
ModifierQueryNode clone = (ModifierQueryNode) super.cloneTree();
Modified: lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/NoTokenFoundQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/NoTokenFoundQueryNode.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/NoTokenFoundQueryNode.java (original)
+++ lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/NoTokenFoundQueryNode.java Mon Nov 9 04:01:50 2009
@@ -31,14 +31,17 @@
super();
}
+ @Override
public CharSequence toQueryString(EscapeQuerySyntax escaper) {
return "[NTF]";
}
+ @Override
public String toString() {
return "<notokenfound/>";
}
+ @Override
public QueryNode cloneTree() throws CloneNotSupportedException {
NoTokenFoundQueryNode clone = (NoTokenFoundQueryNode) super.cloneTree();
Modified: lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/OpaqueQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/OpaqueQueryNode.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/OpaqueQueryNode.java (original)
+++ lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/OpaqueQueryNode.java Mon Nov 9 04:01:50 2009
@@ -46,6 +46,7 @@
}
+ @Override
public String toString() {
return "<opaque schema='" + this.schema + "' value='" + this.value + "'/>";
}
@@ -54,6 +55,7 @@
return "@" + this.schema + ":'" + this.value + "'";
}
+ @Override
public QueryNode cloneTree() throws CloneNotSupportedException {
OpaqueQueryNode clone = (OpaqueQueryNode) super.cloneTree();
Modified: lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/OrQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/OrQueryNode.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/OrQueryNode.java (original)
+++ lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/OrQueryNode.java Mon Nov 9 04:01:50 2009
@@ -43,6 +43,7 @@
}
}
+ @Override
public String toString() {
if (getChildren() == null || getChildren().size() == 0)
return "<boolean operation='or'/>";
@@ -57,6 +58,7 @@
return sb.toString();
}
+ @Override
public CharSequence toQueryString(EscapeQuerySyntax escapeSyntaxParser) {
if (getChildren() == null || getChildren().size() == 0)
return "";
Modified: lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ParametricQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ParametricQueryNode.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ParametricQueryNode.java (original)
+++ lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ParametricQueryNode.java Mon Nov 9 04:01:50 2009
@@ -30,12 +30,30 @@
private CompareOperator operator;
public enum CompareOperator {
- LE { public String toString() { return "<="; } },
- LT { public String toString() { return "<"; } },
- GE { public String toString() { return ">="; } },
- GT { public String toString() { return ">"; } },
- EQ { public String toString() { return "="; } },
- NE { public String toString() { return "!="; } };
+ LE {
+ @Override
+ public String toString() { return "<="; }
+ },
+ LT {
+ @Override
+ public String toString() { return "<"; }
+ },
+ GE {
+ @Override
+ public String toString() { return ">="; }
+ },
+ GT {
+ @Override
+ public String toString() { return ">"; }
+ },
+ EQ {
+ @Override
+ public String toString() { return "="; }
+ },
+ NE {
+ @Override
+ public String toString() { return "!="; }
+ };
}
/**
@@ -61,15 +79,18 @@
return getText();
}
+ @Override
public CharSequence toQueryString(EscapeQuerySyntax escapeSyntaxParser) {
return this.field + "" + this.operator.toString() + "\"" + this.text + "\"";
}
+ @Override
public String toString() {
return "<parametric field='" + this.field + "' operator='"
+ this.operator.toString() + "' text='" + this.text + "'/>";
}
+ @Override
public ParametricQueryNode cloneTree() throws CloneNotSupportedException {
ParametricQueryNode clone = (ParametricQueryNode) super.cloneTree();
Modified: lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ParametricRangeQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ParametricRangeQueryNode.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ParametricRangeQueryNode.java (original)
+++ lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ParametricRangeQueryNode.java Mon Nov 9 04:01:50 2009
@@ -91,6 +91,7 @@
}
+ @Override
public ParametricRangeQueryNode cloneTree() throws CloneNotSupportedException {
ParametricRangeQueryNode clone = (ParametricRangeQueryNode) super
.cloneTree();
Modified: lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/PathQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/PathQueryNode.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/PathQueryNode.java (original)
+++ lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/PathQueryNode.java Mon Nov 9 04:01:50 2009
@@ -70,6 +70,7 @@
this.end = end;
}
+ @Override
public QueryText clone() throws CloneNotSupportedException {
QueryText clone = (QueryText) super.clone();
clone.value = this.value;
@@ -99,6 +100,7 @@
return end;
}
+ @Override
public String toString() {
return value + ", " + begin + ", " + end;
}
@@ -191,6 +193,7 @@
return path.toString();
}
+ @Override
public String toString() {
QueryText text = this.values.get(0);
@@ -198,6 +201,7 @@
+ getPathString() + "'/>";
}
+ @Override
public QueryNode cloneTree() throws CloneNotSupportedException {
PathQueryNode clone = (PathQueryNode) super.cloneTree();
Modified: lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/PhraseSlopQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/PhraseSlopQueryNode.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/PhraseSlopQueryNode.java (original)
+++ lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/PhraseSlopQueryNode.java Mon Nov 9 04:01:50 2009
@@ -66,6 +66,7 @@
}
+ @Override
public String toString() {
return "<phraseslop value='" + getValueString() + "'>" + "\n"
+ getChild().toString() + "\n</phraseslop>";
@@ -78,6 +79,7 @@
+ getValueString();
}
+ @Override
public QueryNode cloneTree() throws CloneNotSupportedException {
PhraseSlopQueryNode clone = (PhraseSlopQueryNode) super.cloneTree();
Modified: lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ProximityQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ProximityQueryNode.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ProximityQueryNode.java (original)
+++ lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ProximityQueryNode.java Mon Nov 9 04:01:50 2009
@@ -36,9 +36,18 @@
private static final long serialVersionUID = 9018220596680832916L;
public enum Type {
- PARAGRAPH { CharSequence toQueryString() { return "WITHIN PARAGRAPH"; } },
- SENTENCE { CharSequence toQueryString() { return "WITHIN SENTENCE"; } },
- NUMBER { CharSequence toQueryString() { return "WITHIN"; } };
+ PARAGRAPH {
+ @Override
+ CharSequence toQueryString() { return "WITHIN PARAGRAPH"; }
+ },
+ SENTENCE {
+ @Override
+ CharSequence toQueryString() { return "WITHIN SENTENCE"; }
+ },
+ NUMBER {
+ @Override
+ CharSequence toQueryString() { return "WITHIN"; }
+ };
abstract CharSequence toQueryString();
}
@@ -131,6 +140,7 @@
return this.proximityType;
}
+ @Override
public String toString() {
String distanceSTR = ((this.distance == -1) ? ("")
: (" distance='" + this.distance) + "'");
@@ -150,6 +160,7 @@
return sb.toString();
}
+ @Override
public CharSequence toQueryString(EscapeQuerySyntax escapeSyntaxParser) {
String withinSTR = this.proximityType.toQueryString()
+ ((this.distance == -1) ? ("") : (" " + this.distance))
@@ -173,6 +184,7 @@
}
}
+ @Override
public QueryNode cloneTree() throws CloneNotSupportedException {
ProximityQueryNode clone = (ProximityQueryNode) super.cloneTree();
Modified: lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNodeImpl.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNodeImpl.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNodeImpl.java (original)
+++ lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNodeImpl.java Mon Nov 9 04:01:50 2009
@@ -131,6 +131,7 @@
return clone;
}
+ @Override
public Object clone() throws CloneNotSupportedException {
return cloneTree();
}
@@ -209,6 +210,7 @@
*
* @see org.apache.lucene.queryParser.core.nodes.QueryNode#toString()
*/
+ @Override
public String toString() {
return super.toString();
}
Modified: lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QuotedFieldQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QuotedFieldQueryNode.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QuotedFieldQueryNode.java (original)
+++ lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QuotedFieldQueryNode.java Mon Nov 9 04:01:50 2009
@@ -42,6 +42,7 @@
super(field, text, begin, end);
}
+ @Override
public CharSequence toQueryString(EscapeQuerySyntax escaper) {
if (isDefaultField(this.field)) {
return "\"" + getTermEscapeQuoted(escaper) + "\"";
@@ -50,11 +51,13 @@
}
}
+ @Override
public String toString() {
return "<quotedfield start='" + this.begin + "' end='" + this.end
+ "' field='" + this.field + "' term='" + this.text + "'/>";
}
+ @Override
public QuotedFieldQueryNode cloneTree() throws CloneNotSupportedException {
QuotedFieldQueryNode clone = (QuotedFieldQueryNode) super.cloneTree();
// nothing to do here
Modified: lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/SlopQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/SlopQueryNode.java?rev=833968&r1=833967&r2=833968&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/SlopQueryNode.java (original)
+++ lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/SlopQueryNode.java Mon Nov 9 04:01:50 2009
@@ -73,6 +73,7 @@
}
+ @Override
public String toString() {
return "<slop value='" + getValueString() + "'>" + "\n"
+ getChild().toString() + "\n</slop>";
@@ -85,6 +86,7 @@
+ getValueString();
}
+ @Override
public QueryNode cloneTree() throws CloneNotSupportedException {
SlopQueryNode clone = (SlopQueryNode) super.cloneTree();