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

Commit 361881b8 authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi Committed by Android (Google) Code Review
Browse files

Merge "Separate JniDataUtils::constructAttributeMap()."

parents 68b4f2ad edc7d02d

native/jni/com_android_inputmethod_latin_BinaryDictionaryUtils.cpp

+4 −23
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h"

#include "utils/autocorrection_threshold_utils.h"

#include "utils/char_utils.h"

#include "utils/jni_data_utils.h"

#include "utils/time_keeper.h"



namespace latinime {
@@ -43,29 +44,9 @@ static jboolean latinime_BinaryDictionaryUtils_createEmptyDictFile(JNIEnv *env, 
    if (keyCount != valueCount) {

        return false;

    }



    DictionaryHeaderStructurePolicy::AttributeMap attributeMap;

    for (int i = 0; i < keyCount; i++) {

        jstring keyString = static_cast<jstring>(

                env->GetObjectArrayElement(attributeKeyStringArray, i));

        const jsize keyUtf8Length = env->GetStringUTFLength(keyString);

        char keyChars[keyUtf8Length + 1];

        env->GetStringUTFRegion(keyString, 0, env->GetStringLength(keyString), keyChars);

        keyChars[keyUtf8Length] = '\0';

        DictionaryHeaderStructurePolicy::AttributeMap::key_type key;

        HeaderReadWriteUtils::insertCharactersIntoVector(keyChars, &key);



        jstring valueString = static_cast<jstring>(

                env->GetObjectArrayElement(attributeValueStringArray, i));

        const jsize valueUtf8Length = env->GetStringUTFLength(valueString);

        char valueChars[valueUtf8Length + 1];

        env->GetStringUTFRegion(valueString, 0, env->GetStringLength(valueString), valueChars);

        valueChars[valueUtf8Length] = '\0';

        DictionaryHeaderStructurePolicy::AttributeMap::mapped_type value;

        HeaderReadWriteUtils::insertCharactersIntoVector(valueChars, &value);

        attributeMap[key] = value;

    }



    DictionaryHeaderStructurePolicy::AttributeMap attributeMap =

            JniDataUtils::constructAttributeMap(env, attributeKeyStringArray,

                    attributeValueStringArray);

    return DictFileWritingUtils::createEmptyDictFile(filePathChars, static_cast<int>(dictVersion),

            CharUtils::convertShortArrayToIntVector(localeCodePoints, localeLength), &attributeMap);

}

native/jni/src/utils/jni_data_utils.h

+29 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 


#include "defines.h"

#include "jni.h"

#include "suggest/core/policy/dictionary_header_structure_policy.h"

#include "suggest/policyimpl/dictionary/header/header_read_write_utils.h"



namespace latinime {
@@ -36,6 +38,33 @@ class JniDataUtils { 
        env->GetIntArrayRegion(array, 0 /* start */, arrayLength, outVector->data());

    }



    static DictionaryHeaderStructurePolicy::AttributeMap constructAttributeMap(JNIEnv *env,

            jobjectArray attributeKeyStringArray, jobjectArray attributeValueStringArray) {

        DictionaryHeaderStructurePolicy::AttributeMap attributeMap;

        const int keyCount = env->GetArrayLength(attributeKeyStringArray);

        for (int i = 0; i < keyCount; i++) {

            jstring keyString = static_cast<jstring>(

                    env->GetObjectArrayElement(attributeKeyStringArray, i));

            const jsize keyUtf8Length = env->GetStringUTFLength(keyString);

            char keyChars[keyUtf8Length + 1];

            env->GetStringUTFRegion(keyString, 0, env->GetStringLength(keyString), keyChars);

            keyChars[keyUtf8Length] = '\0';

            DictionaryHeaderStructurePolicy::AttributeMap::key_type key;

            HeaderReadWriteUtils::insertCharactersIntoVector(keyChars, &key);



            jstring valueString = static_cast<jstring>(

                    env->GetObjectArrayElement(attributeValueStringArray, i));

            const jsize valueUtf8Length = env->GetStringUTFLength(valueString);

            char valueChars[valueUtf8Length + 1];

            env->GetStringUTFRegion(valueString, 0, env->GetStringLength(valueString), valueChars);

            valueChars[valueUtf8Length] = '\0';

            DictionaryHeaderStructurePolicy::AttributeMap::mapped_type value;

            HeaderReadWriteUtils::insertCharactersIntoVector(valueChars, &value);

            attributeMap[key] = value;

        }

        return attributeMap;

    }



 private:

    DISALLOW_IMPLICIT_CONSTRUCTORS(JniDataUtils);

};