You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2012/12/11 17:24:17 UTC
svn commit: r1420249 [6/13] - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/analysis/
lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/
lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/
lucene/analysis/common/src/java/o...
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java Tue Dec 11 16:19:43 2012
@@ -86,6 +86,7 @@ public class TestIndexWriterNRTIsCurrent
this.latch = latch;
}
+ @Override
public void run() {
DirectoryReader currentReader = null;
Random random = LuceneTestCase.random();
@@ -158,6 +159,7 @@ public class TestIndexWriterNRTIsCurrent
this.latch = latch;
}
+ @Override
public void run() {
try {
latch.await();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIntBlockPool.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIntBlockPool.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIntBlockPool.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIntBlockPool.java Tue Dec 11 16:19:43 2012
@@ -116,6 +116,7 @@ public class TestIntBlockPool extends Lu
this.bytesUsed = bytesUsed;
}
+ @Override
public int[] getIntBlock() {
bytesUsed.addAndGet(blockSize * RamUsageEstimator.NUM_BYTES_INT);
return new int[blockSize];
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java Tue Dec 11 16:19:43 2012
@@ -99,6 +99,7 @@ public class TestNRTThreads extends Thre
private IndexSearcher fixedSearcher;
+ @Override
protected IndexSearcher getCurrentSearcher() throws Exception {
return fixedSearcher;
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java Tue Dec 11 16:19:43 2012
@@ -37,7 +37,9 @@ import org.apache.lucene.store.Directory
public class TestOmitTf extends LuceneTestCase {
public static class SimpleSimilarity extends TFIDFSimilarity {
+ @Override
public float queryNorm(float sumOfSquaredWeights) { return 1.0f; }
+ @Override
public float coord(int overlap, int maxOverlap) { return 1.0f; }
@Override public float lengthNorm(FieldInvertState state) { return state.getBoost(); }
@Override public float tf(float freq) { return freq; }
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java Tue Dec 11 16:19:43 2012
@@ -53,6 +53,7 @@ import org.apache.lucene.util._TestUtil;
public class TestPostingsOffsets extends LuceneTestCase {
IndexWriterConfig iwc;
+ @Override
public void setUp() throws Exception {
super.setUp();
iwc = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java Tue Dec 11 16:19:43 2012
@@ -91,6 +91,7 @@ public class TestReaderClosed extends Lu
}
}
+ @Override
public void tearDown() throws Exception {
dir.close();
super.tearDown();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java Tue Dec 11 16:19:43 2012
@@ -193,6 +193,7 @@ public class TestRollingUpdates extends
this.num = num;
}
+ @Override
public void run() {
try {
DirectoryReader open = null;
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java Tue Dec 11 16:19:43 2012
@@ -54,6 +54,7 @@ public class TestTermVectorsReader exten
int pos;
int startOffset;
int endOffset;
+ @Override
public int compareTo(TestToken other) {
return pos - other.pos;
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java Tue Dec 11 16:19:43 2012
@@ -46,6 +46,7 @@ public class TestTermsEnum2 extends Luce
private Automaton termsAutomaton; // automata of the same
int numIterations;
+ @Override
public void setUp() throws Exception {
super.setUp();
// we generate aweful regexps: good for testing.
@@ -76,6 +77,7 @@ public class TestTermsEnum2 extends Luce
writer.close();
}
+ @Override
public void tearDown() throws Exception {
reader.close();
dir.close();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java Tue Dec 11 16:19:43 2012
@@ -163,9 +163,11 @@ public class TestTransactionRollback ext
this.rollbackPoint = rollbackPoint;
}
+ @Override
public void onCommit(List<? extends IndexCommit> commits) throws IOException {
}
+ @Override
public void onInit(List<? extends IndexCommit> commits) throws IOException {
for (final IndexCommit commit : commits) {
Map<String,String> userData=commit.getUserData();
@@ -196,8 +198,10 @@ public class TestTransactionRollback ext
class DeleteLastCommitPolicy implements IndexDeletionPolicy {
+ @Override
public void onCommit(List<? extends IndexCommit> commits) throws IOException {}
+ @Override
public void onInit(List<? extends IndexCommit> commits) throws IOException {
commits.get(commits.size()-1).delete();
}
@@ -218,7 +222,9 @@ public class TestTransactionRollback ext
// Keeps all commit points (used to build index)
class KeepAllDeletionPolicy implements IndexDeletionPolicy {
+ @Override
public void onCommit(List<? extends IndexCommit> commits) throws IOException {}
+ @Override
public void onInit(List<? extends IndexCommit> commits) throws IOException {}
}
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTwoPhaseCommitTool.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTwoPhaseCommitTool.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTwoPhaseCommitTool.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTwoPhaseCommitTool.java Tue Dec 11 16:19:43 2012
@@ -39,6 +39,7 @@ public class TestTwoPhaseCommitTool exte
this.failOnRollback = failOnRollback;
}
+ @Override
public void prepareCommit() throws IOException {
prepareCommit(null);
}
@@ -51,6 +52,7 @@ public class TestTwoPhaseCommitTool exte
}
}
+ @Override
public void commit() throws IOException {
commit(null);
}
@@ -63,6 +65,7 @@ public class TestTwoPhaseCommitTool exte
}
}
+ @Override
public void rollback() throws IOException {
rollbackCalled = true;
if (failOnRollback) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java Tue Dec 11 16:19:43 2012
@@ -91,6 +91,7 @@ final class JustCompileSearch {
static final class JustCompileExtendedFieldCacheLongParser implements FieldCache.LongParser {
+ @Override
public long parseLong(BytesRef string) {
throw new UnsupportedOperationException(UNSUPPORTED_MSG);
}
@@ -99,6 +100,7 @@ final class JustCompileSearch {
static final class JustCompileExtendedFieldCacheDoubleParser implements FieldCache.DoubleParser {
+ @Override
public double parseDouble(BytesRef term) {
throw new UnsupportedOperationException(UNSUPPORTED_MSG);
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java Tue Dec 11 16:19:43 2012
@@ -305,6 +305,7 @@ public class TestBooleanMinShouldMatch e
// callback object to set a random setMinimumNumberShouldMatch
TestBoolean2.Callback minNrCB = new TestBoolean2.Callback() {
+ @Override
public void postCreate(BooleanQuery q) {
BooleanClause[] c =q.getClauses();
int opt=0;
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java Tue Dec 11 16:19:43 2012
@@ -145,6 +145,7 @@ class MultiThreadTermVectorsReader imple
return t.isAlive();
}
+ @Override
public void run() {
try {
// run the test 100 times
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestNRTManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestNRTManager.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestNRTManager.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestNRTManager.java Tue Dec 11 16:19:43 2012
@@ -307,6 +307,7 @@ public class TestNRTManager extends Thre
manager.maybeRefresh();
assertFalse(gen < manager.getCurrentSearchingGen());
Thread t = new Thread() {
+ @Override
public void run() {
try {
signal.await();
@@ -340,6 +341,7 @@ public class TestNRTManager extends Thre
final AtomicBoolean finished = new AtomicBoolean(false);
Thread waiter = new Thread() {
+ @Override
public void run() {
manager.waitForGeneration(lastGen);
finished.set(true);
@@ -372,6 +374,7 @@ public class TestNRTManager extends Thre
}
+ @Override
public void updateDocument(Term term,
Iterable<? extends IndexableField> doc, Analyzer analyzer)
throws IOException {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java Tue Dec 11 16:19:43 2012
@@ -102,6 +102,7 @@ public class TestRegexpQuery extends Luc
BasicAutomata.makeString("brown"),
BasicAutomata.makeString("bob")));
+ @Override
public Automaton getAutomaton(String name) {
if (name.equals("quickBrown")) return quickBrownAutomaton;
else return null;
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java Tue Dec 11 16:19:43 2012
@@ -40,7 +40,9 @@ import org.apache.lucene.document.Docume
public class TestSimilarity extends LuceneTestCase {
public static class SimpleSimilarity extends DefaultSimilarity {
+ @Override
public float queryNorm(float sumOfSquaredWeights) { return 1.0f; }
+ @Override
public float coord(int overlap, int maxOverlap) { return 1.0f; }
@Override public float lengthNorm(FieldInvertState state) { return state.getBoost(); }
@Override public float tf(float freq) { return freq; }
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java Tue Dec 11 16:19:43 2012
@@ -95,6 +95,7 @@ public class TestSimilarityProvider exte
private Similarity sim1 = new Sim1();
private Similarity sim2 = new Sim2();
+ @Override
public Similarity get(String field) {
if (field.equals("foo")) {
return sim1;
@@ -106,10 +107,12 @@ public class TestSimilarityProvider exte
private class Sim1 extends TFIDFSimilarity {
+ @Override
public float coord(int overlap, int maxOverlap) {
return 1f;
}
+ @Override
public float queryNorm(float sumOfSquaredWeights) {
return 1f;
}
@@ -142,10 +145,12 @@ public class TestSimilarityProvider exte
private class Sim2 extends TFIDFSimilarity {
+ @Override
public float coord(int overlap, int maxOverlap) {
return 1f;
}
+ @Override
public float queryNorm(float sumOfSquaredWeights) {
return 1f;
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSort.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSort.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSort.java Tue Dec 11 16:19:43 2012
@@ -598,6 +598,7 @@ public class TestSort extends LuceneTest
sort.setSort (new SortField ("parser", new FieldCache.IntParser(){
+ @Override
public final int parseInt(final BytesRef term) {
return (term.bytes[term.offset]-'A') * 123456;
}
@@ -607,6 +608,7 @@ public class TestSort extends LuceneTest
fc.purgeAllCaches();
sort.setSort (new SortField ("parser", new FieldCache.FloatParser(){
+ @Override
public final float parseFloat(final BytesRef term) {
return (float) Math.sqrt( term.bytes[term.offset] );
}
@@ -616,6 +618,7 @@ public class TestSort extends LuceneTest
fc.purgeAllCaches();
sort.setSort (new SortField ("parser", new FieldCache.LongParser(){
+ @Override
public final long parseLong(final BytesRef term) {
return (term.bytes[term.offset]-'A') * 1234567890L;
}
@@ -625,6 +628,7 @@ public class TestSort extends LuceneTest
fc.purgeAllCaches();
sort.setSort (new SortField ("parser", new FieldCache.DoubleParser(){
+ @Override
public final double parseDouble(final BytesRef term) {
return Math.pow( term.bytes[term.offset], (term.bytes[term.offset]-'A') );
}
@@ -634,6 +638,7 @@ public class TestSort extends LuceneTest
fc.purgeAllCaches();
sort.setSort (new SortField ("parser", new FieldCache.ByteParser(){
+ @Override
public final byte parseByte(final BytesRef term) {
return (byte) (term.bytes[term.offset]-'A');
}
@@ -643,6 +648,7 @@ public class TestSort extends LuceneTest
fc.purgeAllCaches();
sort.setSort (new SortField ("parser", new FieldCache.ShortParser(){
+ @Override
public final short parseShort(final BytesRef term) {
return (short) (term.bytes[term.offset]-'A');
}
@@ -719,6 +725,7 @@ public class TestSort extends LuceneTest
}
private static final FieldCache.IntParser testIntParser = new FieldCache.IntParser() {
+ @Override
public final int parseInt(final BytesRef term) {
return (term.bytes[term.offset]-'A') * 123456;
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java Tue Dec 11 16:19:43 2012
@@ -306,10 +306,12 @@ public class TestPayloadNearQuery extend
static class BoostingSimilarity extends DefaultSimilarity {
+ @Override
public float queryNorm(float sumOfSquaredWeights) {
return 1.0f;
}
+ @Override
public float coord(int overlap, int maxOverlap) {
return 1.0f;
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java Tue Dec 11 16:19:43 2012
@@ -295,10 +295,12 @@ public class TestPayloadTermQuery extend
static class BoostingSimilarity extends DefaultSimilarity {
+ @Override
public float queryNorm(float sumOfSquaredWeights) {
return 1;
}
+ @Override
public float coord(int overlap, int maxOverlap) {
return 1;
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/store/TestDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/store/TestDirectory.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/store/TestDirectory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/store/TestDirectory.java Tue Dec 11 16:19:43 2012
@@ -65,6 +65,7 @@ public class TestDirectory extends Lucen
this.name = name;
}
+ @Override
public void run() {
for (int i = 0; i < 3000; i++) {
String fileName = this.name + i;
@@ -87,6 +88,7 @@ public class TestDirectory extends Lucen
this.name = name;
}
+ @Override
public void run() {
for (int i = 0; i < 10000; i++) {
try {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/TestArrayUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/TestArrayUtil.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/TestArrayUtil.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/TestArrayUtil.java Tue Dec 11 16:19:43 2012
@@ -211,6 +211,7 @@ public class TestArrayUtil extends Lucen
this.order = order;
}
+ @Override
public int compareTo(Item other) {
return this.order - other.order;
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/TestWeakIdentityMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/TestWeakIdentityMap.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/TestWeakIdentityMap.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/TestWeakIdentityMap.java Tue Dec 11 16:19:43 2012
@@ -177,6 +177,7 @@ public class TestWeakIdentityMap extends
for (int t = 0; t < threadCount; t++) {
final Random rnd = new Random(random().nextLong());
exec.execute(new Runnable() {
+ @Override
public void run() {
final int count = atLeast(rnd, 10000);
for (int i = 0; i < count; i++) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java Tue Dec 11 16:19:43 2012
@@ -1187,6 +1187,7 @@ public class TestFSTs extends LuceneTest
}
static final Comparator<Long> minLongComparator = new Comparator<Long> () {
+ @Override
public int compare(Long left, Long right) {
return left.compareTo(right);
}
@@ -1225,6 +1226,7 @@ public class TestFSTs extends LuceneTest
// compares just the weight side of the pair
static final Comparator<Pair<Long,Long>> minPairWeightComparator = new Comparator<Pair<Long,Long>> () {
+ @Override
public int compare(Pair<Long,Long> left, Pair<Long,Long> right) {
return left.output1.compareTo(right.output1);
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestBeforeAfterOverrides.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestBeforeAfterOverrides.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestBeforeAfterOverrides.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestBeforeAfterOverrides.java Tue Dec 11 16:19:43 2012
@@ -37,6 +37,7 @@ public class TestBeforeAfterOverrides ex
}
public static class Before2 extends Before1 {}
public static class Before3 extends Before2 {
+ @Override
@Before
public void before() {}
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestExceptionInBeforeClassHooks.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestExceptionInBeforeClassHooks.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestExceptionInBeforeClassHooks.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestExceptionInBeforeClassHooks.java Tue Dec 11 16:19:43 2012
@@ -39,6 +39,7 @@ public class TestExceptionInBeforeClassH
@BeforeClass
public static void beforeClass() throws Exception {
Thread t = new Thread() {
+ @Override
public void run() {
throw new RuntimeException("foobar");
}
@@ -53,6 +54,7 @@ public class TestExceptionInBeforeClassH
public static class Nested2 extends WithNestedTests.AbstractNestedTest {
public void test1() throws Exception {
Thread t = new Thread() {
+ @Override
public void run() {
throw new RuntimeException("foobar1");
}
@@ -63,6 +65,7 @@ public class TestExceptionInBeforeClassH
public void test2() throws Exception {
Thread t = new Thread() {
+ @Override
public void run() {
throw new RuntimeException("foobar2");
}
@@ -73,6 +76,7 @@ public class TestExceptionInBeforeClassH
public void test3() throws Exception {
Thread t = new Thread() {
+ @Override
public void run() {
throw new RuntimeException("foobar3");
}
@@ -86,6 +90,7 @@ public class TestExceptionInBeforeClassH
@Before
public void runBeforeTest() throws Exception {
Thread t = new Thread() {
+ @Override
public void run() {
throw new RuntimeException("foobar");
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestJUnitRuleOrder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestJUnitRuleOrder.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestJUnitRuleOrder.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestJUnitRuleOrder.java Tue Dec 11 16:19:43 2012
@@ -60,6 +60,7 @@ public class TestJUnitRuleOrder extends
@Override
public Statement apply(final Statement base, Description description) {
return new Statement() {
+ @Override
public void evaluate() throws Throwable {
stack.push("@Rule before");
base.evaluate();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessage.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessage.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessage.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessage.java Tue Dec 11 16:19:43 2012
@@ -52,6 +52,7 @@ public class TestReproduceMessage extend
@Override
public Statement apply(final Statement base, Description description) {
return new Statement() {
+ @Override
public void evaluate() throws Throwable {
triggerOn(SorePoint.RULE);
base.evaluate();
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/enhancements/CategoryEnhancement.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/enhancements/CategoryEnhancement.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/enhancements/CategoryEnhancement.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/enhancements/CategoryEnhancement.java Tue Dec 11 16:19:43 2012
@@ -128,5 +128,6 @@ public interface CategoryEnhancement {
* used in
* {@link EnhancementsPayloadIterator#getCategoryData(CategoryEnhancement)}.
*/
+ @Override
public boolean equals(Object o);
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/enhancements/association/AssociationEnhancement.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/enhancements/association/AssociationEnhancement.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/enhancements/association/AssociationEnhancement.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/enhancements/association/AssociationEnhancement.java Tue Dec 11 16:19:43 2012
@@ -91,20 +91,24 @@ public class AssociationEnhancement impl
return false;
}
+ @Override
public boolean generatesCategoryList() {
return true;
}
+ @Override
public String getCategoryListTermText() {
return CATEGORY_LIST_TERM_TEXT;
}
+ @Override
public CategoryListTokenizer getCategoryListTokenizer(
TokenStream tokenizer, EnhancementsIndexingParams indexingParams,
TaxonomyWriter taxonomyWriter) {
return new AssociationListTokenizer(tokenizer, indexingParams, this);
}
+ @Override
public byte[] getCategoryTokenBytes(CategoryAttribute categoryAttribute) {
AssociationProperty property = getAssociationProperty(categoryAttribute);
@@ -138,6 +142,7 @@ public class AssociationEnhancement impl
return property;
}
+ @Override
public Object extractCategoryTokenData(byte[] buffer, int offset, int length) {
if (length == 0) {
return null;
@@ -146,6 +151,7 @@ public class AssociationEnhancement impl
return i;
}
+ @Override
public Class<? extends CategoryProperty> getRetainableProperty() {
return null;
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/enhancements/association/AssociationFloatProperty.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/enhancements/association/AssociationFloatProperty.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/enhancements/association/AssociationFloatProperty.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/enhancements/association/AssociationFloatProperty.java Tue Dec 11 16:19:43 2012
@@ -55,6 +55,7 @@ public class AssociationFloatProperty ex
return "AssociationFloatProperty".hashCode() * 31 + (int) association;
}
+ @Override
public void merge(CategoryProperty other) {
AssociationFloatProperty o = (AssociationFloatProperty) other;
this.association = Float.floatToIntBits(Float
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/enhancements/association/AssociationIntProperty.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/enhancements/association/AssociationIntProperty.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/enhancements/association/AssociationIntProperty.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/enhancements/association/AssociationIntProperty.java Tue Dec 11 16:19:43 2012
@@ -52,6 +52,7 @@ public class AssociationIntProperty exte
return "AssociationIntProperty".hashCode() * 31 + (int) association;
}
+ @Override
public void merge(CategoryProperty other) {
AssociationIntProperty o = (AssociationIntProperty) other;
this.association += o.association;
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/enhancements/params/DefaultEnhancementsIndexingParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/enhancements/params/DefaultEnhancementsIndexingParams.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/enhancements/params/DefaultEnhancementsIndexingParams.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/enhancements/params/DefaultEnhancementsIndexingParams.java Tue Dec 11 16:19:43 2012
@@ -64,6 +64,7 @@ public class DefaultEnhancementsIndexing
addCategoryEnhancements(enhancements);
}
+ @Override
public void addCategoryEnhancements(CategoryEnhancement... enhancements) {
if (enhancedCategories == null) {
enhancedCategories = new ArrayList<CategoryEnhancement>();
@@ -73,6 +74,7 @@ public class DefaultEnhancementsIndexing
}
}
+ @Override
public List<CategoryEnhancement> getCategoryEnhancements() {
if (enhancedCategories == null || enhancedCategories.isEmpty()) {
return null;
@@ -80,6 +82,7 @@ public class DefaultEnhancementsIndexing
return enhancedCategories;
}
+ @Override
public List<Class<? extends CategoryProperty>> getRetainableProperties() {
if (enhancedCategories == null) {
return null;
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/CategoryContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/CategoryContainer.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/CategoryContainer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/CategoryContainer.java Tue Dec 11 16:19:43 2012
@@ -148,6 +148,7 @@ public class CategoryContainer implement
return map.get(categoryPath);
}
+ @Override
public Iterator<CategoryAttribute> iterator() {
return map.values().iterator();
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/attributes/CategoryAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/attributes/CategoryAttributeImpl.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/attributes/CategoryAttributeImpl.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/attributes/CategoryAttributeImpl.java Tue Dec 11 16:19:43 2012
@@ -60,6 +60,7 @@ public final class CategoryAttributeImpl
setCategoryPath(categoryPath);
}
+ @Override
public void set(CategoryAttribute other) {
((CategoryAttributeImpl) other).copyTo(this);
}
@@ -70,14 +71,17 @@ public final class CategoryAttributeImpl
* @return The category path last assigned to this attribute, or null if
* none has been assigned.
*/
+ @Override
public CategoryPath getCategoryPath() {
return categoryPath;
}
+ @Override
public void setCategoryPath(CategoryPath cp) {
categoryPath = cp;
}
+ @Override
public void addProperty(CategoryProperty property)
throws UnsupportedOperationException {
if (properties == null) {
@@ -91,6 +95,7 @@ public final class CategoryAttributeImpl
}
}
+ @Override
public CategoryProperty getProperty(
Class<? extends CategoryProperty> propertyClass) {
if (properties == null) {
@@ -99,6 +104,7 @@ public final class CategoryAttributeImpl
return properties.get(propertyClass);
}
+ @Override
public CategoryProperty getProperty(
Collection<Class<? extends CategoryProperty>> propertyClasses) {
if (properties == null) {
@@ -139,6 +145,7 @@ public final class CategoryAttributeImpl
clearProperties();
}
+ @Override
public void clearProperties() {
if (properties != null) {
properties.clear();
@@ -178,6 +185,7 @@ public final class CategoryAttributeImpl
return hashCode;
}
+ @Override
public Set<Class<? extends CategoryProperty>> getPropertyClasses() {
if (properties == null || properties.isEmpty()) {
return null;
@@ -185,6 +193,7 @@ public final class CategoryAttributeImpl
return properties.keySet();
}
+ @Override
public void remove(Class<? extends CategoryProperty> propertyClass) {
properties.remove(propertyClass);
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/attributes/CategoryAttributesIterable.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/attributes/CategoryAttributesIterable.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/attributes/CategoryAttributesIterable.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/attributes/CategoryAttributesIterable.java Tue Dec 11 16:19:43 2012
@@ -37,6 +37,7 @@ public class CategoryAttributesIterable
this.inputIterable = inputIterable;
}
+ @Override
public Iterator<CategoryAttribute> iterator() {
return new CategoryAttributesIterator(this.inputIterable);
}
@@ -51,16 +52,19 @@ public class CategoryAttributesIterable
this.categoryAttributeImpl = new CategoryAttributeImpl();
}
+ @Override
public boolean hasNext() {
return this.internalIterator.hasNext();
}
+ @Override
public CategoryAttribute next() {
this.categoryAttributeImpl.setCategoryPath(this.internalIterator
.next());
return this.categoryAttributeImpl;
}
+ @Override
public void remove() {
this.internalIterator.remove();
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/attributes/OrdinalProperty.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/attributes/OrdinalProperty.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/attributes/OrdinalProperty.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/attributes/OrdinalProperty.java Tue Dec 11 16:19:43 2012
@@ -63,6 +63,7 @@ public class OrdinalProperty implements
return this.ordinal;
}
+ @Override
public void merge(CategoryProperty other) {
throw new UnsupportedOperationException(
"Merging ordinal attributes is prohibited");
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/categorypolicy/NonTopLevelOrdinalPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/categorypolicy/NonTopLevelOrdinalPolicy.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/categorypolicy/NonTopLevelOrdinalPolicy.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/categorypolicy/NonTopLevelOrdinalPolicy.java Tue Dec 11 16:19:43 2012
@@ -46,6 +46,7 @@ public class NonTopLevelOrdinalPolicy im
* A relevant taxonomyWriter object, with which ordinals sent to
* {@link #shouldAdd(int)} are examined.
*/
+ @Override
public void init(TaxonomyWriter taxonomyWriter) {
this.taxonomyWriter = taxonomyWriter;
}
@@ -55,6 +56,7 @@ public class NonTopLevelOrdinalPolicy im
* determine if a parent is root, there's a need for
* {@link TaxonomyWriter#getParent(int)}.
*/
+ @Override
public boolean shouldAdd(int ordinal) {
if (ordinal > TaxonomyReader.ROOT_ORDINAL) {
try {
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/categorypolicy/NonTopLevelPathPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/categorypolicy/NonTopLevelPathPolicy.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/categorypolicy/NonTopLevelPathPolicy.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/categorypolicy/NonTopLevelPathPolicy.java Tue Dec 11 16:19:43 2012
@@ -37,6 +37,7 @@ public class NonTopLevelPathPolicy imple
* Filters out (returns false) CategoryPaths equal or less than
* {@link TaxonomyReader#ROOT_ORDINAL}. true otherwise.
*/
+ @Override
public boolean shouldAdd(CategoryPath categoryPath) {
return categoryPath.length() >= DEFAULT_MINIMAL_SUBPATH_LENGTH;
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/params/DefaultFacetIndexingParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/params/DefaultFacetIndexingParams.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/params/DefaultFacetIndexingParams.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/params/DefaultFacetIndexingParams.java Tue Dec 11 16:19:43 2012
@@ -59,10 +59,12 @@ public class DefaultFacetIndexingParams
partitionSize = fixedPartitionSize();
}
+ @Override
public CategoryListParams getCategoryListParams(CategoryPath category) {
return clpParams;
}
+ @Override
public int drillDownTermText(CategoryPath path, char[] buffer) {
return path.copyToCharArray(buffer, 0, -1, getFacetDelimChar());
}
@@ -91,6 +93,7 @@ public class DefaultFacetIndexingParams
return PathPolicy.ALL_CATEGORIES;
}
+ @Override
public final int getPartitionSize() {
return partitionSize;
}
@@ -102,16 +105,19 @@ public class DefaultFacetIndexingParams
* org.apache.lucene.facet.index.params.FacetIndexingParams#getAllCategoryListParams
* ()
*/
+ @Override
public Iterable<CategoryListParams> getAllCategoryListParams() {
List<CategoryListParams> res = new ArrayList<CategoryListParams>();
res.add(clpParams);
return res;
}
+ @Override
public final OrdinalPolicy getOrdinalPolicy() {
return ordinalPolicy;
}
+ @Override
public final PathPolicy getPathPolicy() {
return pathPolicy;
}
@@ -187,6 +193,7 @@ public class DefaultFacetIndexingParams
/**
* Use {@link #DEFAULT_FACET_DELIM_CHAR} as the delimiter.
*/
+ @Override
public char getFacetDelimChar() {
return DEFAULT_FACET_DELIM_CHAR;
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/ScoredDocIdCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/ScoredDocIdCollector.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/ScoredDocIdCollector.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/ScoredDocIdCollector.java Tue Dec 11 16:19:43 2012
@@ -68,9 +68,12 @@ public abstract class ScoredDocIdCollect
private DocIdSetIterator docIdsIter = docIds.iterator();
private int nextDoc;
+ @Override
public int getDocID() { return nextDoc; }
+ @Override
public float getScore() { return defaultScore; }
+ @Override
public boolean next() {
try {
nextDoc = docIdsIter.nextDoc();
@@ -133,9 +136,12 @@ public abstract class ScoredDocIdCollect
private int nextDoc;
private int scoresIdx = -1;
+ @Override
public int getDocID() { return nextDoc; }
+ @Override
public float getScore() { return scores[scoresIdx]; }
+ @Override
public boolean next() {
try {
nextDoc = docIdsIter.nextDoc();
@@ -203,14 +209,17 @@ public abstract class ScoredDocIdCollect
public ScoredDocIDs getScoredDocIDs() {
return new ScoredDocIDs() {
+ @Override
public ScoredDocIDsIterator iterator() throws IOException {
return scoredDocIdsIterator();
}
+ @Override
public DocIdSet getDocIDs() {
return docIds;
}
+ @Override
public int size() {
return numDocIds;
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/CountingAggregator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/CountingAggregator.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/CountingAggregator.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/CountingAggregator.java Tue Dec 11 16:19:43 2012
@@ -28,10 +28,12 @@ public class CountingAggregator implemen
protected int[] counterArray;
+ @Override
public void aggregate(int ordinal) {
++counterArray[ordinal];
}
+ @Override
public void setNextDoc(int docid, float score) {
// There's nothing for us to do here since we only increment the count by 1
// in this aggregator.
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/ScoringAggregator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/ScoringAggregator.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/ScoringAggregator.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/ScoringAggregator.java Tue Dec 11 16:19:43 2012
@@ -34,6 +34,7 @@ public class ScoringAggregator implement
this.hashCode = scoreArray == null ? 0 : scoreArray.hashCode();
}
+ @Override
public void aggregate(int ordinal) {
scoreArray[ordinal] += score;
}
@@ -52,6 +53,7 @@ public class ScoringAggregator implement
return hashCode;
}
+ @Override
public void setNextDoc(int docid, float score) {
this.score = score;
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/association/AssociationFloatSumAggregator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/association/AssociationFloatSumAggregator.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/association/AssociationFloatSumAggregator.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/association/AssociationFloatSumAggregator.java Tue Dec 11 16:19:43 2012
@@ -46,6 +46,7 @@ public class AssociationFloatSumAggregat
this.sumArray = sumArray;
}
+ @Override
public void aggregate(int ordinal) {
long association = associationsPayloadIterator.getAssociation(ordinal);
if (association != AssociationsPayloadIterator.NO_ASSOCIATION) {
@@ -67,6 +68,7 @@ public class AssociationFloatSumAggregat
return field.hashCode();
}
+ @Override
public void setNextDoc(int docid, float score) throws IOException {
associationsPayloadIterator.setNextDoc(docid);
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/association/AssociationIntSumAggregator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/association/AssociationIntSumAggregator.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/association/AssociationIntSumAggregator.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/association/AssociationIntSumAggregator.java Tue Dec 11 16:19:43 2012
@@ -46,6 +46,7 @@ public class AssociationIntSumAggregator
this.sumArray = sumArray;
}
+ @Override
public void aggregate(int ordinal) {
long association = associationsPayloadIterator.getAssociation(ordinal);
if (association != AssociationsPayloadIterator.NO_ASSOCIATION) {
@@ -67,6 +68,7 @@ public class AssociationIntSumAggregator
return field.hashCode();
}
+ @Override
public void setNextDoc(int docid, float score) throws IOException {
associationsPayloadIterator.setNextDoc(docid);
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/cache/CategoryListData.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/cache/CategoryListData.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/cache/CategoryListData.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/cache/CategoryListData.java Tue Dec 11 16:19:43 2012
@@ -112,10 +112,12 @@ public class CategoryListData {
dpc = docPartitionCategories;
}
+ @Override
public boolean init() throws IOException {
return dpc!=null && dpc.length>part;
}
+ @Override
public long nextCategory() throws IOException {
if (nextCategoryIndex >= dpc[currDoc][part].length) {
return 1L+Integer.MAX_VALUE;
@@ -123,6 +125,7 @@ public class CategoryListData {
return dpc[currDoc][part][nextCategoryIndex++];
}
+ @Override
public boolean skipTo(int docId) throws IOException {
final boolean res = dpc.length>docId && dpc[docId]!=null && dpc[docId][part]!=null;
if (res) {
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/results/MutableFacetResultNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/results/MutableFacetResultNode.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/results/MutableFacetResultNode.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/results/MutableFacetResultNode.java Tue Dec 11 16:19:43 2012
@@ -145,6 +145,7 @@ public class MutableFacetResultNode impl
* org.apache.lucene.facet.search.results2.FacetResultNode#toString(java.lang.
* String)
*/
+ @Override
public String toString(String prefix) {
StringBuilder sb = new StringBuilder(prefix);
@@ -171,10 +172,12 @@ public class MutableFacetResultNode impl
return sb.toString();
}
+ @Override
public final int getOrdinal() {
return ordinal;
}
+ @Override
public final CategoryPath getLabel() {
return label;
}
@@ -188,6 +191,7 @@ public class MutableFacetResultNode impl
this.label = label;
}
+ @Override
public final double getValue() {
return value;
}
@@ -199,6 +203,7 @@ public class MutableFacetResultNode impl
* the value to set
* @see #getValue()
*/
+ @Override
public void setValue(double value) {
this.value = value;
}
@@ -212,6 +217,7 @@ public class MutableFacetResultNode impl
this.value += addedValue;
}
+ @Override
public final double getResidue() {
return residue;
}
@@ -234,6 +240,7 @@ public class MutableFacetResultNode impl
this.residue += addedResidue;
}
+ @Override
public final Iterable<? extends FacetResultNode> getSubResults() {
return subResults != null ? subResults : EMPTY_SUB_RESULTS;
}
@@ -308,6 +315,7 @@ public class MutableFacetResultNode impl
* org.apache.lucene.facet.search.results.FacetResultNode#getLabel(org.apache.lucene
* .facet.taxonomy.TaxonomyReader)
*/
+ @Override
public final CategoryPath getLabel(TaxonomyReader taxonomyReader)
throws IOException {
if (label == null) {
@@ -321,6 +329,7 @@ public class MutableFacetResultNode impl
*
* @see org.apache.lucene.facet.search.results.FacetResultNode#getNumSubResults()
*/
+ @Override
public final int getNumSubResults() {
return subResults == null ? 0 : subResults.size();
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/sampling/TakmiSampleFixer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/sampling/TakmiSampleFixer.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/sampling/TakmiSampleFixer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/sampling/TakmiSampleFixer.java Tue Dec 11 16:19:43 2012
@@ -58,6 +58,7 @@ class TakmiSampleFixer implements Sample
this.searchParams = searchParams;
}
+ @Override
public void fixResult(ScoredDocIDs origDocIds, FacetResult fres)
throws IOException {
FacetResultNode topRes = fres.getFacetResultNode();
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CategoryPath.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CategoryPath.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CategoryPath.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CategoryPath.java Tue Dec 11 16:19:43 2012
@@ -1025,6 +1025,7 @@ public class CategoryPath implements Ser
* CategoryPath lexicographically precedes, equals to, or lexicographically follows
* the other CategoryPath.
*/
+ @Override
public int compareTo(CategoryPath other) {
int minlength = (this.length() < other.length()) ? this.length() : other.length();
int ch = 0;
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/cl2o/CharBlockArray.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/cl2o/CharBlockArray.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/cl2o/CharBlockArray.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/cl2o/CharBlockArray.java Tue Dec 11 16:19:43 2012
@@ -78,10 +78,12 @@ class CharBlockArray implements Appendab
return index % blockSize;
}
+ @Override
public CharBlockArray append(CharSequence chars) {
return append(chars, 0, chars.length());
}
+ @Override
public CharBlockArray append(char c) {
if (this.current.length == this.blockSize) {
addBlock();
@@ -92,6 +94,7 @@ class CharBlockArray implements Appendab
return this;
}
+ @Override
public CharBlockArray append(CharSequence chars, int start, int length) {
int end = start + length;
for (int i = start; i < end; i++) {
@@ -144,15 +147,18 @@ class CharBlockArray implements Appendab
return this;
}
+ @Override
public char charAt(int index) {
Block b = this.blocks.get(blockIndex(index));
return b.chars[indexInBlock(index)];
}
+ @Override
public int length() {
return this.length;
}
+ @Override
public CharSequence subSequence(int start, int end) {
throw new UnsupportedOperationException("subsequence not implemented yet");
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/cl2o/CollisionMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/cl2o/CollisionMap.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/cl2o/CollisionMap.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/cl2o/CollisionMap.java Tue Dec 11 16:19:43 2012
@@ -239,10 +239,12 @@ public class CollisionMap {
this.index = i;
}
+ @Override
public boolean hasNext() {
return this.next != null;
}
+ @Override
public Entry next() {
Entry e = this.next;
if (e == null) throw new NoSuchElementException();
@@ -258,6 +260,7 @@ public class CollisionMap {
return e;
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/util/MultiCategoryListIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/util/MultiCategoryListIterator.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/util/MultiCategoryListIterator.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/util/MultiCategoryListIterator.java Tue Dec 11 16:19:43 2012
@@ -43,6 +43,7 @@ public class MultiCategoryListIterator i
}
/** Fails if all given iterators fail to init */
+ @Override
public boolean init() throws IOException {
for (CategoryListIterator cli : iterators) {
if (cli.init()) {
@@ -56,6 +57,7 @@ public class MultiCategoryListIterator i
* Return a value larger than {@link Integer#MAX_VALUE} only if all
* iterators are exhausted
*/
+ @Override
public long nextCategory() throws IOException {
while (!perDocValidIterators.isEmpty()) {
long value = perDocValidIterators.get(0).nextCategory();
@@ -70,6 +72,7 @@ public class MultiCategoryListIterator i
/**
* Fails only if skipTo on all the provided iterators returned {@code false}
*/
+ @Override
public boolean skipTo(int docId) throws IOException {
perDocValidIterators.clear();
for (CategoryListIterator cli : validIterators) {
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/util/ResultSortUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/util/ResultSortUtils.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/util/ResultSortUtils.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/util/ResultSortUtils.java Tue Dec 11 16:19:43 2012
@@ -144,14 +144,17 @@ public class ResultSortUtils {
this.accending = accending;
}
+ @Override
public FacetResultNode insertWithOverflow(FacetResultNode node) {
resultNodes.add(node);
return null;
}
+ @Override
public FacetResultNode pop() {
if (!isReady) {
Collections.sort(resultNodes, new Comparator<FacetResultNode>() {
+ @Override
public int compare(FacetResultNode o1, FacetResultNode o2) {
int value = Double.compare(o1.getValue(), o2
.getValue());
@@ -170,10 +173,12 @@ public class ResultSortUtils {
return resultNodes.remove(0);
}
+ @Override
public int size() {
return resultNodes.size();
}
+ @Override
public FacetResultNode top() {
if (resultNodes.size() > 0) {
return resultNodes.get(0);
@@ -182,11 +187,13 @@ public class ResultSortUtils {
return null;
}
+ @Override
public FacetResultNode add(FacetResultNode frn) {
resultNodes.add(frn);
return null;
}
+ @Override
public void clear() {
resultNodes.clear();
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/util/ScoredDocIdsUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/util/ScoredDocIdsUtils.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/util/ScoredDocIdsUtils.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/util/ScoredDocIdsUtils.java Tue Dec 11 16:19:43 2012
@@ -118,6 +118,7 @@ public class ScoredDocIdsUtils {
return new ScoredDocIDs() {
+ @Override
public DocIdSet getDocIDs() {
return new DocIdSet() {
@@ -155,19 +156,24 @@ public class ScoredDocIdsUtils {
};
}
+ @Override
public ScoredDocIDsIterator iterator() {
return new ScoredDocIDsIterator() {
int next = -1;
+ @Override
public boolean next() { return ++next < size; }
+ @Override
public float getScore() { return scores[next]; }
+ @Override
public int getDocID() { return docids[next]; }
};
}
+ @Override
public int size() { return size; }
};
@@ -191,11 +197,14 @@ public class ScoredDocIdsUtils {
public static final ScoredDocIDs createScoredDocIds(final DocIdSet docIdSet, final int maxDoc) {
return new ScoredDocIDs() {
private int size = -1;
+ @Override
public DocIdSet getDocIDs() { return docIdSet; }
+ @Override
public ScoredDocIDsIterator iterator() throws IOException {
final DocIdSetIterator docIterator = docIdSet.iterator();
return new ScoredDocIDsIterator() {
+ @Override
public boolean next() {
try {
return docIterator.nextDoc() != DocIdSetIterator.NO_MORE_DOCS;
@@ -204,12 +213,15 @@ public class ScoredDocIdsUtils {
}
}
+ @Override
public float getScore() { return DEFAULT_SCORE; }
+ @Override
public int getDocID() { return docIterator.docID(); }
};
}
+ @Override
public int size() {
// lazy size computation
if (size < 0) {
@@ -238,10 +250,12 @@ public class ScoredDocIdsUtils {
this.maxDoc = reader.maxDoc();
}
+ @Override
public int size() {
return maxDoc;
}
+ @Override
public DocIdSet getDocIDs() {
return new DocIdSet() {
@@ -279,10 +293,12 @@ public class ScoredDocIdsUtils {
};
}
+ @Override
public ScoredDocIDsIterator iterator() {
try {
final DocIdSetIterator iter = getDocIDs().iterator();
return new ScoredDocIDsIterator() {
+ @Override
public boolean next() {
try {
return iter.nextDoc() != DocIdSetIterator.NO_MORE_DOCS;
@@ -292,10 +308,12 @@ public class ScoredDocIdsUtils {
}
}
+ @Override
public float getScore() {
return DEFAULT_SCORE;
}
+ @Override
public int getDocID() {
return iter.docID();
}
@@ -324,10 +342,12 @@ public class ScoredDocIdsUtils {
this.reader = reader;
}
+ @Override
public int size() {
return reader.numDocs();
}
+ @Override
public DocIdSet getDocIDs() {
return new DocIdSet() {
@@ -369,10 +389,12 @@ public class ScoredDocIdsUtils {
};
}
+ @Override
public ScoredDocIDsIterator iterator() {
try {
final DocIdSetIterator iter = getDocIDs().iterator();
return new ScoredDocIDsIterator() {
+ @Override
public boolean next() {
try {
return iter.nextDoc() != DocIdSetIterator.NO_MORE_DOCS;
@@ -382,10 +404,12 @@ public class ScoredDocIdsUtils {
}
}
+ @Override
public float getScore() {
return DEFAULT_SCORE;
}
+ @Override
public int getDocID() {
return iter.docID();
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/ArrayHashMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/ArrayHashMap.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/ArrayHashMap.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/ArrayHashMap.java Tue Dec 11 16:19:43 2012
@@ -65,10 +65,12 @@ public class ArrayHashMap<K,V> implement
}
}
+ @Override
public boolean hasNext() {
return index != 0;
}
+ @Override
public int next() {
// Save the last index visited
lastIndex = index;
@@ -86,6 +88,7 @@ public class ArrayHashMap<K,V> implement
return lastIndex;
}
+ @Override
@SuppressWarnings("unchecked")
public void remove() {
ArrayHashMap.this.remove((K) keys[lastIndex]);
@@ -99,15 +102,18 @@ public class ArrayHashMap<K,V> implement
KeyIterator() { }
+ @Override
public boolean hasNext() {
return iterator.hasNext();
}
+ @Override
@SuppressWarnings("unchecked")
public K next() {
return (K) keys[iterator.next()];
}
+ @Override
public void remove() {
iterator.remove();
}
@@ -119,15 +125,18 @@ public class ArrayHashMap<K,V> implement
ValueIterator() { }
+ @Override
public boolean hasNext() {
return iterator.hasNext();
}
+ @Override
@SuppressWarnings("unchecked")
public V next() {
return (V) values[iterator.next()];
}
+ @Override
public void remove() {
iterator.remove();
}
@@ -378,6 +387,7 @@ public class ArrayHashMap<K,V> implement
}
/** Returns an iterator on the mapped objects. */
+ @Override
public Iterator<V> iterator() {
return new ValueIterator();
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/FloatToObjectMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/FloatToObjectMap.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/FloatToObjectMap.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/FloatToObjectMap.java Tue Dec 11 16:19:43 2012
@@ -73,10 +73,12 @@ public class FloatToObjectMap<T> impleme
}
}
+ @Override
public boolean hasNext() {
return (index != 0);
}
+ @Override
public int next() {
// Save the last index visited
lastIndex = index;
@@ -94,6 +96,7 @@ public class FloatToObjectMap<T> impleme
return lastIndex;
}
+ @Override
public void remove() {
FloatToObjectMap.this.remove(keys[lastIndex]);
}
@@ -108,14 +111,17 @@ public class FloatToObjectMap<T> impleme
KeyIterator() { }
+ @Override
public boolean hasNext() {
return iterator.hasNext();
}
+ @Override
public float next() {
return keys[iterator.next()];
}
+ @Override
public void remove() {
iterator.remove();
}
@@ -130,15 +136,18 @@ public class FloatToObjectMap<T> impleme
ValueIterator() { }
+ @Override
public boolean hasNext() {
return iterator.hasNext();
}
+ @Override
@SuppressWarnings("unchecked")
public T next() {
return (T) values[iterator.next()];
}
+ @Override
public void remove() {
iterator.remove();
}
@@ -445,6 +454,7 @@ public class FloatToObjectMap<T> impleme
/**
* Returns a new iterator for the mapped objects.
*/
+ @Override
public Iterator<T> iterator() {
return new ValueIterator();
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/IntHashSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/IntHashSet.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/IntHashSet.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/IntHashSet.java Tue Dec 11 16:19:43 2012
@@ -64,10 +64,12 @@ public class IntHashSet {
}
}
+ @Override
public boolean hasNext() {
return (index != 0);
}
+ @Override
public int next() {
// Save the last index visited
lastIndex = index;
@@ -85,6 +87,7 @@ public class IntHashSet {
return lastIndex;
}
+ @Override
public void remove() {
IntHashSet.this.remove(keys[lastIndex]);
}
@@ -99,14 +102,17 @@ public class IntHashSet {
KeyIterator() { }
+ @Override
public boolean hasNext() {
return iterator.hasNext();
}
+ @Override
public int next() {
return keys[iterator.next()];
}
+ @Override
public void remove() {
iterator.remove();
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/IntToDoubleMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/IntToDoubleMap.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/IntToDoubleMap.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/IntToDoubleMap.java Tue Dec 11 16:19:43 2012
@@ -72,10 +72,12 @@ public class IntToDoubleMap {
}
}
+ @Override
public boolean hasNext() {
return (index != 0);
}
+ @Override
public int next() {
// Save the last index visited
lastIndex = index;
@@ -93,6 +95,7 @@ public class IntToDoubleMap {
return lastIndex;
}
+ @Override
public void remove() {
IntToDoubleMap.this.remove(keys[lastIndex]);
}
@@ -107,14 +110,17 @@ public class IntToDoubleMap {
KeyIterator() { }
+ @Override
public boolean hasNext() {
return iterator.hasNext();
}
+ @Override
public int next() {
return keys[iterator.next()];
}
+ @Override
public void remove() {
iterator.remove();
}
@@ -129,14 +135,17 @@ public class IntToDoubleMap {
ValueIterator() { }
+ @Override
public boolean hasNext() {
return iterator.hasNext();
}
+ @Override
public double next() {
return values[iterator.next()];
}
+ @Override
public void remove() {
iterator.remove();
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/IntToIntMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/IntToIntMap.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/IntToIntMap.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/IntToIntMap.java Tue Dec 11 16:19:43 2012
@@ -71,10 +71,12 @@ public class IntToIntMap {
}
}
+ @Override
public boolean hasNext() {
return (index != 0);
}
+ @Override
public int next() {
// Save the last index visited
lastIndex = index;
@@ -92,6 +94,7 @@ public class IntToIntMap {
return lastIndex;
}
+ @Override
public void remove() {
IntToIntMap.this.remove(keys[lastIndex]);
}
@@ -106,14 +109,17 @@ public class IntToIntMap {
KeyIterator() { }
+ @Override
public boolean hasNext() {
return iterator.hasNext();
}
+ @Override
public int next() {
return keys[iterator.next()];
}
+ @Override
public void remove() {
iterator.remove();
}
@@ -127,14 +133,17 @@ public class IntToIntMap {
ValueIterator() { }
+ @Override
public boolean hasNext() {
return iterator.hasNext();
}
+ @Override
public int next() {
return values[iterator.next()];
}
+ @Override
public void remove() {
iterator.remove();
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/IntToObjectMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/IntToObjectMap.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/IntToObjectMap.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/IntToObjectMap.java Tue Dec 11 16:19:43 2012
@@ -72,10 +72,12 @@ public class IntToObjectMap<T> implement
}
}
+ @Override
public boolean hasNext() {
return (index != 0);
}
+ @Override
public int next() {
// Save the last index visited
lastIndex = index;
@@ -93,6 +95,7 @@ public class IntToObjectMap<T> implement
return lastIndex;
}
+ @Override
public void remove() {
IntToObjectMap.this.remove(keys[lastIndex]);
}
@@ -107,14 +110,17 @@ public class IntToObjectMap<T> implement
KeyIterator() { }
+ @Override
public boolean hasNext() {
return iterator.hasNext();
}
+ @Override
public int next() {
return keys[iterator.next()];
}
+ @Override
public void remove() {
iterator.remove();
}
@@ -129,15 +135,18 @@ public class IntToObjectMap<T> implement
ValueIterator() { }
+ @Override
public boolean hasNext() {
return iterator.hasNext();
}
+ @Override
@SuppressWarnings("unchecked")
public T next() {
return (T) values[iterator.next()];
}
+ @Override
public void remove() {
iterator.remove();
}
@@ -445,6 +454,7 @@ public class IntToObjectMap<T> implement
/**
* Returns a new iterator for the mapped objects.
*/
+ @Override
public Iterator<T> iterator() {
return new ValueIterator();
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/ObjectToFloatMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/ObjectToFloatMap.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/ObjectToFloatMap.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/ObjectToFloatMap.java Tue Dec 11 16:19:43 2012
@@ -72,10 +72,12 @@ public class ObjectToFloatMap<K> {
}
}
+ @Override
public boolean hasNext() {
return (index != 0);
}
+ @Override
public int next() {
// Save the last index visited
lastIndex = index;
@@ -93,6 +95,7 @@ public class ObjectToFloatMap<K> {
return lastIndex;
}
+ @Override
@SuppressWarnings("unchecked")
public void remove() {
ObjectToFloatMap.this.remove((K) keys[lastIndex]);
@@ -108,15 +111,18 @@ public class ObjectToFloatMap<K> {
KeyIterator() { }
+ @Override
public boolean hasNext() {
return iterator.hasNext();
}
+ @Override
@SuppressWarnings("unchecked")
public K next() {
return (K) keys[iterator.next()];
}
+ @Override
public void remove() {
iterator.remove();
}
@@ -131,14 +137,17 @@ public class ObjectToFloatMap<K> {
ValueIterator() { }
+ @Override
public boolean hasNext() {
return iterator.hasNext();
}
+ @Override
public float next() {
return values[iterator.next()];
}
+ @Override
public void remove() {
iterator.remove();
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/ObjectToIntMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/ObjectToIntMap.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/ObjectToIntMap.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/util/collections/ObjectToIntMap.java Tue Dec 11 16:19:43 2012
@@ -72,10 +72,12 @@ public class ObjectToIntMap<K> {
}
}
+ @Override
public boolean hasNext() {
return (index != 0);
}
+ @Override
public int next() {
// Save the last index visited
lastIndex = index;
@@ -93,6 +95,7 @@ public class ObjectToIntMap<K> {
return lastIndex;
}
+ @Override
@SuppressWarnings("unchecked")
public void remove() {
ObjectToIntMap.this.remove((K) keys[lastIndex]);
@@ -108,15 +111,18 @@ public class ObjectToIntMap<K> {
KeyIterator() { }
+ @Override
public boolean hasNext() {
return iterator.hasNext();
}
+ @Override
@SuppressWarnings("unchecked")
public K next() {
return (K) keys[iterator.next()];
}
+ @Override
public void remove() {
iterator.remove();
}
@@ -131,14 +137,17 @@ public class ObjectToIntMap<K> {
ValueIterator() {}
+ @Override
public boolean hasNext() {
return iterator.hasNext();
}
+ @Override
public int next() {
return values[iterator.next()];
}
+ @Override
public void remove() {
iterator.remove();
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/facet/enhancements/CategoryEnhancementDummy1.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/facet/enhancements/CategoryEnhancementDummy1.java?rev=1420249&r1=1420248&r2=1420249&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/facet/enhancements/CategoryEnhancementDummy1.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/facet/enhancements/CategoryEnhancementDummy1.java Tue Dec 11 16:19:43 2012
@@ -28,28 +28,34 @@ import org.apache.lucene.facet.taxonomy.
public class CategoryEnhancementDummy1 implements CategoryEnhancement {
+ @Override
public boolean generatesCategoryList() {
return false;
}
+ @Override
public String getCategoryListTermText() {
return null;
}
+ @Override
public CategoryListTokenizer getCategoryListTokenizer(
TokenStream tokenizer, EnhancementsIndexingParams indexingParams,
TaxonomyWriter taxonomyWriter) {
return null;
}
+ @Override
public byte[] getCategoryTokenBytes(CategoryAttribute categoryAttribute) {
return null;
}
+ @Override
public Object extractCategoryTokenData(byte[] buffer, int offset, int length) {
return null;
}
+ @Override
public Class<? extends CategoryProperty> getRetainableProperty() {
return null;
}