プラグイン読み込み処理をメソッドに分離。

tamra / scim-wnn

Browse code プラグイン読み込み処理をメソッドに分離。 master
1 parent bd69939 commit f132325f4fd50a8b4a57100101755c9919d7bfb5 tamra authored on 27 Sep 2005

Patch

Unified Split

Showing 2 changed files

                Ignore Space
               Show notes
              View
            
          
          157 ■■■■■
          honoka/src/honoka_imengine.cpp
     : IMEngineInstanceBase (factory, encoding, id)
{
    m_iconv.set_encoding ("EUC-JP");
    
    // 初期化へ。
    loadPlugins();
    init();
}
 
HonokaInstance::~HonokaInstance()
{
    for(unsigned int i = 0;i < plugins.size();i ++) {
        plugins[i].deleteInstance(plugins[i].instance);
        dlclose(plugins[i].dll);
    }
    delete acpredictor;
}
 
/*!
    \fn HonokaInstance::split(const String &str,const char &sep)
 */
vector<String> HonokaInstance::split(const String &str,const char &sep)
{
    vector<String> s;
    String w;
    for(unsigned int i = 0;i < str.length();i ++) {
        if (str[i] == sep) {
            if (w.length()) {
                s.push_back(w);
                w.clear();
            }
        } else w = w + str.substr(i,1);
    }
    if (w.length()) s.push_back(w);
    return s;
}
 
bool HonokaInstance::pluginCheck(HonokaPluginBase *p) {
 
    // Convertorの場合。
    if (p->getPluginType() == "Convertor") {
        convertors.push_back(static_cast<Convertor *>(p));
        return true;
    } else
    // PreEditorの場合。
    if (p->getPluginType() == "PreEditor") {
        preeditors.push_back(static_cast<PreEditor *>(p));
        return true;
    } else
    // Predictorの場合。
    if (p->getPluginType() == "Predictor") {
        predictors.push_back(static_cast<Predictor *>(p));
        return true;
    }
    return false;
}
 
 
/*!
    \fn HonokaInstance::loadPlugins()
 */
void HonokaInstance::loadPlugins()
{
    DIR *dir = opendir(HONOKA_PLUGINDIR);
    if (dir) {
        struct dirent *entry;
        //
    m_predictor = predictors.at(0);
    
    m_multi = new MultiConvertor(_scim_config,this);
    
    // 初期化へ。
    init();
}
bool HonokaInstance::pluginCheck(HonokaPluginBase *p) {
 
    // Convertorの場合。
    if (p->getPluginType() == "Convertor") {
        convertors.push_back(static_cast<Convertor *>(p));
        return true;
    } else
    // PreEditorの場合。
    if (p->getPluginType() == "PreEditor") {
        preeditors.push_back(static_cast<PreEditor *>(p));
        return true;
    } else
    // Predictorの場合。
    if (p->getPluginType() == "Predictor") {
        predictors.push_back(static_cast<Predictor *>(p));
        return true;
    }
    return false;
}
 
HonokaInstance::~HonokaInstance()
{
    for(unsigned int i = 0;i < plugins.size();i ++) {
        plugins[i].deleteInstance(plugins[i].instance);
        dlclose(plugins[i].dll);
    }
    delete acpredictor;
}
 
/*!
    \fn HonokaInstance::split(const String &str,const char &sep)
 */
vector<String> HonokaInstance::split(const String &str,const char &sep)
{
    vector<String> s;
    String w;
    for(unsigned int i = 0;i < str.length();i ++) {
        if (str[i] == sep) {
            if (w.length()) {
                s.push_back(w);
                w.clear();
            }
        } else w = w + str.substr(i,1);
    }
    if (w.length()) s.push_back(w);
    return s;
    return;
}
 
 
/*!
     : IMEngineInstanceBase (factory, encoding, id)
 {
     m_iconv.set_encoding ("EUC-JP");
+    // 初期化へ。
+    loadPlugins();
+    init();
+}
+HonokaInstance::~HonokaInstance()
+{
+    for(unsigned int i = 0;i < plugins.size();i ++) {
+        plugins[i].deleteInstance(plugins[i].instance);
+        dlclose(plugins[i].dll);
+    }
+    delete acpredictor;
+}
+/*!
+    \fn HonokaInstance::split(const String &str,const char &sep)
+ */
+vector<String> HonokaInstance::split(const String &str,const char &sep)
+{
+    vector<String> s;
+    String w;
+    for(unsigned int i = 0;i < str.length();i ++) {
+        if (str[i] == sep) {
+            if (w.length()) {
+                s.push_back(w);
+                w.clear();
+            }
+        } else w = w + str.substr(i,1);
+    }
+    if (w.length()) s.push_back(w);
+    return s;
+}
+bool HonokaInstance::pluginCheck(HonokaPluginBase *p) {
+    // Convertorの場合。
+    if (p->getPluginType() == "Convertor") {
+        convertors.push_back(static_cast<Convertor *>(p));
+        return true;
+    } else
+    // PreEditorの場合。
+    if (p->getPluginType() == "PreEditor") {
+        preeditors.push_back(static_cast<PreEditor *>(p));
+        return true;
+    } else
+    // Predictorの場合。
+    if (p->getPluginType() == "Predictor") {
+        predictors.push_back(static_cast<Predictor *>(p));
+        return true;
+    }
+    return false;
+}
+/*!
+    \fn HonokaInstance::loadPlugins()
+ */
+void HonokaInstance::loadPlugins()
+{
     DIR *dir = opendir(HONOKA_PLUGINDIR);
     if (dir) {
         struct dirent *entry;
         //
     m_predictor = predictors.at(0);
     m_multi = new MultiConvertor(_scim_config,this);
+    // 初期化へ。
+    init();
+}
+bool HonokaInstance::pluginCheck(HonokaPluginBase *p) {
+    // Convertorの場合。
+    if (p->getPluginType() == "Convertor") {
+        convertors.push_back(static_cast<Convertor *>(p));
+        return true;
+    } else
+    // PreEditorの場合。
+    if (p->getPluginType() == "PreEditor") {
+        preeditors.push_back(static_cast<PreEditor *>(p));
+        return true;
+    } else
+    // Predictorの場合。
+    if (p->getPluginType() == "Predictor") {
+        predictors.push_back(static_cast<Predictor *>(p));
+        return true;
+    }
+    return false;
+}
+HonokaInstance::~HonokaInstance()
+{
+    for(unsigned int i = 0;i < plugins.size();i ++) {
+        plugins[i].deleteInstance(plugins[i].instance);
+        dlclose(plugins[i].dll);
+    }
+    delete acpredictor;
+}
+/*!
+    \fn HonokaInstance::split(const String &str,const char &sep)
+ */
+vector<String> HonokaInstance::split(const String &str,const char &sep)
+{
+    vector<String> s;
+    String w;
+    for(unsigned int i = 0;i < str.length();i ++) {
+        if (str[i] == sep) {
+            if (w.length()) {
+                s.push_back(w);
+                w.clear();
+            }
+        } else w = w + str.substr(i,1);
+    }
+    if (w.length()) s.push_back(w);
+    return s;
+    return;
 }
 /*!

                Ignore Space
               Show notes
              View
            
          
          1 ■■■■■
          honoka/src/honoka_imengine.h
     bool process_conversion_key_event(const KeyEvent &key);
    bool process_prediction_key_event(const KeyEvent &key);
    void startConversion(WideString s = WideString(), bool multi = false);
    void createLookupTable(ResultList cList);
    void loadPlugins();
    void init();
    void updatePreEditor();
    void updateProperty();
    void updateConversion();
     bool process_conversion_key_event(const KeyEvent &key);
     bool process_prediction_key_event(const KeyEvent &key);
     void startConversion(WideString s = WideString(), bool multi = false);
     void createLookupTable(ResultList cList);
+    void loadPlugins();
     void init();
     void updatePreEditor();
     void updateProperty();
     void updateConversion();

Show line notes below