You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2010/09/09 17:43:57 UTC
svn commit: r995471 - in
/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr:
spelling/suggest/BufferingTermFreqIteratorWrapper.java
spelling/suggest/Suggester.java util/TermFreqIterator.java
Author: ab
Date: Thu Sep 9 15:43:57 2010
New Revision: 995471
URL: http://svn.apache.org/viewvc?rev=995471&view=rev
Log:
Fix 1.6-isms.
Modified:
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/suggest/BufferingTermFreqIteratorWrapper.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/suggest/Suggester.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/TermFreqIterator.java
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/suggest/BufferingTermFreqIteratorWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/suggest/BufferingTermFreqIteratorWrapper.java?rev=995471&r1=995470&r2=995471&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/suggest/BufferingTermFreqIteratorWrapper.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/suggest/BufferingTermFreqIteratorWrapper.java Thu Sep 9 15:43:57 2010
@@ -38,7 +38,6 @@ public class BufferingTermFreqIteratorWr
this.freq = freq;
}
- @Override
public int compareTo(Entry o) {
return word.compareTo(o.word);
}
@@ -59,24 +58,20 @@ public class BufferingTermFreqIteratorWr
curPos = 0;
}
- @Override
public float freq() {
return curEntry.freq;
}
- @Override
public boolean hasNext() {
return curPos < entries.size();
}
- @Override
public String next() {
curEntry = entries.get(curPos);
curPos++;
return curEntry.word;
}
- @Override
public void remove() {
throw new UnsupportedOperationException("remove is not supported");
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/suggest/Suggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/suggest/Suggester.java?rev=995471&r1=995470&r2=995471&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/suggest/Suggester.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/suggest/Suggester.java Thu Sep 9 15:43:57 2010
@@ -140,7 +140,7 @@ public class Suggester extends SolrSpell
lookup.store(storeDir);
}
} catch (Exception e) {
- throw new IOException(e);
+ throw new IOException(e.toString());
}
}
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/TermFreqIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/TermFreqIterator.java?rev=995471&r1=995470&r2=995471&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/TermFreqIterator.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/TermFreqIterator.java Thu Sep 9 15:43:57 2010
@@ -30,22 +30,18 @@ public interface TermFreqIterator extend
this.wrapped = wrapped;
}
- @Override
public float freq() {
return 1.0f;
}
- @Override
public boolean hasNext() {
return wrapped.hasNext();
}
- @Override
public String next() {
return wrapped.next().toString();
}
- @Override
public void remove() {
throw new UnsupportedOperationException();
}