nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 0acd1210: Fix wrong indents. 

* commit '0acd121083baf137dc81cd2c5ce4214a9848a82d':
  Fix wrong indents.
main
Ken Wakasa 2014-01-24 06:59:07 -08:00 committed by Android Git Automerger
parent 042b560a80 0acd121083
commit 86795823f7
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
java/src/com/android/inputmethod/latin/utils/CoordinateUtils.java
View File

@ -50,16 +50,16 @@ public final class CoordinateUtils {
} }
public static int[] newCoordinateArray(final int arraySize) { public static int[] newCoordinateArray(final int arraySize) {
return new int[ELEMENT_SIZE * arraySize]; return new int[ELEMENT_SIZE * arraySize];
} }
public static int[] newCoordinateArray(final int arraySize, public static int[] newCoordinateArray(final int arraySize,
final int defaultX, final int defaultY) { final int defaultX, final int defaultY) {
final int[] result = new int[ELEMENT_SIZE * arraySize]; final int[] result = new int[ELEMENT_SIZE * arraySize];
for (int i = 0; i < arraySize; ++i) { for (int i = 0; i < arraySize; ++i) {
setXYInArray(result, i, defaultX, defaultY); setXYInArray(result, i, defaultX, defaultY);
} }
return result; return result;
} }
public static int xFromArray(final int[] coordsArray, final int index) { public static int xFromArray(final int[] coordsArray, final int index) {
@ -88,8 +88,4 @@ public final class CoordinateUtils {
coordsArray[baseIndex + INDEX_X] = coords[INDEX_X]; coordsArray[baseIndex + INDEX_X] = coords[INDEX_X];
coordsArray[baseIndex + INDEX_Y] = coords[INDEX_Y]; coordsArray[baseIndex + INDEX_Y] = coords[INDEX_Y];
} }
public static void copyArray(final int[] destination, final int[] source) {
System.arraycopy(source, 0, destination, 0, source.length);
}
} }

5
tests/src/com/android/inputmethod/latin/WordComposerTests.java
View File

@ -39,11 +39,10 @@ public class WordComposerTests extends AndroidTestCase {
final int[] CODEPOINTS_WITHIN_BMP = StringUtils.toCodePointArray(STR_WITHIN_BMP); final int[] CODEPOINTS_WITHIN_BMP = StringUtils.toCodePointArray(STR_WITHIN_BMP);
final int[] COORDINATES_WITHIN_BMP = final int[] COORDINATES_WITHIN_BMP =
CoordinateUtils.newCoordinateArray(CODEPOINTS_WITHIN_BMP.length, CoordinateUtils.newCoordinateArray(CODEPOINTS_WITHIN_BMP.length,
Constants.NOT_A_COORDINATE, Constants.NOT_A_COORDINATE); Constants.NOT_A_COORDINATE, Constants.NOT_A_COORDINATE);
final String PREVWORD = "prevword"; final String PREVWORD = "prevword";
wc.setComposingWord(CODEPOINTS_WITHIN_BMP, COORDINATES_WITHIN_BMP, PREVWORD); wc.setComposingWord(CODEPOINTS_WITHIN_BMP, COORDINATES_WITHIN_BMP, PREVWORD);
assertEquals(wc.size(), assertEquals(wc.size(), STR_WITHIN_BMP.codePointCount(0, STR_WITHIN_BMP.length()));
STR_WITHIN_BMP.codePointCount(0, STR_WITHIN_BMP.length()));
assertFalse(wc.isCursorFrontOrMiddleOfComposingWord()); assertFalse(wc.isCursorFrontOrMiddleOfComposingWord());
wc.setCursorPositionWithinWord(2); wc.setCursorPositionWithinWord(2);
assertTrue(wc.isCursorFrontOrMiddleOfComposingWord()); assertTrue(wc.isCursorFrontOrMiddleOfComposingWord());