Merge "Change the return type of getWords and getBigrams (A8)" (90981e42) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/latin/BinaryDictionary.java

+8 −5

Original line number	Diff line number	Diff line
		@@ -107,9 +107,9 @@ public class BinaryDictionary extends Dictionary {
		}

		@Override
		public void getBigrams(final WordComposer codes, final CharSequence previousWord,
		final WordCallback callback) {
		if (mNativeDict == 0) return;
		public ArrayList<SuggestedWordInfo> getBigrams(final WordComposer codes,
		final CharSequence previousWord, final WordCallback callback) {
		if (mNativeDict == 0) return null;

		int[] codePoints = StringUtils.toCodePointArray(previousWord.toString());
		Arrays.fill(mOutputChars_bigrams, (char) 0);
		@@ -142,12 +142,14 @@ public class BinaryDictionary extends Dictionary {
		}
		}
		Utils.addAllSuggestions(mDicTypeId, Dictionary.BIGRAM, suggestions, callback);
		return suggestions;
		}

		// proximityInfo and/or prevWordForBigrams may not be null.
		@Override
		public void getWords(final WordComposer codes, final CharSequence prevWordForBigrams,
		final WordCallback callback, final ProximityInfo proximityInfo) {
		public ArrayList<SuggestedWordInfo> getWords(final WordComposer codes,
		final CharSequence prevWordForBigrams, final WordCallback callback,
		final ProximityInfo proximityInfo) {
		final int count = getSuggestions(codes, prevWordForBigrams, proximityInfo, mOutputChars,
		mScores, mSpaceIndices);

		@@ -167,6 +169,7 @@ public class BinaryDictionary extends Dictionary {
		}
		}
		Utils.addAllSuggestions(mDicTypeId, Dictionary.UNIGRAM, suggestions, callback);
		return suggestions;
		}

		/* package for test */ boolean isValidDictionary() {

java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -120,12 +120,6 @@ public class ContactsBinaryDictionary extends ExpandableBinaryDictionary {
		}
		}

		@Override
		public void getBigrams(final WordComposer codes, final CharSequence previousWord,
		final WordCallback callback) {
		super.getBigrams(codes, previousWord, callback);
		}

		private boolean useFirstLastBigramsForLocale(Locale locale) {
		// TODO: Add firstname/lastname bigram rules for other languages.
		if (locale != null && locale.getLanguage().equals(Locale.ENGLISH.getLanguage())) {

java/src/com/android/inputmethod/latin/Dictionary.java

+8 −5

Original line number	Diff line number	Diff line
		@@ -17,6 +17,9 @@
		package com.android.inputmethod.latin;

		import com.android.inputmethod.keyboard.ProximityInfo;
		import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;

		import java.util.ArrayList;

		/**
		* Abstract base class for a dictionary that can do a fuzzy search for words based on a set of key
		@@ -61,9 +64,10 @@ public abstract class Dictionary {
		* @param prevWordForBigrams the previous word, or null if none
		* @param callback the callback object to send matched words to as possible candidates
		* @param proximityInfo the object for key proximity. May be ignored by some implementations.
		* @return the list of suggestions
		* @see WordCallback#addWord(char[], int, int, int, int, int)
		*/
		abstract public void getWords(final WordComposer composer,
		abstract public ArrayList<SuggestedWordInfo> getWords(final WordComposer composer,
		final CharSequence prevWordForBigrams, final WordCallback callback,
		final ProximityInfo proximityInfo);

		@@ -73,11 +77,10 @@ public abstract class Dictionary {
		* @param composer the key sequence to match
		* @param previousWord the word before
		* @param callback the callback object to send possible word following previous word
		* @return the list of suggestions
		*/
		public void getBigrams(final WordComposer composer, final CharSequence previousWord,
		final WordCallback callback) {
		// empty base implementation
		}
		public abstract ArrayList<SuggestedWordInfo> getBigrams(final WordComposer composer,
		final CharSequence previousWord, final WordCallback callback);

		/**
		* Checks if the given word occurs in the dictionary

java/src/com/android/inputmethod/latin/DictionaryCollection.java

+35 −8

Original line number	Diff line number	Diff line
		@@ -17,9 +17,11 @@
		package com.android.inputmethod.latin;

		import com.android.inputmethod.keyboard.ProximityInfo;
		import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;

		import android.util.Log;

		import java.util.ArrayList;
		import java.util.Collection;
		import java.util.Collections;
		import java.util.concurrent.CopyOnWriteArrayList;
		@@ -50,17 +52,42 @@ public class DictionaryCollection extends Dictionary {
		}

		@Override
		public void getWords(final WordComposer composer, final CharSequence prevWordForBigrams,
		final WordCallback callback, final ProximityInfo proximityInfo) {
		for (final Dictionary dict : mDictionaries)
		dict.getWords(composer, prevWordForBigrams, callback, proximityInfo);
		public ArrayList<SuggestedWordInfo> getWords(final WordComposer composer,
		final CharSequence prevWordForBigrams, final WordCallback callback,
		final ProximityInfo proximityInfo) {
		final CopyOnWriteArrayList<Dictionary> dictionaries = mDictionaries;
		if (dictionaries.isEmpty()) return null;
		// To avoid creating unnecessary objects, we get the list out of the first
		// dictionary and add the rest to it if not null, hence the get(0)
		ArrayList<SuggestedWordInfo> suggestions = dictionaries.get(0).getWords(composer,
		prevWordForBigrams, callback, proximityInfo);
		if (null == suggestions) suggestions = new ArrayList<SuggestedWordInfo>();
		final int length = dictionaries.size();
		for (int i = 0; i < length; ++ i) {
		final ArrayList<SuggestedWordInfo> sugg = dictionaries.get(i).getWords(composer,
		prevWordForBigrams, callback, proximityInfo);
		if (null != sugg) suggestions.addAll(sugg);
		}
		return suggestions;
		}

		@Override
		public void getBigrams(final WordComposer composer, final CharSequence previousWord,
		final WordCallback callback) {
		for (final Dictionary dict : mDictionaries)
		dict.getBigrams(composer, previousWord, callback);
		public ArrayList<SuggestedWordInfo> getBigrams(final WordComposer composer,
		final CharSequence previousWord, final WordCallback callback) {
		final CopyOnWriteArrayList<Dictionary> dictionaries = mDictionaries;
		if (dictionaries.isEmpty()) return null;
		// To avoid creating unnecessary objects, we get the list out of the first
		// dictionary and add the rest to it if not null, hence the get(0)
		ArrayList<SuggestedWordInfo> suggestions = dictionaries.get(0).getBigrams(composer,
		previousWord, callback);
		if (null == suggestions) suggestions = new ArrayList<SuggestedWordInfo>();
		final int length = dictionaries.size();
		for (int i = 0; i < length; ++ i) {
		final ArrayList<SuggestedWordInfo> sugg =
		dictionaries.get(i).getBigrams(composer, previousWord, callback);
		if (null != sugg) suggestions.addAll(sugg);
		}
		return suggestions;
		}

		@Override

java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java

+16 −11

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ import android.os.SystemClock;
		import android.util.Log;

		import com.android.inputmethod.keyboard.ProximityInfo;
		import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
		import com.android.inputmethod.latin.makedict.BinaryDictInputOutput;
		import com.android.inputmethod.latin.makedict.FusionDictionary;
		import com.android.inputmethod.latin.makedict.FusionDictionary.Node;
		@@ -194,13 +195,14 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
		}

		@Override
		public void getWords(final WordComposer codes, final CharSequence prevWordForBigrams,
		final WordCallback callback, final ProximityInfo proximityInfo) {
		public ArrayList<SuggestedWordInfo> getWords(final WordComposer codes,
		final CharSequence prevWordForBigrams, final WordCallback callback,
		final ProximityInfo proximityInfo) {
		asyncReloadDictionaryIfRequired();
		getWordsInner(codes, prevWordForBigrams, callback, proximityInfo);
		return getWordsInner(codes, prevWordForBigrams, callback, proximityInfo);
		}

		protected final void getWordsInner(final WordComposer codes,
		protected final ArrayList<SuggestedWordInfo> getWordsInner(final WordComposer codes,
		final CharSequence prevWordForBigrams, final WordCallback callback,
		final ProximityInfo proximityInfo) {
		// Ensure that there are no concurrent calls to getWords. If there are, do nothing and
		@@ -208,32 +210,35 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
		if (mLocalDictionaryController.tryLock()) {
		try {
		if (mBinaryDictionary != null) {
		mBinaryDictionary.getWords(codes, prevWordForBigrams, callback, proximityInfo);
		return mBinaryDictionary.getWords(codes, prevWordForBigrams, callback,
		proximityInfo);
		}
		} finally {
		mLocalDictionaryController.unlock();
		}
		}
		return null;
		}

		@Override
		public void getBigrams(final WordComposer codes, final CharSequence previousWord,
		final WordCallback callback) {
		public ArrayList<SuggestedWordInfo> getBigrams(final WordComposer codes,
		final CharSequence previousWord, final WordCallback callback) {
		asyncReloadDictionaryIfRequired();
		getBigramsInner(codes, previousWord, callback);
		return getBigramsInner(codes, previousWord, callback);
		}

		protected void getBigramsInner(final WordComposer codes, final CharSequence previousWord,
		final WordCallback callback) {
		protected ArrayList<SuggestedWordInfo> getBigramsInner(final WordComposer codes,
		final CharSequence previousWord, final WordCallback callback) {
		if (mLocalDictionaryController.tryLock()) {
		try {
		if (mBinaryDictionary != null) {
		mBinaryDictionary.getBigrams(codes, previousWord, callback);
		return mBinaryDictionary.getBigrams(codes, previousWord, callback);
		}
		} finally {
		mLocalDictionaryController.unlock();
		}
		}
		return null;
		}

		@Override