Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated metthods in DocIdBitSet. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@824015 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Busch 2009-10-11 04:00:02 +00:00
parent 3619c380d6
commit 2a7ce3faa3
3 changed files with 0 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/java/org/apache/lucene/util/DocIdBitSet.java
View File

@ -56,22 +56,10 @@ public class DocIdBitSet extends DocIdSet {
this.docId = -1;
}
/** @deprecated use {@link #docID()} instead. */
public int doc() {
assert docId != -1;
return docId;
}
public int docID() {
return docId;
}
/** @deprecated use {@link #nextDoc()} instead. */
public boolean next() {
// (docId + 1) on next line requires -1 initial value for docNr:
return nextDoc() != NO_MORE_DOCS;
}
public int nextDoc() {
// (docId + 1) on next line requires -1 initial value for docNr:
int d = bitSet.nextSetBit(docId + 1);
@ -80,11 +68,6 @@ public class DocIdBitSet extends DocIdSet {
return docId;
}
/** @deprecated use {@link #advance(int)} instead. */
public boolean skipTo(int skipDocNr) {
return advance(skipDocNr) != NO_MORE_DOCS;
}
public int advance(int target) {
int d = bitSet.nextSetBit(target);
// -1 returned by BitSet.nextSetBit() when exhausted

15
src/java/org/apache/lucene/util/OpenBitSetIterator.java
View File

@ -128,11 +128,6 @@ public class OpenBitSetIterator extends DocIdSetIterator {
}
******/
/** @deprecated use {@link #nextDoc()} instead. */
public boolean next() {
return nextDoc() != NO_MORE_DOCS;
}
public int nextDoc() {
if (indexArray == 0) {
if (word != 0) {
@ -160,11 +155,6 @@ public class OpenBitSetIterator extends DocIdSetIterator {
return curDocId = (i<<6) + bitIndex;
}
/** @deprecated use {@link #advance(int)} instead. */
public boolean skipTo(int target) {
return advance(target) != NO_MORE_DOCS;
}
public int advance(int target) {
indexArray = 0;
i = target >> 6;
@ -195,11 +185,6 @@ public class OpenBitSetIterator extends DocIdSetIterator {
return curDocId = (i<<6) + bitIndex;
}
/** @deprecated use {@link #docID()} instead. */
public int doc() {
return curDocId;
}
public int docID() {
return curDocId;
}

13
src/java/org/apache/lucene/util/SortedVIntList.java
View File

@ -204,18 +204,10 @@ public class SortedVIntList extends DocIdSet {
}
}
/** @deprecated use {@link #docID()} instead. */
public int doc() {return lastInt;}
public int docID() {
return doc;
}
/** @deprecated use {@link #nextDoc()} instead. */
public boolean next() {
return nextDoc() != NO_MORE_DOCS;
}
public int nextDoc() {
if (bytePos >= lastBytePos) {
doc = NO_MORE_DOCS;
@ -226,11 +218,6 @@ public class SortedVIntList extends DocIdSet {
return doc;
}
/** @deprecated use {@link #advance(int)} instead. */
public boolean skipTo(int docNr) {
return advance(docNr) != NO_MORE_DOCS;
}
public int advance(int target) {
while (bytePos < lastBytePos) {
advance();