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

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 )
     {