Changeset 184 in pacpusframework for trunk/src/PacpusLib/ComponentManager.cpp

Timestamp:

Oct 23, 2013, 9:34:23 AM (11 years ago)

Author:

morasjul

Message:

Minor fixes.

File:

• trunk/src/PacpusLib/ComponentManager.cpp (modified) (3 diffs)

trunk/src/PacpusLib/ComponentManager.cpp

@@ -16 +16 @@
 
 using namespace pacpus;
-using namespace pacpus;
 
 DECLARE_STATIC_LOGGER("pacpus.core.ComponentManager");
@@ -183 +182 @@
 }
 
+bool ComponentManager::checkComponentConnection(const QString& componentName, const QString& connectionName)
+{
+    if (NULL == getComponent(componentName)) {
+        LOG_WARN("cannot make connection : component " << componentName << " not found");
+        return false;
+    }
+    if (NULL == getComponent(componentName)->getOutput(connectionName)) {
+        LOG_WARN("cannot make connection : component " << componentName << " does not have input/output " << connectionName);
+        return false;
+    }
+    return true;
+}
+
 bool ComponentManager::createConnection(const QString& outputSignature, const QString& inputSignature, const QString& type, int priority = 0)
 {
+    // FIXME: use 2 signatures (output component + output connection) instead of 1 separated by a (".") dot
     QStringList output = outputSignature.split(".");
     QStringList input  = inputSignature.split(".");
 
-    if (getComponent(output[0])==NULL) {
-        LOG_WARN("cannot make connection : component " << output[0] << " not found");
-        return false;}
-    if (getComponent(output[0])->getOutput(output[1]) == NULL) {
-        LOG_WARN("cannot make connection : component " << output[0] << " doesn't have output " << output[1]);
-        return false;}
-    if (getComponent(input[0])==NULL) {
-        LOG_WARN("cannot make connection : component " << input[0] << " not found");
-        return false;}
-    if (getComponent(input[0])->getInput(input[1]) == NULL) {
-        LOG_WARN("cannot make connection : component " << input[0] << " doesn't have intput " << input[1]);
-        return false;}
-
+    if (!checkComponentConnection(output[0], output[1])) {
+        return false;
+    }
+    if (!checkComponentConnection(input[0], input[1])) {
+        return false;
+    }
     // NOTE Create communicationInterface if needed ??
     return connectInterface(
@@ -207 +213 @@
         priority
     );
-
 }