am 19b247e7: Fix the name of the argument of writeString.

* commit '19b247e79da7feba9c7b75900f090e7c325f47f4':
  Fix the name of the argument of writeString.
main
Yuichiro Hanada 2013-10-18 01:40:56 -07:00 committed by Android Git Automerger
commit a4c21cad60
1 changed files with 8 additions and 9 deletions

View File

@ -208,8 +208,7 @@ public final class BinaryDictDecoderUtils {
* @param word the string to write. * @param word the string to write.
* @return the size written, in bytes. * @return the size written, in bytes.
*/ */
static int writeString(final byte[] buffer, final int origin, static int writeString(final byte[] buffer, final int origin, final String word) {
final String word) {
final int length = word.length(); final int length = word.length();
int index = origin; int index = origin;
for (int i = 0; i < length; i = word.offsetByCodePoints(i, 1)) { for (int i = 0; i < length; i = word.offsetByCodePoints(i, 1)) {
@ -231,26 +230,26 @@ public final class BinaryDictDecoderUtils {
* *
* This will also write the terminator byte. * This will also write the terminator byte.
* *
* @param buffer the OutputStream to write to. * @param stream the OutputStream to write to.
* @param word the string to write. * @param word the string to write.
* @return the size written, in bytes. * @return the size written, in bytes.
*/ */
static int writeString(final OutputStream buffer, final String word) throws IOException { static int writeString(final OutputStream stream, final String word) throws IOException {
final int length = word.length(); final int length = word.length();
int written = 0; int written = 0;
for (int i = 0; i < length; i = word.offsetByCodePoints(i, 1)) { for (int i = 0; i < length; i = word.offsetByCodePoints(i, 1)) {
final int codePoint = word.codePointAt(i); final int codePoint = word.codePointAt(i);
final int charSize = getCharSize(codePoint); final int charSize = getCharSize(codePoint);
if (1 == charSize) { if (1 == charSize) {
buffer.write((byte) codePoint); stream.write((byte) codePoint);
} else { } else {
buffer.write((byte) (0xFF & (codePoint >> 16))); stream.write((byte) (0xFF & (codePoint >> 16)));
buffer.write((byte) (0xFF & (codePoint >> 8))); stream.write((byte) (0xFF & (codePoint >> 8)));
buffer.write((byte) (0xFF & codePoint)); stream.write((byte) (0xFF & codePoint));
} }
written += charSize; written += charSize;
} }
buffer.write(FormatSpec.PTNODE_CHARACTERS_TERMINATOR); stream.write(FormatSpec.PTNODE_CHARACTERS_TERMINATOR);
written += FormatSpec.PTNODE_TERMINATOR_SIZE; written += FormatSpec.PTNODE_TERMINATOR_SIZE;
return written; return written;
} }