Salome HOME
Copyright update 2022
[modules/yacs.git] / src / hmi / commandsProc.cxx
index a10774b48b3858288d23b0738d5aef5d64f30ade..063473ec7ef4500e19251c02140f3756c3b1fb58 100644 (file)
@@ -1,4 +1,4 @@
-// Copyright (C) 2006-2014  CEA/DEN, EDF R&D
+// Copyright (C) 2006-2022  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -148,7 +148,7 @@ TypeOfElem ProcInvoc::getTypeOfNode(YACS::ENGINE::Node* node)
   else if (dynamic_cast<YACS::ENGINE::ForLoop*>(node))          nodeType = FORLOOP;
   else if (dynamic_cast<YACS::ENGINE::WhileLoop*>(node))        nodeType = WHILELOOP;
   else if (dynamic_cast<YACS::ENGINE::Switch*>(node))           nodeType = SWITCH;
-  else if (dynamic_cast<YACS::ENGINE::ForEachLoop*>(node))      nodeType = FOREACHLOOP;
+  else if (dynamic_cast<YACS::ENGINE::ForEachLoopGen*>(node))      nodeType = FOREACHLOOP;
   else if (dynamic_cast<YACS::ENGINE::OptimizerLoop*>(node))    nodeType = OPTIMIZERLOOP;
   else if (dynamic_cast<YACS::ENGINE::PresetNode*>(node))       nodeType = PRESETNODE;
   else if (dynamic_cast<YACS::ENGINE::OutNode*>(node))          nodeType = OUTNODE;
@@ -242,7 +242,7 @@ bool CommandAddNodeFromCatalog::localExecute()
       ComposedNode* father =dynamic_cast<ComposedNode*> (node);
       if (father && nodeToClone)
         {
-          son = nodeToClone->cloneWithoutCompAndContDeepCpy(0);
+          son = nodeToClone->clone(0);
           son->setName(_name);
           service = dynamic_cast<ServiceNode*>(son);
         }
@@ -292,7 +292,7 @@ bool CommandAddNodeFromCatalog::localExecute()
               (dynamic_cast<YACS::ENGINE::Switch*>(father))->edSetNode(_swCase,son);
               break;
             case FOREACHLOOP:
-              (dynamic_cast<YACS::ENGINE::ForEachLoop*>(father))->edSetNode(son);
+              (dynamic_cast<YACS::ENGINE::ForEachLoopGen*>(father))->edSetNode(son);
               break;
             case OPTIMIZERLOOP:
               (dynamic_cast<YACS::ENGINE::OptimizerLoop*>(father))->edSetNode(son);
@@ -2470,6 +2470,7 @@ bool CommandSetSwitchSelect::localExecute()
       setErrorMsg(ex);
       return false;
     }
+  return true;
 }
 
 bool CommandSetSwitchSelect::localReverse()
@@ -2492,6 +2493,7 @@ bool CommandSetSwitchSelect::localReverse()
       setErrorMsg(ex);
       return false;
     }
+  return true;
 }
 
 // ----------------------------------------------------------------------------