api_generator: c++ refactor

rhomobile · Dec 29, 2012 · cc3b8a9 · cc3b8a9
1 parent 97f1139
commit cc3b8a9
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 24 deletions.
diff --git a/platform/shared/api_generator/common/MethodResult.h b/platform/shared/api_generator/common/MethodResult.h
@@ -55,7 +55,7 @@ class CMethodResult
         {
             rho::Hashtable<rho::String, rho::String> resHash;
             resHash.put( m_strStringParam, m_strRes);
-            set(resHash);
+            m_hashStrRes = resHash; m_ResType = eStringHash;
         }
     }
 

diff --git a/platform/shared/api_generator/sample/windows/Barcode1.h b/platform/shared/api_generator/sample/windows/Barcode1.h
@@ -42,33 +42,17 @@ class CBarcode1ImplBase: public IBarcode1
 
 };
 
-class CBarcode1
+class CBarcode1FactoryBase
 {
+protected:
     static rho::String m_strDefaultID;
     static rho::Hashtable<rho::String,IBarcode1*> m_hashBarcodes;
     static rho::common::CAutoPtr<rho::common::CThreadQueue> m_pCommandQueue;
 
 public:
-    static IBarcode1* create(const rho::String& strID);
     static rho::Hashtable<rho::String,IBarcode1*>& getBarcodes(){ return m_hashBarcodes; }
 
-    static rho::String getDefaultID()
-    { 
-        if ( m_strDefaultID.length() == 0 )
-            CBarcode1::initDefaultID();
-
-        if ( !getBarcodes().containsKey(m_strDefaultID) )
-        {
-            IBarcode1* pObj = create(m_strDefaultID);
-            getBarcodes().put(m_strDefaultID, pObj );
-        }
-        return m_strDefaultID; 
-    }
-
     static void setDefaultID(const rho::String& strDefaultID){ m_strDefaultID = strDefaultID; }
-    static void initDefaultID();
-
-    static void enumerate(CMethodResult& oResult);
 
     static void setCommandQueue( rho::common::CThreadQueue* pQueue){ m_pCommandQueue = pQueue; }
     static void addCommandToQueue(rho::common::IRhoRunnable* pFunctor)
@@ -81,4 +65,27 @@ class CBarcode1
 
         m_pCommandQueue->addQueueCommand( new CGeneratorQueue::CGeneratorQueueCommand(pFunctor) );
     }
+};
+
+class CBarcode1 : public CBarcode1FactoryBase
+{
+public:
+    static IBarcode1* create(const rho::String& strID);
+    static void initDefaultID();
+    static void enumerate(CMethodResult& oResult);
+
+
+    static rho::String getDefaultID()
+    { 
+        if ( m_strDefaultID.length() == 0 )
+            CBarcode1::initDefaultID();
+
+        if ( !getBarcodes().containsKey(m_strDefaultID) )
+        {
+            IBarcode1* pObj = create(m_strDefaultID);
+            getBarcodes().put(m_strDefaultID, pObj );
+        }
+        return m_strDefaultID; 
+    }
+
 };
diff --git a/platform/shared/api_generator/sample/windows/Barcode1Base_impl.cpp b/platform/shared/api_generator/sample/windows/Barcode1Base_impl.cpp
@@ -0,0 +1,5 @@
+#include "Barcode1.h"
+
+rho::Hashtable<rho::String,IBarcode1*> CBarcode1FactoryBase::m_hashBarcodes;
+rho::String CBarcode1FactoryBase::m_strDefaultID;
+rho::common::CAutoPtr<rho::common::CThreadQueue> CBarcode1FactoryBase::m_pCommandQueue;
diff --git a/platform/shared/api_generator/sample/windows/ruby/barcode1_ruby_wrap.cpp b/platform/shared/api_generator/sample/windows/ruby/barcode1_ruby_wrap.cpp
@@ -7,10 +7,6 @@
 
 #include "ext/rho/rhoruby.h"
 
-rho::Hashtable<rho::String,IBarcode1*> CBarcode1::m_hashBarcodes;
-rho::String CBarcode1::m_strDefaultID;
-rho::common::CAutoPtr<rho::common::CThreadQueue> CBarcode1::m_pCommandQueue;
-
 extern "C"
 {
 

diff --git a/platform/shared/common/RhodesApp.cpp b/platform/shared/common/RhodesApp.cpp
@@ -1235,7 +1235,11 @@ static void callback_is_blob_attr(void *arg, String const &strQuery)
     rho_http_sendresponse(arg,  "ok");
 }
 
-
+void CRhodesApp::registerLocalServerUrl(const String& strUrl, rho::net::CHttpServer::callback_t const &callback)
+{
+    if ( m_httpServer )
+        m_httpServer->register_uri(strUrl.c_str(), callback);    
+}
 
 void CRhodesApp::initHttpServer()
 {