Rename ConnectorBase to Connector
With r551 (2.16.2068.102), ConnectorBase has no subclasses. The -Base suffix doesn't make sense anymore.
This CL does not change anything except for the class name. Hence no behavior change is intended.
BUG=none
TEST=unittest
git-svn-id: https://mozc.googlecode.com/svn/trunk@552 a6090854-d499-a067-5803-1114d4e51264
diff --git a/src/converter/connector_base.cc b/src/converter/connector.cc
similarity index 91%
rename from src/converter/connector_base.cc
rename to src/converter/connector.cc
index ca69776..4b81c0a 100644
--- a/src/converter/connector_base.cc
+++ b/src/converter/connector.cc
@@ -27,7 +27,7 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#include "converter/connector_base.h"
+#include "converter/connector.h"
#include <algorithm>
@@ -61,7 +61,7 @@
} // namespace
-class ConnectorBase::Row {
+class Connector::Row {
public:
Row() : chunk_bits_index_(sizeof(uint32)),
compact_bits_index_(sizeof(uint32)) {}
@@ -109,7 +109,7 @@
DISALLOW_COPY_AND_ASSIGN(Row);
};
-ConnectorBase *ConnectorBase::CreateFromDataManager(
+Connector *Connector::CreateFromDataManager(
const DataManagerInterface &data_manager) {
#ifdef OS_ANDROID
const int kCacheSize = 256;
@@ -119,12 +119,12 @@
const char *connection_data = nullptr;
size_t connection_data_size = 0;
data_manager.GetConnectorData(&connection_data, &connection_data_size);
- return new ConnectorBase(connection_data, connection_data_size, kCacheSize);
+ return new Connector(connection_data, connection_data_size, kCacheSize);
}
-ConnectorBase::ConnectorBase(const char *connection_data,
- size_t connection_size,
- int cache_size)
+Connector::Connector(const char *connection_data,
+ size_t connection_size,
+ int cache_size)
: default_cost_(nullptr),
cache_size_(cache_size),
cache_hash_mask_(cache_size - 1),
@@ -178,12 +178,12 @@
ClearCache();
}
-ConnectorBase::~ConnectorBase() {
+Connector::~Connector() {
STLDeleteElements(&rows_);
}
-int ConnectorBase::GetTransitionCost(uint16 rid, uint16 lid) const {
+int Connector::GetTransitionCost(uint16 rid, uint16 lid) const {
const uint32 index = EncodeKey(rid, lid);
const uint32 bucket = GetHashValue(rid, lid, cache_hash_mask_);
if (cache_key_[bucket] == index) {
@@ -195,15 +195,15 @@
return value;
}
-int ConnectorBase::GetResolution() const {
+int Connector::GetResolution() const {
return resolution_;
}
-void ConnectorBase::ClearCache() {
+void Connector::ClearCache() {
fill(cache_key_.get(), cache_key_.get() + cache_size_, kInvalidCacheKey);
}
-int ConnectorBase::LookupCost(uint16 rid, uint16 lid) const {
+int Connector::LookupCost(uint16 rid, uint16 lid) const {
uint16 value;
if (!rows_[rid]->GetValue(lid, &value)) {
return default_cost_[rid];
diff --git a/src/converter/connector_base.h b/src/converter/connector.h
similarity index 82%
rename from src/converter/connector_base.h
rename to src/converter/connector.h
index 7c345ac..83fc594 100644
--- a/src/converter/connector_base.h
+++ b/src/converter/connector.h
@@ -27,8 +27,8 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#ifndef MOZC_CONVERTER_CONNECTOR_BASE_H_
-#define MOZC_CONVERTER_CONNECTOR_BASE_H_
+#ifndef MOZC_CONVERTER_CONNECTOR_H_
+#define MOZC_CONVERTER_CONNECTOR_H_
#include <vector>
@@ -40,15 +40,14 @@
class DataManagerInterface;
-// TODO(noriyukit): Rename this to Connector as no class inherits this class.
-class ConnectorBase : public ConnectorInterface {
+class Connector : public ConnectorInterface {
public:
- static ConnectorBase *CreateFromDataManager(
+ static Connector *CreateFromDataManager(
const DataManagerInterface &data_manager);
- ConnectorBase(const char *connection_data, size_t connection_size,
- int cache_size);
- virtual ~ConnectorBase();
+ Connector(const char *connection_data, size_t connection_size,
+ int cache_size);
+ virtual ~Connector();
virtual int GetTransitionCost(uint16 rid, uint16 lid) const;
virtual int GetResolution() const;
@@ -69,9 +68,9 @@
mutable scoped_ptr<uint32[]> cache_key_;
mutable scoped_ptr<int[]> cache_value_;
- DISALLOW_COPY_AND_ASSIGN(ConnectorBase);
+ DISALLOW_COPY_AND_ASSIGN(Connector);
};
} // namespace mozc
-#endif // MOZC_CONVERTER_CONNECTOR_BASE_H_
+#endif // MOZC_CONVERTER_CONNECTOR_H_
diff --git a/src/converter/connector_base_test.cc b/src/converter/connector_test.cc
similarity index 94%
rename from src/converter/connector_base_test.cc
rename to src/converter/connector_test.cc
index 0b8ab7e..35d4d0d 100644
--- a/src/converter/connector_base_test.cc
+++ b/src/converter/connector_test.cc
@@ -27,7 +27,7 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#include "converter/connector_base.h"
+#include "converter/connector.h"
#include <algorithm>
#include <string>
@@ -55,13 +55,13 @@
int cost;
};
-TEST(ConnectorBaseTest, CompareWithRawData) {
+TEST(ConnectorTest, CompareWithRawData) {
const string path = FileUtil::JoinPath(
FLAGS_test_srcdir, kTestConnectionDataImagePath);
Mmap cmmap;
ASSERT_TRUE(cmmap.Open(path.c_str())) << "Failed to open image: " << path;
- scoped_ptr<ConnectorBase> connector(
- new ConnectorBase(cmmap.begin(), cmmap.size(), 256));
+ scoped_ptr<Connector> connector(
+ new Connector(cmmap.begin(), cmmap.size(), 256));
ASSERT_EQ(1, connector->GetResolution());
const string connection_text_path =
diff --git a/src/converter/converter_base.gyp b/src/converter/converter_base.gyp
index 7f3f755..33fefe9 100644
--- a/src/converter/converter_base.gyp
+++ b/src/converter/converter_base.gyp
@@ -49,10 +49,10 @@
],
},
{
- 'target_name': 'connector_base',
+ 'target_name': 'connector',
'type': 'static_library',
'sources': [
- 'connector_base.cc',
+ 'connector.cc',
],
'dependencies': [
'../base/base.gyp:base',
diff --git a/src/converter/converter_test.cc b/src/converter/converter_test.cc
index 09e4873..fae3a0a 100644
--- a/src/converter/converter_test.cc
+++ b/src/converter/converter_test.cc
@@ -41,7 +41,7 @@
#include "composer/table.h"
#include "config/config.pb.h"
#include "config/config_handler.h"
-#include "converter/connector_base.h"
+#include "converter/connector.h"
#include "converter/connector_interface.h"
#include "converter/conversion_request.h"
#include "converter/converter_interface.h"
@@ -208,7 +208,7 @@
ret->suggestion_filter.reset(CreateSuggestionFilter(data_manager));
ret->suffix_dictionary.reset(
CreateSuffixDictionaryFromDataManager(data_manager));
- ret->connector.reset(ConnectorBase::CreateFromDataManager(data_manager));
+ ret->connector.reset(Connector::CreateFromDataManager(data_manager));
ret->segmenter.reset(SegmenterBase::CreateFromDataManager(data_manager));
ret->immutable_converter.reset(
new ImmutableConverterImpl(ret->dictionary.get(),
@@ -1244,7 +1244,7 @@
scoped_ptr<const DictionaryInterface> suffix_dictionary(
CreateSuffixDictionaryFromDataManager(data_manager));
scoped_ptr<const ConnectorInterface> connector(
- ConnectorBase::CreateFromDataManager(data_manager));
+ Connector::CreateFromDataManager(data_manager));
scoped_ptr<const SegmenterInterface> segmenter(
SegmenterBase::CreateFromDataManager(data_manager));
scoped_ptr<const SuggestionFilter> suggestion_filter(
diff --git a/src/converter/converter_test.gyp b/src/converter/converter_test.gyp
index a4b9259..da00aca 100644
--- a/src/converter/converter_test.gyp
+++ b/src/converter/converter_test.gyp
@@ -65,7 +65,7 @@
'../transliteration/transliteration.gyp:transliteration',
'../usage_stats/usage_stats_test.gyp:usage_stats_testing_util',
'converter.gyp:converter',
- 'converter_base.gyp:connector_base',
+ 'converter_base.gyp:connector',
'converter_base.gyp:converter_mock',
'converter_base.gyp:segmenter_base',
'converter_base.gyp:segments',
@@ -92,10 +92,10 @@
],
},
{
- 'target_name': 'connector_base_test',
+ 'target_name': 'connector_test',
'type': 'executable',
'sources': [
- 'connector_base.cc',
+ 'connector_test.cc',
],
'dependencies': [
'../data_manager/data_manager.gyp:connection_file_reader',
@@ -103,7 +103,7 @@
'../data_manager/testing/mock_data_manager.gyp:mock_data_manager',
'../data_manager/testing/mock_data_manager_test.gyp:install_test_connection_txt',
'../testing/testing.gyp:gtest_main',
- 'converter_base.gyp:connector_base',
+ 'converter_base.gyp:connector',
],
'variables': {
'test_size': 'large',
@@ -128,7 +128,7 @@
'target_name': 'converter_all_test',
'type': 'none',
'dependencies': [
- 'connector_base_test',
+ 'connector_test',
'converter_regression_test',
'converter_test',
],
diff --git a/src/converter/immutable_converter_test.cc b/src/converter/immutable_converter_test.cc
index bf67ad2..3a5d7b4 100644
--- a/src/converter/immutable_converter_test.cc
+++ b/src/converter/immutable_converter_test.cc
@@ -41,7 +41,7 @@
#include "base/util.h"
#include "config/config.pb.h"
#include "config/config_handler.h"
-#include "converter/connector_base.h"
+#include "converter/connector.h"
#include "converter/connector_interface.h"
#include "converter/conversion_request.h"
#include "converter/lattice.h"
@@ -128,7 +128,7 @@
}
CHECK(suffix_dictionary);
- connector_.reset(ConnectorBase::CreateFromDataManager(*data_manager_));
+ connector_.reset(Connector::CreateFromDataManager(*data_manager_));
CHECK(connector_.get());
segmenter_.reset(SegmenterBase::CreateFromDataManager(*data_manager_));
diff --git a/src/converter/nbest_generator_test.cc b/src/converter/nbest_generator_test.cc
index 666fecb..1f74b7a 100644
--- a/src/converter/nbest_generator_test.cc
+++ b/src/converter/nbest_generator_test.cc
@@ -37,7 +37,7 @@
#include "base/system_util.h"
#include "config/config.pb.h"
#include "config/config_handler.h"
-#include "converter/connector_base.h"
+#include "converter/connector.h"
#include "converter/connector_interface.h"
#include "converter/conversion_request.h"
#include "converter/immutable_converter.h"
@@ -101,7 +101,7 @@
suffix_dictionary_.reset(new SuffixDictionary(tokens, tokens_size));
CHECK(suffix_dictionary_.get());
- connector_.reset(ConnectorBase::CreateFromDataManager(*data_manager_));
+ connector_.reset(Connector::CreateFromDataManager(*data_manager_));
CHECK(connector_.get());
segmenter_.reset(SegmenterBase::CreateFromDataManager(*data_manager_));
diff --git a/src/data_manager/data_manager_test.gyp b/src/data_manager/data_manager_test.gyp
index f156548..e4d12df 100644
--- a/src/data_manager/data_manager_test.gyp
+++ b/src/data_manager/data_manager_test.gyp
@@ -41,7 +41,7 @@
],
'dependencies': [
'../base/base.gyp:base',
- '../converter/converter_base.gyp:connector_base',
+ '../converter/converter_base.gyp:connector',
'../converter/converter_base.gyp:segmenter_base',
'../dictionary/dictionary_base.gyp:pos_matcher',
'../prediction/prediction_base.gyp:suggestion_filter',
diff --git a/src/data_manager/data_manager_test_base.cc b/src/data_manager/data_manager_test_base.cc
index 0324fd6..fb0f59a 100644
--- a/src/data_manager/data_manager_test_base.cc
+++ b/src/data_manager/data_manager_test_base.cc
@@ -41,7 +41,7 @@
#include "converter/connector_base.h"
#include "converter/connector_interface.h"
#include "converter/node.h"
-#include "converter/segmenter_base.h"
+#include "converter/segmenter.h"
#include "converter/segmenter_interface.h"
#include "data_manager/connection_file_reader.h"
#include "data_manager/data_manager_interface.h"
@@ -171,7 +171,7 @@
void DataManagerTestBase::ConnectorTest_RandomValueCheck() {
scoped_ptr<const ConnectorInterface> connector(
- ConnectorBase::CreateFromDataManager(*data_manager_));
+ Connector::CreateFromDataManager(*data_manager_));
ASSERT_TRUE(connector.get() != NULL);
EXPECT_EQ(expected_resolution_, connector->GetResolution());
diff --git a/src/engine/engine.cc b/src/engine/engine.cc
index df2f2bc..008a4f2 100644
--- a/src/engine/engine.cc
+++ b/src/engine/engine.cc
@@ -31,7 +31,7 @@
#include "base/logging.h"
#include "base/port.h"
-#include "converter/connector_base.h"
+#include "converter/connector.h"
#include "converter/converter.h"
#include "converter/converter_interface.h"
#include "converter/immutable_converter.h"
@@ -171,7 +171,7 @@
suffix_tokens_size));
CHECK(suffix_dictionary_.get());
- connector_.reset(ConnectorBase::CreateFromDataManager(*data_manager));
+ connector_.reset(Connector::CreateFromDataManager(*data_manager));
CHECK(connector_.get());
segmenter_.reset(SegmenterBase::CreateFromDataManager(*data_manager));
diff --git a/src/engine/engine.gyp b/src/engine/engine.gyp
index 09bcf7f..4bbb5e7 100644
--- a/src/engine/engine.gyp
+++ b/src/engine/engine.gyp
@@ -43,7 +43,7 @@
'dependencies': [
'../base/base.gyp:base',
'../converter/converter.gyp:converter',
- '../converter/converter_base.gyp:connector_base',
+ '../converter/converter_base.gyp:connector',
'../converter/converter_base.gyp:segmenter_base',
'../dictionary/dictionary.gyp:dictionary_impl',
'../dictionary/dictionary.gyp:suffix_dictionary',
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index b98e7d2..02e901f 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
MAJOR=2
MINOR=16
-BUILD=2068
+BUILD=2069
REVISION=102
# NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
# downloaded by NaCl Mozc.
diff --git a/src/prediction/dictionary_predictor_test.cc b/src/prediction/dictionary_predictor_test.cc
index 0a9b920..9eed0c4 100644
--- a/src/prediction/dictionary_predictor_test.cc
+++ b/src/prediction/dictionary_predictor_test.cc
@@ -45,7 +45,7 @@
#include "composer/table.h"
#include "config/config.pb.h"
#include "config/config_handler.h"
-#include "converter/connector_base.h"
+#include "converter/connector.h"
#include "converter/connector_interface.h"
#include "converter/conversion_request.h"
#include "converter/converter_interface.h"
@@ -219,7 +219,7 @@
}
CHECK(suffix_dictionary_.get());
- connector_.reset(ConnectorBase::CreateFromDataManager(data_manager));
+ connector_.reset(Connector::CreateFromDataManager(data_manager));
CHECK(connector_.get());
segmenter_.reset(SegmenterBase::CreateFromDataManager(data_manager));
@@ -1559,7 +1559,7 @@
scoped_ptr<const DictionaryInterface> suffix_dictionary(
CreateSuffixDictionaryFromDataManager(data_manager));
scoped_ptr<const ConnectorInterface> connector(
- ConnectorBase::CreateFromDataManager(data_manager));
+ Connector::CreateFromDataManager(data_manager));
scoped_ptr<const SegmenterInterface> segmenter(
SegmenterBase::CreateFromDataManager(data_manager));
scoped_ptr<const SuggestionFilter> suggestion_filter(
@@ -3084,7 +3084,7 @@
scoped_ptr<const DictionaryInterface> suffix_dictionary(
CreateSuffixDictionaryFromDataManager(data_manager));
scoped_ptr<const ConnectorInterface> connector(
- ConnectorBase::CreateFromDataManager(data_manager));
+ Connector::CreateFromDataManager(data_manager));
scoped_ptr<const SegmenterInterface> segmenter(
SegmenterBase::CreateFromDataManager(data_manager));
scoped_ptr<const SuggestionFilter> suggestion_filter(
diff --git a/src/prediction/prediction_test.gyp b/src/prediction/prediction_test.gyp
index beb5228..4b6a160 100644
--- a/src/prediction/prediction_test.gyp
+++ b/src/prediction/prediction_test.gyp
@@ -44,7 +44,7 @@
'dependencies': [
'../composer/composer.gyp:composer',
'../config/config.gyp:config_protocol',
- '../converter/converter_base.gyp:connector_base',
+ '../converter/converter_base.gyp:connector',
'../converter/converter_base.gyp:converter_mock',
'../converter/converter_base.gyp:immutable_converter',
'../converter/converter_base.gyp:segmenter_base',
