+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package com.hughes.android.dictionary.engine;
import java.io.IOException;
}
if (rUp < index.rows.size()) {
final RowBase rowUp = index.rows.get(rUp);
- final TokenRow candidateUp = rowUp.getTokenRow(false);
+ TokenRow candidateUp = rowUp.getTokenRow(false);
if (candidateUp != null) {
+ // Did we hit the next set of TokenRows?
+ if (candidateUp.index() > this.index()) {
+ final int tokenIndex = index.sortedIndexEntries.get(candidateUp.referenceIndex - 1).startRow;
+ candidateUp = (TokenRow) index.rows.get(tokenIndex);
+ }
for (--rUp; rUp >= index(); --rUp) {
index.rows.get(rUp).setTokenRow(candidateUp);
}
final byte rowType = raf.readByte();
if (rowType == 0) {
return new PairEntry.Row(raf, listIndex, index);
- } else if (rowType == 1) {
- return new TokenRow(raf, listIndex, index);
+ } else if (rowType == 1 || rowType == 3) {
+ return new TokenRow(raf, listIndex, index, rowType == 1);
+ } else if (rowType == 2) {
+ return new TextEntry.Row(raf, listIndex, index);
}
throw new RuntimeException("Invalid rowType:" + rowType);
}
if (t instanceof PairEntry.Row) {
raf.writeByte(0);
} else if (t instanceof TokenRow) {
- raf.writeByte(1);
+ final TokenRow tokenRow = (TokenRow) t;
+ raf.writeByte(tokenRow.hasMainEntry ? 1 : 3);
+ } else if (t instanceof TextEntry.Row) {
+ raf.writeByte(2);
}
raf.writeInt(t.referenceIndex);
}