diff options
| author |   Jean Chalard <jchalard@google.com> | 2013-12-10 23:08:29 +0900 |
|---|---|---|
| committer | Jean Chalard <jchalard@google.com> | 2013-12-13 18:15:05 +0900 |
| commit | 7b55cd3e2b4966150fa4c44dd43ebfeb77058a43 (patch) | |
| tree | 1a5e2dbcc86543e4cd661763e6a057aff9b4da03 /tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java | |
| parent | 2fa3693c264a4c150ac307d9bb7f6f8f18cc4ffc (diff) | |
| download | latinime-7b55cd3e2b4966150fa4c44dd43ebfeb77058a43.tar.gz latinime-7b55cd3e2b4966150fa4c44dd43ebfeb77058a43.tar.xz latinime-7b55cd3e2b4966150fa4c44dd43ebfeb77058a43.zip | |
Remove flags from Java side.
This simplifies the code quite a bit.
- GERMAN_UMLAUTS are now handled through a key-value attribute.
The dictionary generator does not need to know about it any more.
- FRENCH_LIGATURES are deprecated as we handle them with shortcuts now.
- CONTAINS_BIGRAMS is deprecated. Bigram processing is always applied
regardless of this flag.
Bug: 11281748
Change-Id: If567e52e245a9342adc7f3104a0f7d8d782df8c1
Diffstat (limited to 'tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java')
| -rw-r--r-- | tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java b/tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java index ad17a7118..34226dcd3 100644 --- a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java +++ b/tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java @@ -29,23 +29,17 @@ public class BinaryDictUtils { public static final String TEST_DICT_FILE_EXTENSION = ".testDict"; - public static final FormatSpec.FormatOptions VERSION2 = + public static final FormatSpec.FormatOptions VERSION2_OPTIONS = new FormatSpec.FormatOptions(FormatSpec.VERSION2); - public static final FormatSpec.FormatOptions VERSION3_WITHOUT_DYNAMIC_UPDATE = - new FormatSpec.FormatOptions(FormatSpec.VERSION3, false /* supportsDynamicUpdate */); - public static final FormatSpec.FormatOptions VERSION3_WITH_DYNAMIC_UPDATE = - new FormatSpec.FormatOptions(FormatSpec.VERSION3, true /* supportsDynamicUpdate */); - public static final FormatSpec.FormatOptions VERSION4_WITHOUT_DYNAMIC_UPDATE = - new FormatSpec.FormatOptions(FormatSpec.VERSION4, false /* supportsDynamicUpdate */); - public static final FormatSpec.FormatOptions VERSION4_WITH_DYNAMIC_UPDATE = - new FormatSpec.FormatOptions(FormatSpec.VERSION4, true /* supportsDynamicUpdate */); - public static final FormatSpec.FormatOptions VERSION4_WITH_DYNAMIC_UPDATE_AND_TIMESTAMP = - new FormatSpec.FormatOptions(FormatSpec.VERSION4, true /* supportsDynamicUpdate */, - true /* hasTimestamp */); + public static final FormatSpec.FormatOptions VERSION3_OPTIONS = + new FormatSpec.FormatOptions(FormatSpec.VERSION3); + public static final FormatSpec.FormatOptions VERSION4_OPTIONS_WITHOUT_TIMESTAMP = + new FormatSpec.FormatOptions(FormatSpec.VERSION4, false /* hasTimestamp */); + public static final FormatSpec.FormatOptions VERSION4_OPTIONS_WITH_TIMESTAMP = + new FormatSpec.FormatOptions(FormatSpec.VERSION4, true /* hasTimestamp */); public static DictionaryOptions makeDictionaryOptions(final String id, final String version) { - final DictionaryOptions options = new DictionaryOptions(new HashMap<String, String>(), - false /* germanUmlautProcessing */, false /* frenchLigatureProcessing */); + final DictionaryOptions options = new DictionaryOptions(new HashMap<String, String>()); options.mAttributes.put(FileHeader.DICTIONARY_LOCALE_ATTRIBUTE, "en_US"); options.mAttributes.put(FileHeader.DICTIONARY_ID_ATTRIBUTE, id); options.mAttributes.put(FileHeader.DICTIONARY_VERSION_ATTRIBUTE, version); |