Merge branch 'V7_dev'

[modules/yacs.git] / src / runtime / SalomeComponent.hxx

diff --git a/src/runtime/SalomeComponent.hxx b/src/runtime/SalomeComponent.hxx
index f49537cf5eab69e5249ef046eb706e9f88be0744..3fe6704f524f4407d789952f19edec27466ef4ab 100644 (file)
--- a/src/runtime/SalomeComponent.hxx
+++ b/src/runtime/SalomeComponent.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2006-2013  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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -28,8 +28,6 @@ namespace YACS
 {
   namespace ENGINE
   {
-    class ServiceNode;
-
 /*! \brief Class for Salome component instance
  *
  *
@@ -40,18 +38,20 @@ namespace YACS
       SalomeComponent(const std::string& name);
       SalomeComponent(const SalomeComponent& other);
       virtual ~SalomeComponent();
-      virtual void load();
-      virtual void unload();
-      virtual bool isLoaded();
-      virtual void setContainer(Container *cont);
+      virtual void load(Task *askingNode);
+      virtual void unload(Task *askingNode);
+      virtual bool isLoaded(Task *askingNode) const;
+      virtual bool setContainer(Container *cont);
       virtual ServiceNode* createNode(const std::string& name);
       virtual ComponentInstance* clone() const;
+      virtual ComponentInstance* cloneAlways() const;
       virtual std::string getFileRepr() const;
       virtual CORBA::Object_ptr getCompoPtr(){return CORBA::Object::_duplicate(_objComponent);}
       virtual void shutdown(int level);
     public:
       static const char KIND[];
       virtual std::string getKind() const;
+      virtual std::string getKindForNode() const;
     protected:
       CORBA::Object_var _objComponent;
     };