Changeset 346 for XIOS/trunk/src/node/grid.cpp

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/node/grid.cpp (modified) (6 diffs)

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 ;