nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

am 3cc55024: Merge "Move files for headerPolicy to policyimpl."

Browse source 
* commit '3cc550248b308b49db677ffa7ee716660373c3a6':
  Move files for headerPolicy to policyimpl.
This commit is contained in:
Keisuke Kuroyanagi 2013-08-13 04:41:07 -07:00 committed by Android Git Automerger
commit 018ab17ef5
7 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
native/jni/Android.mk
View file

@ -54,8 +54,6 @@ LATIN_IME_CORE_SRC_FILES := \
$(addprefix suggest/core/dictionary/, \
bigram_dictionary.cpp \
binary_dictionary_format_utils.cpp \
binary_dictionary_header.cpp \
binary_dictionary_header_reading_utils.cpp \
bloom_filter.cpp \
byte_array_utils.cpp \
dictionary.cpp \
@ -71,6 +69,8 @@ LATIN_IME_CORE_SRC_FILES := \
suggest/core/session/dic_traverse_session.cpp \
$(addprefix suggest/policyimpl/dictionary/, \
bigram/bigram_list_reading_utils.cpp \
header/header_policy.cpp \
header/header_reading_utils.cpp \
shortcut/shortcut_list_reading_utils.cpp \
dictionary_structure_with_buffer_policy_factory.cpp \
dynamic_patricia_trie_node_reader.cpp \

2
native/jni/src/suggest/policyimpl/dictionary/dynamic_patricia_trie_policy.h
View file

@ -20,9 +20,9 @@
#include <stdint.h>
#include "defines.h"
#include "suggest/core/dictionary/binary_dictionary_header.h"
#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h"
#include "suggest/policyimpl/dictionary/bigram/bigram_list_policy.h"
#include "suggest/policyimpl/dictionary/header/header_policy.h"
#include "suggest/policyimpl/dictionary/shortcut/shortcut_list_policy.h"
namespace latinime {

2
native/jni/src/suggest/core/dictionary/binary_dictionary_header.cpp → native/jni/src/suggest/policyimpl/dictionary/header/header_policy.cpp
View file

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "suggest/core/dictionary/binary_dictionary_header.h"
#include "suggest/policyimpl/dictionary/header/header_policy.h"
namespace latinime {

3
native/jni/src/suggest/core/dictionary/binary_dictionary_header.h → native/jni/src/suggest/policyimpl/dictionary/header/header_policy.h
View file

@ -21,11 +21,10 @@
#include "defines.h"
#include "suggest/core/policy/dictionary_header_structure_policy.h"
#include "suggest/core/dictionary/binary_dictionary_header_reading_utils.h"
#include "suggest/policyimpl/dictionary/header/header_reading_utils.h"
namespace latinime {
// TODO: Move to policyimpl.
class HeaderPolicy : public DictionaryHeaderStructurePolicy {
public:
explicit HeaderPolicy(const uint8_t *const dictBuf)

2
native/jni/src/suggest/core/dictionary/binary_dictionary_header_reading_utils.cpp → native/jni/src/suggest/policyimpl/dictionary/header/header_reading_utils.cpp
View file

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "suggest/core/dictionary/binary_dictionary_header_reading_utils.h"
#include "suggest/policyimpl/dictionary/header/header_reading_utils.h"
#include <cctype>
#include <cstdlib>

1
native/jni/src/suggest/core/dictionary/binary_dictionary_header_reading_utils.h → native/jni/src/suggest/policyimpl/dictionary/header/header_reading_utils.h
View file

@ -23,7 +23,6 @@
namespace latinime {
// TODO: Move to policyimpl.
class HeaderReadingUtils {
public:
typedef uint16_t DictionaryFlags;

2
native/jni/src/suggest/policyimpl/dictionary/patricia_trie_policy.h
View file

@ -20,9 +20,9 @@
#include <stdint.h>
#include "defines.h"
#include "suggest/core/dictionary/binary_dictionary_header.h"
#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h"
#include "suggest/policyimpl/dictionary/bigram/bigram_list_policy.h"
#include "suggest/policyimpl/dictionary/header/header_policy.h"
#include "suggest/policyimpl/dictionary/shortcut/shortcut_list_policy.h"
namespace latinime {