You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2014/12/14 23:45:37 UTC
svn commit: r1645535 - in /lucene/dev/branches/lucene2878/lucene/core/src:
java/org/apache/lucene/index/ java/org/apache/lucene/search/
java/org/apache/lucene/search/posfilter/
test/org/apache/lucene/search/posfilter/
Author: romseygeek
Date: Sun Dec 14 22:45:37 2014
New Revision: 1645535
URL: http://svn.apache.org/r1645535
Log:
LUCENE-2878: precommit cleanups
Modified:
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/DocsEnum.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/Scorer.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/posfilter/Interval.java
lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/posfilter/IntervalTestBase.java
Modified: lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/DocsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/DocsEnum.java?rev=1645535&r1=1645534&r2=1645535&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/DocsEnum.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/DocsEnum.java Sun Dec 14 22:45:37 2014
@@ -80,19 +80,14 @@ public abstract class DocsEnum extends D
/**
* Returns the next position. If there are no more
- * positions, this will return DocsEnum.NO_MORE_POSITIONS */
+ * positions, or the iterator does not support positions,
+ * this will return DocsEnum.NO_MORE_POSITIONS */
public abstract int nextPosition() throws IOException;
- /**
- * @return the current starting position.
- * @throws IOException
- */
+ /** Returns current starting position, or NO_MORE_POSITIONS if not supported */
public abstract int startPosition() throws IOException;
- /**
- * @return the current ending position
- * @throws IOException
- */
+ /** Returns current ending position, or NO_MORE_POSITIONS if not supported */
public abstract int endPosition() throws IOException;
/** Returns start offset for the current position, or -1
Modified: lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/Scorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/Scorer.java?rev=1645535&r1=1645534&r2=1645535&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/Scorer.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/Scorer.java Sun Dec 14 22:45:37 2014
@@ -20,6 +20,7 @@ package org.apache.lucene.search;
import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
+import java.util.Locale;
import org.apache.lucene.index.DocsEnum;
@@ -78,9 +79,9 @@ public abstract class Scorer extends Doc
@Override
public String toString() {
try {
- return String.format("%d:%d(%d)->%d(%d)", docID(), startPosition(), startOffset(), endPosition(), endOffset());
+ return String.format(Locale.ROOT, "%d:%d(%d)->%d(%d)", docID(), startPosition(), startOffset(), endPosition(), endOffset());
} catch (IOException e) {
- return String.format("Cannot retrieve position due to IOException");
+ return super.toString();
}
}
Modified: lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/posfilter/Interval.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/posfilter/Interval.java?rev=1645535&r1=1645534&r2=1645535&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/posfilter/Interval.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/posfilter/Interval.java Sun Dec 14 22:45:37 2014
@@ -109,7 +109,7 @@ class Interval implements Cloneable {
/**
* Compare with another Interval to find overlaps
- * @param other
+ * @param other the comparator
* @return true if the two intervals overlap
*/
public boolean overlaps(Interval other) {
Modified: lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/posfilter/IntervalTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/posfilter/IntervalTestBase.java?rev=1645535&r1=1645534&r2=1645535&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/posfilter/IntervalTestBase.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/posfilter/IntervalTestBase.java Sun Dec 14 22:45:37 2014
@@ -18,6 +18,7 @@ package org.apache.lucene.search.posfilt
*/
import java.io.IOException;
+import java.util.Locale;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.index.DocsEnum;
@@ -225,7 +226,7 @@ public abstract class IntervalTestBase e
@Override
public String toString() {
- return String.format("%d:%d[%d]->%d[%d]%s",
+ return String.format(Locale.ROOT, "%d:%d[%d]->%d[%d]%s",
docid, start, startOffset, end, endOffset, composite ? "C" : "");
}
}