X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2Fengine%2FComposedNode.hxx;h=013950a7ff1a7d558c5ed69dd39cac381c5efb96;hb=4c94156d7cf2269f0a4a5d01981436a5c045b35d;hp=a4a06626e4c7905dbcd6cb871ad0f74434964fb8;hpb=3699a56026f27b2de384de5944b20e2d27fdda44;p=modules%2Fyacs.git diff --git a/src/engine/ComposedNode.hxx b/src/engine/ComposedNode.hxx index a4a06626e..013950a7f 100644 --- a/src/engine/ComposedNode.hxx +++ b/src/engine/ComposedNode.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2006-2015 CEA/DEN, EDF R&D +// Copyright (C) 2006-2016 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 @@ -64,7 +64,7 @@ namespace YACS DeploymentTree checkDeploymentTree(bool deep) const throw(Exception); std::vector getNextTasks(bool& isMore); virtual bool isPlacementPredictableB4Run() const = 0; - void notifyFrom(const Task *sender, YACS::Event event); + void notifyFrom(const Task *sender, YACS::Event event, const Executor *execInst); bool edAddLink(OutPort *start, InPort *end) throw(Exception); virtual bool edAddDFLink(OutPort *start, InPort *end) throw(Exception); //Node* DISOWNnode is a SWIG notation to indicate that the ownership of the node is transfered to C++ @@ -136,10 +136,10 @@ namespace YACS static bool splitNamesBySep(const std::string& globalName, const char separator[], std::string& firstPart, std::string& lastPart, bool priority) throw(Exception); virtual Node *getChildByShortName(const std::string& name) const throw(Exception) = 0; - YACS::Event updateStateFrom(Node *node, YACS::Event event);//update the state of this. Precondition : node->_father == this + YACS::Event updateStateFrom(Node *node, YACS::Event event, const Executor *execInst);//update the state of this. Precondition : node->_father == this virtual YACS::Event updateStateOnStartEventFrom(Node *node);//transition 3 doc P.R virtual YACS::Event updateStateOnFinishedEventFrom(Node *node) = 0;//transition 9 doc P.R. - virtual YACS::Event updateStateOnFailedEventFrom(Node *node);//transition 9 doc P.R. + virtual YACS::Event updateStateOnFailedEventFrom(Node *node, const Executor *execInst);//transition 9 doc P.R. virtual void checkLinkPossibility(OutPort *start, const std::list& pointsOfViewStart, InPort *end, const std::list& pointsOfViewEnd) throw(Exception); virtual void buildDelegateOf(InPort * & port, OutPort *initialStart, const std::list& pointsOfView);