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 [6/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/swing/src/test/org/apache/lucene/swing/models/TestBasicList.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/swing/src/test/org/apache/lucene/swing/models/TestBasicList.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/swing/src/test/org/apache/lucene/swing/models/TestBasicList.java (original)
+++ lucene/java/trunk/contrib/swing/src/test/org/apache/lucene/swing/models/TestBasicList.java Sun Nov 8 12:45:12 2009
@@ -30,6 +30,7 @@
private ListSearcher listSearcher;
private List list;
+ @Override
protected void setUp() throws Exception {
list = new ArrayList();
list.add(DataStore.canolis);
Modified: lucene/java/trunk/contrib/swing/src/test/org/apache/lucene/swing/models/TestBasicTable.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/swing/src/test/org/apache/lucene/swing/models/TestBasicTable.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/swing/src/test/org/apache/lucene/swing/models/TestBasicTable.java (original)
+++ lucene/java/trunk/contrib/swing/src/test/org/apache/lucene/swing/models/TestBasicTable.java Sun Nov 8 12:45:12 2009
@@ -29,6 +29,7 @@
private TableSearcher tableSearcher;
private List list;
+ @Override
protected void setUp() throws Exception {
list = new ArrayList();
list.add(DataStore.canolis);
Modified: lucene/java/trunk/contrib/swing/src/test/org/apache/lucene/swing/models/TestSearchingList.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/swing/src/test/org/apache/lucene/swing/models/TestSearchingList.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/swing/src/test/org/apache/lucene/swing/models/TestSearchingList.java (original)
+++ lucene/java/trunk/contrib/swing/src/test/org/apache/lucene/swing/models/TestSearchingList.java Sun Nov 8 12:45:12 2009
@@ -26,6 +26,7 @@
private ListModel baseListModel;
private ListSearcher listSearcher;
+ @Override
protected void setUp() throws Exception {
baseListModel = new BaseListModel(DataStore.getRestaurants());
listSearcher = new ListSearcher(baseListModel);
Modified: lucene/java/trunk/contrib/swing/src/test/org/apache/lucene/swing/models/TestSearchingTable.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/swing/src/test/org/apache/lucene/swing/models/TestSearchingTable.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/swing/src/test/org/apache/lucene/swing/models/TestSearchingTable.java (original)
+++ lucene/java/trunk/contrib/swing/src/test/org/apache/lucene/swing/models/TestSearchingTable.java Sun Nov 8 12:45:12 2009
@@ -25,6 +25,7 @@
private TableModel baseTableModel;
private TableSearcher tableSearcher;
+ @Override
protected void setUp() throws Exception {
baseTableModel = new BaseTableModel(DataStore.getRestaurants());
tableSearcher = new TableSearcher(baseTableModel);
Modified: lucene/java/trunk/contrib/swing/src/test/org/apache/lucene/swing/models/TestUpdatingList.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/swing/src/test/org/apache/lucene/swing/models/TestUpdatingList.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/swing/src/test/org/apache/lucene/swing/models/TestUpdatingList.java (original)
+++ lucene/java/trunk/contrib/swing/src/test/org/apache/lucene/swing/models/TestUpdatingList.java Sun Nov 8 12:45:12 2009
@@ -25,6 +25,7 @@
RestaurantInfo infoToAdd1, infoToAdd2;
+ @Override
protected void setUp() throws Exception {
baseListModel = new BaseListModel(DataStore.getRestaurants());
listSearcher = new ListSearcher(baseListModel);
Modified: lucene/java/trunk/contrib/swing/src/test/org/apache/lucene/swing/models/TestUpdatingTable.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/swing/src/test/org/apache/lucene/swing/models/TestUpdatingTable.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/swing/src/test/org/apache/lucene/swing/models/TestUpdatingTable.java (original)
+++ lucene/java/trunk/contrib/swing/src/test/org/apache/lucene/swing/models/TestUpdatingTable.java Sun Nov 8 12:45:12 2009
@@ -25,6 +25,7 @@
RestaurantInfo infoToAdd1, infoToAdd2;
+ @Override
protected void setUp() throws Exception {
baseTableModel = new BaseTableModel(DataStore.getRestaurants());
tableSearcher = new TableSearcher(baseTableModel);
Modified: lucene/java/trunk/contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizer.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizer.java (original)
+++ lucene/java/trunk/contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizer.java Sun Nov 8 12:45:12 2009
@@ -191,6 +191,7 @@
*
* @see org.apache.lucene.analysis.TokenStream#next()
*/
+ @Override
public final boolean incrementToken() throws IOException {
if (tokens != null && tokens.hasNext()){
AttributeSource.State state = (AttributeSource.State) tokens.next();
@@ -307,11 +308,13 @@
*
* @see org.apache.lucene.analysis.TokenStream#reset()
*/
+ @Override
public void reset() throws IOException {
super.reset();
scanner.yyreset(input);
}
+ @Override
public void reset(Reader reader) throws IOException {
super.reset(reader);
reset();
Modified: lucene/java/trunk/contrib/wordnet/src/java/org/apache/lucene/wordnet/AnalyzerUtil.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/wordnet/src/java/org/apache/lucene/wordnet/AnalyzerUtil.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/wordnet/src/java/org/apache/lucene/wordnet/AnalyzerUtil.java (original)
+++ lucene/java/trunk/contrib/wordnet/src/java/org/apache/lucene/wordnet/AnalyzerUtil.java Sun Nov 8 12:45:12 2009
@@ -72,6 +72,7 @@
throw new IllegalArgumentException("logStream must not be null");
return new Analyzer() {
+ @Override
public TokenStream tokenStream(final String fieldName, Reader reader) {
return new TokenFilter(child.tokenStream(fieldName, reader)) {
private int position = -1;
@@ -80,6 +81,7 @@
private OffsetAttribute offsetAtt = addAttribute(OffsetAttribute.class);
private TypeAttribute typeAtt = addAttribute(TypeAttribute.class);
+ @Override
public boolean incrementToken() throws IOException {
boolean hasNext = input.incrementToken();
log.println(toString(hasNext));
@@ -124,10 +126,12 @@
return child; // no need to wrap
return new Analyzer() {
+ @Override
public TokenStream tokenStream(String fieldName, Reader reader) {
return new TokenFilter(child.tokenStream(fieldName, reader)) {
private int todo = maxTokens;
+ @Override
public boolean incrementToken() throws IOException {
return --todo >= 0 ? input.incrementToken() : false;
}
@@ -163,6 +167,7 @@
throw new IllegalArgumentException("child analyzer must not be null");
return new Analyzer() {
+ @Override
public TokenStream tokenStream(String fieldName, Reader reader) {
return new PorterStemFilter(
child.tokenStream(fieldName, reader));
@@ -201,6 +206,7 @@
return child; // no need to wrap
return new Analyzer() {
+ @Override
public TokenStream tokenStream(String fieldName, Reader reader) {
return new SynonymTokenFilter(
child.tokenStream(fieldName, reader), synonyms, maxSynonyms);
@@ -240,12 +246,14 @@
private final HashMap<String,ArrayList<AttributeSource.State>> cache = new HashMap<String,ArrayList<AttributeSource.State>>();
+ @Override
public TokenStream tokenStream(String fieldName, Reader reader) {
final ArrayList<AttributeSource.State> tokens = cache.get(fieldName);
if (tokens == null) { // not yet cached
final ArrayList<AttributeSource.State> tokens2 = new ArrayList<AttributeSource.State>();
TokenStream tokenStream = new TokenFilter(child.tokenStream(fieldName, reader)) {
+ @Override
public boolean incrementToken() throws IOException {
boolean hasNext = input.incrementToken();
if (hasNext) tokens2.add(captureState());
@@ -260,6 +268,7 @@
private Iterator<AttributeSource.State> iter = tokens.iterator();
+ @Override
public boolean incrementToken() {
if (!iter.hasNext()) return false;
restoreState(iter.next());
@@ -356,6 +365,7 @@
public MutableInteger(int value) { this.value = value; }
public int intValue() { return value; }
public void setValue(int value) { this.value = value; }
+ @Override
public String toString() { return String.valueOf(value); }
};
Modified: lucene/java/trunk/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynLookup.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynLookup.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynLookup.java (original)
+++ lucene/java/trunk/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynLookup.java Sun Nov 8 12:45:12 2009
@@ -52,12 +52,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/trunk/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynonymMap.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynonymMap.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynonymMap.java (original)
+++ lucene/java/trunk/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynonymMap.java Sun Nov 8 12:45:12 2009
@@ -121,6 +121,7 @@
*
* @return a String representation
*/
+ @Override
public String toString() {
StringBuilder buf = new StringBuilder();
Iterator<String> iter = new TreeMap<String,String[]>(table).keySet().iterator();
Modified: lucene/java/trunk/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynonymTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynonymTokenFilter.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynonymTokenFilter.java (original)
+++ lucene/java/trunk/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynonymTokenFilter.java Sun Nov 8 12:45:12 2009
@@ -78,6 +78,7 @@
}
/** Returns the next token in the stream, or null at EOS. */
+ @Override
public final boolean incrementToken() throws IOException {
while (todo > 0 && index < stack.length) { // pop from stack
if (createToken(stack[index++], current)) {
@@ -140,6 +141,7 @@
}
}
+ @Override
public void reset() throws IOException {
super.reset();
stack = null;
Modified: lucene/java/trunk/contrib/wordnet/src/test/org/apache/lucene/wordnet/TestSynonymTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/wordnet/src/test/org/apache/lucene/wordnet/TestSynonymTokenFilter.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/wordnet/src/test/org/apache/lucene/wordnet/TestSynonymTokenFilter.java (original)
+++ lucene/java/trunk/contrib/wordnet/src/test/org/apache/lucene/wordnet/TestSynonymTokenFilter.java Sun Nov 8 12:45:12 2009
@@ -93,6 +93,7 @@
this.maxSynonyms = maxSynonyms;
}
+ @Override
public TokenStream tokenStream(String fieldName, Reader reader) {
TokenStream ts = new WhitespaceTokenizer(reader);
ts = new LowerCaseFilter(ts);
@@ -105,6 +106,7 @@
TokenStream result;
};
+ @Override
public TokenStream reusableTokenStream(String fieldName, Reader reader)
throws IOException {
SavedStreams streams = (SavedStreams) getPreviousTokenStream();
Modified: lucene/java/trunk/contrib/xml-query-parser/src/demo/java/org/apache/lucene/xmlparser/webdemo/FormBasedXmlQueryDemo.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/xml-query-parser/src/demo/java/org/apache/lucene/xmlparser/webdemo/FormBasedXmlQueryDemo.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/xml-query-parser/src/demo/java/org/apache/lucene/xmlparser/webdemo/FormBasedXmlQueryDemo.java (original)
+++ lucene/java/trunk/contrib/xml-query-parser/src/demo/java/org/apache/lucene/xmlparser/webdemo/FormBasedXmlQueryDemo.java Sun Nov 8 12:45:12 2009
@@ -53,6 +53,7 @@
private IndexSearcher searcher;
private Analyzer analyzer=new StandardAnalyzer(org.apache.lucene.util.Version.LUCENE_CURRENT);
+ @Override
public void init(ServletConfig config) throws ServletException {
super.init(config);
try {
@@ -74,6 +75,7 @@
}
}
+ @Override
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
//Take all completed form fields and add to a Properties object
Properties completedFormFields=new Properties();
Modified: lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/CachedFilterBuilder.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/CachedFilterBuilder.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/CachedFilterBuilder.java (original)
+++ lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/CachedFilterBuilder.java Sun Nov 8 12:45:12 2009
@@ -119,6 +119,7 @@
protected int maxsize;
+ @Override
protected boolean removeEldestEntry(Entry eldest)
{
return size() > maxsize;
Modified: lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java (original)
+++ lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java Sun Nov 8 12:45:12 2009
@@ -51,6 +51,7 @@
/*
* @see TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -86,6 +87,7 @@
+ @Override
protected void tearDown() throws Exception {
reader.close();
searcher.close();
Modified: lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java (original)
+++ lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java Sun Nov 8 12:45:12 2009
@@ -135,6 +135,7 @@
/*
* @see TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -156,6 +157,7 @@
}
+ @Override
protected void tearDown() throws Exception {
searcher.close();
}
Modified: lucene/java/trunk/src/demo/org/apache/lucene/demo/SearchFiles.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/demo/org/apache/lucene/demo/SearchFiles.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/src/demo/org/apache/lucene/demo/SearchFiles.java (original)
+++ lucene/java/trunk/src/demo/org/apache/lucene/demo/SearchFiles.java Sun Nov 8 12:45:12 2009
@@ -56,6 +56,7 @@
this.field = field;
}
+ @Override
public byte[] norms(String field) throws IOException {
return in.norms(this.field);
}
@@ -176,19 +177,23 @@
private int docBase;
// simply print docId and score of every matching document
+ @Override
public void collect(int doc) throws IOException {
System.out.println("doc=" + doc + docBase + " score=" + scorer.score());
}
+ @Override
public boolean acceptsDocsOutOfOrder() {
return true;
}
+ @Override
public void setNextReader(IndexReader reader, int docBase)
throws IOException {
this.docBase = docBase;
}
+ @Override
public void setScorer(Scorer scorer) throws IOException {
this.scorer = scorer;
}
Modified: lucene/java/trunk/src/demo/org/apache/lucene/demo/html/ParserThread.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/demo/org/apache/lucene/demo/html/ParserThread.java?rev=833867&r1=833866&r2=833867&view=diff
==============================================================================
--- lucene/java/trunk/src/demo/org/apache/lucene/demo/html/ParserThread.java (original)
+++ lucene/java/trunk/src/demo/org/apache/lucene/demo/html/ParserThread.java Sun Nov 8 12:45:12 2009
@@ -26,6 +26,7 @@
parser = p;
}
+ @Override
public void run() { // convert pipeOut to pipeIn
try {
try { // parse document to pipeOut