From 12d80ebead6a1d7f704a5a3af3b6fe3313ceab05 Mon Sep 17 00:00:00 2001 From: Dan Zivkovic Date: Tue, 10 Feb 2015 14:54:38 -0800 Subject: Remove shortcut support from LatinIME. Note this change does not affect the native decoder interface. Change-Id: I73b7dc008a5acaf75a31a36a2d332b5afabd82d0 --- .../inputmethod/latin/makedict/Ver2DictEncoderTests.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoderTests.java') diff --git a/tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoderTests.java b/tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoderTests.java index 7d858760e..dbf9b7ac2 100644 --- a/tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoderTests.java +++ b/tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoderTests.java @@ -16,9 +16,7 @@ package com.android.inputmethod.latin.makedict; -import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; import java.util.List; import java.util.Map.Entry; @@ -49,7 +47,7 @@ public class Ver2DictEncoderTests extends AndroidTestCase { new FormatSpec.FormatOptions(FormatSpec.VERSION2); final FusionDictionary sourcedict = new FusionDictionary(new PtNodeArray(), BinaryDictUtils.makeDictionaryOptions(dictName, dictVersion, formatOptions)); - addUnigrams(sourcedict, words, null /* shortcutMap */); + addUnigrams(sourcedict, words); final CodePointTable codePointTable = Ver2DictEncoder.makeCodePointTable(sourcedict); // Check if mCodePointOccurrenceArray is correct @@ -73,17 +71,10 @@ public class Ver2DictEncoderTests extends AndroidTestCase { /** * Adds unigrams to the dictionary. */ - private static void addUnigrams(final FusionDictionary dict, final List words, - final HashMap> shortcutMap) { + private static void addUnigrams(final FusionDictionary dict, final List words) { for (final String word : words) { - final ArrayList shortcuts = new ArrayList<>(); - if (shortcutMap != null && shortcutMap.containsKey(word)) { - for (final String shortcut : shortcutMap.get(word)) { - shortcuts.add(new WeightedString(shortcut, UNIGRAM_FREQ)); - } - } dict.add(word, new ProbabilityInfo(UNIGRAM_FREQ), - (shortcutMap == null) ? null : shortcuts, false /* isNotAWord */, + false /* isNotAWord */, false /* isPossiblyOffensive */); } } -- cgit v1.2.3-83-g751a