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 rm...@apache.org on 2009/11/08 13:45:20 UTC
svn commit: r833867 [2/6] - in /lucene/java/trunk:
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/lucene/analysis/cjk/ contr...
Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilter.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilter.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilter.java Sun Nov 8 12:45:12 2009
@@ -44,6 +44,7 @@
}
+ @Override
public final boolean incrementToken() throws IOException {
if (input.incrementToken()) {
String type = typeAtt.type();
Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/position/PositionFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/position/PositionFilter.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/position/PositionFilter.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/position/PositionFilter.java Sun Nov 8 12:45:12 2009
@@ -62,6 +62,7 @@
this.positionIncrement = positionIncrement;
}
+ @Override
public final boolean incrementToken() throws IOException {
if (input.incrementToken()) {
if (firstTokenPositioned) {
@@ -75,6 +76,7 @@
}
}
+ @Override
public void reset() throws IOException {
super.reset();
firstTokenPositioned = false;
Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java Sun Nov 8 12:45:12 2009
@@ -169,6 +169,7 @@
return stopWords.size();
}
+ @Override
public TokenStream tokenStream(String fieldName, Reader reader) {
TokenStream result;
try {
@@ -195,6 +196,7 @@
TokenStream withStopFilter;
};
+ @Override
public TokenStream reusableTokenStream(String fieldName, Reader reader)
throws IOException {
if (overridesTokenStreamMethod) {
Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilter.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilter.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilter.java Sun Nov 8 12:45:12 2009
@@ -88,6 +88,7 @@
termAtt = addAttribute(TermAttribute.class);
}
+ @Override
public boolean incrementToken() throws IOException {
if (input.incrementToken()) {
int len = termAtt.termLength();
Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java Sun Nov 8 12:45:12 2009
@@ -97,6 +97,7 @@
* {@link RussianLowerCaseFilter}, {@link StopFilter},
* and {@link RussianStemFilter}
*/
+ @Override
public TokenStream tokenStream(String fieldName, Reader reader)
{
TokenStream result = new RussianLetterTokenizer(reader);
@@ -121,6 +122,7 @@
* {@link RussianLowerCaseFilter}, {@link StopFilter},
* and {@link RussianStemFilter}
*/
+ @Override
public TokenStream reusableTokenStream(String fieldName, Reader reader)
throws IOException {
SavedStreams streams = (SavedStreams) getPreviousTokenStream();
Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianLetterTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianLetterTokenizer.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianLetterTokenizer.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianLetterTokenizer.java Sun Nov 8 12:45:12 2009
@@ -49,6 +49,7 @@
* Collects only characters which satisfy
* {@link Character#isLetter(char)}.
*/
+ @Override
protected boolean isTokenChar(char c)
{
if (Character.isLetter(c) || (c >= '0' && c <= '9'))
Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianLowerCaseFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianLowerCaseFilter.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianLowerCaseFilter.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianLowerCaseFilter.java Sun Nov 8 12:45:12 2009
@@ -39,6 +39,7 @@
termAtt = addAttribute(TermAttribute.class);
}
+ @Override
public final boolean incrementToken() throws IOException
{
if (input.incrementToken()) {
Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianStemFilter.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianStemFilter.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianStemFilter.java Sun Nov 8 12:45:12 2009
@@ -51,6 +51,7 @@
/**
* Returns the next token in the stream, or null at EOS
*/
+ @Override
public final boolean incrementToken() throws IOException
{
if (input.incrementToken()) {
Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java Sun Nov 8 12:45:12 2009
@@ -98,6 +98,7 @@
this.outputUnigrams = outputUnigrams;
}
+ @Override
public TokenStream tokenStream(String fieldName, Reader reader) {
TokenStream wrapped;
try {
@@ -116,6 +117,7 @@
ShingleFilter shingle;
};
+ @Override
public TokenStream reusableTokenStream(String fieldName, Reader reader) throws IOException {
if (overridesTokenStreamMethod) {
// LUCENE-1678: force fallback to tokenStream() if we
Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java Sun Nov 8 12:45:12 2009
@@ -163,6 +163,7 @@
/* (non-Javadoc)
* @see org.apache.lucene.analysis.TokenStream#next()
*/
+ @Override
public final boolean incrementToken() throws IOException {
while (true) {
if (nextToken == null) {
@@ -328,6 +329,7 @@
return true;
}
+ @Override
public void reset() throws IOException {
super.reset();
nextToken = null;
Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleMatrixFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleMatrixFilter.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleMatrixFilter.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleMatrixFilter.java Sun Nov 8 12:45:12 2009
@@ -345,6 +345,7 @@
private Set<List<Token>> shinglesSeen = new HashSet<List<Token>>();
+ @Override
public void reset() throws IOException {
permutations = null;
shinglesSeen.clear();
@@ -355,6 +356,7 @@
private Token reusableToken = new Token();
+ @Override
public final boolean incrementToken() throws IOException {
if (matrix == null) {
matrix = new Matrix();
@@ -743,6 +745,7 @@
return Matrix.this.columns.indexOf(this);
}
+ @Override
public String toString() {
return "Column{" +
"first=" + first +
@@ -807,6 +810,7 @@
// return ret;
// }
+ @Override
public String toString() {
return "Row{" +
"index=" + getIndex() +
@@ -863,6 +867,7 @@
};
}
+ @Override
public String toString() {
return "Matrix{" +
"columns=" + columns +
@@ -920,17 +925,21 @@
*/
public static class OneDimensionalNonWeightedTokenSettingsCodec extends TokenSettingsCodec {
+ @Override
public TokenPositioner getTokenPositioner(Token token) throws IOException {
return TokenPositioner.newColumn;
}
+ @Override
public void setTokenPositioner(Token token, TokenPositioner tokenPositioner) {
}
+ @Override
public float getWeight(Token token) {
return 1f;
}
+ @Override
public void setWeight(Token token, float weight) {
}
@@ -944,6 +953,7 @@
*/
public static class TwoDimensionalNonWeightedSynonymTokenSettingsCodec extends TokenSettingsCodec {
+ @Override
public TokenPositioner getTokenPositioner(Token token) throws IOException {
if (token.getPositionIncrement() == 0) {
return TokenPositioner.newRow;
@@ -952,14 +962,17 @@
}
}
+ @Override
public void setTokenPositioner(Token token, TokenPositioner tokenPositioner) {
throw new UnsupportedOperationException();
}
+ @Override
public float getWeight(Token token) {
return 1f;
}
+ @Override
public void setWeight(Token token, float weight) {
}
@@ -981,6 +994,7 @@
* @return the token flags int value as TokenPosition
* @throws IOException
*/
+ @Override
public TokenPositioner getTokenPositioner(Token token) throws IOException {
switch (token.getFlags()) {
case 0:
@@ -999,6 +1013,7 @@
* @param token
* @param tokenPositioner
*/
+ @Override
public void setTokenPositioner(Token token, TokenPositioner tokenPositioner) {
token.setFlags(tokenPositioner.getIndex());
}
@@ -1009,6 +1024,7 @@
* @param token
* @return 32 bit float
*/
+ @Override
public float getWeight(Token token) {
if (token.getPayload() == null || token.getPayload().getData() == null) {
return 1f;
@@ -1022,6 +1038,7 @@
* @param token
* @param weight
*/
+ @Override
public void setWeight(Token token, float weight) {
if (weight == 1f) {
token.setPayload(null);
Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/DateRecognizerSinkFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/DateRecognizerSinkFilter.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/DateRecognizerSinkFilter.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/DateRecognizerSinkFilter.java Sun Nov 8 12:45:12 2009
@@ -49,6 +49,7 @@
this.dateFormat = dateFormat;
}
+ @Override
public boolean accept(AttributeSource source) {
if (termAtt == null) {
termAtt = source.addAttribute(TermAttribute.class);
Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/TokenRangeSinkFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/TokenRangeSinkFilter.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/TokenRangeSinkFilter.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/TokenRangeSinkFilter.java Sun Nov 8 12:45:12 2009
@@ -37,6 +37,7 @@
}
+ @Override
public boolean accept(AttributeSource source) {
try {
if (count >= lower && count < upper){
@@ -48,6 +49,7 @@
}
}
+ @Override
public void reset() throws IOException {
count = 0;
}
Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/TokenTypeSinkFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/TokenTypeSinkFilter.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/TokenTypeSinkFilter.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/TokenTypeSinkFilter.java Sun Nov 8 12:45:12 2009
@@ -29,6 +29,7 @@
this.typeToMatch = typeToMatch;
}
+ @Override
public boolean accept(AttributeSource source) {
if (typeAtt == null) {
typeAtt = source.addAttribute(TypeAttribute.class);
Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java Sun Nov 8 12:45:12 2009
@@ -43,6 +43,7 @@
this.matchVersion = matchVersion;
}
+ @Override
public TokenStream tokenStream(String fieldName, Reader reader) {
TokenStream ts = new StandardTokenizer(matchVersion, reader);
ts = new StandardFilter(ts);
@@ -57,6 +58,7 @@
TokenStream result;
};
+ @Override
public TokenStream reusableTokenStream(String fieldName, Reader reader) throws IOException {
if (overridesTokenStreamMethod) {
// LUCENE-1678: force fallback to tokenStream() if we
Modified: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/ThaiWordFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/ThaiWordFilter.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/ThaiWordFilter.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/ThaiWordFilter.java Sun Nov 8 12:45:12 2009
@@ -48,6 +48,7 @@
offsetAtt = addAttribute(OffsetAttribute.class);
}
+ @Override
public final boolean incrementToken() throws IOException {
if (thaiState != null) {
int start = breaker.current();
@@ -82,6 +83,7 @@
return false;
}
+ @Override
public void reset() throws IOException {
super.reset();
thaiState = null;
Modified: lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/cn/TestChineseTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/cn/TestChineseTokenizer.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/cn/TestChineseTokenizer.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/cn/TestChineseTokenizer.java Sun Nov 8 12:45:12 2009
@@ -65,6 +65,7 @@
* convenience to show the behavior of the tokenizer
*/
private class JustChineseTokenizerAnalyzer extends Analyzer {
+ @Override
public TokenStream tokenStream(String fieldName, Reader reader) {
return new ChineseTokenizer(reader);
}
@@ -75,6 +76,7 @@
* convenience to show the behavior of the filter.
*/
private class JustChineseFilterAnalyzer extends Analyzer {
+ @Override
public TokenStream tokenStream(String fieldName, Reader reader) {
return new ChineseFilter(new WhitespaceTokenizer(reader));
}
Modified: lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java Sun Nov 8 12:45:12 2009
@@ -51,6 +51,7 @@
private static byte[] patternsFileContent;
+ @Override
protected void setUp() throws Exception {
super.setUp();
getHyphenationPatternFileContents();
Modified: lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java Sun Nov 8 12:45:12 2009
@@ -51,6 +51,7 @@
* An input stream that always throws IOException for testing.
*/
private class UnreliableInputStream extends InputStream {
+ @Override
public int read() throws IOException {
throw new IOException();
}
Modified: lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java Sun Nov 8 12:45:12 2009
@@ -76,6 +76,7 @@
super(matchVersion);
}
+ @Override
public TokenStream tokenStream(String fieldName, Reader reader) {
return new WhitespaceTokenizer(reader);
}
Modified: lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java Sun Nov 8 12:45:12 2009
@@ -29,6 +29,7 @@
public class EdgeNGramTokenFilterTest extends BaseTokenStreamTestCase {
private TokenStream input;
+ @Override
public void setUp() throws Exception {
super.setUp();
input = new WhitespaceTokenizer(new StringReader("abcde"));
Modified: lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java Sun Nov 8 12:45:12 2009
@@ -28,6 +28,7 @@
public class EdgeNGramTokenizerTest extends BaseTokenStreamTestCase {
private StringReader input;
+ @Override
public void setUp() throws Exception {
super.setUp();
input = new StringReader("abcde");
Modified: lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenFilterTest.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenFilterTest.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenFilterTest.java Sun Nov 8 12:45:12 2009
@@ -30,6 +30,7 @@
public class NGramTokenFilterTest extends BaseTokenStreamTestCase {
private TokenStream input;
+ @Override
public void setUp() throws Exception {
super.setUp();
input = new WhitespaceTokenizer(new StringReader("abcde"));
Modified: lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java Sun Nov 8 12:45:12 2009
@@ -30,6 +30,7 @@
public class NGramTokenizerTest extends BaseTokenStreamTestCase {
private StringReader input;
+ @Override
public void setUp() throws Exception {
super.setUp();
input = new StringReader("abcde");
Modified: lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/nl/TestDutchStemmer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/nl/TestDutchStemmer.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/nl/TestDutchStemmer.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/nl/TestDutchStemmer.java Sun Nov 8 12:45:12 2009
@@ -134,6 +134,7 @@
public DutchSubclassAnalyzer(Version matchVersion) {
super(matchVersion);
}
+ @Override
public TokenStream tokenStream(String fieldName, Reader reader) {
return new WhitespaceTokenizer(reader);
}
Modified: lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java Sun Nov 8 12:45:12 2009
@@ -69,6 +69,7 @@
typeAtt = addAttribute(TypeAttribute.class);
}
+ @Override
public boolean incrementToken() throws IOException {
if (input.incrementToken()) {
if (termAtt.term().equals("dogs"))
Modified: lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java Sun Nov 8 12:45:12 2009
@@ -65,6 +65,7 @@
typeAtt = addAttribute(TypeAttribute.class);
}
+ @Override
public boolean incrementToken() throws IOException {
if (input.incrementToken()) {
typeAtt.setType(String.valueOf(Character.toUpperCase(termAtt.termBuffer()[0])));
Modified: lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/position/PositionFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/position/PositionFilterTest.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/position/PositionFilterTest.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/position/PositionFilterTest.java Sun Nov 8 12:45:12 2009
@@ -38,6 +38,7 @@
termAtt = addAttribute(TermAttribute.class);
}
+ @Override
public final boolean incrementToken() throws IOException {
clearAttributes();
if (index < testToken.length) {
@@ -47,6 +48,7 @@
return false;
}
}
+ @Override
public void reset() {
index = 0;
}
Modified: lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java Sun Nov 8 12:45:12 2009
@@ -47,6 +47,7 @@
IndexReader reader;
QueryAutoStopWordAnalyzer protectedAnalyzer;
+ @Override
protected void setUp() throws Exception {
super.setUp();
dir = new RAMDirectory();
@@ -66,6 +67,7 @@
protectedAnalyzer = new QueryAutoStopWordAnalyzer(Version.LUCENE_CURRENT, appAnalyzer);
}
+ @Override
protected void tearDown() throws Exception {
reader.close();
super.tearDown();
@@ -154,6 +156,7 @@
super(matchVersion, new WhitespaceAnalyzer());
}
+ @Override
public TokenStream tokenStream(String fieldName, Reader reader) {
return new WhitespaceTokenizer(reader);
}
@@ -172,6 +175,7 @@
*/
private class NonreusableAnalyzer extends Analyzer {
int invocationCount = 0;
+ @Override
public TokenStream tokenStream(String fieldName, Reader reader) {
if (++invocationCount % 2 == 0)
return new WhitespaceTokenizer(reader);
Modified: lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java Sun Nov 8 12:45:12 2009
@@ -42,6 +42,7 @@
private File dataDir;
+ @Override
protected void setUp() throws Exception
{
super.setUp();
Modified: lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/TestRussianStem.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/TestRussianStem.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/TestRussianStem.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/TestRussianStem.java Sun Nov 8 12:45:12 2009
@@ -37,6 +37,7 @@
/**
* @see TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception
{
super.setUp();
@@ -73,6 +74,7 @@
/**
* @see TestCase#tearDown()
*/
+ @Override
protected void tearDown() throws Exception
{
super.tearDown();
Modified: lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java Sun Nov 8 12:45:12 2009
@@ -221,6 +221,7 @@
super(org.apache.lucene.util.Version.LUCENE_CURRENT);
}
+ @Override
public TokenStream tokenStream(String fieldName, Reader reader) {
return new WhitespaceTokenizer(reader);
}
@@ -240,6 +241,7 @@
*/
private class NonreusableAnalyzer extends Analyzer {
int invocationCount = 0;
+ @Override
public TokenStream tokenStream(String fieldName, Reader reader) {
if (++invocationCount % 2 == 0)
return new WhitespaceTokenizer(reader);
Modified: lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/ShingleFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/ShingleFilterTest.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/ShingleFilterTest.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/ShingleFilterTest.java Sun Nov 8 12:45:12 2009
@@ -48,6 +48,7 @@
this.typeAtt = addAttribute(TypeAttribute.class);
}
+ @Override
public final boolean incrementToken() throws IOException {
clearAttributes();
if (index < testToken.length) {
@@ -201,6 +202,7 @@
};
+ @Override
protected void setUp() throws Exception {
super.setUp();
testTokenWithHoles = new Token[] {
Modified: lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/TestShingleMatrixFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/TestShingleMatrixFilter.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/TestShingleMatrixFilter.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/TestShingleMatrixFilter.java Sun Nov 8 12:45:12 2009
@@ -537,6 +537,7 @@
private Iterator iterator;
+ @Override
public boolean incrementToken() throws IOException {
if (iterator == null) {
iterator = tokens.iterator();
@@ -556,6 +557,7 @@
}
+ @Override
public void reset() throws IOException {
iterator = null;
}
Modified: lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/sinks/TokenTypeSinkTokenizerTest.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/sinks/TokenTypeSinkTokenizerTest.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/sinks/TokenTypeSinkTokenizerTest.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/sinks/TokenTypeSinkTokenizerTest.java Sun Nov 8 12:45:12 2009
@@ -76,6 +76,7 @@
typeAtt = addAttribute(TypeAttribute.class);
}
+ @Override
public final boolean incrementToken() throws IOException {
if (!input.incrementToken()) return false;
Modified: lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java (original)
+++ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java Sun Nov 8 12:45:12 2009
@@ -132,6 +132,7 @@
public ThaiSubclassAnalyzer(Version matchVersion) {
super(matchVersion);
}
+ @Override
public TokenStream tokenStream(String fieldName, Reader reader) {
return new WhitespaceTokenizer(reader);
}
Modified: lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SentenceTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SentenceTokenizer.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SentenceTokenizer.java (original)
+++ lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SentenceTokenizer.java Sun Nov 8 12:45:12 2009
@@ -73,6 +73,7 @@
typeAtt = addAttribute(TypeAttribute.class);
}
+ @Override
public boolean incrementToken() throws IOException {
clearAttributes();
buffer.setLength(0);
@@ -122,11 +123,13 @@
}
}
+ @Override
public void reset() throws IOException {
super.reset();
tokenStart = tokenEnd = 0;
}
+ @Override
public void reset(Reader input) throws IOException {
super.reset(input);
reset();
Modified: lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java (original)
+++ lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java Sun Nov 8 12:45:12 2009
@@ -144,6 +144,7 @@
this.matchVersion = matchVersion;
}
+ @Override
public TokenStream tokenStream(String fieldName, Reader reader) {
TokenStream result = new SentenceTokenizer(reader);
result = new WordTokenFilter(result);
@@ -163,6 +164,7 @@
TokenStream filteredTokenStream;
}
+ @Override
public TokenStream reusableTokenStream(String fieldName, Reader reader)
throws IOException {
SavedStreams streams = (SavedStreams) getPreviousTokenStream();
Modified: lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordTokenFilter.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordTokenFilter.java (original)
+++ lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordTokenFilter.java Sun Nov 8 12:45:12 2009
@@ -61,6 +61,7 @@
typeAtt = addAttribute(TypeAttribute.class);
}
+ @Override
public boolean incrementToken() throws IOException {
if (tokenIter == null || !tokenIter.hasNext()) {
// there are no remaining tokens from the current sentence... are there more sentences?
@@ -88,6 +89,7 @@
return true;
}
+ @Override
public void reset() throws IOException {
super.reset();
tokenIter = null;
Modified: lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java (original)
+++ lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java Sun Nov 8 12:45:12 2009
@@ -221,6 +221,7 @@
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
Collection<ArrayList<SegTokenPair>> values = tokenPairListTable.values();
Modified: lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/PathNode.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/PathNode.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/PathNode.java (original)
+++ lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/PathNode.java Sun Nov 8 12:45:12 2009
@@ -45,6 +45,7 @@
/**
* @see java.lang.Object#hashCode()
*/
+ @Override
public int hashCode() {
final int prime = 31;
int result = 1;
@@ -58,6 +59,7 @@
/**
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object obj) {
if (this == obj)
return true;
Modified: lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegGraph.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegGraph.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegGraph.java (original)
+++ lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegGraph.java Sun Nov 8 12:45:12 2009
@@ -136,6 +136,7 @@
return result;
}
+ @Override
public String toString() {
List<SegToken> tokenList = this.toTokenList();
StringBuilder sb = new StringBuilder();
Modified: lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegToken.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegToken.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegToken.java (original)
+++ lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegToken.java Sun Nov 8 12:45:12 2009
@@ -80,6 +80,7 @@
/**
* @see java.lang.Object#hashCode()
*/
+ @Override
public int hashCode() {
final int prime = 31;
int result = 1;
@@ -97,6 +98,7 @@
/**
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object obj) {
if (this == obj)
return true;
Modified: lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegTokenPair.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegTokenPair.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegTokenPair.java (original)
+++ lucene/java/trunk/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegTokenPair.java Sun Nov 8 12:45:12 2009
@@ -53,6 +53,7 @@
/**
* @see java.lang.Object#hashCode()
*/
+ @Override
public int hashCode() {
final int prime = 31;
int result = 1;
@@ -70,6 +71,7 @@
/**
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object obj) {
if (this == obj)
return true;
Modified: lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/DocumentHandlerException.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/DocumentHandlerException.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/DocumentHandlerException.java (original)
+++ lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/DocumentHandlerException.java Sun Nov 8 12:45:12 2009
@@ -53,10 +53,12 @@
return cause;
}
+ @Override
public void printStackTrace() {
printStackTrace(System.err);
}
+ @Override
public void printStackTrace(PrintStream ps) {
synchronized (ps) {
super.printStackTrace(ps);
@@ -67,6 +69,7 @@
}
}
+ @Override
public void printStackTrace(PrintWriter pw) {
synchronized (pw) {
super.printStackTrace(pw);
Modified: lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/IndexTask.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/IndexTask.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/IndexTask.java (original)
+++ lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/IndexTask.java Sun Nov 8 12:45:12 2009
@@ -220,6 +220,7 @@
*@exception BuildException If an error occurs indexing the
* fileset
*/
+ @Override
public void execute() throws BuildException {
// construct handler and analyzer dynamically
@@ -426,6 +427,7 @@
/**
* @see EnumeratedAttribute#getValues
*/
+ @Override
public String[] getValues() {
Set keys = analyzerLookup.keySet();
return (String[]) keys.toArray(new String[0]);
Modified: lucene/java/trunk/contrib/ant/src/test/org/apache/lucene/ant/HtmlDocumentTest.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/ant/src/test/org/apache/lucene/ant/HtmlDocumentTest.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/ant/src/test/org/apache/lucene/ant/HtmlDocumentTest.java (original)
+++ lucene/java/trunk/contrib/ant/src/test/org/apache/lucene/ant/HtmlDocumentTest.java Sun Nov 8 12:45:12 2009
@@ -30,6 +30,7 @@
HtmlDocument doc;
+ @Override
public void setUp() throws IOException {
doc = new HtmlDocument(getFile("test.html"));
}
@@ -39,6 +40,7 @@
assertTrue("Body", doc.getBody().startsWith("This is some test"));
}
+ @Override
public void tearDown() {
doc = null;
}
Modified: lucene/java/trunk/contrib/ant/src/test/org/apache/lucene/ant/IndexTaskTest.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/ant/src/test/org/apache/lucene/ant/IndexTaskTest.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/ant/src/test/org/apache/lucene/ant/IndexTaskTest.java (original)
+++ lucene/java/trunk/contrib/ant/src/test/org/apache/lucene/ant/IndexTaskTest.java Sun Nov 8 12:45:12 2009
@@ -54,6 +54,7 @@
*
*@exception IOException Description of Exception
*/
+ @Override
public void setUp() throws Exception {
Project project = new Project();
@@ -86,6 +87,7 @@
* The teardown method for JUnit
* TODO: remove indexDir?
*/
+ @Override
public void tearDown() throws IOException {
searcher.close();
dir.close();
Modified: lucene/java/trunk/contrib/ant/src/test/org/apache/lucene/ant/TextDocumentTest.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/ant/src/test/org/apache/lucene/ant/TextDocumentTest.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/ant/src/test/org/apache/lucene/ant/TextDocumentTest.java (original)
+++ lucene/java/trunk/contrib/ant/src/test/org/apache/lucene/ant/TextDocumentTest.java Sun Nov 8 12:45:12 2009
@@ -30,6 +30,7 @@
TextDocument doc;
+ @Override
public void setUp() throws IOException {
doc = new TextDocument(getFile("test.txt"));
}
@@ -38,6 +39,7 @@
assertEquals("Contents", "Test Contents", doc.getContents());
}
+ @Override
public void tearDown() {
doc = null;
}
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java Sun Nov 8 12:45:12 2009
@@ -174,10 +174,12 @@
return dfi.df.parse(dateStr.trim(), dfi.pos);
}
+ @Override
public void close() throws IOException {
inputFiles = null;
}
+ @Override
public DocData getNextDocData(DocData docData) throws NoMoreDataException, IOException {
File f = null;
String name = null;
@@ -219,12 +221,14 @@
return docData;
}
+ @Override
public synchronized void resetInputs() throws IOException {
super.resetInputs();
inputFiles = new Iterator(dataDir);
iteration = 0;
}
+ @Override
public void setConfig(Config config) {
super.setConfig(config);
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java Sun Nov 8 12:45:12 2009
@@ -103,10 +103,12 @@
return buffer.toString();
}
+ @Override
public void characters(char[] ch, int start, int length) {
contents.append(ch, start, length);
}
+ @Override
public void endElement(String namespace, String simple, String qualified)
throws SAXException {
int elemType = getElementType(qualified);
@@ -197,6 +199,7 @@
}
}
+ @Override
public void startElement(String namespace, String simple, String qualified,
Attributes attributes) {
int elemType = getElementType(qualified);
@@ -257,6 +260,7 @@
private InputStream is;
private Parser parser = new Parser();
+ @Override
public void close() throws IOException {
synchronized (EnwikiContentSource.this) {
if (is != null) {
@@ -266,6 +270,7 @@
}
}
+ @Override
public synchronized DocData getNextDocData(DocData docData) throws NoMoreDataException, IOException {
String[] tuple = parser.next();
docData.clear();
@@ -276,11 +281,13 @@
return docData;
}
+ @Override
public void resetInputs() throws IOException {
super.resetInputs();
is = getInputStream(file);
}
+ @Override
public void setConfig(Config config) {
super.setConfig(config);
keepImages = config.get("keep.image.only.docs", true);
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiDocMaker.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiDocMaker.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiDocMaker.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiDocMaker.java Sun Nov 8 12:45:12 2009
@@ -26,6 +26,7 @@
* @deprecated Please use {@link DocMaker} instead, with content.source=EnwikiContentSource
*/
public class EnwikiDocMaker extends DocMaker {
+ @Override
public void setConfig(Config config) {
super.setConfig(config);
// Override whatever content source was set in the config
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java Sun Nov 8 12:45:12 2009
@@ -122,6 +122,7 @@
return queries.toArray(new Query[0]);
}
+ @Override
protected Query[] prepareQueries() throws Exception {
// analyzer (default is standard analyzer)
Analyzer anlzr = NewAnalyzerTask.createAnalyzer(config.get("analyzer", StandardAnalyzer.class.getName()));
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java Sun Nov 8 12:45:12 2009
@@ -44,6 +44,7 @@
public class FileBasedQueryMaker extends AbstractQueryMaker implements QueryMaker{
+ @Override
protected Query[] prepareQueries() throws Exception {
Analyzer anlzr = NewAnalyzerTask.createAnalyzer(config.get("analyzer",
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocMaker.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocMaker.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocMaker.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocMaker.java Sun Nov 8 12:45:12 2009
@@ -39,6 +39,7 @@
* @deprecated Please use {@link DocMaker} instead, with content.source=LineDocSource
*/
public class LineDocMaker extends DocMaker {
+ @Override
public void setConfig(Config config) {
super.setConfig(config);
source = new LineDocSource();
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocSource.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocSource.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocSource.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocSource.java Sun Nov 8 12:45:12 2009
@@ -61,6 +61,7 @@
}
}
+ @Override
public void close() throws IOException {
if (reader != null) {
reader.close();
@@ -68,6 +69,7 @@
}
}
+ @Override
public DocData getNextDocData(DocData docData) throws NoMoreDataException, IOException {
String line;
synchronized(this) {
@@ -100,11 +102,13 @@
return docData;
}
+ @Override
public void resetInputs() throws IOException {
super.resetInputs();
openFile();
}
+ @Override
public void setConfig(Config config) {
super.setConfig(config);
String fileName = config.get("docs.file", null);
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java Sun Nov 8 12:45:12 2009
@@ -53,6 +53,7 @@
private int nextFile = 0;
private int iteration = 0;
+ @Override
public void setConfig(Config config) {
super.setConfig(config);
File workDir = new File(config.get("work.dir", "work"));
@@ -89,10 +90,12 @@
}
+ @Override
public void close() throws IOException {
// TODO implement?
}
+ @Override
public DocData getNextDocData(DocData docData) throws NoMoreDataException, IOException {
File f = null;
String name = null;
@@ -138,6 +141,7 @@
}
}
+ @Override
public synchronized void resetInputs() throws IOException {
super.resetInputs();
nextFile = 0;
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java Sun Nov 8 12:45:12 2009
@@ -102,6 +102,7 @@
return queries.toArray(new Query[0]);
}
+ @Override
protected Query[] prepareQueries() throws Exception {
// analyzer (default is standard analyzer)
Analyzer anlzr= NewAnalyzerTask.createAnalyzer(config.get("analyzer",
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java Sun Nov 8 12:45:12 2009
@@ -42,6 +42,7 @@
* @return prepared queries.
* @throws Exception if cannot prepare the queries.
*/
+ @Override
protected Query[] prepareQueries() throws Exception {
// analyzer (default is standard analyzer)
Analyzer anlzr= NewAnalyzerTask.createAnalyzer(config.get("analyzer",
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java Sun Nov 8 12:45:12 2009
@@ -32,6 +32,7 @@
/* (non-Javadoc)
* @see org.apache.lucene.benchmark.byTask.feeds.SimpleQueryMaker#prepareQueries()
*/
+ @Override
protected Query[] prepareQueries() throws Exception {
// extract some 100 words from doc text to an array
String words[];
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SingleDocSource.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SingleDocSource.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SingleDocSource.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SingleDocSource.java Sun Nov 8 12:45:12 2009
@@ -50,8 +50,10 @@
return docID++;
}
+ @Override
public void close() throws IOException {}
+ @Override
public DocData getNextDocData(DocData docData) throws NoMoreDataException {
int id = newdocid();
addBytes(DOC_TEXT.length());
@@ -61,6 +63,7 @@
return docData;
}
+ @Override
public synchronized void resetInputs() throws IOException {
super.resetInputs();
docID = 0;
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SortableSingleDocSource.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SortableSingleDocSource.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SortableSingleDocSource.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SortableSingleDocSource.java Sun Nov 8 12:45:12 2009
@@ -78,6 +78,7 @@
private int sortRange;
private Random r;
+ @Override
public DocData getNextDocData(DocData docData) throws NoMoreDataException {
docData = super.getNextDocData(docData);
Properties props = new Properties();
@@ -103,6 +104,7 @@
return start + r.nextInt(end - start);
}
+ @Override
public void setConfig(Config config) {
super.setConfig(config);
sortRange = config.get("sort.rng", 20000);
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java Sun Nov 8 12:45:12 2009
@@ -216,6 +216,7 @@
return null;
}
+ @Override
public void close() throws IOException {
if (reader == null) {
return;
@@ -232,6 +233,7 @@
reader = null;
}
+ @Override
public DocData getNextDocData(DocData docData) throws NoMoreDataException, IOException {
String dateStr = null, name = null;
Reader r = null;
@@ -306,6 +308,7 @@
return docData;
}
+ @Override
public void resetInputs() throws IOException {
synchronized (lock) {
super.resetInputs();
@@ -315,6 +318,7 @@
}
}
+ @Override
public void setConfig(Config config) {
super.setConfig(config);
File workDir = new File(config.get("work.dir", "work"));
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/TaskStats.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/TaskStats.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/TaskStats.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/TaskStats.java Sun Nov 8 12:45:12 2009
@@ -102,6 +102,7 @@
/* (non-Javadoc)
* @see java.lang.Object#toString()
*/
+ @Override
public String toString() {
StringBuffer res = new StringBuffer(task.getName());
res.append(" ");
@@ -178,6 +179,7 @@
/* (non-Javadoc)
* @see java.lang.Object#clone()
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddDocTask.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddDocTask.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddDocTask.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddDocTask.java Sun Nov 8 12:45:12 2009
@@ -37,6 +37,7 @@
// volatile data passed between setup(), doLogic(), tearDown().
private Document doc = null;
+ @Override
public void setup() throws Exception {
super.setup();
DocMaker docMaker = getRunData().getDocMaker();
@@ -47,15 +48,18 @@
}
}
+ @Override
public void tearDown() throws Exception {
doc = null;
super.tearDown();
}
+ @Override
protected String getLogMessage(int recsCount) {
return "added " + recsCount + " docs";
}
+ @Override
public int doLogic() throws Exception {
getRunData().getIndexWriter().addDocument(doc);
return 1;
@@ -65,6 +69,7 @@
* Set the params (docSize only)
* @param params docSize, or 0 for no limit.
*/
+ @Override
public void setParams(String params) {
super.setParams(params);
docSize = (int) Float.parseFloat(params);
@@ -73,6 +78,7 @@
/* (non-Javadoc)
* @see org.apache.lucene.benchmark.byTask.tasks.PerfTask#supportsParams()
*/
+ @Override
public boolean supportsParams() {
return true;
}
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ClearStatsTask.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ClearStatsTask.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ClearStatsTask.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ClearStatsTask.java Sun Nov 8 12:45:12 2009
@@ -29,6 +29,7 @@
super(runData);
}
+ @Override
public int doLogic() throws Exception {
getRunData().getPoints().clearData();
return 0;
@@ -37,6 +38,7 @@
/* (non-Javadoc)
* @see PerfTask#shouldNotRecordStats()
*/
+ @Override
protected boolean shouldNotRecordStats() {
return true;
}
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseIndexTask.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseIndexTask.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseIndexTask.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseIndexTask.java Sun Nov 8 12:45:12 2009
@@ -36,6 +36,7 @@
boolean doWait = true;
+ @Override
public int doLogic() throws IOException {
IndexWriter iw = getRunData().getIndexWriter();
if (iw != null) {
@@ -51,11 +52,13 @@
return 1;
}
+ @Override
public void setParams(String params) {
super.setParams(params);
doWait = Boolean.valueOf(params).booleanValue();
}
+ @Override
public boolean supportsParams() {
return true;
}
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseReaderTask.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseReaderTask.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseReaderTask.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseReaderTask.java Sun Nov 8 12:45:12 2009
@@ -33,6 +33,7 @@
super(runData);
}
+ @Override
public int doLogic() throws IOException {
IndexReader reader= getRunData().getIndexReader();
if (reader!=null) {
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java Sun Nov 8 12:45:12 2009
@@ -34,15 +34,18 @@
super(runData);
}
+ @Override
public boolean supportsParams() {
return true;
}
+ @Override
public void setParams(String params) {
commitUserData = new HashMap<String,String>();
commitUserData.put(OpenReaderTask.USER_DATA, params);
}
+ @Override
public int doLogic() throws Exception {
IndexWriter iw = getRunData().getIndexWriter();
if (iw != null) {
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ConsumeContentSourceTask.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ConsumeContentSourceTask.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ConsumeContentSourceTask.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ConsumeContentSourceTask.java Sun Nov 8 12:45:12 2009
@@ -50,15 +50,18 @@
}
}
+ @Override
protected String getLogMessage(int recsCount) {
return "read " + recsCount + " documents from the content source";
}
+ @Override
public void close() throws Exception {
source.close();
super.close();
}
+ @Override
public int doLogic() throws Exception {
dd = source.getNextDocData(dd);
return 1;
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java Sun Nov 8 12:45:12 2009
@@ -122,6 +122,7 @@
return indexDeletionPolicy;
}
+ @Override
public int doLogic() throws IOException {
PerfRunData runData = getRunData();
Config config = runData.getConfig();
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/DeleteByPercentTask.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/DeleteByPercentTask.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/DeleteByPercentTask.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/DeleteByPercentTask.java Sun Nov 8 12:45:12 2009
@@ -49,19 +49,23 @@
random = new Random(runData.getConfig().get("delete.percent.rand.seed", 1717));
}
+ @Override
public void setup() throws Exception {
super.setup();
}
+ @Override
public void setParams(String params) {
super.setParams(params);
percent = Double.parseDouble(params)/100;
}
+ @Override
public boolean supportsParams() {
return true;
}
+ @Override
public int doLogic() throws Exception {
IndexReader r = getRunData().getIndexReader();
int maxDoc = r.maxDoc();
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/DeleteDocTask.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/DeleteDocTask.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/DeleteDocTask.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/DeleteDocTask.java Sun Nov 8 12:45:12 2009
@@ -40,6 +40,7 @@
private int docid = -1;
private boolean byStep = true;
+ @Override
public int doLogic() throws Exception {
getRunData().getIndexReader().deleteDocument(docid);
lastDeleted = docid;
@@ -49,6 +50,7 @@
/* (non-Javadoc)
* @see org.apache.lucene.benchmark.byTask.tasks.PerfTask#setup()
*/
+ @Override
public void setup() throws Exception {
super.setup();
if (deleteStep<0) {
@@ -58,6 +60,7 @@
docid = (byStep ? lastDeleted + deleteStep : docid);
}
+ @Override
protected String getLogMessage(int recsCount) {
return "deleted " + recsCount + " docs, last deleted: " + lastDeleted;
}
@@ -66,6 +69,7 @@
* Set the params (docid only)
* @param params docid to delete, or -1 for deleting by delete gap settings.
*/
+ @Override
public void setParams(String params) {
super.setParams(params);
docid = (int) Float.parseFloat(params);
@@ -75,6 +79,7 @@
/* (non-Javadoc)
* @see org.apache.lucene.benchmark.byTask.tasks.PerfTask#supportsParams()
*/
+ @Override
public boolean supportsParams() {
return true;
}
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/FlushReaderTask.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/FlushReaderTask.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/FlushReaderTask.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/FlushReaderTask.java Sun Nov 8 12:45:12 2009
@@ -31,15 +31,18 @@
super(runData);
}
+ @Override
public boolean supportsParams() {
return true;
}
+ @Override
public void setParams(String params) {
super.setParams(params);
userData = params;
}
+ @Override
public int doLogic() throws IOException {
IndexReader reader = getRunData().getIndexReader();
if (userData != null) {
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NearRealtimeReaderTask.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NearRealtimeReaderTask.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NearRealtimeReaderTask.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NearRealtimeReaderTask.java Sun Nov 8 12:45:12 2009
@@ -59,6 +59,7 @@
setDaemon(true);
}
+ @Override
public void run() {
IndexReader reader = null;
@@ -106,6 +107,7 @@
super(runData);
}
+ @Override
public int doLogic() throws IOException {
if (t == null) {
IndexWriter w = getRunData().getIndexWriter();
@@ -115,16 +117,19 @@
return 1;
}
+ @Override
public void setParams(String params) {
super.setParams(params);
pauseSec = Float.parseFloat(params);
}
+ @Override
public boolean supportsParams() {
return true;
}
// Close the thread
+ @Override
public void close() throws InterruptedException {
if (t != null) {
t.done = true;
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java Sun Nov 8 12:45:12 2009
@@ -50,6 +50,7 @@
}
}
+ @Override
public int doLogic() throws IOException {
String className = null;
try {
@@ -81,6 +82,7 @@
* Example Declaration: {"NewAnalyzer" NewAnalyzer(WhitespaceAnalyzer, SimpleAnalyzer, StopAnalyzer, standard.StandardAnalyzer) >
* @param params analyzerClassName, or empty for the StandardAnalyzer
*/
+ @Override
public void setParams(String params) {
super.setParams(params);
for (StringTokenizer tokenizer = new StringTokenizer(params, ","); tokenizer.hasMoreTokens();) {
@@ -92,6 +94,7 @@
/* (non-Javadoc)
* @see org.apache.lucene.benchmark.byTask.tasks.PerfTask#supportsParams()
*/
+ @Override
public boolean supportsParams() {
return true;
}
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewRoundTask.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewRoundTask.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewRoundTask.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewRoundTask.java Sun Nov 8 12:45:12 2009
@@ -30,6 +30,7 @@
super(runData);
}
+ @Override
public int doLogic() throws Exception {
getRunData().getConfig().newRound();
return 0;
@@ -38,6 +39,7 @@
/* (non-Javadoc)
* @see PerfTask#shouldNotRecordStats()
*/
+ @Override
protected boolean shouldNotRecordStats() {
return true;
}
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenIndexTask.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenIndexTask.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenIndexTask.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenIndexTask.java Sun Nov 8 12:45:12 2009
@@ -42,6 +42,7 @@
super(runData);
}
+ @Override
public int doLogic() throws IOException {
PerfRunData runData = getRunData();
Config config = runData.getConfig();
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenReaderTask.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenReaderTask.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenReaderTask.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenReaderTask.java Sun Nov 8 12:45:12 2009
@@ -42,6 +42,7 @@
super(runData);
}
+ @Override
public int doLogic() throws IOException {
Directory dir = getRunData().getDirectory();
Config config = getRunData().getConfig();
@@ -75,6 +76,7 @@
return r;
}
+ @Override
public void setParams(String params) {
super.setParams(params);
if (params != null) {
@@ -88,6 +90,7 @@
}
}
+ @Override
public boolean supportsParams() {
return true;
}
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OptimizeTask.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OptimizeTask.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OptimizeTask.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OptimizeTask.java Sun Nov 8 12:45:12 2009
@@ -32,6 +32,7 @@
int maxNumSegments = 1;
+ @Override
public int doLogic() throws Exception {
IndexWriter iw = getRunData().getIndexWriter();
iw.optimize(maxNumSegments);
@@ -39,11 +40,13 @@
return 1;
}
+ @Override
public void setParams(String params) {
super.setParams(params);
maxNumSegments = Double.valueOf(params).intValue();
}
+ @Override
public boolean supportsParams() {
return true;
}
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PerfTask.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PerfTask.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PerfTask.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PerfTask.java Sun Nov 8 12:45:12 2009
@@ -117,6 +117,7 @@
checkObsoleteSettings(config);
}
+ @Override
protected Object clone() throws CloneNotSupportedException {
// tasks having non primitive data structures should override this.
// otherwise parallel running of a task sequence might not run correctly.
@@ -208,6 +209,7 @@
/* (non-Javadoc)
* @see java.lang.Object#toString()
*/
+ @Override
public String toString() {
String padd = getPadding();
StringBuffer sb = new StringBuffer(padd);
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PrintReaderTask.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PrintReaderTask.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PrintReaderTask.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PrintReaderTask.java Sun Nov 8 12:45:12 2009
@@ -29,15 +29,18 @@
super(runData);
}
+ @Override
public void setParams(String params) {
super.setParams(params);
userData = params;
}
+ @Override
public boolean supportsParams() {
return true;
}
+ @Override
public int doLogic() throws Exception {
Directory dir = getRunData().getDirectory();
Config config = getRunData().getConfig();
Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java (original)
+++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java Sun Nov 8 12:45:12 2009
@@ -63,6 +63,7 @@
public ReadTask(PerfRunData runData) {
super(runData);
}
+ @Override
public int doLogic() throws Exception {
int res = 0;
boolean closeReader = false;
@@ -224,6 +225,7 @@
static final int DEFAULT_SEARCH_NUM_HITS = 10;
private int numHits;
+ @Override
public void setup() throws Exception {
super.setup();
numHits = getRunData().getConfig().get("search.num.hits", DEFAULT_SEARCH_NUM_HITS);