X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FContainer%2FSALOME_Component_i.hxx;h=4315da8b38b6e954f96adc1509b8e134b21bbac6;hb=52111d0ad7a0d8acccc1bb4e49bb5877d949b844;hp=94fd62ce8824d3c147ec9947b47672dc6033e77d;hpb=bbac39ee34bd6a5e6fd051024209399b97b818b1;p=modules%2Fkernel.git diff --git a/src/Container/SALOME_Component_i.hxx b/src/Container/SALOME_Component_i.hxx index 94fd62ce8..4315da8b3 100644 --- a/src/Container/SALOME_Component_i.hxx +++ b/src/Container/SALOME_Component_i.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -6,7 +6,7 @@ // 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 @@ -49,7 +49,7 @@ class RegistryConnexion; class Engines_Container_i; -class CONTAINER_EXPORT Engines_Component_i: +class CONTAINER_EXPORT Engines_Component_i: public virtual POA_Engines::EngineComponent, public virtual PortableServer::ServantBase { @@ -57,16 +57,16 @@ public: Engines_Component_i(); Engines_Component_i(CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, - PortableServer::ObjectId * contId, - const char *instanceName, + PortableServer::ObjectId * contId, + const char *instanceName, const char *interfaceName, bool notif = false, bool regist = true); //Constructor for standalone component Engines_Component_i(CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, - Engines::Container_ptr container, - const char *instanceName, + Engines::Container_ptr container, + const char *instanceName, const char *interfaceName, bool notif = false, bool regist = true); @@ -103,26 +103,29 @@ public: CORBA::Boolean& isValidScript); // CORBA operations for Salome_file - virtual Engines::Salome_file_ptr getInputFileToService(const char* service_name, + virtual Engines::Salome_file_ptr getInputFileToService(const char* service_name, const char* Salome_file_name); - virtual Engines::Salome_file_ptr getOutputFileToService(const char* service_name, + virtual Engines::Salome_file_ptr getOutputFileToService(const char* service_name, const char* Salome_file_name); virtual void checkInputFilesToService(const char* service_name); - virtual Engines::Salome_file_ptr setInputFileToService(const char* service_name, + virtual Engines::Salome_file_ptr setInputFileToService(const char* service_name, const char* Salome_file_name); virtual void checkOutputFilesToService(const char* service_name); - virtual Engines::Salome_file_ptr setOutputFileToService(const char* service_name, + virtual Engines::Salome_file_ptr setOutputFileToService(const char* service_name, const char* Salome_file_name); // Object information virtual bool hasObjectInfo() { return false; } virtual char* getObjectInfo(CORBA::Long studyId, const char* entry) { return CORBA::string_dup(""); } - + + // Version information + virtual char* getVersion(); + // --- local C++ methods - PortableServer::ObjectId * getId(); + PortableServer::ObjectId * getId(); Engines_Container_i *GetContainerPtr(); std::string getContainerName(); void setContainerName(); @@ -146,7 +149,6 @@ public: std::string file_port_name, Salome_file_i * file); - protected: int _studyId; // -1: not initialised; 0: multiStudy; >0: study static bool _isMultiStudy; @@ -170,7 +172,7 @@ protected: typedef std::map _t_Salome_file_map; // Map Service_name to _Salome_file_map typedef std::map _t_Service_file_map; - + _t_Service_file_map _Input_Service_file_map; _t_Service_file_map _Output_Service_file_map; _t_Service_file_map::iterator _Service_file_map_it;