Changeset 346 for XIOS/trunk

Timestamp:

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

Author:

ymipsl

Message:

Suppress access to CObjectFactory class and CTreeManager.

YM

Location:

XIOS/trunk/src

Files:

• client.cpp (modified) (1 diff)
• context_server.cpp (modified) (1 diff)
• cxios.cpp (modified) (3 diffs)
• cxios.hpp (modified) (1 diff)
• cxios_impl.hpp (modified) (3 diffs)
• data_output.cpp (modified) (3 diffs)
• field_impl.hpp (modified) (1 diff)
• generate_fortran_interface.cpp (modified) (1 diff)
• group_parser.hpp (modified) (1 diff)
• group_template.hpp (modified) (1 diff)
• group_template_impl.hpp (modified) (4 diffs)
• interface/c/icaxis.cpp (modified) (4 diffs)
• interface/c/iccontext.cpp (modified) (3 diffs)
• interface/c/icdata.cpp (modified) (8 diffs)
• interface/c/icdate.cpp (modified) (2 diffs)
• interface/c/icdomain.cpp (modified) (4 diffs)
• interface/c/icfield.cpp (modified) (4 diffs)
• interface/c/icfile.cpp (modified) (4 diffs)
• interface/c/icgrid.cpp (modified) (4 diffs)
• interface/c/icxml_tree.cpp (modified) (1 diff)
• manager/tree_manager.cpp (modified) (5 diffs)
• node/context.cpp (modified) (14 diffs)
• node/context.hpp (modified) (2 diffs)
• node/domain.cpp (modified) (4 diffs)
• node/field.cpp (modified) (11 diffs)
• node/file.cpp (modified) (10 diffs)
• node/grid.cpp (modified) (6 diffs)
• node/variable.cpp (modified) (2 diffs)
• object_template.hpp (modified) (1 diff)
• object_template_impl.hpp (modified) (4 diffs)
• output/nc4_data_output.cpp (modified) (3 diffs)
• server.cpp (modified) (1 diff)
• test/test_xios.cpp (modified) (3 diffs)
• xml_parser.cpp (modified) (3 diffs)

XIOS/trunk/src/client.cpp

@@ -129 +129 @@
     void CClient::registerContext(const string& id,MPI_Comm contextComm)
     {
-      CObjectFactory::SetCurrentContextId(id);
-      shared_ptr<CContext> context=CTreeManager::CreateContext(id) ;
+      CContext::setCurrent(id) ;
+      shared_ptr<CContext> context=CContext::create(id) ;
         
       if (!CXios::isServer)

XIOS/trunk/src/context_server.cpp

@@ -167 +167 @@
     int rank ;
     list<CEventServer::SSubEvent>::iterator it ;
-    CTreeManager::SetCurrentContextId(context->getId()) ;
+    CContext::setCurrent(context->getId()) ;
         
     if (event.classId==CContext::GetType() && event.type==CContext::EVENT_ID_CONTEXT_FINALIZE)

XIOS/trunk/src/cxios.cpp

@@ -4 +4 @@
 #include "client.hpp"
 #include "server.hpp"
-#include "tree_manager.hpp"
+//#include "tree_manager.hpp"
+#include "xml_parser.hpp"
 #include <boost/functional/hash.hpp>
 #include <mpi.h>
@@ -25 +26 @@
   void CXios::initialize()
   {
-    CTreeManager::ParseFile(rootFile);
+    parseFile(rootFile);
     usingServer=getin<bool>("using_server",false) ;
     usingOasis=getin<bool>("using_oasis",false) ;
@@ -65 +66 @@
   } 
   
+  void CXios::parseFile(const string& filename)
+  {
+    xml::CXMLParser::ParseFile(filename); 
+  }
+  
 
 }

XIOS/trunk/src/cxios.hpp

@@ -20 +20 @@
      static void initServerSide(void) ;
      static void clientFinalize(void) ;
+     static void parseFile(const string& filename) ;
    
      template <typename T>

XIOS/trunk/src/cxios_impl.hpp

@@ -4 +4 @@
 #include "xmlioserver_spl.hpp"
 #include "variable.hpp"
+#include "object_template_impl.hpp"
 
 namespace xios
@@ -10 +11 @@
   T CXios::getin(const string& id)
   {
-    return CObjectFactory::GetObject<CVariable>("xios",id)->getData<T>() ;
+    return CVariable::get("xios",id)->getData<T>() ;
   }
 
@@ -16 +17 @@
   T CXios::getin(const string& id, const T& defaultValue)
   {
-    if (CObjectFactory::HasObject<CVariable>("xios",id))
-      return CObjectFactory::GetObject<CVariable>("xios",id)->getData<T>() ;
+    if (CVariable::has("xios",id)) return CVariable::get("xios",id)->getData<T>() ;
     else return defaultValue ;
   }

XIOS/trunk/src/data_output.cpp

@@ -23 +23 @@
          if (grid->axis_ref.isEmpty())
          {
-            this->writeGrid
-            (CObjectFactory::GetObject<CDomain>(grid->domain_ref.getValue()));
+            this->writeGrid(CDomain::get(grid->domain_ref.getValue()));
          }
          else
          {
-            this->writeGrid
-            (CObjectFactory::GetObject<CDomain>(grid->domain_ref.getValue()),
-             CObjectFactory::GetObject<CAxis>(grid->axis_ref.getValue()));
+            this->writeGrid(CDomain::get(grid->domain_ref.getValue()),
+                            CAxis::get(grid->axis_ref.getValue()));
          }
       }
@@ -75 +73 @@
          (const boost::shared_ptr<CField> field)
       {
-         boost::shared_ptr<CContext> context =
-         CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId());
+         boost::shared_ptr<CContext> context = CContext::getCurrent() ;
          boost::shared_ptr<CCalendar> calendar = context->getCalendar();
          
@@ -95 +92 @@
       void CDataOutput::writeFieldData(const boost::shared_ptr<CField> field)
       {
-         boost::shared_ptr<CGrid> grid =
-            CObjectFactory::GetObject<CGrid>(field->grid_ref.getValue());
-         boost::shared_ptr<CDomain> domain =
-            CObjectFactory::GetObject<CDomain>(grid->domain_ref.getValue());
+         boost::shared_ptr<CGrid> grid = CGrid::get(field->grid_ref.getValue());
+         boost::shared_ptr<CDomain> domain = CDomain::get(grid->domain_ref.getValue());
             
 //         if (domain->isEmpty()) return;

XIOS/trunk/src/field_impl.hpp

@@ -23 +23 @@
       bool CField::updateData(const ARRAY(double, N) _data)
    {        
-      shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
+      shared_ptr<CContext> context=CContext::getCurrent();
       const CDate & currDate = context->getCalendar()->getCurrentDate();
       const CDate opeDate      = *last_operation + freq_operation;

XIOS/trunk/src/generate_fortran_interface.cpp

@@ -11 +11 @@
   string path="./interface/" ;
   
-  CContext* context=CTreeManager::CreateContext("interface").get();
+  CContext* context=CContext::create("interface").get();
   CAxis axis ;
   CAxisGroup axisgroup ;

XIOS/trunk/src/group_parser.hpp

@@ -67 +67 @@
             }
 
-            DEBUG(<< "Dans le contexte \'" << CObjectFactory::GetCurrentContextId()
+            DEBUG(<< "Dans le contexte \'" << CContext::getCurrent()->getId()
                   << "\', un objet de type \'" << V::GetName()
                   << "\' ne peut contenir qu'un objet de type \'" << V::GetName()

XIOS/trunk/src/group_template.hpp

@@ -66 +66 @@
 //         static boost::shared_ptr<V> create(const string& id=string("")) ;
          boost::shared_ptr<U> createChild(const string& id="") ; 
+         void addChild(shared_ptr<U> child) ; 
          boost::shared_ptr<V> createChildGroup(const string& id="") ; 
+         void addChildGroup(shared_ptr<V> childGroup) ; 
          static bool dispatchEvent(CEventServer& event) ;
          void sendCreateChild(const string& id="") ;

XIOS/trunk/src/group_template_impl.hpp

@@ -341 +341 @@
    ///--------------------------------------------------------------
 
+  
    template <class U, class V, class W>
    boost::shared_ptr<U> CGroupTemplate<U, V, W>::createChild(const string& id) 
@@ -346 +347 @@
     return CGroupFactory::CreateChild<V>(this->get(), id) ;
   }
+
+   template <class U, class V, class W>
+   void CGroupTemplate<U, V, W>::addChild(shared_ptr<U> child) 
+  {
+    return CGroupFactory::AddChild<V>(this->get(),child) ;
+  }
   
    template <class U, class V, class W>
@@ -353 +360 @@
   }
 
+   template <class U, class V, class W>
+   void CGroupTemplate<U, V, W>::addChildGroup(shared_ptr<V> childGroup) 
+  {
+    return CGroupFactory::AddGroup<V>(this->get(), childGroup) ;
+  }
+
 
    template <class U, class V, class W>
    void CGroupTemplate<U, V, W>::sendCreateChild(const string& id)
    {
-    shared_ptr<CContext> context=CContext::current() ;
+    shared_ptr<CContext> context=CContext::getCurrent() ;
     
     if (! context->hasServer )
@@ -380 +393 @@
    void CGroupTemplate<U, V, W>::sendCreateChildGroup(const string& id)
    {
-    shared_ptr<CContext> context=CContext::current() ;
+    shared_ptr<CContext> context=CContext::getCurrent() ;
     if (! context->hasServer )
     {

XIOS/trunk/src/interface/c/icaxis.cpp

@@ -30 +30 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::GetObject<xios::CAxis>(id).get();
+      *_ret = xios::CAxis::get(id).get();
    }
    
@@ -38 +38 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::GetObject<xios::CAxisGroup>(id).get();
+      *_ret = xios::CAxisGroup::get(id).get();
    }
 
@@ -48 +48 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::HasObject<xios::CAxis>(id);
+      *_ret = xios::CAxis::has(id);
    }
 
@@ -56 +56 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::HasObject<xios::CAxisGroup>(id);
+      *_ret = xios::CAxisGroup::has(id);
    }
    

XIOS/trunk/src/interface/c/iccontext.cpp

@@ -34 +34 @@
 
       std::vector<boost::shared_ptr<xios::CContext> > def_vector =
-            xios::CContext::GetContextGroup()->getChildList();
+            xios::CContext::getRoot()->getChildList();
 
       for (std::size_t i = 0; i < def_vector.size(); i++)
@@ -49 +49 @@
    void cxios_context_set_current(XContextPtr context, bool withswap)
    {
-      CTreeManager::SetCurrentContextId(context->getId());
+      CContext::setCurrent(context->getId());
    }
    
@@ -61 +61 @@
 
       std::vector<boost::shared_ptr<xios::CContext> > def_vector =
-            xios::CContext::GetContextGroup()->getChildList();
+            xios::CContext::getRoot()->getChildList();
 
       for (std::size_t i = 0; i < def_vector.size(); i++)

XIOS/trunk/src/interface/c/icdata.cpp

@@ -67 +67 @@
     void cxios_context_close_definition()
    {
-     boost::shared_ptr<CContext> context =
-            CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId());
+     boost::shared_ptr<CContext> context = CContext::getCurrent() ;
      context->closeDefinition() ;
    }  
@@ -74 +73 @@
    void cxios_context_finalize()
    {
-     boost::shared_ptr<CContext> context =
-            CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId());
+     boost::shared_ptr<CContext> context = CContext::getCurrent() ;
      context->finalize() ;
    }
@@ -91 +89 @@
    {
       std::string fieldid_str;
-      boost::shared_ptr<CContext> context =
-      CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId());
+      boost::shared_ptr<CContext> context = CContext::getCurrent() ;
       if (!cstr2string(fieldid, fieldid_size, fieldid_str)) return; 
       
@@ -108 +105 @@
    {
       std::string fieldid_str;
-      boost::shared_ptr<CContext> context =
-      CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId());
+      boost::shared_ptr<CContext> context = CContext::getCurrent() ;
       if (!cstr2string(fieldid, fieldid_size, fieldid_str)) return;
       
@@ -124 +120 @@
    {
       std::string fieldid_str;
-      boost::shared_ptr<CContext> context =
-      CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId());
+      boost::shared_ptr<CContext> context = CContext::getCurrent() ;
       if (!cstr2string(fieldid, fieldid_size, fieldid_str)) return; 
       
@@ -141 +136 @@
    {
       std::string fieldid_str;
-      boost::shared_ptr<CContext> context =
-      CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId());
+      boost::shared_ptr<CContext> context = CContext::getCurrent() ;
       if (!cstr2string(fieldid, fieldid_size, fieldid_str)) return; 
       
@@ -160 +154 @@
    {
       std::string fieldid_str;
-      boost::shared_ptr<CContext> context =
-      CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId());
+      boost::shared_ptr<CContext> context = CContext::getCurrent() ;
       if (!cstr2string(fieldid, fieldid_size, fieldid_str)) return; 
       
@@ -179 +172 @@
    {
       std::string fieldid_str;
-      boost::shared_ptr<CContext> context =
-      CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId());
+      boost::shared_ptr<CContext> context = CContext::getCurrent() ;
       if (!cstr2string(fieldid, fieldid_size, fieldid_str)) return; 
       

XIOS/trunk/src/interface/c/icdate.cpp

@@ -26 +26 @@
       {
          CDuration dur = {ts_year, ts_month, ts_day, ts_hour, ts_minute, ts_second};
-         boost::shared_ptr<xios::CContext> context =
-         xios::CObjectFactory::GetObject<xios::CContext>
-            (CObjectFactory::GetCurrentContextId());
+         boost::shared_ptr<xios::CContext> context = CContext::getCurrent() ;
          
             context->timestep.setValue(dur.toString());
@@ -42 +40 @@
    void cxios_update_calendar(int step)
    {
-      boost::shared_ptr<xios::CContext> context =
-            xios::CObjectFactory::GetObject<xios::CContext>
-            (CObjectFactory::GetCurrentContextId());
+      boost::shared_ptr<xios::CContext> context = CContext::getCurrent() ;
       context->updateCalendar(step) ;
       context->sendUpdateCalendar(step) ;

XIOS/trunk/src/interface/c/icdomain.cpp

@@ -30 +30 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::GetObject<xios::CDomain>(id).get();
+      *_ret = CDomain::get(id).get();
    }
    
@@ -38 +38 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::GetObject<xios::CDomainGroup>(id).get();
+      *_ret = CDomainGroup::get(id).get();
    }
 
@@ -48 +48 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::HasObject<xios::CDomain>(id);
+      *_ret = CDomain::has(id);
    }
 
@@ -56 +56 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::HasObject<xios::CDomainGroup>(id);
+      *_ret = CDomainGroup::has(id);
    }
 } // extern "C"

XIOS/trunk/src/interface/c/icfield.cpp

@@ -32 +32 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::GetObject<xios::CField>(id).get();
+      *_ret = CField::get(id).get();
    }
    
@@ -40 +40 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::GetObject<xios::CFieldGroup>(id).get();
+      *_ret = CFieldGroup::get(id).get();
    }
 
@@ -51 +51 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::HasObject<xios::CField>(id);
+      *_ret = CField::has(id);
    }
 
@@ -59 +59 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::HasObject<xios::CFieldGroup>(id);
+      *_ret = CFieldGroup::has(id);
    }
 

XIOS/trunk/src/interface/c/icfile.cpp

@@ -30 +30 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::GetObject<xios::CFile>(id).get();
+      *_ret = CFile::get(id).get();
    }
    
@@ -38 +38 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::GetObject<xios::CFileGroup>(id).get();
+      *_ret = CFileGroup::get(id).get();
    }
 
@@ -48 +48 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::HasObject<xios::CFile>(id);
+      *_ret = CFile::has(id);
    }
 
@@ -56 +56 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::HasObject<xios::CFileGroup>(id);
+      *_ret = CFileGroup::has(id);
    }
 } // extern "C"

XIOS/trunk/src/interface/c/icgrid.cpp

@@ -30 +30 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::GetObject<xios::CGrid>(id).get();
+      *_ret = CGrid::get(id).get();
    }
    
@@ -38 +38 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::GetObject<xios::CGridGroup>(id).get();
+      *_ret = CGridGroup::get(id).get();
    }
 
@@ -48 +48 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::HasObject<xios::CGrid>(id);
+      *_ret = CGrid::has(id);
    }
 
@@ -56 +56 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::HasObject<xios::CGridGroup>(id);
+      *_ret = CGridGroup::has(id);
    }
 } // extern "C"

XIOS/trunk/src/interface/c/icxml_tree.cpp

@@ -241 +241 @@
    // ----------------------- Affichage de l'arborescence ----------------------
    
-   void cxios_xml_tree_show   (const char * filename, int filename_size) 
-   {
-      std::string filename_str;
-      try
-      {
-         if (cstr2string(filename, filename_size, filename_str))
-            xios::CTreeManager::PrintTreeToFile(filename_str);
-         else
-            xios::CTreeManager::PrintTreeToStream(std::clog);
-      }
-      catch (xios::CException & exc)
-      {
-         std::cerr << exc.getMessage() << std::endl;
-         exit (EXIT_FAILURE);
-      }
-   }
+//   void cxios_xml_tree_show   (const char * filename, int filename_size) 
+//   {
+//      std::string filename_str;
+//      try
+//      {
+//         if (cstr2string(filename, filename_size, filename_str))
+//            xios::CTreeManager::PrintTreeToFile(filename_str);
+//         else
+//            xios::CTreeManager::PrintTreeToStream(std::clog);
+//      }
+//      catch (xios::CException & exc)
+//      {
+//         std::cerr << exc.getMessage() << std::endl;
+//         exit (EXIT_FAILURE);
+//      }
+//  }
      
    
    // ----------------------- Parsing de document xml --------------------------
    
-   void cxios_xml_parse_file  (const char * filename  , int filename_size)
-   {
-      std::string filename_str; 
-      if (!cstr2string(filename, filename_size, filename_str)) return;
-
-      try
-      {
-         xios::CTreeManager::ParseFile(filename_str);
-      }
-      catch (xios::CException & exc)
-      {
-         std::cerr << exc.getMessage() << std::endl;
-         exit (EXIT_FAILURE);
-      }
-   }
-   
-   void cxios_xml_parse_string(const char * xmlcontent, int xmlcontent_size)
-   {
-      std::string xmlcontent_str; 
-      if (!cstr2string(xmlcontent, xmlcontent_size, xmlcontent_str)) return;
-
-      try
-      {
-         xios::CTreeManager::ParseString(xmlcontent_str);
-      }
-      catch (xios::CException & exc)
-      {
-         std::cerr << exc.getMessage() << std::endl;
-         exit (EXIT_FAILURE);
-      }
-   }
+//   void cxios_xml_parse_file  (const char * filename  , int filename_size)//
+//   {
+//      std::string filename_str; 
+//      if (!cstr2string(filename, filename_size, filename_str)) return;
+//
+//      try
+//      {
+//         xios::CTreeManager::ParseFile(filename_str);
+//      }
+//      catch (xios::CException & exc)
+//      {
+//         std::cerr << exc.getMessage() << std::endl;
+//         exit (EXIT_FAILURE);
+//      }
+//   }
+   
+//   void cxios_xml_parse_string(const char * xmlcontent, int xmlcontent_size)
+//   {
+//      std::string xmlcontent_str; 
+//      if (!cstr2string(xmlcontent, xmlcontent_size, xmlcontent_str)) return;
+//
+//      try
+//      {
+//         xios::CTreeManager::ParseString(xmlcontent_str);
+//      }
+//      catch (xios::CException & exc)
+//      {
+//         std::cerr << exc.getMessage() << std::endl;
+//         exit (EXIT_FAILURE);
+//      }
+//   }
    
 

XIOS/trunk/src/manager/tree_manager.cpp

@@ -17 +17 @@
       boost::shared_ptr<CContext> CTreeManager::CreateContext(const StdString & id)
       {
-         boost::shared_ptr<CContextGroup> group_context = CContext::GetContextGroup();
+         boost::shared_ptr<CContextGroup> group_context = CContext::getRoot();
          CTreeManager::SetCurrentContextId(id);
          bool hasctxt = CObjectFactory::HasObject<CContext>(id);
@@ -79 +79 @@
             CObjectFactory::GetCurrentContextId();
          std::vector<boost::shared_ptr<CContext> > def_vector =
-            CContext::GetContextGroup()->getChildList();
+            CContext::getRoot()->getChildList();
             
          const StdSize size = def_vector.size();         
@@ -116 +116 @@
          ENodeType renum = Unknown;
          
-         boost::shared_ptr<CContextGroup> group_context =
-                           CContext::GetContextGroup();
+         boost::shared_ptr<CContextGroup> group_context = CContext::getRoot();
                            
          is.read (reinterpret_cast<char*>(&renum), sizeof(ENodeType));   
@@ -172 +171 @@
          StdString currentContextId =
             CObjectFactory::GetCurrentContextId();
-         std::vector<boost::shared_ptr<CContext> > def_vector =
-            CContext::GetContextGroup()->getChildList();
+         std::vector<boost::shared_ptr<CContext> > def_vector = CContext::getRoot()->getChildList();
             
          const StdSize size = def_vector.size();         
@@ -262 +260 @@
          ENodeType renum = Unknown;
          
-         boost::shared_ptr<CContextGroup> group_context =
-                           CContext::GetContextGroup();
-         std::vector<boost::shared_ptr<CContext> > def_vector =
-            CContext::GetContextGroup()->getChildList();
+         boost::shared_ptr<CContextGroup> group_context = CContext::getRoot();
+         std::vector<boost::shared_ptr<CContext> > def_vector = CContext::getRoot()->getChildList();
             
          const StdSize size = def_vector.size();  

XIOS/trunk/src/node/context.cpp

@@ -12 +12 @@
 #include "context_server.hpp"
 #include "nc4_data_output.hpp"
+#include "node_type.hpp"
 
 namespace xios {
+  
+  shared_ptr<CContextGroup> CContext::root ;
    
    /// ////////////////////// Définitions ////////////////////// ///
@@ -41 +44 @@
    //----------------------------------------------------------------
 
-   boost::shared_ptr<CContextGroup> CContext::GetContextGroup(void)
+   boost::shared_ptr<CContextGroup> CContext::getRoot(void)
    {  
-      static boost::shared_ptr<CContextGroup> group_context
-                          (new CContextGroup(xml::CXMLNode::GetRootName()));
-      return (group_context); 
+      if (root.get()==NULL) root=shared_ptr<CContextGroup>(new CContextGroup(xml::CXMLNode::GetRootName())) ;
+      return root; 
    }
    
@@ -134 +136 @@
 #define DECLARE_NODE(Name_, name_)    \
    if (name.compare(C##Name_##Definition::GetDefName()) == 0) \
-   { CObjectFactory::CreateObject<C##Name_##Definition>(C##Name_##Definition::GetDefName()) -> parse(node); \
-   continue; }
+   { C##Name_##Definition::create(C##Name_##Definition::GetDefName()) -> parse(node) ; continue; }
 #define DECLARE_NODE_PAR(Name_, name_)
 #include "node_type.conf"
 
             DEBUG(<< "L'élément nommé \'"     << name
-                  << "\' dans le contexte \'" << CObjectFactory::GetCurrentContextId()
+                  << "\' dans le contexte \'" << CContext::getCurrent()->getId()
                   << "\' ne représente pas une définition !");
 
@@ -153 +154 @@
    void CContext::ShowTree(StdOStream & out)
    {
-      StdString currentContextId =
-         CObjectFactory::GetCurrentContextId();
+      StdString currentContextId = CContext::getCurrent() -> getId() ;
       std::vector<boost::shared_ptr<CContext> > def_vector =
-         CContext::GetContextGroup()->getChildList();
+         CContext::getRoot()->getChildList();
       std::vector<boost::shared_ptr<CContext> >::iterator
          it = def_vector.begin(), end = def_vector.end();
@@ -166 +166 @@
       {
          boost::shared_ptr<CContext> context = *it;         
-         CTreeManager::SetCurrentContextId(context->getId());         
+         CContext::setCurrent(context->getId());         
          out << *context << std::endl;
       }
       
       out << "</" << xml::CXMLNode::GetRootName() << " >" << std::endl;
-      CTreeManager::SetCurrentContextId(currentContextId);  
+      CContext::setCurrent(currentContextId);  
    }
    
@@ -179 +179 @@
    {
       SuperClass::toBinary(os);
-       
+
 #define DECLARE_NODE(Name_, name_)                                         \
    {                                                                       \
       ENodeType renum = C##Name_##Definition::GetType();                   \
-      bool val = CObjectFactory::HasObject<C##Name_##Definition>           \
-                     (C##Name_##Definition::GetDefName());                 \
+      bool val = C##Name_##Definition::has(C##Name_##Definition::GetDefName()); \
       os.write (reinterpret_cast<const char*>(&renum), sizeof(ENodeType)); \
       os.write (reinterpret_cast<const char*>(&val), sizeof(bool));        \
-      if (val) CObjectFactory::GetObject<C##Name_##Definition>             \
-                     (C##Name_##Definition::GetDefName())->toBinary(os);   \
+      if (val) C##Name_##Definition::get(C##Name_##Definition::GetDefName())->toBinary(os);   \
    }   
 #define DECLARE_NODE_PAR(Name_, name_)
@@ -208 +206 @@
          ERROR("CContext::fromBinary(StdIStream & is)",                    \
                << "[ renum = " << renum << "] Bad type !");                \
-      if (val) CObjectFactory::CreateObject<C##Name_##Definition>          \
-                   (C##Name_##Definition::GetDefName()) -> fromBinary(is); \
+      if (val) C##Name_##Definition::create(C##Name_##Definition::GetDefName()) -> fromBinary(is); \
    }   
 #define DECLARE_NODE_PAR(Name_, name_)
@@ -233 +230 @@
 
 #define DECLARE_NODE(Name_, name_)    \
-   if (CObjectFactory::HasObject<C##Name_##Definition>(C##Name_##Definition::GetDefName())) \
-   oss << *CObjectFactory::GetObject<C##Name_##Definition>(C##Name_##Definition::GetDefName()) << std::endl;
+   if (C##Name_##Definition::has(C##Name_##Definition::GetDefName())) \
+   oss << * C##Name_##Definition::get(C##Name_##Definition::GetDefName()) << std::endl;
 #define DECLARE_NODE_PAR(Name_, name_)
 #include "node_type.conf"
@@ -250 +247 @@
    {
 #define DECLARE_NODE(Name_, name_)    \
-   if (CObjectFactory::HasObject<C##Name_##Definition>(C##Name_##Definition::GetDefName())) \
-   CObjectFactory::GetObject<C##Name_##Definition>(C##Name_##Definition::GetDefName())->solveDescInheritance();
+   if (C##Name_##Definition::has(C##Name_##Definition::GetDefName())) \ 
+     C##Name_##Definition::get(C##Name_##Definition::GetDefName())->solveDescInheritance();
 #define DECLARE_NODE_PAR(Name_, name_)
 #include "node_type.conf"
@@ -262 +259 @@
       return (
 #define DECLARE_NODE(Name_, name_)    \
-   CObjectFactory::HasObject<C##Name_##Definition>  (C##Name_##Definition::GetDefName())   ||
+   C##Name_##Definition::has(C##Name_##Definition::GetDefName())   ||
 #define DECLARE_NODE_PAR(Name_, name_)
 #include "node_type.conf"
@@ -273 +270 @@
    {
       if (!this->hasId()) return;
-      std::vector<boost::shared_ptr<CField> > allField
+      std::vector<boost::shared_ptr<CField> >& allField
                = CObjectTemplate<CField>::GetAllVectobject(this->getId());
       std::vector<boost::shared_ptr<CField> >::iterator 
@@ -379 +376 @@
 
      // Résolution des héritages par référence au niveau des fichiers.
-      const std::vector<boost::shared_ptr<CFile> > & allFiles
-             = CObjectFactory::GetObjectVector<CFile>();
+      const std::vector<boost::shared_ptr<CFile> > & allFiles=CFile::getAll() ;
 
       for (unsigned int i = 0; i < allFiles.size(); i++)
@@ -388 +384 @@
    void CContext::findEnabledFiles(void)
    {
-      const std::vector<boost::shared_ptr<CFile> > & allFiles
-          = CObjectFactory::GetObjectVector<CFile>();
+      const std::vector<boost::shared_ptr<CFile> > & allFiles = CFile::getAll();
 
       for (unsigned int i = 0; i < allFiles.size(); i++)
@@ -541 +536 @@
    } 
    
-   shared_ptr<CContext> CContext::current(void)
+   shared_ptr<CContext> CContext::getCurrent(void)
    {
      return CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
    }
    
+   void CContext::setCurrent(const string& id)
+   {
+     CObjectFactory::SetCurrentContextId(id);
+     CGroupFactory::SetCurrentContextId(id);
+   }
+   
+  boost::shared_ptr<CContext> CContext::create(const StdString& id)
+  {
+    CContext::setCurrent(id) ;
+ 
+    bool hasctxt = CContext::has(id);
+    boost::shared_ptr<CContext> context = CObjectFactory::CreateObject<CContext>(id);
+    if (!hasctxt) CGroupFactory::AddChild(getRoot(), context);
+
+#define DECLARE_NODE(Name_, name_) \
+    C##Name_##Definition::create(C##Name_##Definition::GetDefName());
+#define DECLARE_NODE_PAR(Name_, name_)
+#include "node_type.conf"
+
+    return (context);
+  }
 } // namespace xios

XIOS/trunk/src/node/context.hpp

@@ -127 +127 @@
          static void recvCreateFileHeader(CEventServer& event) ;
          void recvCreateFileHeader(CBufferIn& buffer) ;
-         static shared_ptr<CContext> current(void) ;
+         static shared_ptr<CContext> getCurrent(void) ;
+         static shared_ptr<CContextGroup> getRoot(void) ;
+         static void setCurrent(const string& id) ;
+         static shared_ptr<CContext> create(const string& id = "") ;
          
       public :
@@ -143 +146 @@
  
          std::vector<boost::shared_ptr<CFile> > enabledFiles;
+         static shared_ptr<CContextGroup> root ;
 
 

XIOS/trunk/src/node/domain.cpp

@@ -635 +635 @@
    {
       if (this->isChecked) return;
-      shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
+      shared_ptr<CContext> context=CContext::getCurrent() ;
 
       this->checkGlobalDomain();
@@ -696 +696 @@
     int jend_srv ;
     
-    shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
+    shared_ptr<CContext> context=CContext::getCurrent() ;
     CContextClient* client=context->client ;
     int nbServer=client->serverSize ;
@@ -738 +738 @@
     jbegin_client=jbegin.getValue() ; jend_client=jend.getValue() ; nj_client=nj.getValue() ;
      
-    shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
+    shared_ptr<CContext> context = CContext::getCurrent() ;
     CContextClient* client=context->client ;
     int nbServer=client->serverSize ;
@@ -847 +847 @@
   void CDomain::sendLonLat(void)
   {
-    shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
+    shared_ptr<CContext> context = CContext::getCurrent() ;
     CContextClient* client=context->client ;
     // send lon lat for each connected server

XIOS/trunk/src/node/field.cpp

@@ -94 +94 @@
   void CField::sendUpdateData(void)
   {
-    shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
+    shared_ptr<CContext> context = CContext::getCurrent() ;
     CContextClient* client=context->client ;
     
@@ -150 +150 @@
     }
 
-    shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
+    shared_ptr<CContext> context = CContext::getCurrent() ;
     const CDate & currDate = context->getCalendar()->getCurrentDate();
     const CDate opeDate      = *last_operation_srv + freq_operation_srv;
@@ -187 +187 @@
       getRelFile()->checkFile();
       this->incrementNStep();
-      getRelFile()->getDataOutput()->writeFieldData(CObjectFactory::GetObject<CField>(this));
+      getRelFile()->getDataOutput()->writeFieldData(CField::get(this));
     }
   }
@@ -239 +239 @@
          return (this->getBaseFieldReference());
 
-      if (! CObjectFactory::HasObject<CField>(this->field_ref.getValue()))
+      if (! CField::has(this->field_ref.getValue()))
          ERROR("CField::getDirectFieldReference(void)",
                << "[ ref_name = " << this->field_ref.getValue() << "]"
                << " invalid field name !");
 
-      return (CObjectFactory::GetObject<CField>(this->field_ref.getValue()));
+      return (CField::get(this->field_ref.getValue()));
    }
 
@@ -328 +328 @@
       CField * refer_ptr = this;
       
-      this->baseRefObject = CObjectFactory::GetObject<CField>(this);
+      this->baseRefObject = CField::get(this);
       
       while (refer_ptr->hasDirectFieldReference())
@@ -356 +356 @@
        
       StdString id = this->getBaseFieldReference()->getId();
-      boost::shared_ptr<CContext> context =
-         CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId());
+      boost::shared_ptr<CContext> context = CContext::getCurrent();
 
       if (operation.isEmpty() || freq_op.isEmpty() || this->file->output_freq.isEmpty())
@@ -448 +447 @@
       if (!domain_ref.isEmpty())
       {
-         if (CObjectFactory::HasObject<CDomain>(domain_ref.getValue()))
-            domain = CObjectFactory::GetObject<CDomain>(domain_ref.getValue()) ;
+         if (CDomain::has(domain_ref.getValue()))
+            domain = CDomain::get(domain_ref.getValue()) ;
          else
             ERROR("CField::solveGridReference(void)",
@@ -458 +457 @@
       if (!axis_ref.isEmpty())
       {
-         if (CObjectFactory::HasObject<CAxis>(axis_ref.getValue()))
-            axis = CObjectFactory::GetObject<CAxis>(axis_ref.getValue()) ;
+         if (CAxis::has(axis_ref.getValue()))
+            axis = CAxis::get(axis_ref.getValue()) ;
          else
             ERROR("CField::solveGridReference(void)",
@@ -468 +467 @@
       if (!grid_ref.isEmpty())
       {
-         if (CObjectFactory::HasObject<CGrid>(grid_ref.getValue()))
-            this->grid = CObjectFactory::GetObject<CGrid>(grid_ref.getValue()) ;
+         if (CGrid::has(grid_ref.getValue()))
+            this->grid = CGrid::get(grid_ref.getValue()) ;
          else
             ERROR("CField::solveGridReference(void)",
@@ -514 +513 @@
       StdString gref = this->group_ref.getValue();
 
-      if (!CObjectFactory::HasObject<CFieldGroup>(gref))
+      if (!CFieldGroup::has(gref))
          ERROR("CGroupTemplate<CField, CFieldGroup, CFieldAttributes>::solveRefInheritance(void)",
                << "[ gref = " << gref << "]"
                << " invalid group name !");
 
-      boost::shared_ptr<CFieldGroup> group
-               = CObjectFactory::GetObject<CFieldGroup>(gref);
-      boost::shared_ptr<CFieldGroup> owner
-               = CObjectFactory::GetObject<CFieldGroup>
-                  (boost::polymorphic_downcast<CFieldGroup*>(this));
+      boost::shared_ptr<CFieldGroup> group = CFieldGroup::get(gref);
+      boost::shared_ptr<CFieldGroup> owner = CFieldGroup::get(boost::polymorphic_downcast<CFieldGroup*>(this));
 
       std::vector<boost::shared_ptr<CField> > allChildren  = group->getAllChildren();
@@ -532 +528 @@
       {
          boost::shared_ptr<CField> child = *it;
-         if (child->hasId())
-            CGroupFactory::CreateChild(owner)->field_ref.setValue(child->getId());
+         if (child->hasId()) owner->createChild()->field_ref.setValue(child->getId()) ;
+            
       }
    }

XIOS/trunk/src/node/file.cpp

@@ -101 +101 @@
          (*it)->refObject.push_back(*it);
          // Le champ est finalement actif, on y ajoute la référence au champ de base.
-         (*it)->setRelFile(CObjectFactory::GetObject(this));
+         (*it)->setRelFile(CFile::get(this));
          (*it)->baseRefObject->refObject.push_back(*it);
          // A faire, ajouter les references intermediaires...
@@ -121 +121 @@
    void CFile::setVirtualFieldGroup(void)
    {
-      this->setVirtualFieldGroup
-         (CObjectFactory::CreateObject<CFieldGroup>());
+      this->setVirtualFieldGroup(CFieldGroup::create());
    }
 
@@ -128 +127 @@
    bool CFile::isSyncTime(void)
    {
-     shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
+     shared_ptr<CContext> context = CContext::getCurrent() ;
      CDate& currentDate=context->calendar->getCurrentDate() ;
      if (! sync_freq.isEmpty())
@@ -143 +142 @@
    void CFile::initFile(void)
    {
-      shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
+      shared_ptr<CContext> context = CContext::getCurrent() ;
       CDate& currentDate=context->calendar->getCurrentDate() ;
       
@@ -164 +163 @@
    bool CFile::checkSync(void)
    {
-     shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
+     shared_ptr<CContext> context = CContext::getCurrent() ;
      CDate& currentDate=context->calendar->getCurrentDate() ;
      if (! sync_freq.isEmpty())
@@ -181 +180 @@
     bool CFile::checkSplit(void)
     {
-      shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
+      shared_ptr<CContext> context = CContext::getCurrent() ;
       CDate& currentDate=context->calendar->getCurrentDate() ;
       if (! split_freq.isEmpty())
@@ -200 +199 @@
    void CFile::createHeader(void)
    {
-      shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
+      shared_ptr<CContext> context = CContext::getCurrent() ;
       CDate& currentDate=context->calendar->getCurrentDate() ;
       
@@ -258 +257 @@
          isOpen=true ;
 
-         data_out->writeFile(CObjectFactory::GetObject<CFile>(this));
+         data_out->writeFile(CFile::get(this));
          for (it = this->enabledFields.begin() ;it != end; it++)
          {
@@ -395 +394 @@
    void CFile::sendAddField(const string& id)
    {
-    shared_ptr<CContext> context=CContext::current() ;
+    shared_ptr<CContext> context=CContext::getCurrent() ;
     
     if (! context->hasServer )
@@ -417 +416 @@
    void CFile::sendAddFieldGroup(const string& id)
    {
-    shared_ptr<CContext> context=CContext::current() ;
+    shared_ptr<CContext> context=CContext::getCurrent() ;
     if (! context->hasServer )
     {

XIOS/trunk/src/node/grid.cpp

@@ -158 +158 @@
    {
       if (this->isChecked) return;
-      shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
+      shared_ptr<CContext> context = CContext::getCurrent() ;
       CContextClient* client=context->client ;
       
@@ -187 +187 @@
       if (!domain_ref.isEmpty())
       {
-         if (CObjectFactory::HasObject<CDomain>(domain_ref.getValue()))
-         {
-            this->domain = CObjectFactory::GetObject<CDomain>(domain_ref.getValue()) ;
+         if (CDomain::has(domain_ref.getValue()))
+         {
+            this->domain = CDomain::get(domain_ref.getValue()) ;
             domain->checkAttributes() ;
          }
@@ -206 +206 @@
       {
          this->withAxis = true ;
-         if (CObjectFactory::GetObject<CAxis>(axis_ref.getValue()))
-         {
-            this->axis = CObjectFactory::GetObject<CAxis>(axis_ref.getValue()) ;
+         if (CAxis::get(axis_ref.getValue()))
+         {
+            this->axis = CAxis::get(axis_ref.getValue()) ;
             axis->checkAttributes() ;
          }
@@ -310 +310 @@
    {
       StdString new_id = StdString("__") + domain->getId() + StdString("__") ;
-      boost::shared_ptr<CGrid> grid =
-         CGroupFactory::CreateChild(CObjectFactory::GetObject<CGridGroup> ("grid_definition"), new_id);
+      boost::shared_ptr<CGrid> grid = CGridGroup::get("grid_definition")->createChild(new_id) ;
       grid->domain_ref.setValue(domain->getId());
       return (grid);
@@ -321 +320 @@
       StdString new_id = StdString("__") + domain->getId() +
                          StdString("_") + axis->getId() + StdString("__") ;
-      boost::shared_ptr<CGrid> grid =
-         CGroupFactory::CreateChild(CObjectFactory::GetObject<CGridGroup> ("grid_definition"), new_id);
+      boost::shared_ptr<CGrid> grid = CGridGroup::get("grid_definition")->createChild(new_id) ;
       grid->domain_ref.setValue(domain->getId());
       grid->axis_ref.setValue(axis->getId());
@@ -418 +416 @@
   void CGrid::sendIndex(void)
   {
-    shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
+    shared_ptr<CContext> context = CContext::getCurrent() ;
     CContextClient* client=context->client ;
     

XIOS/trunk/src/node/variable.cpp

@@ -83 +83 @@
    {
       boost::shared_ptr<CVariableGroup> group_ptr = (this->hasId())
-         ? CObjectFactory::GetObject<CVariableGroup>(this->getId())
-         : CObjectFactory::GetObject(this);
+         ? CVariableGroup::get(this->getId()) : CVariableGroup::get(this);
 
       StdString content;
@@ -101 +100 @@
            subdata   = content.substr ( begindata, enddata-begindata);
 
-           CGroupFactory::CreateChild(group_ptr, subid)->content = subdata;
+           group_ptr->createChild(subid)->content = subdata ;
         }
       }

XIOS/trunk/src/object_template.hpp

@@ -67 +67 @@
          
          static bool has(const string& id) ;
+         static bool has(const string& contextId, const string& id) ;
          static boost::shared_ptr<T> get(const string& id) ;
+         static boost::shared_ptr<T> get(const T* ptr) ;
+         static boost::shared_ptr<T> get(const string& contextId, const string& id) ;
          boost::shared_ptr<T> get(void) ;
          static boost::shared_ptr<T> create(const string& id=string("")) ;
-         
+         static const vector< boost::shared_ptr<T> >& getAll() ;
+         static const vector< boost::shared_ptr<T> >& getAll(const string& contextId) ;
+        
          void generateCInterface(ostream& oss) ;
          void generateFortran2003Interface(ostream& oss) ;

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) ;
   }
   

XIOS/trunk/src/output/nc4_data_output.cpp

@@ -57 +57 @@
       void CNc4DataOutput::writeDomain_(const boost::shared_ptr<CDomain> domain)
       {
-         shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
+         shared_ptr<CContext> context = CContext::getCurrent() ;
          CContextServer* server=context->server ;
          
@@ -271 +271 @@
       void CNc4DataOutput::writeField_(const boost::shared_ptr<CField> field)
       {
-         shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
+         shared_ptr<CContext> context = CContext::getCurrent() ;
          CContextServer* server=context->server ;
 
@@ -463 +463 @@
       void CNc4DataOutput::writeFieldData_ (const boost::shared_ptr<CField>  field)
       {
-         shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
+         shared_ptr<CContext> context = CContext::getCurrent() ;
 //          if (field->getRelFile()->isSyncTime()) SuperClassWriter::sync() ;
 

XIOS/trunk/src/server.cpp

@@ -346 +346 @@
               <<"Context has already been registred") ;
       
-      shared_ptr<CContext> context=CTreeManager::CreateContext(contextId) ;
+      shared_ptr<CContext> context=CContext::create(contextId) ;
       contextList[contextId]=context.get() ;
       context->initServer(intraComm,contextIntercomm) ;

XIOS/trunk/src/test/test_xios.cpp

@@ -68 +68 @@
 //     CClient::registerContext("tata",CClient::intraComm) ;
      CClient::registerContext("tutu",CClient::intraComm) ;
-     CObjectFactory::SetCurrentContextId("tutu") ;
-     CContext*  tutu=(CObjectFactory::GetObject<CContext>("tutu")).get(); 
+     CContext::setCurrent("tutu") ;
+     CContext*  tutu=CContext::get("tutu").get() ; 
      
      
-     CObjectFactory::SetCurrentContextId("toto") ;
-     CContext*  toto=(CObjectFactory::GetObject<CContext>("toto")).get(); 
+     CContext::setCurrent("toto") ;
+     CContext*  toto=(CContext::get("toto").get() ;
      toto->calendar_type.setValue("NoLeap") ;
      toto->sendAttributToServer("calendar_type" );
@@ -101 +101 @@
      CXios::initClientSide("test2") ;
      CClient::registerContext("tito",CClient::intraComm) ;
-     CObjectFactory::SetCurrentContextId("tito") ;
-     CContext*  tito=(CObjectFactory::GetObject<CContext>("tito")).get();
+     CContext::setCurrent("tito") ;
+     CContext*  tito=CContext::get("tito").get() ;
       
      CClient::registerContext("tete",CClient::intraComm) ;
-     CObjectFactory::SetCurrentContextId("tete") ;
-     CContext*  tete=(CObjectFactory::GetObject<CContext>("tete")).get(); 
+     CContext::setCurrent("tete") ;
+     CContext*  tete=CContext::get("tete").get() ; 
 
      tito->client->finalize() ;
@@ -116 +116 @@
      CXios::initClientSide("test3") ;
      CClient::registerContext("turlututu",CClient::intraComm) ;
-     CObjectFactory::SetCurrentContextId("turlututu") ;
-     CContext*  turlututu=(CObjectFactory::GetObject<CContext>("turlututu")).get(); 
+     CContext::setCurrent("turlututu") ;
+     CContext*  turlututu=CContext::get("turlututu").get() ; 
      turlututu->client->finalize() ;
      CXios::clientFinalize() ;

XIOS/trunk/src/xml_parser.cpp

@@ -52 +52 @@
                do
                {
-                  boost::shared_ptr<CContextGroup> group_context =
-                                    CContext::GetContextGroup();
+                  boost::shared_ptr<CContextGroup> group_context = CContext::getRoot() ;
+ 
                   attributes = node.getAttributes();
 
@@ -62 +62 @@
                   }
 
-                  CObjectFactory::SetCurrentContextId(attributes["id"]);
-                  CGroupFactory::SetCurrentContextId(attributes["id"]);
+                  CContext::setCurrent(attributes["id"]) ;
 
-                  bool hasctxt = CObjectFactory::HasObject<CContext>(attributes["id"]);
+                  bool hasctxt = CContext::has(attributes["id"]);
 
                   if(hasctxt)
@@ -74 +73 @@
                   }
 
-                  boost::shared_ptr<CContext> context =
-                     CObjectFactory::CreateObject<CContext>(attributes["id"]);
-                  if (!hasctxt) CGroupFactory::AddChild(group_context, context);
+                  boost::shared_ptr<CContext> context = CContext::create(attributes["id"]);
+//                  if (!hasctxt)  group_context->addChild(context);
                   context->parse(node);