Changeset 110 in pacpusframework for branches/2.0-beta1/src/PacpusLib/ComponentManager.cpp

Timestamp:

06/13/13 13:43:39 (11 years ago)

Author:

morasjul

Message:

Beta-2 : Fix CMakeList (link), remove useless code and add improvement

File:

• branches/2.0-beta1/src/PacpusLib/ComponentManager.cpp (modified) (6 diffs)

branches/2.0-beta1/src/PacpusLib/ComponentManager.cpp

@@ -7 +7 @@
 #include <Pacpus/kernel/ComponentManager.h>
 #include <Pacpus/kernel/ComponentBase.h>
+#include <Pacpus/kernel/ConnectionBase.h>
 #include <Pacpus/kernel/Log.h>
-#include <Pacpus/kernel/ConnectionBase.h>
 #include <QObject>
 
@@ -227 +227 @@
         QString componentType = cfg.getComponentType();
         QString componentName = cfg.getComponentName();
-        //LOG_DEBUG("try to create component '" << componentName << "'");
+        LOG_DEBUG("try to create component '" << componentName << "'");
+
         // create the component and automatically add it to the component manager list
         if (!createComponent(componentType, componentName)) {
@@ -239 +240 @@
     // Second, try to configure the components without regarding the dependencies
     for (int i = 0; i < componentsNodeList.size(); ++i) {
-        //LOG_DEBUG("try to configure component '" << (*it) << "'");
         cfg.localCopy(componentsNodeList.item(i).toElement());
         QString componentName = cfg.getComponentName();
+        LOG_DEBUG("try to configure component '" << componentName << "'");
 
         // copy locally the config parameters of the component
@@ -250 +251 @@
             component->param.localCopy(cfg.qDomElement());
             component->configuration_ = component->configureComponent(cfg);
-
         }
     } // for
@@ -264 +264 @@
         } else {
             if (component->configuration_ == ComponentBase::CONFIGURATION_DELAYED) {
-                //LOG_DEBUG("try to configure component '" << (*it) << "'");
+                LOG_DEBUG("try to configure component '" << componentName << "'");
 
                 // copy locally the config parameters of the component
@@ -274 +274 @@
                 --componentsToConfigureCount;
             } else {
-                /*LOG_ERROR("cannot configure component '" << (*it) << "'"
+                LOG_ERROR("cannot configure component '" << componentName << "'"
                           << ". Dependencies with other components are too complex"
                           << ". It was not configured, please review your configuration and/or your component"
-                          );*/
+                          );
                 component->configuration_ = ComponentBase::CONFIGURED_FAILED;
             }