Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa918710 authored by Jean Chalard's avatar Jean Chalard
Browse files

Make the dictionary iterator shortcut-aware (B4) 

Change-Id: I529dff4a50276d1a4f4896c66d1aa35296b21000
parent eec2e51e

tools/makedict/src/com/android/inputmethod/latin/BinaryDictInputOutput.java

+1 −2
Original line number Diff line number Diff line
@@ -1003,8 +1003,7 @@ public class BinaryDictInputOutput { 
                new FusionDictionary.DictionaryOptions());

        if (null != dict) {

            for (Word w : dict) {

                // TODO: pass the shortcut targets

                newDict.add(w.mWord, w.mFrequency, null, w.mBigrams);

                newDict.add(w.mWord, w.mFrequency, w.mShortcutTargets, w.mBigrams);

            }

        }

tools/makedict/src/com/android/inputmethod/latin/FusionDictionary.java

+1 −2
Original line number Diff line number Diff line
@@ -592,8 +592,7 @@ public class FusionDictionary implements Iterable<Word> { 
                    }

                    if (currentGroup.mFrequency >= 0)

                        return new Word(mCurrentString.toString(), currentGroup.mFrequency,

                                // TODO: pass the shortcut targets here

                                currentGroup.mBigrams);

                                currentGroup.mShortcutTargets, currentGroup.mBigrams);

                } else {

                    mPositions.removeLast();

                    currentPos = mPositions.getLast();

tools/makedict/src/com/android/inputmethod/latin/Word.java

+6 −1
Original line number Diff line number Diff line
@@ -28,11 +28,15 @@ import java.util.ArrayList; 
public class Word implements Comparable<Word> {

    final String mWord;

    final int mFrequency;

    final ArrayList<WeightedString> mShortcutTargets;

    final ArrayList<WeightedString> mBigrams;



    public Word(String word, int frequency, ArrayList<WeightedString> bigrams) {

    public Word(final String word, final int frequency,

            final ArrayList<WeightedString> shortcutTargets,

            final ArrayList<WeightedString> bigrams) {

        mWord = word;

        mFrequency = frequency;

        mShortcutTargets = shortcutTargets;

        mBigrams = bigrams;

    }
@@ -60,6 +64,7 @@ public class Word implements Comparable<Word> { 
        if (!(o instanceof Word)) return false;

        Word w = (Word)o;

        return mFrequency == w.mFrequency && mWord.equals(w.mWord)

                && mShortcutTargets.equals(w.mShortcutTargets)

                && mBigrams.equals(w.mBigrams);

    }

}