diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-08-31 15:24:39 +0900 |
|---|---|---|
| committer | Jean Chalard <jchalard@google.com> | 2012-08-31 22:11:52 +0900 |
| commit | 72b1c9394105b6fbc0d8c6ff00f3574ee37a9aaa (patch) | |
| tree | 546b40591ede9a009afdab46dd7495aafc859fa0 /tools/dicttool/src | |
| parent | 49d8af8a4e900f3c68c333aba7fde0a11fd368b1 (diff) | |
| download | latinime-72b1c9394105b6fbc0d8c6ff00f3574ee37a9aaa.tar.gz latinime-72b1c9394105b6fbc0d8c6ff00f3574ee37a9aaa.tar.xz latinime-72b1c9394105b6fbc0d8c6ff00f3574ee37a9aaa.zip | |
Reinstate the shortcut-only attribute
Also add the blacklist attribute
Bug: 7005742
Bug: 2704000
Change-Id: Icbe60bdf25bfb098d9e3f20870be30d6aef07c9d
Diffstat (limited to 'tools/dicttool/src')
| -rw-r--r-- | tools/dicttool/src/android/inputmethod/latin/dicttool/XmlDictInputOutput.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/dicttool/src/android/inputmethod/latin/dicttool/XmlDictInputOutput.java b/tools/dicttool/src/android/inputmethod/latin/dicttool/XmlDictInputOutput.java index 9ce8c4934..c31cd724a 100644 --- a/tools/dicttool/src/android/inputmethod/latin/dicttool/XmlDictInputOutput.java +++ b/tools/dicttool/src/android/inputmethod/latin/dicttool/XmlDictInputOutput.java @@ -50,6 +50,7 @@ public class XmlDictInputOutput { private static final String SHORTCUT_TAG = "shortcut"; private static final String FREQUENCY_ATTR = "f"; private static final String WORD_ATTR = "word"; + private static final String NOT_A_WORD_ATTR = "not_a_word"; private static final int SHORTCUT_ONLY_DEFAULT_FREQ = 1; @@ -92,7 +93,7 @@ public class XmlDictInputOutput { final FusionDictionary dict = mDictionary; for (final String shortcutOnly : mShortcutsMap.keySet()) { if (dict.hasWord(shortcutOnly)) continue; - dict.add(shortcutOnly, 0, mShortcutsMap.get(shortcutOnly)); + dict.add(shortcutOnly, 0, mShortcutsMap.get(shortcutOnly), true /* isNotAWord */); } mDictionary = null; mShortcutsMap.clear(); @@ -144,7 +145,7 @@ public class XmlDictInputOutput { @Override public void endElement(String uri, String localName, String qName) { if (WORD == mState) { - mDictionary.add(mWord, mFreq, mShortcutsMap.get(mWord)); + mDictionary.add(mWord, mFreq, mShortcutsMap.get(mWord), false /* isNotAWord */); mState = START; } } @@ -345,7 +346,8 @@ public class XmlDictInputOutput { destination.write("<!-- Warning: there is no code to read this format yet. -->\n"); for (Word word : set) { destination.write(" <" + WORD_TAG + " " + WORD_ATTR + "=\"" + word.mWord + "\" " - + FREQUENCY_ATTR + "=\"" + word.mFrequency + "\">"); + + FREQUENCY_ATTR + "=\"" + word.mFrequency + + (word.mIsNotAWord ? "\" " + NOT_A_WORD_ATTR + "=\"true" : "") + "\">"); if (null != word.mShortcutTargets) { destination.write("\n"); for (WeightedString target : word.mShortcutTargets) { |