From 7c48352af8233dfc740859b2fe73b007ce737122 Mon Sep 17 00:00:00 2001 From: Keisuke Kuroyanagi Date: Mon, 12 Aug 2013 17:18:28 +0900 Subject: [PATCH] Move methods for Shortcut reading to policyimpl. Bug: 6669677 Change-Id: If0a565de015564f803429f4fbf21b05687f80553 --- native/jni/Android.mk | 2 +- .../binary_dictionary_terminal_attributes_reading_utils.cpp | 3 ++- .../binary_dictionary_terminal_attributes_reading_utils.h | 0 .../policyimpl/dictionary/shortcut/shortcut_list_policy.h | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) rename native/jni/src/suggest/{core/dictionary => policyimpl/dictionary/shortcut}/binary_dictionary_terminal_attributes_reading_utils.cpp (94%) rename native/jni/src/suggest/{core/dictionary => policyimpl/dictionary/shortcut}/binary_dictionary_terminal_attributes_reading_utils.h (100%) diff --git a/native/jni/Android.mk b/native/jni/Android.mk index ecc0e4c96..1f86ecc9b 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk @@ -56,7 +56,6 @@ LATIN_IME_CORE_SRC_FILES := \ binary_dictionary_format_utils.cpp \ binary_dictionary_header.cpp \ binary_dictionary_header_reading_utils.cpp \ - binary_dictionary_terminal_attributes_reading_utils.cpp \ bloom_filter.cpp \ byte_array_utils.cpp \ dictionary.cpp \ @@ -72,6 +71,7 @@ LATIN_IME_CORE_SRC_FILES := \ suggest/core/session/dic_traverse_session.cpp \ $(addprefix suggest/policyimpl/dictionary/, \ bigram/bigram_list_reading_utils.cpp \ + shortcut/binary_dictionary_terminal_attributes_reading_utils.cpp \ dictionary_structure_with_buffer_policy_factory.cpp \ dynamic_patricia_trie_node_reader.cpp \ dynamic_patricia_trie_policy.cpp \ diff --git a/native/jni/src/suggest/core/dictionary/binary_dictionary_terminal_attributes_reading_utils.cpp b/native/jni/src/suggest/policyimpl/dictionary/shortcut/binary_dictionary_terminal_attributes_reading_utils.cpp similarity index 94% rename from native/jni/src/suggest/core/dictionary/binary_dictionary_terminal_attributes_reading_utils.cpp rename to native/jni/src/suggest/policyimpl/dictionary/shortcut/binary_dictionary_terminal_attributes_reading_utils.cpp index cb73a577e..4b619bebe 100644 --- a/native/jni/src/suggest/core/dictionary/binary_dictionary_terminal_attributes_reading_utils.cpp +++ b/native/jni/src/suggest/policyimpl/dictionary/shortcut/binary_dictionary_terminal_attributes_reading_utils.cpp @@ -14,7 +14,8 @@ * limitations under the License. */ -#include "suggest/core/dictionary/binary_dictionary_terminal_attributes_reading_utils.h" +#include \ + "suggest/policyimpl/dictionary/shortcut/binary_dictionary_terminal_attributes_reading_utils.h" #include "suggest/core/dictionary/byte_array_utils.h" diff --git a/native/jni/src/suggest/core/dictionary/binary_dictionary_terminal_attributes_reading_utils.h b/native/jni/src/suggest/policyimpl/dictionary/shortcut/binary_dictionary_terminal_attributes_reading_utils.h similarity index 100% rename from native/jni/src/suggest/core/dictionary/binary_dictionary_terminal_attributes_reading_utils.h rename to native/jni/src/suggest/policyimpl/dictionary/shortcut/binary_dictionary_terminal_attributes_reading_utils.h diff --git a/native/jni/src/suggest/policyimpl/dictionary/shortcut/shortcut_list_policy.h b/native/jni/src/suggest/policyimpl/dictionary/shortcut/shortcut_list_policy.h index 9c9ed5f4f..e7acb9dec 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/shortcut/shortcut_list_policy.h +++ b/native/jni/src/suggest/policyimpl/dictionary/shortcut/shortcut_list_policy.h @@ -21,8 +21,8 @@ #include "defines.h" #include "suggest/core/policy/dictionary_shortcuts_structure_policy.h" -// TODO: Move shortcuts reading methods to policyimpl. -#include "suggest/core/dictionary/binary_dictionary_terminal_attributes_reading_utils.h" +#include \ + "suggest/policyimpl/dictionary/shortcut/binary_dictionary_terminal_attributes_reading_utils.h" namespace latinime {