change event name to Object<Event>

source/RobotAPI/libraries/skills/core/executor/FluxioCompositeExecutor.cpp

@@ -73,7 +73,7 @@ namespace armarx::skills
         // fill in missing with default values
         for (const auto& [key, param] : this->skill.parameters)
         {
-            if (param.type->getShortName() == "Event" || !param.isInput ||
+            if (param.type->getShortName() == "Object<Event>" || !param.isInput ||
                 this->possibleInputs[this->skill.id]->hasElement(key))
             {
                 continue;
@@ -283,7 +283,7 @@ namespace armarx::skills
         }
 
         // make sure it is an event parameter
-        if (parameterNode->parameterPtr->type->getShortName() != "Event")
+        if (parameterNode->parameterPtr->type->getShortName() != "Object<Event>")
         {
             ARMARX_WARNING << "Unexpected parameter type "
                            << parameterNode->parameterPtr->type->getShortName();
@@ -300,7 +300,7 @@ namespace armarx::skills
                      {
                          return (edge.isValid() &&
                                  edge.toNodePtr->nodeType == FluxioNodeType::PARAMETER &&
-                                 edge.fromParameterPtr->type->getShortName() != "Event");
+                                 edge.fromParameterPtr->type->getShortName() != "Object<Event>");
                      });
 
         std::unique_lock l(possibleInputsMutex);
@@ -369,7 +369,7 @@ namespace armarx::skills
                      [&subSkillNode](const skills::FluxioEdge& edge)
                      {
                          return (edge.isValid() && edge.toNodePtr->nodeId == subSkillNode->nodeId &&
-                                 edge.fromParameterPtr->type->getShortName() != "Event");
+                                 edge.fromParameterPtr->type->getShortName() != "Object<Event>");
                      });
 
         for (const auto& e : paramEdges)
@@ -476,7 +476,7 @@ namespace armarx::skills
             subSkillNode->skillPtr->parameters.end(),
             [&outputEventName](const std::pair<std::string, skills::FluxioParameter>& param)
             {
-                return (param.second.type->getShortName() == "Event" && !param.second.isInput &&
+                return (param.second.type->getShortName() == "Object<Event>" && !param.second.isInput &&
                         param.second.name == outputEventName);
             });
 
@@ -749,7 +749,7 @@ namespace armarx::skills
                          skill.parameters.end(),
                          [](const std::pair<std::string, skills::FluxioParameter>& param)
                          {
-                             return (param.second.type->getShortName() == "Event" &&
+                             return (param.second.type->getShortName() == "Object<Event>" &&
                                      param.second.isInput && param.second.name == "Start");
                          });
 
@@ -803,7 +803,7 @@ namespace armarx::skills
                          skill.parameters.end(),
                          [](const std::pair<std::string, skills::FluxioParameter>& param)
                          {
-                             return (param.second.type->getShortName() == "Event" &&
+                             return (param.second.type->getShortName() == "Object<Event>" &&
                                      !param.second.isInput && param.second.name == "Succeeded");
                          });
         const auto& outputParamsFailed =
@@ -811,7 +811,7 @@ namespace armarx::skills
                          skill.parameters.end(),
                          [](const std::pair<std::string, skills::FluxioParameter>& param)
                          {
-                             return (param.second.type->getShortName() == "Event" &&
+                             return (param.second.type->getShortName() == "Object<Event>" &&
                                      !param.second.isInput && param.second.name == "Failed");
                          });
         const auto& outputParamsAborted =
@@ -819,7 +819,7 @@ namespace armarx::skills
                          skill.parameters.end(),
                          [](const std::pair<std::string, skills::FluxioParameter>& param)
                          {
-                             return (param.second.type->getShortName() == "Event" &&
+                             return (param.second.type->getShortName() == "Object<Event>" &&
                                      !param.second.isInput && param.second.name == "Aborted");
                          });
 

source/RobotAPI/libraries/skills/core/executor/FluxioNativeExecutor.cpp

@@ -57,7 +57,7 @@ namespace armarx::skills
         // fill in missing with default values
         for (const auto& [key, param] : this->fluxioSkill.parameters)
         {
-            if (param.type->getShortName() == "Event" || !param.isInput ||
+            if (param.type->getShortName() == "Object<Event>" || !param.isInput ||
                 this->possibleInputs[this->fluxioSkill.id]->hasElement(key))
             {
                 continue;