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

Move arrayAsList method to CollectionUtils 

Change-Id: If7c1eb7c802490f19c5d3b81d714362408daf376
main
Tadashi G. Takaoka 2014-01-31 15:26:05 +09:00
parent de76e62b69
commit d245f6c9e2
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
java/src/com/android/inputmethod/keyboard/internal/KeySpecParser.java
View File

@ -265,21 +265,6 @@ public final class KeySpecParser {
return KeyboardIconsSet.ICON_UNDEFINED; return KeyboardIconsSet.ICON_UNDEFINED;
} }
private static <T> ArrayList<T> arrayAsList(final T[] array, final int start, final int end) {
if (array == null) {
throw new NullPointerException();
}
if (start < 0 || start > end || end > array.length) {
throw new IllegalArgumentException();
}
final ArrayList<T> list = CollectionUtils.newArrayList(end - start);
for (int i = start; i < end; i++) {
list.add(array[i]);
}
return list;
}
private static final String[] EMPTY_STRING_ARRAY = new String[0]; private static final String[] EMPTY_STRING_ARRAY = new String[0];
private static String[] filterOutEmptyString(final String[] array) { private static String[] filterOutEmptyString(final String[] array) {
@ -291,7 +276,7 @@ public final class KeySpecParser {
final String entry = array[i]; final String entry = array[i];
if (TextUtils.isEmpty(entry)) { if (TextUtils.isEmpty(entry)) {
if (out == null) { if (out == null) {
out = arrayAsList(array, 0, i); out = CollectionUtils.arrayAsList(array, 0, i);
} }
} else if (out != null) { } else if (out != null) {
out.add(entry); out.add(entry);
@ -326,7 +311,7 @@ public final class KeySpecParser {
} else { } else {
// Filter out excessive '%' marker. // Filter out excessive '%' marker.
if (out == null) { if (out == null) {
out = arrayAsList(moreKeys, 0, moreKeyIndex); out = CollectionUtils.arrayAsList(moreKeys, 0, moreKeyIndex);
} }
} }
} else { } else {
@ -343,7 +328,7 @@ public final class KeySpecParser {
+ " moreKeys=" + Arrays.toString(moreKeys) + " moreKeys=" + Arrays.toString(moreKeys)
+ " additionalMoreKeys=" + Arrays.toString(additionalMoreKeys)); + " additionalMoreKeys=" + Arrays.toString(additionalMoreKeys));
} }
out = arrayAsList(additionalMoreKeys, additionalIndex, additionalCount); out = CollectionUtils.arrayAsList(additionalMoreKeys, additionalIndex, additionalCount);
for (int i = 0; i < moreKeysCount; i++) { for (int i = 0; i < moreKeysCount; i++) {
out.add(moreKeys[i]); out.add(moreKeys[i]);
} }
@ -355,7 +340,7 @@ public final class KeySpecParser {
+ " moreKeys=" + Arrays.toString(moreKeys) + " moreKeys=" + Arrays.toString(moreKeys)
+ " additionalMoreKeys=" + Arrays.toString(additionalMoreKeys)); + " additionalMoreKeys=" + Arrays.toString(additionalMoreKeys));
} }
out = arrayAsList(moreKeys, 0, moreKeysCount); out = CollectionUtils.arrayAsList(moreKeys, 0, moreKeysCount);
for (int i = additionalIndex; i < additionalCount; i++) { for (int i = additionalIndex; i < additionalCount; i++) {
out.add(additionalMoreKeys[additionalIndex]); out.add(additionalMoreKeys[additionalIndex]);
} }

15
java/src/com/android/inputmethod/latin/utils/CollectionUtils.java
View File

@ -102,4 +102,19 @@ public final class CollectionUtils {
public static <E> SparseArray<E> newSparseArray() { public static <E> SparseArray<E> newSparseArray() {
return new SparseArray<E>(); return new SparseArray<E>();
} }
public static <E> ArrayList<E> arrayAsList(final E[] array, final int start, final int end) {
if (array == null) {
throw new NullPointerException();
}
if (start < 0 || start > end || end > array.length) {
throw new IllegalArgumentException();
}
final ArrayList<E> list = newArrayList(end - start);
for (int i = start; i < end; i++) {
list.add(array[i]);
}
return list;
}
} }