Changeset 346 for XIOS/trunk/src/node/field.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/field.cpp (modified) (11 diffs)

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