Changeset 346 for XIOS/trunk/src/object_template_impl.hpp

Timestamp:

04/12/12 17:02:23 (12 years ago)

Author:

ymipsl

Message:

Suppress access to CObjectFactory class and CTreeManager.

YM

File:

• XIOS/trunk/src/object_template_impl.hpp (modified) (4 diffs)

XIOS/trunk/src/object_template_impl.hpp

@@ -146 +146 @@
    {
       std::vector<boost::shared_ptr<T> > & avect =
-         CObjectTemplate<T>::GetAllVectobject(CObjectFactory::GetCurrentContextId());
+         CObjectTemplate<T>::GetAllVectobject(CContext::getCurrent()->getId());
       typename std::vector<boost::shared_ptr<T> >::iterator
             it = avect.begin(), end = avect.end();
@@ -168 +168 @@
    void CObjectTemplate<T>::sendAttributToServer(CAttribute& attr)
    {
-     shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
+     shared_ptr<CContext> context=CContext::getCurrent() ;
      
     if (!context->hasServer)
@@ -232 +232 @@
 
    template <typename T>
+   bool CObjectTemplate<T>::has(const string& contextId, const string & id)
+   {
+     return CObjectFactory::HasObject<T>(contextId,id) ;
+   }
+
+   template <typename T>
    boost::shared_ptr<T> CObjectTemplate<T>::get(const string & id)
    {
      return CObjectFactory::GetObject<T>(id) ;
+   }
+
+   template <typename T>
+   boost::shared_ptr<T> CObjectTemplate<T>::get(const T* ptr)
+   {
+     return CObjectFactory::GetObject<T>(ptr) ;
+   }
+   
+   
+   template <typename T>
+   const vector<boost::shared_ptr<T> >& CObjectTemplate<T>::getAll()
+   {
+     return CObjectFactory::GetObjectVector<T>() ;
+   }
+
+   template <typename T>
+   const vector<boost::shared_ptr<T> >& CObjectTemplate<T>::getAll(const string & id)
+   {
+     return CObjectFactory::GetObjectVector<T>(id) ;
+   }
+
+   template <typename T>
+   boost::shared_ptr<T> CObjectTemplate<T>::get(const string& contextId, const string & id)
+   {
+     return CObjectFactory::GetObject<T>(contextId,id) ;
    }
 
@@ -247 +278 @@
   {
     return CObjectFactory::GetObject<T>((T*)this) ;
+//      return shared_ptr<T>((T*)this) ;
   }